From 06dea47bec39ba1d803d2788dbfc8ac81dae56fd Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 5 Sep 2025 17:48:41 +0800 Subject: [PATCH 01/24] =?UTF-8?q?feat:=20=E5=BC=95=E5=85=A5iconpark?= =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend_nuxt/app.vue | 2 +- frontend_nuxt/components/CommentItem.vue | 12 +++--- frontend_nuxt/components/MenuComponent.vue | 22 +++++----- frontend_nuxt/components/ReactionsGroup.vue | 2 +- frontend_nuxt/nuxt.config.ts | 17 +++++--- frontend_nuxt/package-lock.json | 17 ++++++++ frontend_nuxt/package.json | 1 + frontend_nuxt/pages/index.vue | 12 ++---- frontend_nuxt/plugins/iconpark.client.ts | 48 +++++++++++++++++++++ 9 files changed, 101 insertions(+), 32 deletions(-) create mode 100644 frontend_nuxt/plugins/iconpark.client.ts diff --git a/frontend_nuxt/app.vue b/frontend_nuxt/app.vue index 486e3a8d4..408521752 100644 --- a/frontend_nuxt/app.vue +++ b/frontend_nuxt/app.vue @@ -25,7 +25,7 @@ class="app-new-post-icon" @click="goToNewPost" > - + diff --git a/frontend_nuxt/components/CommentItem.vue b/frontend_nuxt/components/CommentItem.vue index 9c807ddc9..8fb7ebe96 100644 --- a/frontend_nuxt/components/CommentItem.vue +++ b/frontend_nuxt/components/CommentItem.vue @@ -15,16 +15,16 @@
{{ comment.userName }} - + {{ getMedalTitle(comment.medal) }} - + - +
@@ -53,10 +53,10 @@
- +
- +
diff --git a/frontend_nuxt/components/MenuComponent.vue b/frontend_nuxt/components/MenuComponent.vue index 7335a8c1b..f30efcfe0 100644 --- a/frontend_nuxt/components/MenuComponent.vue +++ b/frontend_nuxt/components/MenuComponent.vue @@ -4,7 +4,7 @@
- + 话题 - + 发帖 - + 我的消息 {{ showUnreadCount }} @@ -34,7 +34,7 @@ to="/about" @click="handleItemClick" > - + 关于 - + 🔥 活动 - + 站点统计 - + 积分商城 {{ myPoint }} @@ -74,7 +74,8 @@
类别 - + +
@@ -107,7 +108,8 @@
标签 - + +
@@ -120,7 +122,7 @@ class="section-item-icon" :alt="t.name" /> - + {{ t.name }} x {{ t.count }} diff --git a/frontend_nuxt/components/ReactionsGroup.vue b/frontend_nuxt/components/ReactionsGroup.vue index 2c983f93d..d4f658e52 100644 --- a/frontend_nuxt/components/ReactionsGroup.vue +++ b/frontend_nuxt/components/ReactionsGroup.vue @@ -19,7 +19,7 @@
- +
diff --git a/frontend_nuxt/nuxt.config.ts b/frontend_nuxt/nuxt.config.ts index ec01e7cb4..0656e9d51 100644 --- a/frontend_nuxt/nuxt.config.ts +++ b/frontend_nuxt/nuxt.config.ts @@ -15,7 +15,12 @@ export default defineNuxtConfig({ telegramBotId: process.env.NUXT_PUBLIC_TELEGRAM_BOT_ID || '', }, }, - css: ['vditor/dist/index.css', '~/assets/fonts.css', '~/assets/global.css'], + css: [ + 'vditor/dist/index.css', + '~/assets/fonts.css', + '~/assets/global.css', + '@icon-park/vue-next/styles/index.css', + ], app: { pageTransition: { name: 'page', mode: 'out-in' }, head: { @@ -72,11 +77,11 @@ export default defineNuxtConfig({ rel: 'manifest', href: '/manifest.webmanifest', }, - { - rel: 'stylesheet', - href: 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css', - referrerpolicy: 'no-referrer', - }, + // { + // rel: 'stylesheet', + // href: 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css', + // referrerpolicy: 'no-referrer', + // }, ], }, baseURL: '/', diff --git a/frontend_nuxt/package-lock.json b/frontend_nuxt/package-lock.json index 31931b57b..1e9ca8f91 100644 --- a/frontend_nuxt/package-lock.json +++ b/frontend_nuxt/package-lock.json @@ -6,6 +6,7 @@ "": { "name": "frontend_nuxt", "dependencies": { + "@icon-park/vue-next": "^1.4.2", "@nuxt/image": "^1.11.0", "@stomp/stompjs": "^7.0.0", "cropperjs": "^1.6.2", @@ -25,6 +26,9 @@ "vue-echarts": "^7.0.3", "vue-flatpickr-component": "^12.0.0", "vue-toastification": "^2.0.0-rc.5" + }, + "engines": { + "node": ">=20.0.0" } }, "node_modules/@ampproject/remapping": { @@ -990,6 +994,19 @@ "integrity": "sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==", "license": "MIT" }, + "node_modules/@icon-park/vue-next": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@icon-park/vue-next/-/vue-next-1.4.2.tgz", + "integrity": "sha512-+QklF255wkfBOabY+xw6FAI0Bwln/RhdwCunNy/9sKdKuChtaU67QZqU67KGAvZUTeeBgsL+yaHHxqfQeGZXEQ==", + "license": "Apache-2.0", + "engines": { + "node": ">= 8.0.0", + "npm": ">= 5.0.0" + }, + "peerDependencies": { + "vue": "3.x" + } + }, "node_modules/@img/sharp-darwin-arm64": { "version": "0.34.3", "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.3.tgz", diff --git a/frontend_nuxt/package.json b/frontend_nuxt/package.json index 277fb3f4d..8df2c955a 100644 --- a/frontend_nuxt/package.json +++ b/frontend_nuxt/package.json @@ -12,6 +12,7 @@ "generate": "nuxt generate" }, "dependencies": { + "@icon-park/vue-next": "^1.4.2", "@nuxt/image": "^1.11.0", "@stomp/stompjs": "^7.0.0", "cropperjs": "^1.6.2", diff --git a/frontend_nuxt/pages/index.vue b/frontend_nuxt/pages/index.vue index d671abacc..aaaa42ccc 100644 --- a/frontend_nuxt/pages/index.vue +++ b/frontend_nuxt/pages/index.vue @@ -68,13 +68,10 @@ >
- - - - + + + + {{ article.title }} @@ -141,7 +138,6 @@ import { getToken } from '~/utils/auth' import { stripMarkdown } from '~/utils/markdown' import { useIsMobile } from '~/utils/screen' import TimeManager from '~/utils/time' - useHead({ title: 'OpenIsle - 全面开源的自由社区', meta: [ diff --git a/frontend_nuxt/plugins/iconpark.client.ts b/frontend_nuxt/plugins/iconpark.client.ts new file mode 100644 index 000000000..641410beb --- /dev/null +++ b/frontend_nuxt/plugins/iconpark.client.ts @@ -0,0 +1,48 @@ +import { defineNuxtPlugin } from 'nuxt/app' +import { + Pin, + Fireworks, + Gift, + RankingList, + Star, + Edit, + HashtagKey, + Remind, + Info, + ChartLine, + Finance, + Up, + Down, + TagOne, + MedalOne, + Next, + DropDownList, + MoreOne, + Comment, + Link, + FaceWithoutMouth, +} from '@icon-park/vue-next' + +export default defineNuxtPlugin((nuxtApp) => { + nuxtApp.vueApp.component('Pin', Pin) + nuxtApp.vueApp.component('Fireworks', Fireworks) + nuxtApp.vueApp.component('Gift', Gift) + nuxtApp.vueApp.component('RankingList', RankingList) + nuxtApp.vueApp.component('Star', Star) + nuxtApp.vueApp.component('Edit', Edit) + nuxtApp.vueApp.component('HashtagKey', HashtagKey) + nuxtApp.vueApp.component('Remind', Remind) + nuxtApp.vueApp.component('Info', Info) + nuxtApp.vueApp.component('ChartLine', ChartLine) + nuxtApp.vueApp.component('Finance', Finance) + nuxtApp.vueApp.component('Up', Up) + nuxtApp.vueApp.component('Down', Down) + nuxtApp.vueApp.component('TagOne', TagOne) + nuxtApp.vueApp.component('MedalOne', MedalOne) + nuxtApp.vueApp.component('Next', Next) + nuxtApp.vueApp.component('DropDownList', DropDownList) + nuxtApp.vueApp.component('MoreOne', MoreOne) + nuxtApp.vueApp.component('CommentIcon', Comment) + nuxtApp.vueApp.component('LinkIcon', Link) + nuxtApp.vueApp.component('FaceWithoutMouth', FaceWithoutMouth) +}) From d13ee2257fd474ba71246c1c656e86fbbd667754 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 5 Sep 2025 18:01:38 +0800 Subject: [PATCH 02/24] =?UTF-8?q?feat:=20=E8=A1=A8=E6=83=85=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend_nuxt/components/ReactionsGroup.vue | 5 ++--- frontend_nuxt/plugins/iconpark.client.ts | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend_nuxt/components/ReactionsGroup.vue b/frontend_nuxt/components/ReactionsGroup.vue index d4f658e52..feeac2adf 100644 --- a/frontend_nuxt/components/ReactionsGroup.vue +++ b/frontend_nuxt/components/ReactionsGroup.vue @@ -19,8 +19,7 @@
- - +
{{ c.name }} @@ -135,7 +135,7 @@
- +
@@ -195,11 +195,11 @@ const { const iconClass = computed(() => { switch (themeState.mode) { case ThemeMode.DARK: - return 'fas fa-moon' + return 'Moon' case ThemeMode.LIGHT: - return 'fas fa-sun' + return 'SunOne' default: - return 'fas fa-desktop' + return 'ComputerOne' } }) diff --git a/frontend_nuxt/plugins/iconpark.client.ts b/frontend_nuxt/plugins/iconpark.client.ts index f76c31445..457e106aa 100644 --- a/frontend_nuxt/plugins/iconpark.client.ts +++ b/frontend_nuxt/plugins/iconpark.client.ts @@ -18,6 +18,9 @@ import { Next, DropDownList, MoreOne, + SunOne, + Moon, + ComputerOne, Comment, Link, SlyFaceWhitSmile, @@ -49,6 +52,9 @@ export default defineNuxtPlugin((nuxtApp) => { nuxtApp.vueApp.component('Next', Next) nuxtApp.vueApp.component('DropDownList', DropDownList) nuxtApp.vueApp.component('MoreOne', MoreOne) + nuxtApp.vueApp.component('SunOne', SunOne) + nuxtApp.vueApp.component('Moon', Moon) + nuxtApp.vueApp.component('ComputerOne', ComputerOne) nuxtApp.vueApp.component('CommentIcon', Comment) nuxtApp.vueApp.component('LinkIcon', Link) nuxtApp.vueApp.component('SlyFaceWhitSmile', SlyFaceWhitSmile) From 3bb14ca6a389da9f82894b89801340e4add8faaa Mon Sep 17 00:00:00 2001 From: Tim <135014430+nagisa77@users.noreply.github.com> Date: Sat, 6 Sep 2025 01:42:15 +0800 Subject: [PATCH 06/24] feat: use iconpark in base tabs --- frontend_nuxt/components/BaseTabs.vue | 8 +++++++- frontend_nuxt/pages/users/[id].vue | 10 +++++----- frontend_nuxt/plugins/iconpark.client.ts | 4 ++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/frontend_nuxt/components/BaseTabs.vue b/frontend_nuxt/components/BaseTabs.vue index f9272b9e0..0f505f3ac 100644 --- a/frontend_nuxt/components/BaseTabs.vue +++ b/frontend_nuxt/components/BaseTabs.vue @@ -8,7 +8,12 @@ :class="['base-tabs-item', { selected: modelValue === tab.key }]" @click="$emit('update:modelValue', tab.key)" > - + +
{{ tab.label }}
@@ -72,6 +77,7 @@ function onTouchEnd(e) { align-items: center; } +.base-tabs-item-icon, .base-tabs-item i { margin-right: 6px; } diff --git a/frontend_nuxt/pages/users/[id].vue b/frontend_nuxt/pages/users/[id].vue index 3275d0ef6..f8f613f76 100644 --- a/frontend_nuxt/pages/users/[id].vue +++ b/frontend_nuxt/pages/users/[id].vue @@ -368,11 +368,11 @@ const selectedTab = ref( : 'summary', ) const tabs = [ - { key: 'summary', label: '总结', icon: 'fas fa-chart-line' }, - { key: 'timeline', label: '时间线', icon: 'fas fa-clock' }, - { key: 'following', label: '关注', icon: 'fas fa-user-plus' }, - { key: 'favorites', label: '收藏', icon: 'fas fa-bookmark' }, - { key: 'achievements', label: '勋章', icon: 'fas fa-medal' }, + { key: 'summary', label: '总结', icon: 'ChartLine' }, + { key: 'timeline', label: '时间线', icon: 'AlarmClock' }, + { key: 'following', label: '关注', icon: 'AddUser' }, + { key: 'favorites', label: '收藏', icon: 'Bookmark' }, + { key: 'achievements', label: '勋章', icon: 'MedalOne' }, ] const followTab = ref('followers') diff --git a/frontend_nuxt/plugins/iconpark.client.ts b/frontend_nuxt/plugins/iconpark.client.ts index 450e9ceba..72c6bc176 100644 --- a/frontend_nuxt/plugins/iconpark.client.ts +++ b/frontend_nuxt/plugins/iconpark.client.ts @@ -34,6 +34,8 @@ import { AddUser, ReduceUser, MessageOne, + AlarmClock, + Bookmark, } from '@icon-park/vue-next' export default defineNuxtPlugin((nuxtApp) => { @@ -71,4 +73,6 @@ export default defineNuxtPlugin((nuxtApp) => { nuxtApp.vueApp.component('AddUser', AddUser) nuxtApp.vueApp.component('ReduceUser', ReduceUser) nuxtApp.vueApp.component('MessageOne', MessageOne) + nuxtApp.vueApp.component('AlarmClock', AlarmClock) + nuxtApp.vueApp.component('Bookmark', Bookmark) }) From f5d8f37f96a803ff8484f9f8cdc7335b5175b840 Mon Sep 17 00:00:00 2001 From: Tim <135014430+nagisa77@users.noreply.github.com> Date: Sat, 6 Sep 2025 01:55:50 +0800 Subject: [PATCH 07/24] feat(frontend): migrate BaseInput to IconPark --- frontend_nuxt/components/BaseInput.vue | 5 ++--- frontend_nuxt/pages/forgot-password.vue | 8 ++++---- frontend_nuxt/pages/login.vue | 4 ++-- frontend_nuxt/pages/settings.vue | 2 +- frontend_nuxt/pages/signup.vue | 13 ++++--------- frontend_nuxt/plugins/iconpark.client.ts | 6 ++++++ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/frontend_nuxt/components/BaseInput.vue b/frontend_nuxt/components/BaseInput.vue index 211e19ec8..cdaebf429 100644 --- a/frontend_nuxt/components/BaseInput.vue +++ b/frontend_nuxt/components/BaseInput.vue @@ -1,6 +1,6 @@ {{ option.name }} x {{ option.count }} diff --git a/frontend_nuxt/components/CommentEditor.vue b/frontend_nuxt/components/CommentEditor.vue index 422fb563c..68203de89 100644 --- a/frontend_nuxt/components/CommentEditor.vue +++ b/frontend_nuxt/components/CommentEditor.vue @@ -7,7 +7,7 @@
- +
diff --git a/frontend_nuxt/components/CommentItem.vue b/frontend_nuxt/components/CommentItem.vue index 8fb7ebe96..d87f19f14 100644 --- a/frontend_nuxt/components/CommentItem.vue +++ b/frontend_nuxt/components/CommentItem.vue @@ -71,8 +71,8 @@ />
- - + + {{ replyCount }}条回复
@@ -375,7 +375,6 @@ const handleContentClick = (e) => { } .reply-toggle-icon { - margin-right: 5px; } .common-info-content-header { diff --git a/frontend_nuxt/components/InviteCodeActivityComponent.vue b/frontend_nuxt/components/InviteCodeActivityComponent.vue index eed2bfefc..98bfed71a 100644 --- a/frontend_nuxt/components/InviteCodeActivityComponent.vue +++ b/frontend_nuxt/components/InviteCodeActivityComponent.vue @@ -2,7 +2,7 @@
- + 邀请规则说明
@@ -17,7 +17,7 @@

邀请链接：{{ inviteLink }} - +

diff --git a/frontend_nuxt/components/LoginOverlay.vue b/frontend_nuxt/components/LoginOverlay.vue index e1a7907b7..af508a404 100644 --- a/frontend_nuxt/components/LoginOverlay.vue +++ b/frontend_nuxt/components/LoginOverlay.vue @@ -2,7 +2,7 @@