diff --git a/web-app/packages/admin-app/components.d.ts b/web-app/packages/admin-app/components.d.ts index 97368df8..6bcacfd1 100644 --- a/web-app/packages/admin-app/components.d.ts +++ b/web-app/packages/admin-app/components.d.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -/* prettier-ignore */ // @ts-nocheck // Generated by unplugin-vue-components // Read more: https://github.com/vuejs/core/pull/3399 export {} +/* prettier-ignore */ declare module 'vue' { export interface GlobalComponents { PDivider: typeof import('primevue/divider')['default'] diff --git a/web-app/packages/admin-app/src/modules/layout/components/Sidebar.vue b/web-app/packages/admin-app/src/modules/layout/components/Sidebar.vue index cccd4d1d..ffb15e66 100644 --- a/web-app/packages/admin-app/src/modules/layout/components/Sidebar.vue +++ b/web-app/packages/admin-app/src/modules/layout/components/Sidebar.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: LicenseRef-MerginMaps-Commercial --> diff --git a/web-app/packages/admin-lib/src/modules/layout/components/index.ts b/web-app/packages/admin-lib/src/modules/layout/components/index.ts new file mode 100644 index 00000000..dcf4179e --- /dev/null +++ b/web-app/packages/admin-lib/src/modules/layout/components/index.ts @@ -0,0 +1,5 @@ +// Copyright (C) Lutra Consulting Limited +// +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial + +export { default as SidebarFooter } from './SidebarFooter.vue' diff --git a/web-app/packages/admin-lib/src/modules/layout/index.ts b/web-app/packages/admin-lib/src/modules/layout/index.ts new file mode 100644 index 00000000..d333dd14 --- /dev/null +++ b/web-app/packages/admin-lib/src/modules/layout/index.ts @@ -0,0 +1,5 @@ +// Copyright (C) Lutra Consulting Limited +// +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial + +export * from './components' diff --git a/web-app/packages/lib/src/modules/layout/components/SideBarItem.vue b/web-app/packages/lib/src/modules/layout/components/SideBarItem.vue index 8198ac79..57c26f38 100644 --- a/web-app/packages/lib/src/modules/layout/components/SideBarItem.vue +++ b/web-app/packages/lib/src/modules/layout/components/SideBarItem.vue @@ -21,6 +21,7 @@ function closeDrawer() { diff --git a/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue b/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue index 60c9fa37..813e2a79 100644 --- a/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue +++ b/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue @@ -60,11 +60,20 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial -
+
+ @@ -75,13 +84,14 @@ import { useRoute } from 'vue-router' import { SideBarItemModel } from '../types' -import { DashboardRouteName } from '@/main' +import { DashboardRouteName, useUserStore } from '@/main' import SideBarItem from '@/modules/layout/components/SideBarItem.vue' import { useLayoutStore } from '@/modules/layout/store' import { ProjectRouteName } from '@/modules/project' const route = useRoute() const layoutStore = useLayoutStore() +const userStore = useUserStore() const props = defineProps<{ sidebarItems?: SideBarItemModel[] }>() diff --git a/web-app/packages/lib/src/modules/layout/types.ts b/web-app/packages/lib/src/modules/layout/types.ts index 9adff558..38b3e873 100644 --- a/web-app/packages/lib/src/modules/layout/types.ts +++ b/web-app/packages/lib/src/modules/layout/types.ts @@ -4,7 +4,8 @@ export interface SideBarItemModel { title: string - to: string + to?: string + href?: string icon: string active: boolean }