feat: save secret #2

Signed-off-by: seven <zilisheng1996@gmail.com>
geek-fun · Feb 21, 2024 · 9e48f2e · 9e48f2e
1 parent 7984b8c
commit 9e48f2e
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 29 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -65,7 +65,7 @@ jobs:
         with:
           tagName: ${{ steps.tag_release.outputs.version }}
           releaseName: ${{ steps.tag_release.outputs.version }}
-          appVersion: ${{ steps.tag_release.outputs.version }}
+          appVersion: "${{ steps.tag_release.outputs.versionNumber }}"
           releaseBody: |
             ${{ steps.changelog.outputs.compareurl }}
 

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/ico" href="/icon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>AnyTerm</title>
   </head>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "oh-vue-icons": "^1.0.0-rc3",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
+    "ulidx": "^2.3.0",
     "vue": "^3.3.4",
     "vue-i18n": "^9.9.0",
     "vue-router": "^4.2.5"

diff --git a/public/vite.svg b/public/vite.svg
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -37,8 +37,8 @@
         "fullscreen": false,
         "resizable": true,
         "title": "AnyTerm",
-        "width": 800,
-        "height": 600
+        "width": 1200,
+        "height": 750
       }
     ]
   }

diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss
@@ -6,8 +6,8 @@ body,
   width: 100%;
 }
 :root {
-  --theme-color: #36ad6a;
-  --theme-color-hover: #19934e;
+  --theme-color: #FF8911;
+  --theme-color-hover: #7F27FF;
   --dange-color: #cd2158;
 }
 :root[theme='light'] {
@@ -30,4 +30,4 @@ body {
   color: var(--text-color);
   transition: .3s;
   font-size: 14px;
-}
+}
diff --git a/src/assets/theme/naive-theme-overrides.ts b/src/assets/theme/naive-theme-overrides.ts
@@ -1,6 +1,6 @@
 export const naiveThemeOverrides = {
   common: {
-    primaryColor: '#36ad6a',
-    primaryColorHover: '#19934e',
+    primaryColor: '#FF8911',
+    primaryColorHover: '#7F27FF',
   },
 };
diff --git a/src/store/secretStore.ts b/src/store/secretStore.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-
+import { ulid } from 'ulidx';
 export enum SecretType {
   SSH_KEY = 'SSH_KEY',
   PASSWORD = 'PASSWORD',
@@ -22,5 +22,15 @@ export const useSecretStore = defineStore('secretStore', {
     };
   },
   getters: {},
-  actions: {},
+  actions: {
+    saveSecret(secret: Secret) {
+      if (!secret.id) {
+        secret.id = ulid();
+        this.secrets.push(secret);
+      } else {
+        const index = this.secrets.findIndex(s => s.id === secret.id);
+        this.secrets[index] = secret;
+      }
+    },
+  },
 });
diff --git a/src/views/secret/components/key-list.vue b/src/views/secret/components/key-list.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="secret-list">
+    <n-card v-for="secret in secrets" :key="secret.id" :title="secret.name" hoverable> </n-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useSecretStore } from '../../../store';
+
+const secretStore = useSecretStore();
+
+const { secrets } = toRefs(secretStore);
+</script>
+
+<style lang="scss" scoped>
+.n-card {
+  max-width: 300px;
+}
+</style>
diff --git a/src/views/secret/components/new-key-dialog.vue b/src/views/secret/components/new-key-dialog.vue
@@ -88,23 +88,13 @@
       </n-tabs>
       <template #footer>
         <div class="card-footer">
-          <div class="left">
-            <n-button
-              type="info"
-              :loading="testLoading"
-              :disabled="!validationPassed"
-              @click="verify"
-            >
-              {{ $t('secret.verify') }}
-            </n-button>
-          </div>
           <div class="right">
             <n-button @click="closeModal">{{ $t('dialogOps.cancel') }}</n-button>
             <n-button
               type="primary"
               :loading="saveLoading"
               :disabled="!validationPassed"
-              @click="saveSecret"
+              @click="submitSaveSecret"
             >
               {{ $t('dialogOps.confirm') }}
             </n-button>
@@ -117,10 +107,13 @@
 
 <script setup lang="ts">
 import { CustomError } from '../../../common';
-import { Secret } from '../../../store';
+import { Secret, useSecretStore } from '../../../store';
 import { useLang } from '../../../lang';
 import { FormValidationError } from 'naive-ui';
 
+const secretStore = useSecretStore();
+const { saveSecret } = secretStore;
+
 const lang = useLang();
 // DOM
 const connectFormRef = ref();
@@ -192,11 +185,10 @@ const verify = async (event: MouseEvent) => {
   }
 };
 
-const saveSecret = async (event: MouseEvent) => {
+const submitSaveSecret = async (event: MouseEvent) => {
   event.preventDefault();
   saveLoading.value = !saveLoading.value;
-  // @TODO: save secret
-  // saveConnection(formData.value);
+  saveSecret({ ...formData.value } as Secret);
   saveLoading.value = !saveLoading.value;
   showModal.value = false;
 };

diff --git a/src/views/secret/components/tool-bar.vue b/src/views/secret/components/tool-bar.vue
@@ -5,8 +5,6 @@
 </template>
 
 <script setup lang="ts">
-import { defineEmits } from 'vue';
-
 const emit = defineEmits(['newSecretEmit']);
 
 const addSecret = () => {

diff --git a/src/views/secret/index.vue b/src/views/secret/index.vue
@@ -2,12 +2,14 @@
   <div>
     <tool-bar @new-secret-emit="toolBarEmit" />
     <new-key-dialog ref="addKeyDialogRef" />
+    <key-list />
   </div>
 </template>
 
 <script setup lang="ts">
 import ToolBar from './components/tool-bar.vue';
 import NewKeyDialog from './components/new-key-dialog.vue';
+import KeyList from './components/key-list.vue';
 
 const addKeyDialogRef = ref();
 const toolBarEmit = () => {