diff --git a/src/assets/icons/search.svg b/src/assets/icons/search.svg new file mode 100644 index 00000000..c5af0296 --- /dev/null +++ b/src/assets/icons/search.svg @@ -0,0 +1,18 @@ + + +search + + diff --git a/src/layout/components/NavBar.vue b/src/layout/components/NavBar.vue index 2b98c8be..59f10033 100644 --- a/src/layout/components/NavBar.vue +++ b/src/layout/components/NavBar.vue @@ -57,7 +57,7 @@ const utcHour = isNaN(Number(utcArr[0])) ? 0 : Number(utcArr[0]); const utcMin = isNaN(Number(utcArr[1])) ? 0 : Number(utcArr[1]); appStore.setUTC(utcHour, utcMin); -console.log(route); + const setConfig = (value: string) => { pageName.value = value || ""; theme.value = route.path.includes("/infrastructure/") ? "dark" : "light"; diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 789ada7d..05fe3fc9 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -23,7 +23,7 @@ const msg = { infrastructure: "Infrastructure", virtualMachine: "Virtual Machine", kubernetes: "Kubernetes", - dashboardHome: "Dashboard Home", + dashboardNew: "New Dashboard", dashboardList: "Dashboard List", logs: "Logs", events: "Events", diff --git a/src/router/dashboard.ts b/src/router/dashboard.ts index f6d25598..90829095 100644 --- a/src/router/dashboard.ts +++ b/src/router/dashboard.ts @@ -29,24 +29,24 @@ export const routesDashboard: Array = [ exact: true, }, children: [ - { - path: "/dashboard/home", - component: () => import("@/views/Service.vue"), - name: "Home", - meta: { - title: "dashboardHome", - exact: false, - }, - }, { path: "/dashboard/list", - component: () => import("@/views/Log.vue"), + component: () => import("@/views/dashboard/List.vue"), name: "List", meta: { title: "dashboardList", exact: false, }, }, + { + path: "/dashboard/new", + component: () => import("@/views/dashboard/New.vue"), + name: "New", + meta: { + title: "dashboardNew", + exact: false, + }, + }, ], }, ]; diff --git a/src/router/database.ts b/src/router/database.ts index 6eb5148a..2b08c1f7 100644 --- a/src/router/database.ts +++ b/src/router/database.ts @@ -36,7 +36,7 @@ export const routesDatabase: Array = [ headPath: "/database", exact: true, }, - component: () => import("@/views/Service.vue"), + component: () => import("@/views/service/Service.vue"), }, { path: "/database/:id/:type", diff --git a/src/router/generalService.ts b/src/router/generalService.ts index a8b4d389..a88dbae1 100644 --- a/src/router/generalService.ts +++ b/src/router/generalService.ts @@ -38,7 +38,7 @@ export const routesGen: Array = [ headPath: "/generalService/service", exact: true, }, - component: () => import("@/views/Service.vue"), + component: () => import("@/views/service/Service.vue"), }, { path: "/generalService/service/:id/:type", diff --git a/src/router/infrastructure.ts b/src/router/infrastructure.ts index 8257df82..6ec33f27 100644 --- a/src/router/infrastructure.ts +++ b/src/router/infrastructure.ts @@ -35,7 +35,7 @@ export const routesInfra: Array = [ meta: { title: "virtualMachine", }, - component: () => import("@/views/Infrastructure.vue"), + component: () => import("@/views/infrastructure/Infrastructure.vue"), }, { path: "/infrastructure/k8s", @@ -43,7 +43,7 @@ export const routesInfra: Array = [ meta: { title: "kubernetes", }, - component: () => import("@/views/Infrastructure.vue"), + component: () => import("@/views/infrastructure/Infrastructure.vue"), }, ], }, diff --git a/src/router/serviceMesh.ts b/src/router/serviceMesh.ts index 81b28971..1f9e674b 100644 --- a/src/router/serviceMesh.ts +++ b/src/router/serviceMesh.ts @@ -36,7 +36,7 @@ export const routesMesh: Array = [ title: "services", headPath: "/mesh/services", }, - component: () => import("@/views/Service.vue"), + component: () => import("@/views/service/Service.vue"), }, { path: "/mesh/controlPanel", @@ -45,7 +45,7 @@ export const routesMesh: Array = [ title: "controlPanel", headPath: "/mesh/controlPanel", }, - component: () => import("@/views/Service.vue"), + component: () => import("@/views/service/Service.vue"), }, { path: "/mesh/dataPanel", @@ -54,7 +54,7 @@ export const routesMesh: Array = [ title: "dataPanel", headPath: "/mesh/dataPanel", }, - component: () => import("@/views/Service.vue"), + component: () => import("@/views/service/Service.vue"), }, { path: "/mesh/services/:id/:type", diff --git a/src/styles/lib.scss b/src/styles/lib.scss index 069c6f10..c783820d 100644 --- a/src/styles/lib.scss +++ b/src/styles/lib.scss @@ -55,6 +55,9 @@ .grey { color: #a7aebb; } +.white { + color: #fff; +} .bg-green { background-color: #4caf50; } diff --git a/src/views/dashboard/List.vue b/src/views/dashboard/List.vue new file mode 100644 index 00000000..01b5974a --- /dev/null +++ b/src/views/dashboard/List.vue @@ -0,0 +1,113 @@ + + + + diff --git a/src/views/Dashboard.vue b/src/views/dashboard/New.vue similarity index 94% rename from src/views/Dashboard.vue rename to src/views/dashboard/New.vue index 6e121b20..01ccb749 100644 --- a/src/views/Dashboard.vue +++ b/src/views/dashboard/New.vue @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -->