diff --git a/dashboard/pkg/epinio/components/dashboard/Cards.vue b/dashboard/pkg/epinio/components/dashboard/Cards.vue index e6712a45..e5bc761f 100644 --- a/dashboard/pkg/epinio/components/dashboard/Cards.vue +++ b/dashboard/pkg/epinio/components/dashboard/Cards.vue @@ -9,7 +9,7 @@ const props = defineProps<{ link: object, linkText: string, description: string, - slotTitle: string | null, + slotTitle: string | null, }>() const setLoading = computed(() => { diff --git a/dashboard/pkg/epinio/list/namespaces.vue b/dashboard/pkg/epinio/list/namespaces.vue new file mode 100644 index 00000000..e169e771 --- /dev/null +++ b/dashboard/pkg/epinio/list/namespaces.vue @@ -0,0 +1,253 @@ + + + + + + diff --git a/dashboard/pkg/epinio/pages/auth/verify.vue b/dashboard/pkg/epinio/pages/auth/verify.vue new file mode 100644 index 00000000..47b157f8 --- /dev/null +++ b/dashboard/pkg/epinio/pages/auth/verify.vue @@ -0,0 +1,47 @@ + + + diff --git a/dashboard/pkg/epinio/pages/c/_cluster/_resource/_id.vue b/dashboard/pkg/epinio/pages/c/_cluster/_resource/_id.vue new file mode 100644 index 00000000..27dc5696 --- /dev/null +++ b/dashboard/pkg/epinio/pages/c/_cluster/_resource/_id.vue @@ -0,0 +1,8 @@ + + + + diff --git a/dashboard/pkg/epinio/pages/c/_cluster/_resource/_namespace/_id.vue b/dashboard/pkg/epinio/pages/c/_cluster/_resource/_namespace/_id.vue new file mode 100644 index 00000000..dd023156 --- /dev/null +++ b/dashboard/pkg/epinio/pages/c/_cluster/_resource/_namespace/_id.vue @@ -0,0 +1,8 @@ + + + + diff --git a/dashboard/pkg/epinio/pages/c/_cluster/_resource/create.vue b/dashboard/pkg/epinio/pages/c/_cluster/_resource/create.vue new file mode 100644 index 00000000..dd023156 --- /dev/null +++ b/dashboard/pkg/epinio/pages/c/_cluster/_resource/create.vue @@ -0,0 +1,8 @@ + + + + diff --git a/dashboard/pkg/epinio/pages/c/_cluster/_resource/index.vue b/dashboard/pkg/epinio/pages/c/_cluster/_resource/index.vue new file mode 100644 index 00000000..7edb03d1 --- /dev/null +++ b/dashboard/pkg/epinio/pages/c/_cluster/_resource/index.vue @@ -0,0 +1,8 @@ + + + + diff --git a/dashboard/pkg/epinio/routing/epinio-routing.ts b/dashboard/pkg/epinio/routing/epinio-routing.ts index d97dc1bf..20d7c52e 100644 --- a/dashboard/pkg/epinio/routing/epinio-routing.ts +++ b/dashboard/pkg/epinio/routing/epinio-routing.ts @@ -1,11 +1,13 @@ // Don't forget to create a VueJS page called index.vue in the /pages folder!!! import ListEpinio from "../pages/index.vue"; import Dashboard from "../pages/c/_cluster/dashboard.vue"; +import AuthVerify from "../pages/auth/verify.vue"; import ListApp from "../pages/c/_cluster/applications/index.vue"; import CreateApp from "../pages/c/_cluster/applications/createapp/index.vue"; import AboutEpinio from "../pages/c/_cluster/about.vue"; // import { BLANK_CLUSTER } from '../config/epinio'; import { EPINIO_PRODUCT_NAME } from '../types'; +import ListEpinioResource from '../pages/c/_cluster/_resource/index.vue'; // // import ViewResource from '@shell/pages/c/_cluster/_product/_resource/_id.vue'; @@ -38,7 +40,7 @@ const routes = [ { name: `${EPINIO_PRODUCT_NAME}-auth-verify`, path: `/:product/auth/verify`, - component: ListEpinio, //AuthVerify, + component: AuthVerify, meta, }, { @@ -65,8 +67,11 @@ const routes = [ { name: `${EPINIO_PRODUCT_NAME}-c-cluster-resource`, path: `/:product/c/:cluster/:resource`, - component: ListEpinio, //ListEpinioResource, - meta, + component: ListEpinioResource, + meta: { + product: EPINIO_PRODUCT_NAME, + pkg: EPINIO_PRODUCT_NAME, + }, }, { name: `${EPINIO_PRODUCT_NAME}-c-cluster-resource-create`, diff --git a/dashboard/pkg/epinio/utils/custom-routing.ts b/dashboard/pkg/epinio/utils/custom-routing.ts index c88e82d2..c3d58758 100644 --- a/dashboard/pkg/epinio/utils/custom-routing.ts +++ b/dashboard/pkg/epinio/utils/custom-routing.ts @@ -1,18 +1,14 @@ import { EPINIO_PRODUCT_NAME } from '../types'; +import { Location } from 'vue-router'; type Dictionary = { [key: string]: T } -const BLANK_CLUSTER = '_'; - -export const rootEpinioRoute = () => ({ +export const rootEpinioRoute = (): Location => ({ name: EPINIO_PRODUCT_NAME, - params: { - product: EPINIO_PRODUCT_NAME, - cluster: BLANK_CLUSTER, - } + params: { product: EPINIO_PRODUCT_NAME } }); -export const createEpinioRoute = (name: string, params: Dictionary, query?: Object) => { +export const createEpinioRoute = (name: string, params: Dictionary, query?: Object): Location => { const rootParams = rootEpinioRoute().params || {}; return {