Merge pull request #242 from little3201/develop

优化认证逻辑，修改国际化文件和配置，修改接口请求得函数

Author: little3201

.gitignore

@@ -31,3 +31,6 @@ yarn-error.log*
 
 # local .env files
 .env.local*
+
+# vitest coverage
+/coverage

.husky/commit-msg

@@ -0,0 +1 @@
+pnpm dlx commitlint --edit $1

.husky/pre-commit

@@ -0,0 +1,2 @@
+pnpm run lint:lint-staged
+pnpm test

.vscode/extensions.json

@@ -1,8 +1,9 @@
 {
   "recommendations": [
-    "Vue.volar",
     "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
     "editorconfig.editorconfig",
+    "vue.volar",
     "wayou.vscode-todo-highlight"
   ],
   "unwantedRecommendations": [

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
   "editor.bracketPairColorization.enabled": true,
   "editor.guides.bracketPairs": true,
-  "editor.formatOnSave": true,
   "editor.defaultFormatter": "dbaeumer.vscode-eslint",
   "editor.codeActionsOnSave": [
     "source.fixAll.eslint"
@@ -13,5 +12,9 @@
     "vue"
   ],
   "typescript.tsdk": "node_modules/typescript/lib",
-  "eslint.format.enable": true
+  "eslint.format.enable": true,
+  "editor.formatOnSave": true,
+  "[typescript]": {
+    "editor.defaultFormatter": "vscode.typescript-language-features"
+  }
 }

README.md

@@ -1,7 +1,13 @@
 # Leafage UI
 
+<div align="center">
+
+[![license](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE) [![github stars](https://img.shields.io/github/stars/little3201/leafage-ui)](https://github.com/little3201/leafage-ui/stargazers) [![github forks](https://img.shields.io/github/forks/little3201/leafage-ui)](https://github.com/little3201/leafage-ui/network/members)
+
+</div>
+
 <p align="center">
-  免费且美观的管理模板，使用 Vue 3、Vite、Pinia 和 Tailwind CSS构建。设计用于构建高效、响应式和快速加载的管理界面。
+  管理模板，使用 Vue 3/React、Vite、Pinia 和 Tailwind CSS构建。设计用于构建高效、响应式和快速加载的管理界面。
 
   后台接口服务仓库： <a href="https://github.com/little3201/leafage.git">后端服务仓库</a> </br>
 
@@ -12,32 +18,48 @@
 
 ### 特性
 
-- **Vue 3、Vite、Pinia 和 Tailwind CSS -** 快速高效的开发
+- **Vue 3/React、Vite、Pinia 和 Tailwind CSS -** 快速高效的开发
 - **深色主题 -** 现代且引人注目
 - **可访问性 -** 包容且用户友好
 - **i18n集成 -** 便于全球本地化
-- **响应式设计 -** 无缝适应所有设备
-- **专业支持 -** 专家提供可靠帮助
+- **响应式设计 -** 自适应各种大小的设备
 - **高度可定制 -** 可根据项目风格定制
 
+## 技术栈
+
+开发框架：Vue3/React、TypeScript、Vite、Element-Plus/Quasar、Tailwind CSS
+测试框架：Vitest
+代码规范：Eslint、Husky、Lint-staged、commitlint
+
 ### 目录结构
 
 ```
+├── public/                 # Public static assets
+│   ├── icons/              # Public icons
+│   ├── svgs/               # Public svgs
 ├── src/
-│   ├── api/            # http request api
-│   ├── boot/           # Vue composables
-│   ├── components/     # Vue components
-│   ├── constants/      # Constants
-│   ├── i18n/           # i18n
-│   ├── layouts/        # Layout components
-│   ├── mocks/          # Mocks
-│   ├── pages/          # Pages
-│   ├── router/         # vue router
-│   ├── stores/         # Pinia
-│   ├── utils/          # Utils
-│   └── App.vue         # Root component
-├── public/             # Public static assets
-├── index.html          # Entry HTML file
-└── eslint.config.js    # Eslint configuration
-└── vite.config.js      # Vite configuration
+│   ├── api/                # http request api
+│   ├── assets/             # assets
+│   ├── boot/               # plugins init
+│   ├── components/         # Vue components
+│   ├── constants/          # Constants
+│   ├── css/                # css
+│   ├── lang/               # i18n languages
+│   ├── layouts/            # Layout components
+│   ├── mocks/              # Mocks with msw
+│   ├── pages/              # Pages
+│   ├── router/             # vue router
+│   ├── stores/             # Pinia
+│   ├── utils/              # Utils
+│   └── App.vue             # Root component
+├── test/                   # Test
+├── index.html              # Entry HTML file
+├── .env.development        # Env for dev
+├── .env.production         # Env for prod
+└── postcss.config.js       # Postcss configuration
+└── eslint.config.js        # Eslint configuration
+└── commitlint.config.js    # Commitlint configuration
+└── lint-staged.config.js   # Lint staged configuration
+└── quasar.config.ts        # Vite configuration
+└── vitest.config.ts        # Vitest configuration
 ```

commitlint.config.js

@@ -0,0 +1,20 @@
+export default {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'type-enum': [2, 'always',
+      [
+        'build',
+        'chore',
+        'ci',
+        'docs',
+        'feat',
+        'fix',
+        'perf',
+        'refactor',
+        'revert',
+        'style',
+        'test',
+      ]
+    ]
+  }
+}

eslint.config.js

@@ -17,7 +17,7 @@ export default defineConfigWithVueTs(
     // ignores: []
   },
 
-  ...pluginQuasar.configs.recommended(),
+  pluginQuasar.configs.recommended(),
   js.configs.recommended,
 
   /**
@@ -32,8 +32,19 @@ export default defineConfigWithVueTs(
    * pluginVue.configs["flat/recommended"]
    *   -> Above, plus rules to enforce subjective community defaults to ensure consistency.
    */
-  ...pluginVue.configs['flat/essential'],
-  vueTsConfigs.recommended,
+  pluginVue.configs['flat/essential'],
+
+  {
+    files: ['**/*.ts', '**/*.vue'],
+    rules: {
+      '@typescript-eslint/consistent-type-imports': [
+        'error',
+        { prefer: 'type-imports' }
+      ],
+    }
+  },
+  // https://github.com/vuejs/eslint-config-typescript
+  vueTsConfigs.recommendedTypeChecked,
 
   {
     languageOptions: {
@@ -55,11 +66,6 @@ export default defineConfigWithVueTs(
     // add your custom rules here
     rules: {
       'prefer-promise-reject-errors': 'off',
-      '@typescript-eslint/consistent-type-imports': [
-        'error',
-        { prefer: 'type-imports' }
-      ],
-
       // allow debugger during development only
       'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
     }

lint-staged.config.js

@@ -0,0 +1,8 @@
+/**
+ * @filename: lint-staged.config.js
+ * @type {import('lint-staged').Configuration}
+ */
+export default {
+  '*.{js,mjs,ts,mts,vue}': 'eslint --fix --max-warnings=0',
+  '*.{ts,tsx}': () => 'tsc --noEmit'
+}

package.json

@@ -7,41 +7,49 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "lint": "eslint -c ./eslint.config.js './src*/**/*.{ts,js,cjs,mjs,vue}'",
-    "test": "echo \"No test specified\" && exit 0",
+    "lint": "eslint -c ./eslint.config.js ./src*/**/*.{js,mjs,cjs,ts,mts,vue}",
     "dev": "quasar dev",
-    "build": "quasar build"
+    "build": "quasar build",
+    "test": "vitest",
+    "coverage": "vitest run --coverage",
+    "lint:lint-staged": "lint-staged",
+    "prepare": "husky"
   },
   "dependencies": {
     "@quasar/extras": "^1.17.0",
-    "apexcharts": "^5.3.5",
-    "axios": "^1.12.2",
+    "apexcharts": "^5.3.6",
+    "axios": "^1.13.2",
     "highlight.js": "^11.11.1",
-    "pinia": "^3.0.3",
-    "quasar": "^2.18.3",
-    "vue": "^3.5.21",
-    "vue-i18n": "^11.1.12",
-    "vue-router": "^4.5.1"
+    "pinia": "^3.0.4",
+    "quasar": "^2.18.6",
+    "vue": "^3.5.25",
+    "vue-i18n": "^11.2.2",
+    "vue-router": "^4.6.3"
   },
   "devDependencies": {
-    "@eslint/js": "^9.35.0",
-    "@lottiefiles/dotlottie-web": "^0.47.0",
+    "@commitlint/cli": "^20.1.0",
+    "@commitlint/config-conventional": "^20.0.0",
+    "@eslint/js": "^9.39.1",
     "@quasar/app-vite": "^2.4.0",
-    "@types/node": "^22.18.5",
+    "@types/node": "^22.19.1",
+    "@vitest/coverage-v8": "^4.0.15",
     "@vue/eslint-config-typescript": "^14.6.0",
-    "autoprefixer": "^10.4.21",
-    "eslint": "^9.35.0",
-    "eslint-plugin-vue": "^10.4.0",
-    "globals": "^16.4.0",
-    "msw": "^2.11.2",
+    "autoprefixer": "^10.4.22",
+    "eslint": "^9.39.1",
+    "eslint-plugin-vue": "^10.6.2",
+    "globals": "^16.5.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.2.7",
+    "msw": "^2.12.3",
     "typescript": "~5.8.3",
-    "vite-plugin-checker": "^0.10.3",
-    "vue-tsc": "^3.0.7"
+    "vite-plugin-checker": "^0.11.0",
+    "vitest": "^4.0.15",
+    "vue-tsc": "^3.1.5"
   },
   "msw": {
     "workerDirectory": [
       "public"
     ]
   },
   "packageManager": "pnpm@10.8.0"
-}
+}