From 559f566d503b14a3a64f1698d88c905db5621049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=B2=AB=E8=8A=B1=E7=81=ABzzz=F0=9F=8C=99?=
 <xmcn@1l1.icu>
Date: Thu, 19 Sep 2024 02:12:46 +0800
Subject: [PATCH] =?UTF-8?q?[*]=20=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=EF=BC=8C=E6=8C=89=E7=85=A7=20Vue3=20?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E8=A7=84=E8=8C=83=EF=BC=8C.vue=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E8=87=B3=E5=B0=91=E4=BD=BF=E7=94=A8=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E8=AF=8D=E7=BB=84=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   8 +-
 src/components/GuestNav.vue                   |   2 +-
 src/components/GuestSideBar.vue               |   2 +-
 src/components/InstallCsApp.vue               |   1 +
 src/components/MainNav.vue                    |   2 +-
 src/components/MainSideBar.vue                |   4 +-
 src/main.js                                   |   8 +-
 src/router/index.js                           | 143 +++++++++---------
 src/utils/profile.js                          |   2 +-
 src/utils/request.js                          |   2 +-
 .../{Dashboard.vue => DashboardView.vue}      |   0
 src/views/{Donate.vue => DonateView.vue}      |   0
 src/views/{IcpCheck.vue => IcpCheckView.vue}  |   0
 src/views/{Main.vue => MainView.vue}          |   2 +-
 src/views/NotFoundView.vue                    |  35 +++++
 src/views/{RealName.vue => RealNameView.vue}  |   0
 src/views/{Sign.vue => SignView.vue}          |   0
 src/views/SoftwareDownloadView.vue            |   0
 .../NewYearView.vue}                          |   0
 .../{Prize.vue => activities/PrizeView.vue}   |   0
 src/views/{Login.vue => auth/LoginView.vue}   |   2 +-
 .../{Register.vue => auth/RegisterView.vue}   |   2 +-
 .../ResetPasswordView.vue}                    |   2 +-
 .../{AddProxies.vue => proxies/AddView.vue}   |   0
 .../{Config.vue => proxies/ConfigView.vue}    |   0
 .../{Proxies.vue => proxies/ProxiesView.vue}  |   2 +-
 tsconfig.node.json                            |   3 +
 vite.config.js                                |   5 +-
 28 files changed, 138 insertions(+), 89 deletions(-)
 rename src/views/{Dashboard.vue => DashboardView.vue} (100%)
 rename src/views/{Donate.vue => DonateView.vue} (100%)
 rename src/views/{IcpCheck.vue => IcpCheckView.vue} (100%)
 rename src/views/{Main.vue => MainView.vue} (99%)
 create mode 100644 src/views/NotFoundView.vue
 rename src/views/{RealName.vue => RealNameView.vue} (100%)
 rename src/views/{Sign.vue => SignView.vue} (100%)
 create mode 100644 src/views/SoftwareDownloadView.vue
 rename src/views/{NewYear.vue => activities/NewYearView.vue} (100%)
 rename src/views/{Prize.vue => activities/PrizeView.vue} (100%)
 rename src/views/{Login.vue => auth/LoginView.vue} (99%)
 rename src/views/{Register.vue => auth/RegisterView.vue} (99%)
 rename src/views/{ResetPassword.vue => auth/ResetPasswordView.vue} (99%)
 rename src/views/{AddProxies.vue => proxies/AddView.vue} (100%)
 rename src/views/{Config.vue => proxies/ConfigView.vue} (100%)
 rename src/views/{Proxies.vue => proxies/ProxiesView.vue} (99%)

diff --git a/src/App.vue b/src/App.vue
index 9ce1dae..5225533 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -28,9 +28,9 @@ import {
   NNotificationProvider,
   useOsTheme
 } from 'naive-ui'
-import MainNav from './components/MainNav.vue'
-import GuestNav from './components/GuestNav.vue'
-import Notification from './components/Notification.vue'
+import MainNav from '@components/MainNav.vue'
+import GuestNav from '@components/GuestNav.vue'
+import Notification from '@components/Notification.vue'
 import { computed } from 'vue'
 import userData from '@/utils/stores/userData/store'
 import hljs from 'highlight.js/lib/core'
@@ -39,7 +39,7 @@ import nginx from 'highlight.js/lib/languages/nginx'
 import api from '@/api'
 import { sendWarningMessage } from '@/utils/message'
 import { logout } from '@/utils/profile'
-import router from '@/router/index'
+import router from '@router'
 // import { init_ws, SetOnMessageFunction } from "@/utils/websocket.js";
 // import { sendInfoNotification } from '@/utils/notification'
 
diff --git a/src/components/GuestNav.vue b/src/components/GuestNav.vue
index 0e57b39..18ed2cb 100644
--- a/src/components/GuestNav.vue
+++ b/src/components/GuestNav.vue
@@ -41,7 +41,7 @@
 import { h, ref, onMounted } from 'vue'
 import { NGradientText } from 'naive-ui'
 import GuestSideBar from './GuestSideBar.vue'
-import router from '@/router/index'
+import router from '@router'
 import { get } from '@/utils/request'
 
 // 手机状态下收缩菜单栏
diff --git a/src/components/GuestSideBar.vue b/src/components/GuestSideBar.vue
index ea0fb6b..55862da 100644
--- a/src/components/GuestSideBar.vue
+++ b/src/components/GuestSideBar.vue
@@ -68,7 +68,7 @@ const menuOptions = [
 </script>
 <script>
 import { ref } from 'vue'
-import router from '@/router/index'
+import router from '@router'
 
 const active = ref('')
 
diff --git a/src/components/InstallCsApp.vue b/src/components/InstallCsApp.vue
index 881c94f..e6ecbd3 100644
--- a/src/components/InstallCsApp.vue
+++ b/src/components/InstallCsApp.vue
@@ -11,6 +11,7 @@
       <n-space vertical>
         <n-spin :show="show">
           <div style="text-align: center">
+            <n-alert title="已废弃" type="warning"> 请改用软件下载 </n-alert>
             文件名: {{ file_name }}
             <br />
             <br />
diff --git a/src/components/MainNav.vue b/src/components/MainNav.vue
index 326ebde..50bfae4 100644
--- a/src/components/MainNav.vue
+++ b/src/components/MainNav.vue
@@ -107,7 +107,7 @@ import { h, ref, onMounted } from 'vue'
 import { NGradientText } from 'naive-ui'
 import SideBar from './MainSideBar.vue'
 import userData from '@/utils/stores/userData/store'
-import router from '@/router/index'
+import router from '@router'
 import UserInfo, { changeUserInfoShow } from './UserInfo.vue'
 import { get } from '@/utils/request'
 import { GitAlt } from '@vicons/fa'
diff --git a/src/components/MainSideBar.vue b/src/components/MainSideBar.vue
index 1afaaea..7ee96e6 100644
--- a/src/components/MainSideBar.vue
+++ b/src/components/MainSideBar.vue
@@ -113,7 +113,7 @@ const menuOptions = [
         icon: renderIcon(List)
       },
       {
-        path: '/config',
+        path: '/proxies/config',
         label: '配置文件',
         key: 'Config',
         icon: renderIcon(FileTrayFull)
@@ -204,7 +204,7 @@ const inverted = false
 </script>
 <script>
 import { ref } from 'vue'
-import router from '@/router/index'
+import router from '@router'
 
 const active = ref('')
 const menuInstRef = ref(null)
diff --git a/src/main.js b/src/main.js
index ec041cb..a638a36 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,10 +2,10 @@ import { createApp } from 'vue'
 import './style.css'
 import './twemoji-amazing.css'
 import App from './App.vue'
-import message from './components/Message.vue'
-import loadingbar from './components/LoadingBar.vue'
-import ndialog from './components/Dialog.vue'
-import router from './router/index'
+import message from '@components/Message.vue'
+import loadingbar from '@components/LoadingBar.vue'
+import ndialog from '@components/Dialog.vue'
+import router from '@router'
 import axios from 'axios'
 import VueAxios from 'vue-axios'
 import userData from '@/utils/stores/userData/store'
diff --git a/src/router/index.js b/src/router/index.js
index e932e67..31f1fbf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,10 +1,10 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import { finishLoadingBar, startLoadingBar } from '@/utils/loadingbar'
 import userData from '@/utils/stores/userData/store'
-import { changeMainSideBarShow } from '../components/MainNav.vue'
-import { changeShowGuestSideBar } from '../components/GuestNav.vue'
-import { setSideBarActiveKey } from '../components/MainSideBar.vue'
-import { setGuestSideBarActiveKey } from '../components/GuestSideBar.vue'
+import { changeMainSideBarShow } from '@/components/MainNav.vue'
+import { changeShowGuestSideBar } from '@/components/GuestNav.vue'
+import { setSideBarActiveKey } from '@/components/MainSideBar.vue'
+import { setGuestSideBarActiveKey } from '@/components/GuestSideBar.vue'
 import logger from '@/utils/logger'
 
 const routes = [
@@ -15,127 +15,147 @@ const routes = [
         path: '/',
         name: 'MainPage',
         meta: {
-          keepAlive: true,
           title: '首页'
         },
-        component: () => import('../views/Main.vue')
+        component: () => import('@views/MainView.vue')
       },
       {
         path: '/dashboard',
         name: 'Dashboard',
         meta: {
+          title: '仪表盘',
           keepAlive: true,
-          title: '仪表盘'
+          needLogin: true
         },
-        component: () => import('../views/Dashboard.vue')
+        component: () => import('@views/DashboardView.vue')
       },
       {
         path: '/sign',
         name: 'Sign',
         meta: {
+          title: '签到',
           keepAlive: true,
-          title: '签到'
+          needLogin: true
         },
-        component: () => import('../views/Sign.vue')
+        component: () => import('@views/SignView.vue')
       },
       {
         path: '/login',
         name: 'Login',
         meta: {
+          title: '登录',
           keepAlive: true,
-          title: '登录'
+          autoRedirectLogined: true
         },
-        component: () => import('../views/Login.vue')
+        component: () => import('@views/auth/LoginView.vue')
       },
       {
         path: '/register',
         name: 'Register',
         meta: {
+          title: '注册',
           keepAlive: true,
-          title: '注册'
+          autoRedirectLogined: true
         },
-        component: () => import('../views/Register.vue')
+        component: () => import('@views/auth/RegisterView.vue')
       },
       {
         path: '/reset_password',
         name: 'ResetPassword',
         meta: {
+          title: '重置密码',
           keepAlive: true,
-          title: '重置密码'
+          autoRedirectLogined: true
         },
-        component: () => import('../views/ResetPassword.vue')
+        component: () => import('@views/auth/ResetPasswordView.vue')
       },
       {
         path: '/proxies',
         name: 'Proxies',
         meta: {
+          title: '隧道列表',
           keepAlive: true,
-          title: '隧道列表'
+          needLogin: true
         },
-        component: () => import('../views/Proxies.vue')
+        component: () => import('@views/proxies/ProxiesView.vue')
       },
       {
         path: '/proxies/add',
         name: 'AddProxies',
         meta: {
+          title: '添加隧道',
           keepAlive: true,
-          title: '添加隧道'
+          needLogin: true
         },
-        component: () => import('../views/AddProxies.vue')
+        component: () => import('@views/proxies/AddView.vue')
       },
       {
         path: '/realname',
         name: 'RealName',
         meta: {
+          title: '实名认证',
           keepAlive: true,
-          title: '实名认证'
+          needLogin: true
         },
-        component: () => import('../views/RealName.vue')
+        component: () => import('@views/RealNameView.vue')
       },
       {
         path: '/hello2024',
         name: 'NewYear',
         meta: {
+          title: '留言',
           keepAlive: true,
-          title: '留言'
+          needLogin: true
         },
-        component: () => import('../views/NewYear.vue')
+        component: () => import('@views/activities/NewYearView.vue')
       },
       {
         path: '/prize',
         name: 'Prize',
         meta: {
+          title: '抽奖',
           keepAlive: true,
-          title: '抽奖'
+          needLogin: true
         },
-        component: () => import('../views/Prize.vue')
+        component: () => import('@views/activities/PrizeView.vue')
       },
       {
-        path: '/config',
+        path: '/proxies/config',
         name: 'Config',
         meta: {
+          title: '配置文件',
           keepAlive: true,
-          title: '配置文件'
+          needLogin: true
         },
-        component: () => import('../views/Config.vue')
+        component: () => import('@views/proxies/ConfigView.vue')
       },
       {
         path: '/donate',
         name: 'Donate',
         meta: {
+          title: '赞助',
           keepAlive: true,
-          title: '赞助'
+          needLogin: true
         },
-        component: () => import('../views/Donate.vue')
+        component: () => import('@views/DonateView.vue')
       },
       {
         path: '/icp',
         name: 'Icp',
         meta: {
+          title: '域名白名单',
           keepAlive: true,
-          title: '域名白名单'
+          needLogin: true
         },
-        component: () => import('../views/IcpCheck.vue')
+        component: () => import('@views/IcpCheckView.vue')
+      },
+      {
+        path: '/:pathMatch(.*)*',
+        name: 'NotFound',
+        meta: {
+          title: '页面未找到'
+        },
+        component: () => import('@views/NotFoundView.vue')
       }
       // 没做完的
       // {
@@ -145,7 +165,7 @@ const routes = [
       //     keepAlive: true,
       //     title: '多人游戏大厅'
       //   },
-      //   component: () => import('../views/LanLobby.vue')
+      //   component: () => import('@views/LanLobby.vue')
       // }
     ]
   }
@@ -161,54 +181,41 @@ const router = createRouter({
 //   userData.commit('set_token', localStorage.getItem('token'))
 // }
 
-// 检测到已登录之后自动跳转 /dashboard 的界面
-const _autoRedirectLogined = ['Login', 'Register', 'ResetPassword']
-
 router.beforeEach((to, from, next) => {
   logger.info(`Routing from ${from.name} to ${to.name}`)
   startLoadingBar()
-  if (_autoRedirectLogined.includes(to.name)) {
-    const hasToken = userData.getters.get_token != ''
-    logger.info(`Has token: ${hasToken}${hasToken ? ` ${userData.getters.get_token}` : ''}`)
-    if (hasToken) next({ name: 'Dashboard' })
-    else next()
-  } else if (to.name === 'MainPage') {
-    next()
-  } else if (userData.getters.get_token == '') {
+
+  if (to.name === 'NotFound') {
+    next() // 直接放行 404 路由
+    return
+  }
+
+  const hasToken = userData.getters.get_token !== ''
+
+  if (to.meta.needLogin && !hasToken) {
     next({ name: 'Login', query: { redirect: location.pathname } })
-  } else {
-    next()
   }
+  if (to.meta.autoRedirectLogined && hasToken) {
+    next({ name: 'Dashboard' })
+  }
+  next()
 })
 
 // from next
 router.afterEach((to) => {
   finishLoadingBar()
   if (to.meta.title) {
-    //设置标题
+    // 设置标题
     document.title = to.meta.title + ' | LoCyanFrp'
   }
 
-  switch (to.name) {
-    case 'MainPage':
-      changeMainSideBarShow(false)
-      changeShowGuestSideBar(false)
-      break
-    case 'Login':
-      changeMainSideBarShow(false)
-      changeShowGuestSideBar(true)
-      break
-    case 'Register':
-      changeMainSideBarShow(false)
-      changeShowGuestSideBar(true)
-      break
-    case 'ResetPassword':
-      changeMainSideBarShow(false)
-      changeShowGuestSideBar(true)
-      break
-    default:
-      changeMainSideBarShow(true)
-      changeShowGuestSideBar(false)
+  // 需要登录则展示主 sidebar
+  if (to.meta.needLogin) {
+    changeMainSideBarShow(true)
+    changeShowGuestSideBar(false)
+  } else {
+    changeMainSideBarShow(false)
+    changeShowGuestSideBar(false)
   }
 
   if (userData.getters.get_token) {
diff --git a/src/utils/profile.js b/src/utils/profile.js
index ef83673..f18dfb7 100644
--- a/src/utils/profile.js
+++ b/src/utils/profile.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { ref } from 'vue'
 import userData from './stores/userData/store'
-import router from '@/router/index'
+import router from '@router'
 import { get } from './request'
 import { sendWarningMessage } from './message'
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 179e8bc..2410c06 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,7 @@ import axios from 'axios'
 import QS from 'qs'
 // vuex
 import userData from './stores/userData/store'
-import router from '@/router/index'
+import router from '@router'
 import Base64 from 'qs/lib/utils'
 import { sendErrorMessage } from './message'
 import logger from '@/utils/logger'
diff --git a/src/views/Dashboard.vue b/src/views/DashboardView.vue
similarity index 100%
rename from src/views/Dashboard.vue
rename to src/views/DashboardView.vue
diff --git a/src/views/Donate.vue b/src/views/DonateView.vue
similarity index 100%
rename from src/views/Donate.vue
rename to src/views/DonateView.vue
diff --git a/src/views/IcpCheck.vue b/src/views/IcpCheckView.vue
similarity index 100%
rename from src/views/IcpCheck.vue
rename to src/views/IcpCheckView.vue
diff --git a/src/views/Main.vue b/src/views/MainView.vue
similarity index 99%
rename from src/views/Main.vue
rename to src/views/MainView.vue
index 47d792c..0519ff3 100644
--- a/src/views/Main.vue
+++ b/src/views/MainView.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script setup>
-import router from '@/router/index'
+import router from '@router'
 
 const GoToDocs = () => {
   window.open('https://doc.locyan.cn')
diff --git a/src/views/NotFoundView.vue b/src/views/NotFoundView.vue
new file mode 100644
index 0000000..ef2900a
--- /dev/null
+++ b/src/views/NotFoundView.vue
@@ -0,0 +1,35 @@
+<script setup>
+import router from '@router'
+import userData from '@/utils/stores/userData/store'
+</script>
+
+<template>
+  <div class="flex-center outbox">
+    <h2>404 :&lpar;</h2>
+    <p>我们没有找到你请求的页面，似乎你来到了没有任何东西的地方..?</p>
+    <n-button
+      style="margin-top: 10px"
+      @click="
+        () => {
+          if (userData.getters.get_token != '') router.push('/dashboard')
+          else router.push('/')
+        }
+      "
+    >
+      带我去首页
+    </n-button>
+  </div>
+</template>
+
+<style scoped>
+.outbox {
+  margin: 3rem;
+  margin-block: 40vh;
+}
+.flex-center {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/RealName.vue b/src/views/RealNameView.vue
similarity index 100%
rename from src/views/RealName.vue
rename to src/views/RealNameView.vue
diff --git a/src/views/Sign.vue b/src/views/SignView.vue
similarity index 100%
rename from src/views/Sign.vue
rename to src/views/SignView.vue
diff --git a/src/views/SoftwareDownloadView.vue b/src/views/SoftwareDownloadView.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/NewYear.vue b/src/views/activities/NewYearView.vue
similarity index 100%
rename from src/views/NewYear.vue
rename to src/views/activities/NewYearView.vue
diff --git a/src/views/Prize.vue b/src/views/activities/PrizeView.vue
similarity index 100%
rename from src/views/Prize.vue
rename to src/views/activities/PrizeView.vue
diff --git a/src/views/Login.vue b/src/views/auth/LoginView.vue
similarity index 99%
rename from src/views/Login.vue
rename to src/views/auth/LoginView.vue
index 2ea31be..6134914 100644
--- a/src/views/Login.vue
+++ b/src/views/auth/LoginView.vue
@@ -58,7 +58,7 @@
 import { ref, onMounted } from 'vue'
 import { useLoadingBar, useMessage } from 'naive-ui'
 import { getUrlKey } from '@/utils/request'
-import router from '@/router/index'
+import router from '@router'
 import userData from '@/utils/stores/userData/store'
 import { sendErrorMessage } from '@/utils/message'
 import logger from '@/utils/logger'
diff --git a/src/views/Register.vue b/src/views/auth/RegisterView.vue
similarity index 99%
rename from src/views/Register.vue
rename to src/views/auth/RegisterView.vue
index 9a0efbe..06a9c78 100644
--- a/src/views/Register.vue
+++ b/src/views/auth/RegisterView.vue
@@ -50,7 +50,7 @@
 <script setup>
 import { ref } from 'vue'
 import { useLoadingBar, useMessage } from 'naive-ui'
-import router from '@/router/index'
+import router from '@router'
 import api from '@/api'
 // import logger from '@/utils/logger'
 
diff --git a/src/views/ResetPassword.vue b/src/views/auth/ResetPasswordView.vue
similarity index 99%
rename from src/views/ResetPassword.vue
rename to src/views/auth/ResetPasswordView.vue
index 49a76f8..e78cd13 100644
--- a/src/views/ResetPassword.vue
+++ b/src/views/auth/ResetPasswordView.vue
@@ -60,7 +60,7 @@
 import { ref } from 'vue'
 import { useLoadingBar, useMessage } from 'naive-ui'
 import { getUrlKey } from '@/utils/request'
-import router from '@/router/index'
+import router from '@router'
 import api from '@/api'
 import logger from '@/utils/logger'
 
diff --git a/src/views/AddProxies.vue b/src/views/proxies/AddView.vue
similarity index 100%
rename from src/views/AddProxies.vue
rename to src/views/proxies/AddView.vue
diff --git a/src/views/Config.vue b/src/views/proxies/ConfigView.vue
similarity index 100%
rename from src/views/Config.vue
rename to src/views/proxies/ConfigView.vue
diff --git a/src/views/Proxies.vue b/src/views/proxies/ProxiesView.vue
similarity index 99%
rename from src/views/Proxies.vue
rename to src/views/proxies/ProxiesView.vue
index a0c7ff4..4ec5d19 100644
--- a/src/views/Proxies.vue
+++ b/src/views/proxies/ProxiesView.vue
@@ -263,7 +263,7 @@ import { useDialog } from 'naive-ui'
 import userData from '@/utils/stores/userData/store'
 import { sendErrorMessage, sendSuccessMessage } from '@/utils/message'
 import { sendErrorDialog, sendSuccessDialog, sendWarningDialog } from '@/utils/dialog'
-import downloadSoftPage from '../components/InstallCsApp.vue'
+import downloadSoftPage from '@components/InstallCsApp.vue'
 import api from '@/api'
 import logger from '@/utils/logger'
 
diff --git a/tsconfig.node.json b/tsconfig.node.json
index 8387885..9dd56b8 100644
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -1,5 +1,8 @@
 {
   "extends": "@tsconfig/node20/tsconfig.json",
+  "include": [
+    "vite.config.*"
+  ],
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
diff --git a/vite.config.js b/vite.config.js
index 63ea101..43b31f2 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -39,7 +39,10 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      '@': path.resolve('./src') // @代替src
+      '@': path.resolve('./src'), // @代替src
+      '@views': path.resolve('./src/views'),
+      '@components': path.resolve('./src/components'),
+      '@router': path.resolve('./src/router/index.js')
     }
   },
   build: {