Merge branch 'main' of https://github.com/halo-dev/halo into feat/edi…

…tor-search-and-replace
halo-dev · Jan 19, 2024 · a59d8a0 · a59d8a0
2 parents 91a1d98 + 3ebb45c
commit a59d8a0
Show file tree

Hide file tree

Showing 21 changed files with 278 additions and 208 deletions.
diff --git a/console/console-src/modules/contents/attachments/module.ts b/console/console-src/modules/contents/attachments/module.ts
@@ -12,23 +12,24 @@ export default definePlugin({
   routes: [
     {
       path: "/attachments",
+      name: "AttachmentsRoot",
       component: BasicLayout,
+      meta: {
+        title: "core.attachment.title",
+        permissions: ["system:attachments:view"],
+        menu: {
+          name: "core.sidebar.menu.items.attachments",
+          group: "content",
+          icon: markRaw(IconFolder),
+          priority: 3,
+          mobile: true,
+        },
+      },
       children: [
         {
           path: "",
           name: "Attachments",
           component: AttachmentList,
-          meta: {
-            title: "core.attachment.title",
-            permissions: ["system:attachments:view"],
-            menu: {
-              name: "core.sidebar.menu.items.attachments",
-              group: "content",
-              icon: markRaw(IconFolder),
-              priority: 3,
-              mobile: true,
-            },
-          },
         },
       ],
     },

diff --git a/console/console-src/modules/contents/comments/module.ts b/console/console-src/modules/contents/comments/module.ts
@@ -12,24 +12,25 @@ export default definePlugin({
   routes: [
     {
       path: "/comments",
+      name: "CommentsRoot",
       component: BasicLayout,
+      meta: {
+        title: "core.comment.title",
+        searchable: true,
+        permissions: ["system:comments:view"],
+        menu: {
+          name: "core.sidebar.menu.items.comments",
+          group: "content",
+          icon: markRaw(IconMessage),
+          priority: 2,
+          mobile: true,
+        },
+      },
       children: [
         {
           path: "",
           name: "Comments",
           component: CommentList,
-          meta: {
-            title: "core.comment.title",
-            searchable: true,
-            permissions: ["system:comments:view"],
-            menu: {
-              name: "core.sidebar.menu.items.comments",
-              group: "content",
-              icon: markRaw(IconMessage),
-              priority: 2,
-              mobile: true,
-            },
-          },
         },
       ],
     },

diff --git a/console/console-src/modules/contents/pages/module.ts b/console/console-src/modules/contents/pages/module.ts
@@ -14,23 +14,24 @@ export default definePlugin({
   routes: [
     {
       path: "/single-pages",
+      name: "SinglePagesRoot",
       component: BasicLayout,
+      meta: {
+        title: "core.page.title",
+        searchable: true,
+        permissions: ["system:singlepages:view"],
+        menu: {
+          name: "core.sidebar.menu.items.single_pages",
+          group: "content",
+          icon: markRaw(IconPages),
+          priority: 1,
+        },
+      },
       children: [
         {
           path: "",
           name: "SinglePages",
           component: SinglePageList,
-          meta: {
-            title: "core.page.title",
-            searchable: true,
-            permissions: ["system:singlepages:view"],
-            menu: {
-              name: "core.sidebar.menu.items.single_pages",
-              group: "content",
-              icon: markRaw(IconPages),
-              priority: 1,
-            },
-          },
         },
         {
           path: "deleted",

diff --git a/console/console-src/modules/contents/posts/module.ts b/console/console-src/modules/contents/posts/module.ts
@@ -19,24 +19,25 @@ export default definePlugin({
   routes: [
     {
       path: "/posts",
+      name: "PostsRoot",
       component: BasicLayout,
+      meta: {
+        title: "core.post.title",
+        searchable: true,
+        permissions: ["system:posts:view"],
+        menu: {
+          name: "core.sidebar.menu.items.posts",
+          group: "content",
+          icon: markRaw(IconBookRead),
+          priority: 0,
+          mobile: true,
+        },
+      },
       children: [
         {
           path: "",
           name: "Posts",
           component: PostList,
-          meta: {
-            title: "core.post.title",
-            searchable: true,
-            permissions: ["system:posts:view"],
-            menu: {
-              name: "core.sidebar.menu.items.posts",
-              group: "content",
-              icon: markRaw(IconBookRead),
-              priority: 0,
-              mobile: true,
-            },
-          },
         },
         {
           path: "deleted",

diff --git a/console/console-src/modules/interface/menus/module.ts b/console/console-src/modules/interface/menus/module.ts
@@ -9,23 +9,24 @@ export default definePlugin({
   routes: [
     {
       path: "/menus",
+      name: "MenusRoot",
       component: BasicLayout,
+      meta: {
+        title: "core.menu.title",
+        searchable: true,
+        permissions: ["system:menus:view"],
+        menu: {
+          name: "core.sidebar.menu.items.menus",
+          group: "interface",
+          icon: markRaw(IconListSettings),
+          priority: 1,
+        },
+      },
       children: [
         {
           path: "",
           name: "Menus",
           component: Menus,
-          meta: {
-            title: "core.menu.title",
-            searchable: true,
-            permissions: ["system:menus:view"],
-            menu: {
-              name: "core.sidebar.menu.items.menus",
-              group: "interface",
-              icon: markRaw(IconListSettings),
-              priority: 1,
-            },
-          },
         },
       ],
     },

diff --git a/console/console-src/modules/interface/themes/module.ts b/console/console-src/modules/interface/themes/module.ts
@@ -10,23 +10,24 @@ export default definePlugin({
   routes: [
     {
       path: "/theme",
+      name: "ThemeRoot",
       component: ThemeLayout,
+      meta: {
+        title: "core.theme.title",
+        searchable: true,
+        permissions: ["system:themes:view"],
+        menu: {
+          name: "core.sidebar.menu.items.themes",
+          group: "interface",
+          icon: markRaw(IconPalette),
+          priority: 0,
+        },
+      },
       children: [
         {
           path: "",
           name: "ThemeDetail",
           component: ThemeDetail,
-          meta: {
-            title: "core.theme.title",
-            searchable: true,
-            permissions: ["system:themes:view"],
-            menu: {
-              name: "core.sidebar.menu.items.themes",
-              group: "interface",
-              icon: markRaw(IconPalette),
-              priority: 0,
-            },
-          },
         },
         {
           path: "settings/:group",

diff --git a/console/console-src/modules/system/actuator/module.ts b/console/console-src/modules/system/actuator/module.ts
@@ -9,22 +9,24 @@ export default definePlugin({
   routes: [
     {
       path: "/actuator",
+      name: "OverviewRoot", // fixme: actuator will be renamed to overview in the future
       component: BasicLayout,
+      meta: {
+        title: "core.actuator.title",
+        searchable: true,
+        permissions: ["system:actuator:manage"],
+        menu: {
+          name: "core.sidebar.menu.items.actuator",
+          group: "system",
+          icon: markRaw(IconTerminalBoxLine),
+          priority: 3,
+        },
+      },
       children: [
         {
           path: "",
+          name: "Actuator",
           component: Actuator,
-          meta: {
-            title: "core.actuator.title",
-            searchable: true,
-            permissions: ["system:actuator:manage"],
-            menu: {
-              name: "core.sidebar.menu.items.actuator",
-              group: "system",
-              icon: markRaw(IconTerminalBoxLine),
-              priority: 3,
-            },
-          },
         },
       ],
     },

diff --git a/console/console-src/modules/system/backup/module.ts b/console/console-src/modules/system/backup/module.ts
@@ -9,23 +9,24 @@ export default definePlugin({
   routes: [
     {
       path: "/backup",
+      name: "BackupRoot",
       component: BasicLayout,
+      meta: {
+        title: "core.backup.title",
+        searchable: true,
+        permissions: ["system:migrations:manage"],
+        menu: {
+          name: "core.sidebar.menu.items.backup",
+          group: "system",
+          icon: markRaw(IconServerLine),
+          priority: 4,
+        },
+      },
       children: [
         {
           path: "",
           name: "Backup",
           component: Backups,
-          meta: {
-            title: "core.backup.title",
-            searchable: true,
-            permissions: ["system:migrations:manage"],
-            menu: {
-              name: "core.sidebar.menu.items.backup",
-              group: "system",
-              icon: markRaw(IconServerLine),
-              priority: 4,
-            },
-          },
         },
       ],
     },

diff --git a/console/console-src/modules/system/plugins/module.ts b/console/console-src/modules/system/plugins/module.ts
@@ -1,6 +1,5 @@
 import { definePlugin } from "@halo-dev/console-shared";
 import BasicLayout from "@console/layouts/BasicLayout.vue";
-import BlankLayout from "@console/layouts/BlankLayout.vue";
 import PluginList from "./PluginList.vue";
 import PluginDetail from "./PluginDetail.vue";
 import { IconPlug } from "@halo-dev/components";
@@ -11,44 +10,33 @@ export default definePlugin({
   routes: [
     {
       path: "/plugins",
-      component: BlankLayout,
+      name: "PluginsRoot",
+      component: BasicLayout,
+      meta: {
+        title: "core.plugin.title",
+        searchable: true,
+        permissions: ["system:plugins:view"],
+        menu: {
+          name: "core.sidebar.menu.items.plugins",
+          group: "system",
+          icon: markRaw(IconPlug),
+          priority: 0,
+        },
+      },
       children: [
         {
           path: "",
-          component: BasicLayout,
-          children: [
-            {
-              path: "",
-              name: "Plugins",
-              component: PluginList,
-              meta: {
-                title: "core.plugin.title",
-                searchable: true,
-                permissions: ["system:plugins:view"],
-                menu: {
-                  name: "core.sidebar.menu.items.plugins",
-                  group: "system",
-                  icon: markRaw(IconPlug),
-                  priority: 0,
-                },
-              },
-            },
-          ],
+          name: "Plugins",
+          component: PluginList,
         },
         {
           path: ":name",
-          component: BasicLayout,
-          children: [
-            {
-              path: "",
-              name: "PluginDetail",
-              component: PluginDetail,
-              meta: {
-                title: "core.plugin.detail.title",
-                permissions: ["system:plugins:view"],
-              },
-            },
-          ],
+          name: "PluginDetail",
+          component: PluginDetail,
+          meta: {
+            title: "core.plugin.detail.title",
+            permissions: ["system:plugins:view"],
+          },
         },
       ],
     },

diff --git a/console/console-src/modules/system/settings/module.ts b/console/console-src/modules/system/settings/module.ts
@@ -9,22 +9,23 @@ export default definePlugin({
   routes: [
     {
       path: "/settings",
+      name: "SettingsRoot",
       component: BasicLayout,
+      meta: {
+        title: "core.setting.title",
+        permissions: ["system:settings:view"],
+        menu: {
+          name: "core.sidebar.menu.items.settings",
+          group: "system",
+          icon: markRaw(IconSettings),
+          priority: 2,
+        },
+      },
       children: [
         {
           path: "",
           name: "SystemSetting",
           component: SystemSettings,
-          meta: {
-            title: "core.setting.title",
-            permissions: ["system:settings:view"],
-            menu: {
-              name: "core.sidebar.menu.items.settings",
-              group: "system",
-              icon: markRaw(IconSettings),
-              priority: 2,
-            },
-          },
         },
       ],
     },