Merge branch 'feature/el' into dev

power4j · Jul 5, 2024 · c050fbd · c050fbd
2 parents e10b3f6 + 7703cb9
commit c050fbd
Show file tree

Hide file tree

Showing 38 changed files with 4,463 additions and 3,238 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,5 +27,5 @@ dist-ssr
 *.sw?
 
 # others
-yarn.lock
-package-lock.json
+pnpm-lock.yaml
+package-lock.json
diff --git a/README.md b/README.md
@@ -1,29 +1,33 @@
-> Tauri / Quasar / Vuejs starter projects.
+> Tauri / Elememt-Plus / Vuejs starter projects.
+
+<img src="docs/img/app-main.png" alt="screen" width="400"/>
+
 
 ## Links
+
 * [Vuejs Page](https://vuejs.org/)
-* [Quasar Framework Page](https://quasar-framework.org/)
+* [Elememt-Plus](https://github.com/element-plus/element-plus)
+* [element-plus-vite-starter](https://github.com/element-plus/element-plus-vite-starter)
 * [TauriPage](https://tauri.app/)
 
 ## build
 
 Install Node 20 LTS
 
 ```shell
-pnpm i && pnpm tauri build
+yarn && yarn tauri build
 ```
 
-
-
 ## develop
 
 vite dev
 
 ```sh
 # vite dev
-pnpm dev
+yarn dev
 # tauri dev
-pnpm tauri dev
+yarn tauri dev
 # lint & fix 
-pnpm lint
+yarn lint
 ```
+
diff --git a/docs/img/app-main.png b/docs/img/app-main.png
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Tauri + Vue + TS</title>
+    <title>Key Tools</title>
   </head>
 
   <body>

diff --git a/package.json b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "tauri-app",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "private": true,
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "run-p type-check \"build-only {@}\" --",
+    "generate": "vite-ssg build",
     "preview": "vite preview",
     "test:unit": "vitest",
     "build-only": "vite build",
@@ -16,14 +17,12 @@
   },
   "dependencies": {
     "@tauri-apps/api": "^1",
-    "@quasar/extras": "^1.16.11",
+    "element-plus": "^2.7.1",
     "pinia": "^2.1.7",
-    "quasar": "^2.15.3",
     "vue": "^3.4.21",
     "vue-router": "^4.3.0"
   },
   "devDependencies": {
-    "@quasar/vite-plugin": "^1.6.0",
     "@rushstack/eslint-patch": "^1.8.0",
     "@tauri-apps/cli": "^1.5.11",
     "@tsconfig/node20": "^20.1.4",
@@ -39,10 +38,15 @@
     "jsdom": "^24.0.0",
     "npm-run-all2": "^6.1.2",
     "prettier": "^3.2.5",
-    "sass": "1.33.0",
     "typescript": "~5.4.0",
+    "unplugin-auto-import": "^0.17.5",
+    "unplugin-vue-components": "^0.26.0",
     "vite": "^5.2.8",
     "vitest": "^1.4.0",
-    "vue-tsc": "^2.0.11"
+    "vue-tsc": "^2.0.11",
+    "@iconify-json/ep": "^1.1.15",
+    "sass": "^1.72.0",
+    "unocss": "^0.58.6",
+    "vite-ssg": "^0.23.6"
   }
 }