🎨 代码格式化

BTMuli · Oct 10, 2023 · b04f49e · b04f49e
1 parent 5c2bb4e
commit b04f49e
Show file tree

Hide file tree

Showing 114 changed files with 354 additions and 523 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -3,3 +3,5 @@ dist
 src-tauri/target
 # Submodules
 TGAssistant
+# Package files
+pnpm-lock.yaml
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -17,7 +17,8 @@ globals:
   TGApp: readonly
   window: readonly
 rules:
-  vue/multi-word-component-names: warn
+  vue/multi-word-component-names: off
+  vue/valid-template-root: off
 overrides:
   - files: ["*.ts"]
     extends: standard-with-typescript
@@ -34,9 +35,7 @@ overrides:
           alphabetize:
             order: asc
             caseInsensitive: true
-      "@typescript-eslint/indent":
-        - warn
-        - 2
+      "@typescript-eslint/indent": off
       "@typescript-eslint/quotes":
         - error
         - double
@@ -57,31 +56,23 @@ overrides:
             delimiter: semi
             requireLast: true
       "@typescript-eslint/no-import-type-side-effects": error
-      "@typescript-eslint/strict-boolean-expressions":
-        - warn
-        - allowString: false
-          allowNumber: false
-          allowNullableObject: false
-          allowNullableBoolean: false
-          allowNullableString: false
-          allowNullableNumber: false
-          allowAny: false
+      "@typescript-eslint/strict-boolean-expressions": off
       "@typescript-eslint/consistent-type-assertions":
         - warn
         - assertionStyle: angle-bracket # 使用尖括号
       "@typescript-eslint/naming-convention":
         - warn
         - selector: variableLike
-          format: ["camelCase", "UPPER_CASE", "PascalCase", "snake_case"]
-          leadingUnderscore: "allow"
-          trailingUnderscore: "allow"
+          format: [camelCase, UPPER_CASE, PascalCase, snake_case]
+          leadingUnderscore: allow
+          trailingUnderscore: allow
       "@typescript-eslint/no-non-null-assertion": warn
-      "@typescript-eslint/no-misused-promises": warn
+      "@typescript-eslint/no-misused-promises": off
   - files: ["*.vue"]
     parser: vue-eslint-parser
     parserOptions:
       parser: "@typescript-eslint/parser"
-      extraFileExtensions: [".vue"]
+      extraFileExtensions: [.vue]
     rules:
       import/order:
         - error
@@ -94,9 +85,7 @@ overrides:
           alphabetize:
             order: asc
             caseInsensitive: true
-      "@typescript-eslint/indent":
-        - warn
-        - 2
+      "@typescript-eslint/indent": off
       "@typescript-eslint/quotes":
         - error
         - double
@@ -117,27 +106,19 @@ overrides:
             delimiter: semi
             requireLast: true
       "@typescript-eslint/no-import-type-side-effects": error
-      "@typescript-eslint/strict-boolean-expressions":
-        - warn
-        - allowString: false
-          allowNumber: false
-          allowNullableObject: false
-          allowNullableBoolean: false
-          allowNullableString: false
-          allowNullableNumber: false
-          allowAny: false
+      "@typescript-eslint/strict-boolean-expressions": off
       "@typescript-eslint/consistent-type-assertions":
         - warn
         - assertionStyle: angle-bracket # 使用尖括号
       "@typescript-eslint/naming-convention":
         - warn
         - selector: variableLike
-          format: ["camelCase", "UPPER_CASE", "PascalCase", "snake_case"]
-          leadingUnderscore: "allow"
-          trailingUnderscore: "allow"
+          format: [camelCase, UPPER_CASE, PascalCase, snake_case]
+          leadingUnderscore: allow
+          trailingUnderscore: allow
       "@typescript-eslint/no-non-null-assertion": warn
-      "@typescript-eslint/no-misused-promises": warn
-  - files: ["*.json"]
+      "@typescript-eslint/no-misused-promises": off
+  - files: [package.json, tsconfig.json]
     parser: jsonc-eslint-parser
     rules:
       jsonc/sort-array-values:

diff --git a/package.json b/package.json
@@ -1,9 +1,8 @@
 {
   "name": "TeyvatGuide",
+  "version": "0.3.3",
   "description": "A Genshin Tool build with Tauri",
   "private": true,
-  "version": "0.3.3",
-  "author": "BTMuli <[email protected]>",
   "packageManager": "[email protected]",
   "scripts": {
     "build": "tauri build",
@@ -28,26 +27,27 @@
     "*.{vue,css}": "stylelint --fix",
     "*.{ts,vue,css,yml,json,md}": "prettier --write"
   },
-  "bugs": {
-    "url": "https://github.com/BTMuli/TeyvatGuide/issues"
-  },
-  "directories": {
-    "doc": "docs"
-  },
-  "homepage": "https://github.com/BTMuli/TeyvatGuide#readme",
   "keywords": [
-    "Tauri",
+    "Genshin Impact",
     "Node",
+    "Tauri",
     "Typescript",
     "Vite",
-    "Genshin Impact",
     "Vuetify"
   ],
+  "author": "BTMuli <[email protected]>",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/BTMuli/TeyvatGuide.git"
   },
+  "homepage": "https://github.com/BTMuli/TeyvatGuide#readme",
+  "bugs": {
+    "url": "https://github.com/BTMuli/TeyvatGuide/issues"
+  },
+  "directories": {
+    "doc": "docs"
+  },
   "dependencies": {
     "@mdi/font": "7.2.96",
     "@tauri-apps/api": "^1.4.0",

diff --git a/qodana.yaml b/qodana.yaml
@@ -1,32 +1,32 @@
-#-------------------------------------------------------------------------------#
+# -------------------------------------------------------------------------------#
 #               Qodana analysis is configured by qodana.yaml file               #
 #             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
-#-------------------------------------------------------------------------------#
+# -------------------------------------------------------------------------------#
 version: "1.0"
 
-#Specify inspection profile for code analysis
+# Specify inspection profile for code analysis
 profile:
   name: qodana.starter
 
-#Enable inspections
-#include:
+# Enable inspections
+# include:
 #  - name: <SomeEnabledInspectionId>
 
-#Disable inspections
-#exclude:
+# Disable inspections
+# exclude:
 #  - name: <SomeDisabledInspectionId>
 #    paths:
 #      - <path/where/not/run/inspection>
 
-#The following options are only applied in CI/CD environment
-#These options are ignored during local run
+# The following options are only applied in CI/CD environment
+# These options are ignored during local run
 
-#Execute shell command before Qodana execution
-#bootstrap: sh ./prepare-qodana.sh
+# Execute shell command before Qodana execution
+# bootstrap: sh ./prepare-qodana.sh
 
-#Install IDE plugins before Qodana execution
-#plugins:
+# Install IDE plugins before Qodana execution
+# plugins:
 #  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
 
-#Specify Qodana linter for analysis
+# Specify Qodana linter for analysis
 linter: jetbrains/qodana-js:latest
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -21,23 +21,23 @@
         "all": true,
         "request": true,
         "scope": [
-          "https://api-takumi.mihoyo.com/*",
-          "https://api-takumi-record.mihoyo.com/*",
+          "https://act-webstatic.mihoyo.com/*",
           "https://api-static.mihoyo.com/*",
+          "https://api-takumi-record.mihoyo.com/*",
+          "https://api-takumi.mihoyo.com/*",
+          "https://api.geetest.com/*",
+          "https://bbs-api-static.miyoushe.com/*",
           "https://bbs-api.mihoyo.com/*",
           "https://bbs-api.miyoushe.com/*",
-          "https://bbs-api-static.miyoushe.com/*",
           "https://bbs.mihoyo.com/*",
+          "https://enka-api.hut.ao/*",
           "https://hk4e-api.mihoyo.com/*",
           "https://hk4e-sdk.mihoyo.com/*",
+          "https://homa.snapgenshin.com/*",
+          "https://passport-api-v4.mihoyo.com/*",
           "https://passport-api.mihoyo.com/*",
           "https://passport-api.miyoushe.com/*",
-          "https://passport-api-v4.mihoyo.com/*",
-          "https://act-webstatic.mihoyo.com/*",
-          "https://sdk-webstatic.mihoyo.com/*",
-          "https://homa.snapgenshin.com/*",
-          "https://enka-api.hut.ao/*",
-          "https://api.geetest.com/*"
+          "https://sdk-webstatic.mihoyo.com/*"
         ]
       },
       "shell": {
@@ -48,21 +48,21 @@
     "bundle": {
       "active": true,
       "icon": [
-        "icons/32x32.png",
         "icons/128x128.png",
         "icons/[email protected]",
-        "icons/icon.ico",
-        "icons/icon.png",
-        "icons/Square30x30Logo.png",
-        "icons/Square44x44Logo.png",
-        "icons/Square71x71Logo.png",
-        "icons/Square89x89Logo.png",
+        "icons/32x32.png",
         "icons/Square107x107Logo.png",
         "icons/Square142x142Logo.png",
         "icons/Square150x150Logo.png",
         "icons/Square284x284Logo.png",
+        "icons/Square30x30Logo.png",
         "icons/Square310x310Logo.png",
-        "icons/StoreLogo.png"
+        "icons/Square44x44Logo.png",
+        "icons/Square71x71Logo.png",
+        "icons/Square89x89Logo.png",
+        "icons/StoreLogo.png",
+        "icons/icon.ico",
+        "icons/icon.png"
       ],
       "identifier": "TeyvatGuide",
       "targets": ["msi"],

diff --git a/src/App.vue b/src/App.vue
@@ -11,20 +11,17 @@
 </template>
 
 <script lang="ts" setup>
-// vue
+import { app, event, fs, tauri, window as TauriWindow } from "@tauri-apps/api";
 import { onBeforeMount, onMounted, ref } from "vue";
 import { useRouter } from "vue-router";
-import showSnackbar from "./components/func/snackbar";
-import TSidebar from "./components/app/t-sidebar.vue";
+
 import TBackTop from "./components/app/t-backTop.vue";
-// tauri
-import { app, event, fs, tauri, window as TauriWindow } from "@tauri-apps/api";
-// store
-import { useAppStore } from "./store/modules/app";
-import { useUserStore } from "./store/modules/user";
-// utils
+import TSidebar from "./components/app/t-sidebar.vue";
+import showSnackbar from "./components/func/snackbar";
 import { getEmojis } from "./plugins/Mys/request/getEmojis";
 import TGSqlite from "./plugins/Sqlite";
+import { useAppStore } from "./store/modules/app";
+import { useUserStore } from "./store/modules/user";
 
 const appStore = useAppStore();
 const isMain = ref<boolean>(false);
@@ -69,6 +66,7 @@ async function listenOnInit(): Promise<void> {
     await checkAppLoad();
     await checkUserLoad();
   });
+  return;
 }
 
 async function emojiLoad(): Promise<void> {
@@ -155,11 +153,19 @@ async function initData(): Promise<void> {
 async function getDeepLink(): Promise<void> {
   await event.listen("active_deep_link", (e) => {
     new TauriWindow.WebviewWindow("TeyvatGuide")
-      .show()
+      .center()
       .then(async () => {
+        if (typeof e.payload !== "string") {
+          showSnackbar({
+            text: "无效的 deep link！",
+            color: "error",
+            timeout: 3000,
+          });
+          return;
+        }
         // 导入格式: teyvatguide://import_uigf?app=appName
         // 跳转格式: localhost:4000/achievements/?app=appName
-        if ((<string>e.payload).startsWith("teyvatguide://import_uigf")) {
+        if (e.payload.startsWith("teyvatguide://import_uigf")) {
           const param = (<string>e.payload).split("teyvatguide://import_uigf/?")[1];
           let appName = "";
           if (param) {

diff --git a/src/components/app/t-sidebar.vue b/src/components/app/t-sidebar.vue
@@ -121,11 +121,9 @@
 </template>
 
 <script lang="ts" setup>
-// vue
-import { computed, onMounted, ref } from "vue";
-// tauri
 import { event } from "@tauri-apps/api";
-// store
+import { computed, onMounted, ref } from "vue";
+
 import { useAppStore } from "../../store/modules/app";
 import { useUserStore } from "../../store/modules/user";
 
@@ -137,8 +135,8 @@ const isDevEnv = ref<boolean>(import.meta.env.MODE === "development");
 const userInfo = computed(() => {
   const info = userStore.getBriefInfo();
   return {
-    nickname: info.nickname || "未登录",
-    avatar: info.avatar || "/source/UI/defaultUser.webp",
+    nickname: info?.nickname ?? "未登录",
+    avatar: info?.avatar ?? "/source/UI/defaultUser.webp",
   };
 });
 const rail = ref(appStore.sidebar.collapse);

diff --git a/src/components/app/t-switchTheme.vue b/src/components/app/t-switchTheme.vue
@@ -8,11 +8,9 @@
   </div>
 </template>
 <script lang="ts" setup>
-// vue
-import { computed, onMounted } from "vue";
-// tauri
 import { event } from "@tauri-apps/api";
-// store
+import { computed, onMounted } from "vue";
+
 import { useAppStore } from "../../store/modules/app";
 
 // store

diff --git a/src/components/func/confirm.ts b/src/components/func/confirm.ts
@@ -1,13 +1,11 @@
 /**
  * @file component func confirm.ts
  * @description 封装自定义 confirm 组件，通过函数调用的方式，简化 confirm 的使用
- * @author BTMuli <[email protected]>
- * @since Alpha v0.2.3
+ * @since Beta v0.3.3
  */
 
-// vue
 import { h, render, type VNode } from "vue";
-// confirm
+
 import confirm from "./confirm.vue";
 
 const confirmId = "tg-func-confirm";
@@ -24,7 +22,7 @@ const renderBox = (props: TGApp.Component.Confirm.Params): VNode => {
 let confirmInstance: VNode;
 
 const showConfirm = async (props: TGApp.Component.Confirm.Params): Promise<string | boolean> => {
-  if (confirmInstance) {
+  if (confirmInstance !== undefined) {
     const boxVue = confirmInstance.component;
     return boxVue?.exposeProxy?.displayBox(props);
   } else {