Merge branch 'master' of https://github.com/969025903/ChopperBot

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);

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();

console-ui/src/configs/menus/apps.menu.ts

@@ -96,4 +96,10 @@ export default [
     text: "Email",
     link: "/apps/email",
   },
+  {
+    icon: "mdi-bookmark-plus",
+    key: "menu.tool",
+    text: "Tool",
+    link: "/apps/tool",
+  },
 ];

console-ui/src/router/apps.routes.ts

@@ -188,4 +188,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",
+    },
+  },
 ];

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],
   },
   {

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>

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";
 

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 -->
     <!-- ---------------------------------------------- -->

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>
 

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>
 

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();

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>
 

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"
       ),
   },
 ];