diff --git a/.github/workflows/deploy-aliyun-oss.yml b/.github/workflows/deploy-aliyun-oss.yml index 31e64222..6829e3b3 100644 --- a/.github/workflows/deploy-aliyun-oss.yml +++ b/.github/workflows/deploy-aliyun-oss.yml @@ -34,7 +34,7 @@ jobs: run: pnpm install - name: Build - run: pnpm run build + run: pnpm run build-oss - name: Deploy to OSS + Refresh CDN run: pnpm run deploy-oss diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml index 08f1f058..dfc8fbe7 100644 --- a/.github/workflows/deploy-pages.yml +++ b/.github/workflows/deploy-pages.yml @@ -34,7 +34,7 @@ jobs: run: pnpm install - name: Build - run: pnpm run build-nocdn + run: pnpm run build - name: Upload artifact uses: actions/upload-pages-artifact@v3 diff --git a/Note.md b/Note.md index bb6111f8..c60fe2d6 100644 --- a/Note.md +++ b/Note.md @@ -68,13 +68,4 @@ Food and talk 26的 of curse 1、例句可以选中单词，并添加到收藏 - -1、域名：你需要一个真正的品牌，type域名，契合内容，让人记得住 -2、口号太墨迹记不住，要简介：学习英语，一次敲击，一点进步记忆不再盲目，学习更高效，开源单词与文章练习工具 -3、布局：没有逻辑，首页进去看到标题，然后两个小的单词练习、文章联系，下面又是一大堆大的，没有逻辑和划分 -4、下面联系方式你需要放一个QQ群，社群资源，全放联系方式等于没放 -5、ABC页面弹出来的保存书签，不是加入书签就不迷失，是要让他们肌肉记忆住这个网站 -6、ABC页面太墨迹，不简洁，进度复杂，本周学习记录改成日历，有个标记，+激励分享功能，满足炫耀欲望 -7、设置不要用那个烂字体，真的很山寨， -8、更新日志要按v版本和日期跟踪，要写的多，做得少，显示你在认真维护，是个令人尊重的程序员 -9、必须加后端、账号注册 \ No newline at end of file +2、ABC页面太墨迹，不简洁，进度复杂，本周学习记录改成日历，有个标记，+激励分享功能，满足炫耀欲望 diff --git a/components.d.ts b/components.d.ts index a7719dd0..59240612 100644 --- a/components.d.ts +++ b/components.d.ts @@ -20,7 +20,6 @@ declare module 'vue' { Book: typeof import('./src/components/Book.vue')['default'] Checkbox: typeof import('./src/components/base/checkbox/Checkbox.vue')['default'] Close: typeof import('./src/components/icon/Close.vue')['default'] - CollectNotice: typeof import('./src/components/CollectNotice.vue')['default'] ConflictNotice: typeof import('./src/components/ConflictNotice.vue')['default'] DeleteIcon: typeof import('./src/components/icon/DeleteIcon.vue')['default'] Dialog: typeof import('./src/components/dialog/Dialog.vue')['default'] @@ -78,7 +77,6 @@ declare module 'vue' { IconFluentSlideTextTitleEdit20Regular: typeof import('~icons/fluent/slide-text-title-edit20-regular')['default'] IconFluentSpeakerEdit20Regular: typeof import('~icons/fluent/speaker-edit20-regular')['default'] IconFluentSpeakerSettings20Regular: typeof import('~icons/fluent/speaker-settings20-regular')['default'] - IconFluentStar12Regular: typeof import('~icons/fluent/star12-regular')['default'] IconFluentStar16Filled: typeof import('~icons/fluent/star16-filled')['default'] IconFluentStar16Regular: typeof import('~icons/fluent/star16-regular')['default'] IconFluentStar20Filled: typeof import('~icons/fluent/star20-filled')['default'] @@ -92,12 +90,7 @@ declare module 'vue' { IconFluentWeatherMoon16Regular: typeof import('~icons/fluent/weather-moon16-regular')['default'] IconFluentWeatherSunny16Regular: typeof import('~icons/fluent/weather-sunny16-regular')['default'] IconIconParkOutlineAddMusic: typeof import('~icons/icon-park-outline/add-music')['default'] - IconMaterialSymbolsMail: typeof import('~icons/material-symbols/mail')['default'] IconPhExportLight: typeof import('~icons/ph/export-light')['default'] - IconRiTwitterFill: typeof import('~icons/ri/twitter-fill')['default'] - IconSimpleIconsGithub: typeof import('~icons/simple-icons/github')['default'] - IconSimpleIconsWechat: typeof import('~icons/simple-icons/wechat')['default'] - IconSimpleIconsXiaohongshu: typeof import('~icons/simple-icons/xiaohongshu')['default'] IconSystemUiconsImport: typeof import('~icons/system-uicons/import')['default'] InputNumber: typeof import('./src/components/base/InputNumber.vue')['default'] List: typeof import('./src/components/list/List.vue')['default'] diff --git a/index.html b/index.html index 054961f8..d90b0653 100644 --- a/index.html +++ b/index.html @@ -2,34 +2,50 @@ - - - - Type Words - 词文记 | 单词跟打 · 文章跟打 + Type Words 官网 - 词文记 | 单词跟打 · 文章跟打 + content="Type Words 官方网站 - 在线英语练习平台，支持单词、文章跟打练习，提升英语学习效率。Practice English, one strike, one step forward"> + content="Type Words, Typing Word, Type Words 官网, 官方网站, 英语打字练习, 单词跟打, 文章跟打, 键盘练习, 英语学习, 文章学习, 打字练习软件, 单词记忆工具, 英语学习软件, 背单词神器, 英语肌肉记忆, 键盘工作者, 免费英语学习, 音标发音, 默写练习, 在线学英语, CET-4, CET-6, TOEFL, IELTS, GRE, GMAT, SAT, 考研英语, 专四专八, 程序员英语, JavaScript API, Node.js API, Java API, Linux命令, 编程词汇, 技术英语, VSCode插件, 开源项目, GitHub趋势榜, V2EX热搜, Gitee GVP, 少数派推荐, 英语打字训练, WPM统计, 准确率分析, 商务英语, BEC, 雅思听力, 日语学习, 多语言学习, 英语口语练习, 单词拼写训练"> + + + + - + + content="Type Words 官方网站 - 在线英语练习平台，支持单词、文章跟打练习，提升英语学习效率。Practice English, one strike, one step forward"> - + + content="Type Words 官方网站 - 在线英语练习平台，支持单词、文章跟打练习，提升英语学习效率。Practice English, one strike, one step forward"> - - + + + + + + + + + + + + + + + + + +
diff --git a/netlify.toml b/netlify.toml deleted file mode 100644 index 782b28e8..00000000 --- a/netlify.toml +++ /dev/null @@ -1,5 +0,0 @@ -[[redirects]] - from = "/baidu" - to = "https://api.fanyi.baidu.com/api/trans/vip/translate" - status = 200 - force = true \ No newline at end of file diff --git a/package.json b/package.json index 03beb38c..ba6bd345 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,11 @@ "start": "vite", "dev": "vite", "test": "", - "build": "vite build && node scripts/do.js", - "build-nocdn": "vite build", + "build": "vite build", + "build-oss": "vite build && node scripts/do.js", "build-tsc": "vue-tsc && vite build", "report": "vite build", + "report-oss": "vite build", "preview": "vite preview", "commit": "git-cz", "prepare": "husky install", diff --git a/public/article.png b/public/article.png deleted file mode 100644 index 35d6168e..00000000 Binary files a/public/article.png and /dev/null differ diff --git a/manifest.json b/public/manifest.json similarity index 100% rename from manifest.json rename to public/manifest.json diff --git a/public/qq.jpg b/public/qq.jpg new file mode 100644 index 00000000..94c0d414 Binary files /dev/null and b/public/qq.jpg differ diff --git a/service-worker.js b/public/service-worker.js similarity index 100% rename from service-worker.js rename to public/service-worker.js diff --git a/public/static-home.html b/public/static-home.html index 6e05356d..ae78be0e 100644 --- a/public/static-home.html +++ b/public/static-home.html @@ -2,81 +2,51 @@ - - - Type Words - 词文记 | 单词跟打 · 文章跟打 + Type Words 官网 - 词文记 | 单词跟打 · 文章跟打 + content="Type Words 官方网站 - 在线英语练习平台，支持单词、文章跟打练习，提升英语学习效率。Practice English, one strike, one step forward"> + content="Type Words, Typing Word, Type Words 官网, 官方网站, 英语打字练习, 单词跟打, 文章跟打, 键盘练习, 英语学习, 文章学习, 打字练习软件, 单词记忆工具, 英语学习软件, 背单词神器, 英语肌肉记忆, 键盘工作者, 免费英语学习, 音标发音, 默写练习, 在线学英语, CET-4, CET-6, TOEFL, IELTS, GRE, GMAT, SAT, 考研英语, 专四专八, 程序员英语, JavaScript API, Node.js API, Java API, Linux命令, 编程词汇, 技术英语, VSCode插件, 开源项目, GitHub趋势榜, V2EX热搜, Gitee GVP, 少数派推荐, 英语打字训练, WPM统计, 准确率分析, 商务英语, BEC, 雅思听力, 日语学习, 多语言学习, 英语口语练习, 单词拼写训练"> + + + + - + + content="Type Words 官方网站 - 在线英语练习平台，支持单词、文章跟打练习，提升英语学习效率。Practice English, one strike, one step forward"> - + + content="Type Words 官方网站 - 在线英语练习平台，支持单词、文章跟打练习，提升英语学习效率。Practice English, one strike, one step forward"> - - + + +

Type Words

-

学习英语，一次敲击，一点进步

-

记忆不再盲目，学习更高效，开源单词与文章练习工具

+

学习英语，一次敲击，一点进步，开源单词与文章练习工具

单词练习
@@ -306,11 +336,11 @@
- - + Skywork.AI - Skywork.AI:10 tasks in 1 hour, not 10 hours →Limited free spots: 127 left + 赞助：Skywork.AI: 10 tasks in 1 hour, not 10 hours →Limited free spots: 127 left
@@ -383,7 +413,7 @@
简洁高效
    -
  • 简洁设计，现代化UI，无广告
    • +
  • 简洁设计，现代化UI
  • 界面清爽，操作简单
  • 不强制关注任何平台
@@ -425,6 +455,10 @@ d="M8.691 2.188C3.891 2.188 0 5.476 0 9.53c0 2.212 1.17 4.203 3.002 5.55a.59.59 0 0 1 .213.665l-.39 1.48c-.019.07-.048.141-.048.213c0 .163.13.295.29.295a.33.33 0 0 0 .167-.054l1.903-1.114a.86.86 0 0 1 .717-.098a10.2 10.2 0 0 0 2.837.403c.276 0 .543-.027.811-.05c-.857-2.578.157-4.972 1.932-6.446c1.703-1.415 3.882-1.98 5.853-1.838c-.576-3.583-4.196-6.348-8.596-6.348M5.785 5.991c.642 0 1.162.529 1.162 1.18a1.17 1.17 0 0 1-1.162 1.178A1.17 1.17 0 0 1 4.623 7.17c0-.651.52-1.18 1.162-1.18zm5.813 0c.642 0 1.162.529 1.162 1.18a1.17 1.17 0 0 1-1.162 1.178a1.17 1.17 0 0 1-1.162-1.178c0-.651.52-1.18 1.162-1.18m5.34 2.867c-1.797-.052-3.746.512-5.28 1.786c-1.72 1.428-2.687 3.72-1.78 6.22c.942 2.453 3.666 4.229 6.884 4.229c.826 0 1.622-.12 2.361-.336a.72.72 0 0 1 .598.082l1.584.926a.3.3 0 0 0 .14.047c.134 0 .24-.111.24-.247c0-.06-.023-.12-.038-.177l-.327-1.233a.6.6 0 0 1-.023-.156a.49.49 0 0 1 .201-.398C23.024 18.48 24 16.82 24 14.98c0-3.21-2.931-5.837-6.656-6.088V8.89c-.135-.01-.27-.027-.407-.03zm-2.53 3.274c.535 0 .969.44.969.982a.976.976 0 0 1-.969.983a.976.976 0 0 1-.969-.983c0-.542.434-.982.97-.982zm4.844 0c.535 0 .969.44.969.982a.976.976 0 0 1-.969.983a.976.976 0 0 1-.969-.983c0-.542.434-.982.969-.982">
+ +
+ +
-
Type Words 交流群
+
微信群
@@ -473,9 +507,7 @@
- - 加入我们的用户社群后，您可以与我们的开发团队进行沟通，分享您的使用体验和建议，帮助我们改进产品，同时也能够及时了解我们的最新动态和更新内容。 - + 加入我们的用户社群后，您可以与我们的开发团队进行沟通，分享您的使用体验和建议，帮助我们改进产品，同时也能够及时了解我们的最新动态和更新内容。
微信群二维码
@@ -499,6 +531,24 @@
+ +
+
+
QQ群
+ + + +
+
+ 加入我们的用户社群后，您可以与我们的开发团队进行沟通，分享您的使用体验和建议，帮助我们改进产品，同时也能够及时了解我们的最新动态和更新内容。 +
+ QQ群二维码 +
+
+
diff --git a/public/wechat.png b/public/wechat.png index 10b44143..082f1c0c 100644 Binary files a/public/wechat.png and b/public/wechat.png differ diff --git a/public/word.png b/public/word.png deleted file mode 100644 index d1d495f0..00000000 Binary files a/public/word.png and /dev/null differ diff --git a/src/pages/article/components/TypingArticle.vue b/src/pages/article/components/TypingArticle.vue index b90dd56d..ad6932b2 100644 --- a/src/pages/article/components/TypingArticle.vue +++ b/src/pages/article/components/TypingArticle.vue @@ -427,8 +427,8 @@ function onContextMenu(e: MouseEvent, sentence: Sentence, i, j, w) { label: "收藏单词", onClick: () => { let word = props.article.sections[i][j].words[w] - let doc = nlp(word.word) let text = word.word + let doc = nlp(text) // 优先判断是不是动词 if (doc.verbs().found) { text = doc.verbs().toInfinitive().text() diff --git a/vite.config.ts b/vite.config.ts index d806be2c..7bae2ed2 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -17,7 +17,8 @@ function pathResolve(dir: string) { } const lifecycle = process.env.npm_lifecycle_event; -let isCdnBuild = ['build', 'report'].includes(lifecycle) +let isCdnBuild = ['build-oss', 'report-oss'].includes(lifecycle) +let isAnalyseBuild = ['report-oss', 'report'].includes(lifecycle) // https://vitejs.dev/config/ export default defineConfig(() => { @@ -47,7 +48,7 @@ export default defineConfig(() => { }, }), UnoCSS(), - lifecycle === 'report' ? + isAnalyseBuild ? visualizer({ gzipSize: true, brotliSize: true,