From a742e870f00f0ac6166fd0a769147a430486c246 Mon Sep 17 00:00:00 2001
From: Klein <11241686+Klein422@user.noreply.gitee.com>
Date: Mon, 23 Oct 2023 21:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=B4=A6=E5=8F=B7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BD=8D=E7=BD=AE=20=E6=96=B0=E5=A2=9E=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/TodoCard.vue     |  2 +-
 .../src/components/toolbar/MainAppbar.vue     |  2 +-
 console-ui/src/configs/menus/apps.menu.ts     |  6 ++
 console-ui/src/router/apps.routes.ts          | 14 +++++
 console-ui/src/router/data.routes.ts          |  4 +-
 console-ui/src/views/app/tool/ToolApp.vue     | 55 +++++++++++++++++++
 .../src/views/{app => data}/user/UserApp.vue  |  4 +-
 .../{app => data}/user/component/UserCard.vue |  0
 .../{app => data}/user/component/UserList.vue |  3 +
 .../{app => data}/user/component/UserMenu.vue |  2 +-
 .../user/pages/CompletedPage.vue              |  4 +-
 .../{app => data}/user/pages/LabelPage.vue    |  4 +-
 .../{app => data}/user/pages/TasksPage.vue    |  4 +-
 .../views/{app => data}/user/userRoutes.ts    |  6 +-
 .../src/views/{app => data}/user/userStore.ts |  0
 .../src/views/{app => data}/user/userTypes.ts |  0
 16 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 console-ui/src/views/app/tool/ToolApp.vue
 rename console-ui/src/views/{app => data}/user/UserApp.vue (92%)
 rename console-ui/src/views/{app => data}/user/component/UserCard.vue (100%)
 rename console-ui/src/views/{app => data}/user/component/UserList.vue (96%)
 rename console-ui/src/views/{app => data}/user/component/UserMenu.vue (96%)
 rename console-ui/src/views/{app => data}/user/pages/CompletedPage.vue (66%)
 rename console-ui/src/views/{app => data}/user/pages/LabelPage.vue (74%)
 rename console-ui/src/views/{app => data}/user/pages/TasksPage.vue (65%)
 rename console-ui/src/views/{app => data}/user/userRoutes.ts (58%)
 rename console-ui/src/views/{app => data}/user/userStore.ts (100%)
 rename console-ui/src/views/{app => data}/user/userTypes.ts (100%)

diff --git a/console-ui/src/components/dashboard/TodoCard.vue b/console-ui/src/components/dashboard/TodoCard.vue
index d1504d4..a096f2f 100644
--- a/console-ui/src/components/dashboard/TodoCard.vue
+++ b/console-ui/src/components/dashboard/TodoCard.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useUserStore } from "@/views/app/user/userStore";
+import { useUserStore } from "@/views/data/user/userStore";
 const userStore = useUserStore();
 
 const loading = ref(true);
diff --git a/console-ui/src/components/toolbar/MainAppbar.vue b/console-ui/src/components/toolbar/MainAppbar.vue
index 376a92f..f6c6812 100644
--- a/console-ui/src/components/toolbar/MainAppbar.vue
+++ b/console-ui/src/components/toolbar/MainAppbar.vue
@@ -8,7 +8,7 @@ import { useCustomizeThemeStore } from "@/stores/customizeTheme";
 import ToolbarLanguage from "@/components/toolbar/ToolbarLanguage.vue";
 import ToolbarNotifications from "./ToolbarNotifications.vue";
 import ToolbarUser from "./ToolbarUser.vue";
-import { useUserStore } from "@/views/app/user/userStore";
+import { useUserStore } from "@/views/data/user/userStore";
 
 const userStore = useUserStore();
 const customizeTheme = useCustomizeThemeStore();
diff --git a/console-ui/src/configs/menus/apps.menu.ts b/console-ui/src/configs/menus/apps.menu.ts
index 84f78a8..8ded758 100644
--- a/console-ui/src/configs/menus/apps.menu.ts
+++ b/console-ui/src/configs/menus/apps.menu.ts
@@ -83,4 +83,10 @@ export default [
     text: "Email",
     link: "/apps/email",
   },
+  {
+    icon: "mdi-bookmark-plus",
+    key: "menu.tool",
+    text: "Tool",
+    link: "/apps/tool",
+  },
 ];
diff --git a/console-ui/src/router/apps.routes.ts b/console-ui/src/router/apps.routes.ts
index 0dc07b8..7d93947 100644
--- a/console-ui/src/router/apps.routes.ts
+++ b/console-ui/src/router/apps.routes.ts
@@ -174,4 +174,18 @@ export default [
       ),
     children: [...unsplashRoutes],
   },
+  {
+    path: "/apps/tool",
+    name: "tools",
+    component: () =>
+      import(
+        /* webpackChunkName: "utility-board" */ "@/views/app/tool/ToolApp.vue"
+        ),
+    meta: {
+      requiresAuth: true,
+      title: "Tools",
+      layout: "ui",
+      category: "APP",
+    },
+  },
 ];
diff --git a/console-ui/src/router/data.routes.ts b/console-ui/src/router/data.routes.ts
index 27834c6..bff5210 100644
--- a/console-ui/src/router/data.routes.ts
+++ b/console-ui/src/router/data.routes.ts
@@ -1,5 +1,5 @@
 // users Data Page
-import userRoutes from "@/views/app/user/userRoutes";
+import userRoutes from "@/views/data/user/userRoutes";
 export default [
   {
     path: "/data/hotLive",
@@ -25,7 +25,7 @@ export default [
       title: "Account",
     },
     component: () =>
-      import(/* webpackChunkName: "app-todo" */ "@/views/app/user/UserApp.vue"),
+      import(/* webpackChunkName: "app-todo" */ "@/views/data/user/UserApp.vue"),
     children: [...userRoutes],
   },
   {
diff --git a/console-ui/src/views/app/tool/ToolApp.vue b/console-ui/src/views/app/tool/ToolApp.vue
new file mode 100644
index 0000000..26ab71e
--- /dev/null
+++ b/console-ui/src/views/app/tool/ToolApp.vue
@@ -0,0 +1,55 @@
+
+<script>
+export default {
+  name: "ToolApp.vue"
+}
+</script>
+<template>
+  <div class="app-container">
+    <!-- ---------------------------------------------- -->
+    <!-- Side Bar -->
+    <!-- ---------------------------------------------- -->
+    <div class="d-none d-md-block sidebar">
+
+    </div>
+
+    <!-- ---------------------------------------------- -->
+    <!--  List User-->
+    <!-- ---------------------------------------------- -->
+    <div class="main">
+      <router-view v-slot="{ Component }">
+        <transition name="fade">
+          <component :is="Component" />
+        </transition>
+      </router-view>
+    </div>
+
+
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.app-container {
+  display: flex;
+  height: calc(100vh - 240px);
+  width: 100%;
+  font-size: 13px;
+  padding: 20px;
+
+  .sidebar {
+    display: flex;
+    flex-direction: column;
+    width: 300px;
+    height: 100%;
+    background-color: #fff;
+    margin-right: 20px;
+  }
+
+  .main {
+    flex: 1;
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+  }
+}
+</style>
diff --git a/console-ui/src/views/app/user/UserApp.vue b/console-ui/src/views/data/user/UserApp.vue
similarity index 92%
rename from console-ui/src/views/app/user/UserApp.vue
rename to console-ui/src/views/data/user/UserApp.vue
index 4fa0394..0d4c11d 100644
--- a/console-ui/src/views/app/user/UserApp.vue
+++ b/console-ui/src/views/data/user/UserApp.vue
@@ -4,8 +4,8 @@
 * @Description:
 -->
 <script setup lang="ts">
-import UserMenu from "@/views/app/user/component/UserMenu.vue";
-import UserCard from "@/views/app/user/component/UserCard.vue";
+import UserMenu from "@/views/data/user/component/UserMenu.vue";
+import UserCard from "@/views/data/user/component/UserCard.vue";
 import { useUserStore } from "./userStore";
 import {getUsers} from "@/api/userApi";
 
diff --git a/console-ui/src/views/app/user/component/UserCard.vue b/console-ui/src/views/data/user/component/UserCard.vue
similarity index 100%
rename from console-ui/src/views/app/user/component/UserCard.vue
rename to console-ui/src/views/data/user/component/UserCard.vue
diff --git a/console-ui/src/views/app/user/component/UserList.vue b/console-ui/src/views/data/user/component/UserList.vue
similarity index 96%
rename from console-ui/src/views/app/user/component/UserList.vue
rename to console-ui/src/views/data/user/component/UserList.vue
index 7c8836c..38fa624 100644
--- a/console-ui/src/views/app/user/component/UserList.vue
+++ b/console-ui/src/views/data/user/component/UserList.vue
@@ -31,6 +31,9 @@ const filterdUserList = computed(() => {
 
 <template>
   <v-card height="100%">
+    <v-alert border color="#C51162" icon="mdi-material-design" theme="dark">
+      正在施工中...
+    </v-alert>
     <!-- ---------------------------------------------- -->
     <!-- Filter Input -->
     <!-- ---------------------------------------------- -->
diff --git a/console-ui/src/views/app/user/component/UserMenu.vue b/console-ui/src/views/data/user/component/UserMenu.vue
similarity index 96%
rename from console-ui/src/views/app/user/component/UserMenu.vue
rename to console-ui/src/views/data/user/component/UserMenu.vue
index f888bff..ec1f6e6 100644
--- a/console-ui/src/views/app/user/component/UserMenu.vue
+++ b/console-ui/src/views/data/user/component/UserMenu.vue
@@ -4,7 +4,7 @@
 * @Description:
 -->
 <script setup lang="ts">
-import { useUserStore } from "@/views/app/user/userStore";
+import { useUserStore } from "@/views/data/user/userStore";
 const userStore = useUserStore();
 </script>
 
diff --git a/console-ui/src/views/app/user/pages/CompletedPage.vue b/console-ui/src/views/data/user/pages/CompletedPage.vue
similarity index 66%
rename from console-ui/src/views/app/user/pages/CompletedPage.vue
rename to console-ui/src/views/data/user/pages/CompletedPage.vue
index df54d1d..0768a7b 100644
--- a/console-ui/src/views/app/user/pages/CompletedPage.vue
+++ b/console-ui/src/views/data/user/pages/CompletedPage.vue
@@ -4,8 +4,8 @@
 * @Description:
 -->
 <script lang="ts" setup>
-import UserList from "@/views/app/user/component/UserList.vue";
-import { useUserStore } from "@/views/app/user/userStore";
+import UserList from "@/views/data/user/component/UserList.vue";
+import { useUserStore } from "@/views/data/user/userStore";
 const userStore = useUserStore();
 </script>
 
diff --git a/console-ui/src/views/app/user/pages/LabelPage.vue b/console-ui/src/views/data/user/pages/LabelPage.vue
similarity index 74%
rename from console-ui/src/views/app/user/pages/LabelPage.vue
rename to console-ui/src/views/data/user/pages/LabelPage.vue
index 78d1623..42c3f06 100644
--- a/console-ui/src/views/app/user/pages/LabelPage.vue
+++ b/console-ui/src/views/data/user/pages/LabelPage.vue
@@ -4,8 +4,8 @@
 * @Description:
 -->
 <script lang="ts" setup>
-import UserList from "@/views/app/user/component/UserList.vue";
-import { useUserStore } from "@/views/app/user/userStore";
+import UserList from "@/views/data/user/component/UserList.vue";
+import { useUserStore } from "@/views/data/user/userStore";
 
 const userStore = useUserStore();
 const route = useRoute();
diff --git a/console-ui/src/views/app/user/pages/TasksPage.vue b/console-ui/src/views/data/user/pages/TasksPage.vue
similarity index 65%
rename from console-ui/src/views/app/user/pages/TasksPage.vue
rename to console-ui/src/views/data/user/pages/TasksPage.vue
index b009d48..a62400d 100644
--- a/console-ui/src/views/app/user/pages/TasksPage.vue
+++ b/console-ui/src/views/data/user/pages/TasksPage.vue
@@ -4,8 +4,8 @@
 * @Description:
 -->
 <script lang="ts" setup>
-import UserList from "@/views/app/user/component/UserList.vue";
-import { useUserStore } from "@/views/app/user/userStore";
+import UserList from "@/views/data/user/component/UserList.vue";
+import { useUserStore } from "@/views/data/user/userStore";
 const userStore = useUserStore();
 </script>
 
diff --git a/console-ui/src/views/app/user/userRoutes.ts b/console-ui/src/views/data/user/userRoutes.ts
similarity index 58%
rename from console-ui/src/views/app/user/userRoutes.ts
rename to console-ui/src/views/data/user/userRoutes.ts
index c5c19dd..80a1937 100644
--- a/console-ui/src/views/app/user/userRoutes.ts
+++ b/console-ui/src/views/data/user/userRoutes.ts
@@ -8,7 +8,7 @@ export default [
     name: "apps-todo-tasks",
     component: () =>
       import(
-        /* webpackChunkName: "apps-todo-tasks" */ "@/views/app/user/pages/TasksPage.vue"
+        /* webpackChunkName: "apps-todo-tasks" */ "@/views/data/user/pages/TasksPage.vue"
       ),
   },
   {
@@ -16,7 +16,7 @@ export default [
     name: "apps-todo-completed",
     component: () =>
       import(
-        /* webpackChunkName: "apps-todo-completed" */ "@/views/app/user/pages/CompletedPage.vue"
+        /* webpackChunkName: "apps-todo-completed" */ "@/views/data/user/pages/CompletedPage.vue"
       ),
   },
   {
@@ -24,7 +24,7 @@ export default [
     name: "apps-todo-label",
     component: () =>
       import(
-        /* webpackChunkName: "apps-todo-label" */ "@/views/app/user/pages/LabelPage.vue"
+        /* webpackChunkName: "apps-todo-label" */ "@/views/data/user/pages/LabelPage.vue"
       ),
   },
 ];
diff --git a/console-ui/src/views/app/user/userStore.ts b/console-ui/src/views/data/user/userStore.ts
similarity index 100%
rename from console-ui/src/views/app/user/userStore.ts
rename to console-ui/src/views/data/user/userStore.ts
diff --git a/console-ui/src/views/app/user/userTypes.ts b/console-ui/src/views/data/user/userTypes.ts
similarity index 100%
rename from console-ui/src/views/app/user/userTypes.ts
rename to console-ui/src/views/data/user/userTypes.ts