From 490fcd90abb62e5c7b1ed577de9b8a5fc06581df Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 15 Oct 2023 15:03:18 +0800 Subject: [PATCH 1/7] update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ecae3abf..a4a083f4 100644 --- a/index.html +++ b/index.html @@ -28,6 +28,6 @@
- + From 05f0439372955a38b340cfbd9ffc042ce895a426 Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 15 Oct 2023 15:21:34 +0800 Subject: [PATCH 2/7] save --- components.d.ts | 6 ------ package.json | 4 +++- pnpm-lock.yaml | 11 +++++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/components.d.ts b/components.d.ts index cd70f40c..6f4ef0da 100644 --- a/components.d.ts +++ b/components.d.ts @@ -16,7 +16,6 @@ declare module 'vue' { ChapterList: typeof import('./src/components/ChapterList.vue')['default'] Close: typeof import('./src/components/Close.vue')['default'] DictGroup: typeof import('./src/components/Toolbar/DictGroup.vue')['default'] - DictItem: typeof import('./src/components/DictItem.vue')['default'] DictList: typeof import('./src/components/DictList.vue')['default'] DictModal: typeof import('./src/components/Toolbar/DictModal.vue')['default'] EditAbleText: typeof import('./src/components/EditAbleText.vue')['default'] @@ -24,10 +23,6 @@ declare module 'vue' { EditBatchArticleModal: typeof import('./src/components/Article/EditBatchArticleModal.vue')['default'] EditSingleArticleModal: typeof import('./src/components/Article/EditSingleArticleModal.vue')['default'] ElButton: typeof import('element-plus/es')['ElButton'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] - ElCol: typeof import('element-plus/es')['ElCol'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -40,7 +35,6 @@ declare module 'vue' { ElSelect: typeof import('element-plus/es')['ElSelect'] ElSlider: typeof import('element-plus/es')['ElSlider'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] FeedbackModal: typeof import('./src/components/Toolbar/FeedbackModal.vue')['default'] Fireworks: typeof import('./src/components/Fireworks.vue')['default'] Footer: typeof import('./src/components/Practice/Footer.vue')['default'] diff --git a/package.json b/package.json index 736bb683..31bd8509 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "preview": "vite preview", "commit": "git-cz", "prepare": "husky install", - "test": "" + "test": "", + "deploy": "push-dir --dir=dist --branch=gh-pages --cleanup" }, "dependencies": { "@opentranslate/baidu": "^1.4.2", @@ -44,6 +45,7 @@ "commitizen": "^4.3.0", "cz-conventional-changelog": "^3.3.0", "husky": "^8.0.3", + "push-dir": "^0.4.1", "rollup-plugin-visualizer": "^5.9.2", "sass": "^1.64.2", "tslib": "^2.6.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 284be019..0a32c6f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -91,6 +91,9 @@ devDependencies: husky: specifier: ^8.0.3 version: 8.0.3 + push-dir: + specifier: ^0.4.1 + version: 0.4.1 rollup-plugin-visualizer: specifier: ^5.9.2 version: 5.9.2 @@ -2541,6 +2544,14 @@ packages: dev: true optional: true + /push-dir@0.4.1: + resolution: {integrity: sha512-Nrrsly0c3kCfu725Jnif/s5adHpBwKCGWBttHVxTndF4iyGBSFtNi/pduFxHF5ks0kWtHcbA3XXP5MEra6iiCA==} + engines: {node: '>=0.12'} + hasBin: true + dependencies: + minimist: 1.2.7 + dev: true + /qs@6.11.2: resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==} engines: {node: '>=0.6'} From d72814f62279ac61655cce0f25f161419d8e194d Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 15 Oct 2023 15:37:47 +0800 Subject: [PATCH 3/7] save --- index.html | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index a4a083f4..ecae3abf 100644 --- a/index.html +++ b/index.html @@ -28,6 +28,6 @@
- + diff --git a/package.json b/package.json index 31bd8509..03b5aabf 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "version": "0.0.0", "type": "module", + "homepage": "./", "scripts": { "dev": "vite", "build": "vue-tsc && vite build", From 8534896e3f9a95f29d0e6228fdb5d713e79ecef4 Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 15 Oct 2023 15:49:40 +0800 Subject: [PATCH 4/7] save --- package.json | 1 - vite.config.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03b5aabf..31bd8509 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "private": true, "version": "0.0.0", "type": "module", - "homepage": "./", "scripts": { "dev": "vite", "build": "vue-tsc && vite build", diff --git a/vite.config.ts b/vite.config.ts index 70d2d662..0b5d8b29 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -36,6 +36,7 @@ export default defineConfig({ open: true //如果存在本地服务端口，将在打包后自动展示 }) : null, ], + base:'./', resolve: { alias: { "@": pathResolve("src"), From 886142e9465280bca9fc9047ad191cfb16dad6bc Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 15 Oct 2023 15:51:17 +0800 Subject: [PATCH 5/7] save --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 31bd8509..74b8b9d4 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "commit": "git-cz", "prepare": "husky install", "test": "", - "deploy": "push-dir --dir=dist --branch=gh-pages --cleanup" + "deploy": "push-dir --dir=dist --branch=gh-pages --cleanup", + "d2": "git subtree push --prefix dist Web gh-pages" }, "dependencies": { "@opentranslate/baidu": "^1.4.2", From 5fb837774ed2e99d3a9e63f180a1b8391ba362ac Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 15 Oct 2023 16:07:56 +0800 Subject: [PATCH 6/7] save --- package.json | 3 +-- src/hooks/sound.ts | 10 +++++----- src/stores/base.ts | 4 ++-- vite.config.ts | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 74b8b9d4..31bd8509 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,7 @@ "commit": "git-cz", "prepare": "husky install", "test": "", - "deploy": "push-dir --dir=dist --branch=gh-pages --cleanup", - "d2": "git subtree push --prefix dist Web gh-pages" + "deploy": "push-dir --dir=dist --branch=gh-pages --cleanup" }, "dependencies": { "@opentranslate/baidu": "^1.4.2", diff --git a/src/hooks/sound.ts b/src/hooks/sound.ts index 1bca9d61..d702f945 100644 --- a/src/hooks/sound.ts +++ b/src/hooks/sound.ts @@ -101,13 +101,13 @@ export function usePlayAudio(url: string) { export function getAudioFileUrl(name: string) { if (name === '机械') { return [ - `/sound/key-sounds/jixie/机械0.mp3`, - `/sound/key-sounds/jixie/机械1.mp3`, - `/sound/key-sounds/jixie/机械2.mp3`, - `/sound/key-sounds/jixie/机械3.mp3`, + `./sound/key-sounds/jixie/机械0.mp3`, + `./sound/key-sounds/jixie/机械1.mp3`, + `./sound/key-sounds/jixie/机械2.mp3`, + `./sound/key-sounds/jixie/机械3.mp3`, ] } else { - return [`/sound/key-sounds/${name}.mp3`] + return [`./sound/key-sounds/${name}.mp3`] } } diff --git a/src/stores/base.ts b/src/stores/base.ts index dce56686..ba3e7e17 100644 --- a/src/stores/base.ts +++ b/src/stores/base.ts @@ -192,7 +192,7 @@ export const useBaseStore = defineStore('base', { DictType.customDict, ].includes(this.current.dictType)) { if (!this.currentDict.originWords.length) { - let r = await fetch(`${this.currentDict.url}`) + let r = await fetch(`.${this.currentDict.url}`) r.json().then(v => { this.currentDict.originWords = cloneDeep(v) this.currentDict.words = cloneDeep(v) @@ -207,7 +207,7 @@ export const useBaseStore = defineStore('base', { DictType.customArticle, ].includes(this.current.dictType)) { if (!this.currentDict.articles.length) { - let r = await fetch(`${this.currentDict.url}`) + let r = await fetch(`.${this.currentDict.url}`) r.json().then((v: any[]) => { this.currentDict.articles = cloneDeep(v.map(v => { v.id = uuidv4() diff --git a/vite.config.ts b/vite.config.ts index 0b5d8b29..6b0845f7 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -36,7 +36,7 @@ export default defineConfig({ open: true //如果存在本地服务端口，将在打包后自动展示 }) : null, ], - base:'./', + base: './', resolve: { alias: { "@": pathResolve("src"), From 08bbe9a030f6af8366963e8fa90128b02486aacd Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 15 Oct 2023 16:14:58 +0800 Subject: [PATCH 7/7] update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f45de7af..077b9182 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,9 @@ ## 📸 在线访问 -Netlify: +Github Pages: (国内推荐访问这个) +Netlify: (需要翻墙) ## 🛠 功能列表