From 2c7021af31cefe29254d0502079c4e052c6d96d9 Mon Sep 17 00:00:00 2001
From: tiny-craft <137850705+tiny-craft@users.noreply.github.com>
Date: Mon, 3 Jul 2023 23:48:41 +0800
Subject: [PATCH] refactor: rename DatabasePane and DatabaseTree to BrowserPane
 and BrowserTree refactor: tidy Components folder

---
 frontend/src/AppContent.vue                   |  6 ++--
 .../{ => content_value}/ContentToolbar.vue    | 18 +++++-----
 .../content_value/ContentValueHash.vue        |  2 +-
 .../content_value/ContentValueList.vue        |  2 +-
 .../content_value/ContentValueSet.vue         |  2 +-
 .../content_value/ContentValueString.vue      |  2 +-
 .../content_value/ContentValueZSet.vue        |  2 +-
 frontend/src/components/icons/Help.vue        | 35 +++++++++++++++++++
 .../{DatabasePane.vue => BrowserPane.vue}     |  7 ++--
 .../{DatabaseTree.vue => BrowserTree.vue}     |  0
 .../src/components/{ => sidebar}/NavMenu.vue  | 24 ++++++++-----
 frontend/src/langs/en.json                    |  1 +
 frontend/src/langs/zh-cn.json                 |  1 +
 13 files changed, 73 insertions(+), 29 deletions(-)
 rename frontend/src/components/{ => content_value}/ContentToolbar.vue (88%)
 create mode 100644 frontend/src/components/icons/Help.vue
 rename frontend/src/components/sidebar/{DatabasePane.vue => BrowserPane.vue} (88%)
 rename frontend/src/components/sidebar/{DatabaseTree.vue => BrowserTree.vue} (100%)
 rename frontend/src/components/{ => sidebar}/NavMenu.vue (84%)

diff --git a/frontend/src/AppContent.vue b/frontend/src/AppContent.vue
index 3991122..bd45726 100644
--- a/frontend/src/AppContent.vue
+++ b/frontend/src/AppContent.vue
@@ -1,12 +1,12 @@
 <script setup>
 import ContentPane from './components/content/ContentPane.vue'
-import DatabasePane from './components/sidebar/DatabasePane.vue'
+import BrowserPane from './components/sidebar/BrowserPane.vue'
 import { computed, nextTick, onMounted, provide, reactive, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { GetPreferences } from '../wailsjs/go/storage/PreferencesStorage.js'
 import { get } from 'lodash'
 import { useThemeVars } from 'naive-ui'
-import NavMenu from './components/NavMenu.vue'
+import NavMenu from './components/sidebar/NavMenu.vue'
 import ConnectionPane from './components/sidebar/ConnectionPane.vue'
 import ContentServerPane from './components/content/ContentServerPane.vue'
 import useTabStore from './stores/tab.js'
@@ -71,7 +71,7 @@ const dragging = computed(() => {
         <!-- structure page-->
         <div v-show="tabStore.nav === 'structure'" class="flex-box-h flex-item-expand">
             <div id="app-side" :style="{ width: asideWidthVal }" class="flex-box-h flex-item">
-                <database-pane
+                <browser-pane
                     v-for="t in tabStore.tabs"
                     v-show="get(tabStore.currentTab, 'name') === t.name"
                     :key="t.name"
diff --git a/frontend/src/components/ContentToolbar.vue b/frontend/src/components/content_value/ContentToolbar.vue
similarity index 88%
rename from frontend/src/components/ContentToolbar.vue
rename to frontend/src/components/content_value/ContentToolbar.vue
index 5ccdae3..676885a 100644
--- a/frontend/src/components/ContentToolbar.vue
+++ b/frontend/src/components/content_value/ContentToolbar.vue
@@ -1,15 +1,15 @@
 <script setup>
-import { validType } from '../consts/support_redis_type'
-import useDialog from '../stores/dialog'
-import Delete from './icons/Delete.vue'
-import Edit from './icons/Edit.vue'
-import Refresh from './icons/Refresh.vue'
-import Timer from './icons/Timer.vue'
-import RedisTypeTag from './common/RedisTypeTag.vue'
+import { validType } from '../../consts/support_redis_type.js'
+import useDialog from '../../stores/dialog.js'
+import Delete from '../icons/Delete.vue'
+import Edit from '../icons/Edit.vue'
+import Refresh from '../icons/Refresh.vue'
+import Timer from '../icons/Timer.vue'
+import RedisTypeTag from '../common/RedisTypeTag.vue'
 import { useI18n } from 'vue-i18n'
 import { useMessage } from 'naive-ui'
-import IconButton from './common/IconButton.vue'
-import useConnectionStore from '../stores/connections.js'
+import IconButton from '../common/IconButton.vue'
+import useConnectionStore from '../../stores/connections.js'
 
 const props = defineProps({
     server: String,
diff --git a/frontend/src/components/content_value/ContentValueHash.vue b/frontend/src/components/content_value/ContentValueHash.vue
index bd6ee1a..cc0ffa4 100644
--- a/frontend/src/components/content_value/ContentValueHash.vue
+++ b/frontend/src/components/content_value/ContentValueHash.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed, h, reactive, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import ContentToolbar from '../ContentToolbar.vue'
+import ContentToolbar from './ContentToolbar.vue'
 import AddLink from '../icons/AddLink.vue'
 import { NButton, NCode, NIcon, NInput, useMessage } from 'naive-ui'
 import { types, types as redisTypes } from '../../consts/support_redis_type.js'
diff --git a/frontend/src/components/content_value/ContentValueList.vue b/frontend/src/components/content_value/ContentValueList.vue
index a71879c..e950e9d 100644
--- a/frontend/src/components/content_value/ContentValueList.vue
+++ b/frontend/src/components/content_value/ContentValueList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed, h, reactive, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import ContentToolbar from '../ContentToolbar.vue'
+import ContentToolbar from './ContentToolbar.vue'
 import AddLink from '../icons/AddLink.vue'
 import { NButton, NCode, NIcon, NInput, useMessage } from 'naive-ui'
 import { size } from 'lodash'
diff --git a/frontend/src/components/content_value/ContentValueSet.vue b/frontend/src/components/content_value/ContentValueSet.vue
index 1856f5b..fd9eb35 100644
--- a/frontend/src/components/content_value/ContentValueSet.vue
+++ b/frontend/src/components/content_value/ContentValueSet.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed, h, reactive, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import ContentToolbar from '../ContentToolbar.vue'
+import ContentToolbar from './ContentToolbar.vue'
 import AddLink from '../icons/AddLink.vue'
 import { NButton, NCode, NIcon, NInput, useMessage } from 'naive-ui'
 import { size } from 'lodash'
diff --git a/frontend/src/components/content_value/ContentValueString.vue b/frontend/src/components/content_value/ContentValueString.vue
index 9f6e4ec..45f1b99 100644
--- a/frontend/src/components/content_value/ContentValueString.vue
+++ b/frontend/src/components/content_value/ContentValueString.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed, onMounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import ContentToolbar from '../ContentToolbar.vue'
+import ContentToolbar from './ContentToolbar.vue'
 import Copy from '../icons/Copy.vue'
 import Save from '../icons/Save.vue'
 import { useMessage } from 'naive-ui'
diff --git a/frontend/src/components/content_value/ContentValueZSet.vue b/frontend/src/components/content_value/ContentValueZSet.vue
index 6e7da07..d594547 100644
--- a/frontend/src/components/content_value/ContentValueZSet.vue
+++ b/frontend/src/components/content_value/ContentValueZSet.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed, h, reactive, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import ContentToolbar from '../ContentToolbar.vue'
+import ContentToolbar from './ContentToolbar.vue'
 import AddLink from '../icons/AddLink.vue'
 import { NButton, NCode, NIcon, NInput, NInputNumber, useMessage } from 'naive-ui'
 import { types, types as redisTypes } from '../../consts/support_redis_type.js'
diff --git a/frontend/src/components/icons/Help.vue b/frontend/src/components/icons/Help.vue
new file mode 100644
index 0000000..c43c4db
--- /dev/null
+++ b/frontend/src/components/icons/Help.vue
@@ -0,0 +1,35 @@
+<script setup>
+const props = defineProps({
+    strokeWidth: {
+        type: [Number, String],
+        default: 3,
+    },
+})
+</script>
+
+<template>
+    <svg viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path
+            d="M24 44C29.5228 44 34.5228 41.7614 38.1421 38.1421C41.7614 34.5228 44 29.5228 44 24C44 18.4772 41.7614 13.4772 38.1421 9.85786C34.5228 6.23858 29.5228 4 24 4C18.4772 4 13.4772 6.23858 9.85786 9.85786C6.23858 13.4772 4 18.4772 4 24C4 29.5228 6.23858 34.5228 9.85786 38.1421C13.4772 41.7614 18.4772 44 24 44Z"
+            fill="none"
+            stroke="currentColor"
+            :stroke-width="strokeWidth"
+            stroke-linejoin="round"
+        />
+        <path
+            d="M24 28.6248V24.6248C27.3137 24.6248 30 21.9385 30 18.6248C30 15.3111 27.3137 12.6248 24 12.6248C20.6863 12.6248 18 15.3111 18 18.6248"
+            stroke="currentColor"
+            :stroke-width="strokeWidth"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+        />
+        <path
+            fill-rule="evenodd"
+            clip-rule="evenodd"
+            d="M24 37.6248C25.3807 37.6248 26.5 36.5055 26.5 35.1248C26.5 33.7441 25.3807 32.6248 24 32.6248C22.6193 32.6248 21.5 33.7441 21.5 35.1248C21.5 36.5055 22.6193 37.6248 24 37.6248Z"
+            fill="currentColor"
+        />
+    </svg>
+</template>
+
+<style lang="scss" scoped></style>
diff --git a/frontend/src/components/sidebar/DatabasePane.vue b/frontend/src/components/sidebar/BrowserPane.vue
similarity index 88%
rename from frontend/src/components/sidebar/DatabasePane.vue
rename to frontend/src/components/sidebar/BrowserPane.vue
index 3ff5b16..659a8d6 100644
--- a/frontend/src/components/sidebar/DatabasePane.vue
+++ b/frontend/src/components/sidebar/BrowserPane.vue
@@ -1,8 +1,7 @@
 <script setup>
 import { NIcon } from 'naive-ui'
-import AddGroup from '../icons/AddGroup.vue'
 import AddLink from '../icons/AddLink.vue'
-import DatabaseTree from './DatabaseTree.vue'
+import BrowserTree from './BrowserTree.vue'
 import IconButton from '../common/IconButton.vue'
 import Filter from '../icons/Filter.vue'
 import useTabStore from '../../stores/tab.js'
@@ -10,14 +9,16 @@ import { computed } from 'vue'
 import { get } from 'lodash'
 import Delete from '../icons/Delete.vue'
 import Refresh from '../icons/Refresh.vue'
+import useDialogStore from '../../stores/dialog.js'
 
+const dialogStore = useDialogStore()
 const tabStore = useTabStore()
 const currentName = computed(() => get(tabStore.currentTab, 'name', ''))
 </script>
 
 <template>
     <div class="nav-pane-container flex-box-v">
-        <database-tree :server="currentName" />
+        <browser-tree :server="currentName" />
 
         <!-- bottom function bar -->
         <div class="nav-pane-bottom flex-box-h">
diff --git a/frontend/src/components/sidebar/DatabaseTree.vue b/frontend/src/components/sidebar/BrowserTree.vue
similarity index 100%
rename from frontend/src/components/sidebar/DatabaseTree.vue
rename to frontend/src/components/sidebar/BrowserTree.vue
diff --git a/frontend/src/components/NavMenu.vue b/frontend/src/components/sidebar/NavMenu.vue
similarity index 84%
rename from frontend/src/components/NavMenu.vue
rename to frontend/src/components/sidebar/NavMenu.vue
index f15e0b3..fa02877 100644
--- a/frontend/src/components/NavMenu.vue
+++ b/frontend/src/components/sidebar/NavMenu.vue
@@ -1,16 +1,17 @@
 <script setup>
 import { computed, h } from 'vue'
 import { NIcon, useThemeVars } from 'naive-ui'
-import ToggleDb from './icons/ToggleDb.vue'
+import ToggleDb from '../icons/ToggleDb.vue'
 import { useI18n } from 'vue-i18n'
-import ToggleServer from './icons/ToggleServer.vue'
-import IconButton from './common/IconButton.vue'
-import Config from './icons/Config.vue'
-import useDialogStore from '../stores/dialog.js'
-import Github from './icons/Github.vue'
-import { BrowserOpenURL } from '../../wailsjs/runtime/runtime.js'
-import Log from './icons/Log.vue'
-import useConnectionStore from '../stores/connections.js'
+import ToggleServer from '../icons/ToggleServer.vue'
+import IconButton from '../common/IconButton.vue'
+import Config from '../icons/Config.vue'
+import useDialogStore from '../../stores/dialog.js'
+import Github from '../icons/Github.vue'
+import { BrowserOpenURL } from '../../../wailsjs/runtime/runtime.js'
+import Log from '../icons/Log.vue'
+import useConnectionStore from '../../stores/connections.js'
+import Help from '../icons/Help.vue'
 
 const themeVars = useThemeVars()
 
@@ -62,6 +63,11 @@ const preferencesOptions = computed(() => {
             key: 'preferences',
             icon: renderIcon(Config),
         },
+        {
+            label: i18n.t('help'),
+            key: 'help',
+            icon: renderIcon(Help),
+        },
         {
             label: i18n.t('about'),
             key: 'about',
diff --git a/frontend/src/langs/en.json b/frontend/src/langs/en.json
index 6ef0b19..16cce9c 100644
--- a/frontend/src/langs/en.json
+++ b/frontend/src/langs/en.json
@@ -120,5 +120,6 @@
   "structure": "Structure",
   "log": "Log",
   "about": "About",
+  "help": "Help",
   "check_update": "Check for Updates..."
 }
diff --git a/frontend/src/langs/zh-cn.json b/frontend/src/langs/zh-cn.json
index bd7dda8..117832d 100644
--- a/frontend/src/langs/zh-cn.json
+++ b/frontend/src/langs/zh-cn.json
@@ -123,5 +123,6 @@
   "structure": "结构",
   "log": "日志",
   "about": "关于",
+  "help": "帮助",
   "check_update": "检查更新..."
 }