Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: azusatheme #87

Merged
merged 2 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions build.pem

This file was deleted.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.12.0",
"@typescript-eslint/parser": "^7.12.0",
"@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.13.0",
"@welldone-software/why-did-you-render": "^8.0.1",
"babel-loader": "^9.1.3",
"clean-webpack-plugin": "^4.0.0",
Expand All @@ -53,14 +53,14 @@
"lodash": "^4.17.21",
"mini-css-extract-plugin": "^2.9.0",
"node-sass": "^9.0.0",
"prettier": "^3.3.1",
"prettier": "^3.3.2",
"progress-bar-webpack-plugin": "^2.1.0",
"react-refresh": "^0.14.2",
"sass-loader": "^14.2.1",
"style-loader": "^4.0.0",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "^5.4.5",
"webpack": "^5.91.0",
"webpack": "^5.92.0",
"webpack-cli": "^5.1.4",
"webpack-config-utils": "^2.3.1",
"webpack-dev-server": "^5.0.4"
Expand Down
5 changes: 3 additions & 2 deletions src/styles/skin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const setting = await getPlayerSetting();
// http://192.168.50.1:19527/getimg?imgserve=itsuki&file=herabanner.png

export const SkinMap: { [key: string]: () => any } = {
诺莺nox: () => NoxTheme(),
诺莺Nox: () => NoxTheme(),
阿梓Azusa: () => AzusaTheme(),
星谷樹itsuki: () => ItsukiTheme(),
clessS: () => ClessSTheme(),
'Amelia Watson': () => AmeliaTheme(),
Expand Down Expand Up @@ -51,7 +52,7 @@ export const skins = (key = setting.skin) => {
* various color themes
*
*/
return SkinMap[key ?? '诺莺nox']() ?? AzusaTheme();
return SkinMap[key ?? '诺莺Nox']() ?? AzusaTheme();
};
const playerStyle = getSkin();
return {
Expand Down
148 changes: 79 additions & 69 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3091,15 +3091,15 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/eslint-plugin@npm:^7.12.0":
version: 7.12.0
resolution: "@typescript-eslint/eslint-plugin@npm:7.12.0"
"@typescript-eslint/eslint-plugin@npm:^7.13.0":
version: 7.13.0
resolution: "@typescript-eslint/eslint-plugin@npm:7.13.0"
dependencies:
"@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:7.12.0"
"@typescript-eslint/type-utils": "npm:7.12.0"
"@typescript-eslint/utils": "npm:7.12.0"
"@typescript-eslint/visitor-keys": "npm:7.12.0"
"@typescript-eslint/scope-manager": "npm:7.13.0"
"@typescript-eslint/type-utils": "npm:7.13.0"
"@typescript-eslint/utils": "npm:7.13.0"
"@typescript-eslint/visitor-keys": "npm:7.13.0"
graphemer: "npm:^1.4.0"
ignore: "npm:^5.3.1"
natural-compare: "npm:^1.4.0"
Expand All @@ -3110,68 +3110,68 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/abf899e07144e8edd8ae010d25e4679e2acded407a10efc6aaa7ee325af8daf0dd149946ad58e46982e29e0a23f56b1e0dd461ef09aab09b0d94fc24ffc827c2
checksum: 10c0/00a69d029713252c03490e0a9c49c9136d99c9c1888dd3570b1e044c9a740b59c2e488849beda654d6fc0a69e2549445c16d443bcf5832c66b7a4472b42826ae
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:^7.12.0":
version: 7.12.0
resolution: "@typescript-eslint/parser@npm:7.12.0"
"@typescript-eslint/parser@npm:^7.13.0":
version: 7.13.0
resolution: "@typescript-eslint/parser@npm:7.13.0"
dependencies:
"@typescript-eslint/scope-manager": "npm:7.12.0"
"@typescript-eslint/types": "npm:7.12.0"
"@typescript-eslint/typescript-estree": "npm:7.12.0"
"@typescript-eslint/visitor-keys": "npm:7.12.0"
"@typescript-eslint/scope-manager": "npm:7.13.0"
"@typescript-eslint/types": "npm:7.13.0"
"@typescript-eslint/typescript-estree": "npm:7.13.0"
"@typescript-eslint/visitor-keys": "npm:7.13.0"
debug: "npm:^4.3.4"
peerDependencies:
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/223c32a6ba6cee770ee39108fb0a6d132283673d44c751bec85d8792df3382ddb839617787d183dc8fd7686d8a2018bf1ec0f3d63b7010c4370913f249c80fbc
checksum: 10c0/8cf58116d6577c9459db3e3047e337dc41d914bf222a33b20e149515d037e09e6171fbac5af02b66aa6fbad81dd492fa5b7bcd44aaf659d4e9b02ab23100f955
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:7.12.0":
version: 7.12.0
resolution: "@typescript-eslint/scope-manager@npm:7.12.0"
"@typescript-eslint/scope-manager@npm:7.13.0":
version: 7.13.0
resolution: "@typescript-eslint/scope-manager@npm:7.13.0"
dependencies:
"@typescript-eslint/types": "npm:7.12.0"
"@typescript-eslint/visitor-keys": "npm:7.12.0"
checksum: 10c0/7af53cd9045cc70459e4f451377affc0ef03e67bd743480ab2cbfebe1b7d8269fc639406966930c5abb26f1b633623c98442c2b60f6257e0ce1555439343d5e9
"@typescript-eslint/types": "npm:7.13.0"
"@typescript-eslint/visitor-keys": "npm:7.13.0"
checksum: 10c0/0f5c75578ee8cb3c31b9c4e222f4787ea4621fde639f3ac0a467e56250f3cc48bf69304c33b2b8cc8ba5ec69f3977b6c463b8d9e791806af9a8c6a2233505432
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:7.12.0":
version: 7.12.0
resolution: "@typescript-eslint/type-utils@npm:7.12.0"
"@typescript-eslint/type-utils@npm:7.13.0":
version: 7.13.0
resolution: "@typescript-eslint/type-utils@npm:7.13.0"
dependencies:
"@typescript-eslint/typescript-estree": "npm:7.12.0"
"@typescript-eslint/utils": "npm:7.12.0"
"@typescript-eslint/typescript-estree": "npm:7.13.0"
"@typescript-eslint/utils": "npm:7.13.0"
debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.3.0"
peerDependencies:
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/41f4aa20d24724b461eb0cdac69d91ef60c2b628fb4a5739e4dbb8378aa4a7ff20c302f60e5d74ce75d5b99fcd3e3d71b9b3c96a1714aac47ce2ce5d6d611fcd
checksum: 10c0/240e9b34e8602444cd234b84c9e3e52c565e3141a4942751f597c38cee48f7cb43c42a093d219ac6404dca2e74b54d2a8121fe66cbc59f404cb0ec2adecd8520
languageName: node
linkType: hard

"@typescript-eslint/types@npm:7.12.0":
version: 7.12.0
resolution: "@typescript-eslint/types@npm:7.12.0"
checksum: 10c0/76786d02a0838750d74ad6e49b026875c0753b81c5a46a56525a1e82d89c0939a13434b03494e3b31b7ffbba7824f426c5b502a12337806a1f6ca560b5dad46c
"@typescript-eslint/types@npm:7.13.0":
version: 7.13.0
resolution: "@typescript-eslint/types@npm:7.13.0"
checksum: 10c0/73dc59d4b0d0f0fed9f4b9b55f143185259ced5f0ca8ad9efa881eea1ff1cc9ccc1f175af2e2069f7b92a69c9f64f9be29d160c932b8f70a129af6b738b23be0
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:7.12.0":
version: 7.12.0
resolution: "@typescript-eslint/typescript-estree@npm:7.12.0"
"@typescript-eslint/typescript-estree@npm:7.13.0":
version: 7.13.0
resolution: "@typescript-eslint/typescript-estree@npm:7.13.0"
dependencies:
"@typescript-eslint/types": "npm:7.12.0"
"@typescript-eslint/visitor-keys": "npm:7.12.0"
"@typescript-eslint/types": "npm:7.13.0"
"@typescript-eslint/visitor-keys": "npm:7.13.0"
debug: "npm:^4.3.4"
globby: "npm:^11.1.0"
is-glob: "npm:^4.0.3"
Expand All @@ -3181,31 +3181,31 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/855be5ba6c3d7540319ad250555055a798deb04855f26abe719a3b8d555a3227d52e09453930bd829e260a72f65a985998b235514ce2872b31615015da3163c0
checksum: 10c0/75b09384bc14afa3d3623507432d19d8ca91c4e936b1d2c1cfe4654a9c07179f1bc04aa99d1b541e84e40a01536862b23058f462d61b4a797c27d02f64b8aa51
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:7.12.0":
version: 7.12.0
resolution: "@typescript-eslint/utils@npm:7.12.0"
"@typescript-eslint/utils@npm:7.13.0":
version: 7.13.0
resolution: "@typescript-eslint/utils@npm:7.13.0"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:7.12.0"
"@typescript-eslint/types": "npm:7.12.0"
"@typescript-eslint/typescript-estree": "npm:7.12.0"
"@typescript-eslint/scope-manager": "npm:7.13.0"
"@typescript-eslint/types": "npm:7.13.0"
"@typescript-eslint/typescript-estree": "npm:7.13.0"
peerDependencies:
eslint: ^8.56.0
checksum: 10c0/04241c0313f2d061bc81ec2d5d589c9a723f8c1493e5b83d98f804ff9dac23c5e7157d9bb57bee8b458f40824f56ea65a02ebd344926a37cb58bf151cb4d3bf2
checksum: 10c0/5391f628775dec1a7033d954a066b77eeb03ac04c0a94690e60d8ebe351b57fdbda51b90cf785c901bcdf68b88ca3bcb5533ac59276b8b626b73eb18ac3280b6
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:7.12.0":
version: 7.12.0
resolution: "@typescript-eslint/visitor-keys@npm:7.12.0"
"@typescript-eslint/visitor-keys@npm:7.13.0":
version: 7.13.0
resolution: "@typescript-eslint/visitor-keys@npm:7.13.0"
dependencies:
"@typescript-eslint/types": "npm:7.12.0"
"@typescript-eslint/types": "npm:7.13.0"
eslint-visitor-keys: "npm:^3.4.3"
checksum: 10c0/f3aa6704961e65fa8d66fcde57cd28e382412bb8bec2e99312bf8cda38772ae9a74d6d95b9765f76a249bc9ab65624db34b8c00078ebad129b2e1b624e935d90
checksum: 10c0/5daa45c3358aeab41495c4419cc26fbbe54a42bb18c6f0f70f0ac31cb7bc5890ec6478a1a6bb00b0b8522663fe5466ee0fd2972bd4235b07140918875797f4eb
languageName: node
linkType: hard

Expand Down Expand Up @@ -3449,12 +3449,12 @@ __metadata:
languageName: node
linkType: hard

"acorn-import-assertions@npm:^1.9.0":
version: 1.9.0
resolution: "acorn-import-assertions@npm:1.9.0"
"acorn-import-attributes@npm:^1.9.5":
version: 1.9.5
resolution: "acorn-import-attributes@npm:1.9.5"
peerDependencies:
acorn: ^8
checksum: 10c0/3b4a194e128efdc9b86c2b1544f623aba4c1aa70d638f8ab7dc3971a5b4aa4c57bd62f99af6e5325bb5973c55863b4112e708a6f408bad7a138647ca72283afe
checksum: 10c0/5926eaaead2326d5a86f322ff1b617b0f698aa61dc719a5baa0e9d955c9885cc71febac3fb5bacff71bbf2c4f9c12db2056883c68c53eb962c048b952e1e013d
languageName: node
linkType: hard

Expand Down Expand Up @@ -5578,7 +5578,7 @@ __metadata:
languageName: node
linkType: hard

"enhanced-resolve@npm:^5.12.0, enhanced-resolve@npm:^5.16.0, enhanced-resolve@npm:^5.7.0":
"enhanced-resolve@npm:^5.12.0, enhanced-resolve@npm:^5.7.0":
version: 5.16.0
resolution: "enhanced-resolve@npm:5.16.0"
dependencies:
Expand All @@ -5588,6 +5588,16 @@ __metadata:
languageName: node
linkType: hard

"enhanced-resolve@npm:^5.17.0":
version: 5.17.0
resolution: "enhanced-resolve@npm:5.17.0"
dependencies:
graceful-fs: "npm:^4.2.4"
tapable: "npm:^2.2.0"
checksum: 10c0/90065e58e4fd08e77ba47f827eaa17d60c335e01e4859f6e644bb3b8d0e32b203d33894aee92adfa5121fa262f912b48bdf0d0475e98b4a0a1132eea1169ad37
languageName: node
linkType: hard

"entities@npm:^2.0.0":
version: 2.2.0
resolution: "entities@npm:2.2.0"
Expand Down Expand Up @@ -9125,8 +9135,8 @@ __metadata:
"@types/react": "npm:^18.3.3"
"@types/react-dom": "npm:^18.3.0"
"@types/uuid": "npm:^9.0.8"
"@typescript-eslint/eslint-plugin": "npm:^7.12.0"
"@typescript-eslint/parser": "npm:^7.12.0"
"@typescript-eslint/eslint-plugin": "npm:^7.13.0"
"@typescript-eslint/parser": "npm:^7.13.0"
"@welldone-software/why-did-you-render": "npm:^8.0.1"
axios: "npm:^1.7.2"
babel-loader: "npm:^9.1.3"
Expand Down Expand Up @@ -9174,7 +9184,7 @@ __metadata:
octokit: "npm:^4.0.2"
os-browserify: "npm:^0.3.0"
path-browserify: "npm:^1.0.1"
prettier: "npm:^3.3.1"
prettier: "npm:^3.3.2"
progress-bar-webpack-plugin: "npm:^2.1.0"
prop-types: "npm:^15.8.1"
react: "npm:^18.3.1"
Expand All @@ -9195,7 +9205,7 @@ __metadata:
typescript: "npm:^5.4.5"
util: "npm:^0.12.5"
uuid: "npm:^10.0.0"
webpack: "npm:^5.91.0"
webpack: "npm:^5.92.0"
webpack-cli: "npm:^5.1.4"
webpack-config-utils: "npm:^2.3.1"
webpack-dev-server: "npm:^5.0.4"
Expand Down Expand Up @@ -9841,12 +9851,12 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:^3.3.1":
version: 3.3.1
resolution: "prettier@npm:3.3.1"
"prettier@npm:^3.3.2":
version: 3.3.2
resolution: "prettier@npm:3.3.2"
bin:
prettier: bin/prettier.cjs
checksum: 10c0/c25a709c9f0be670dc6bcb190b622347e1dbeb6c3e7df8b0711724cb64d8647c60b839937a4df4df18e9cfb556c2b08ca9d24d9645eb5488a7fc032a2c4d5cb3
checksum: 10c0/39ed27d17f0238da6dd6571d63026566bd790d3d0edac57c285fbab525982060c8f1e01955fe38134ab10f0951a6076da37f015db8173c02f14bc7f0803a384c
languageName: node
linkType: hard

Expand Down Expand Up @@ -12371,20 +12381,20 @@ __metadata:
languageName: node
linkType: hard

"webpack@npm:^5.91.0":
version: 5.91.0
resolution: "webpack@npm:5.91.0"
"webpack@npm:^5.92.0":
version: 5.92.0
resolution: "webpack@npm:5.92.0"
dependencies:
"@types/eslint-scope": "npm:^3.7.3"
"@types/estree": "npm:^1.0.5"
"@webassemblyjs/ast": "npm:^1.12.1"
"@webassemblyjs/wasm-edit": "npm:^1.12.1"
"@webassemblyjs/wasm-parser": "npm:^1.12.1"
acorn: "npm:^8.7.1"
acorn-import-assertions: "npm:^1.9.0"
acorn-import-attributes: "npm:^1.9.5"
browserslist: "npm:^4.21.10"
chrome-trace-event: "npm:^1.0.2"
enhanced-resolve: "npm:^5.16.0"
enhanced-resolve: "npm:^5.17.0"
es-module-lexer: "npm:^1.2.1"
eslint-scope: "npm:5.1.1"
events: "npm:^3.2.0"
Expand All @@ -12404,7 +12414,7 @@ __metadata:
optional: true
bin:
webpack: bin/webpack.js
checksum: 10c0/74a3e0ea1c9a492accf035317f31769ffeaaab415811524b9f17bc7bf7012c5b6e1a9860df5ca6903f3ae2618727b801eb47d9351a2595dfffb25941d368b88c
checksum: 10c0/588de5ce6f1e8fb4fec7300c2c36a8fc844fe71f4c871b06aca1a68553bea8f6479697615abb53cbbeb2e3859fc1b982f2f48ff23dd0e60024f69bb3d46d0712
languageName: node
linkType: hard

Expand Down
Loading