@@ -68,5 +64,3 @@ const isOutsideClicked = (event) => {
-
-
diff --git a/src/layout/AppMenu.vue b/src/layout/AppMenu.vue
index a934316..d19b770 100644
--- a/src/layout/AppMenu.vue
+++ b/src/layout/AppMenu.vue
@@ -24,16 +24,10 @@ const model = ref([
{ label: 'Message', icon: 'pi pi-fw pi-comment', to: '/uikit/message' },
{ label: 'File', icon: 'pi pi-fw pi-file', to: '/uikit/file' },
{ label: 'Chart', icon: 'pi pi-fw pi-chart-bar', to: '/uikit/charts' },
+ { label: 'Timeline', icon: 'pi pi-fw pi-calendar', to: '/uikit/timeline' },
{ label: 'Misc', icon: 'pi pi-fw pi-circle', to: '/uikit/misc' }
]
},
- {
- label: 'Utilities',
- items: [
- { label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/utilities/icons' },
- { label: 'PrimeFlex', icon: 'pi pi-fw pi-desktop', url: 'https://www.primefaces.org/primeflex/', target: '_blank' }
- ]
- },
{
label: 'Pages',
icon: 'pi pi-fw pi-briefcase',
@@ -70,11 +64,6 @@ const model = ref([
icon: 'pi pi-fw pi-pencil',
to: '/pages/crud'
},
- {
- label: 'Timeline',
- icon: 'pi pi-fw pi-calendar',
- to: '/pages/timeline'
- },
{
label: 'Not Found',
icon: 'pi pi-fw pi-exclamation-circle',
diff --git a/src/layout/AppSidebar.vue b/src/layout/AppSidebar.vue
index e67654f..0c10c84 100644
--- a/src/layout/AppSidebar.vue
+++ b/src/layout/AppSidebar.vue
@@ -3,7 +3,9 @@ import AppMenu from './AppMenu.vue';
-
+
diff --git a/src/layout/composables/layout.js b/src/layout/composables/layout.js
index 5d4ed79..49ef73b 100644
--- a/src/layout/composables/layout.js
+++ b/src/layout/composables/layout.js
@@ -35,6 +35,10 @@ export function useLayout() {
layoutConfig.activeMenuItem = item.value || item;
};
+ const setMenuMode = (mode) => {
+ layoutConfig.menuMode = mode;
+ };
+
const toggleDarkMode = () => {
if (!document.startViewTransition) {
executeDarkModeToggle();
@@ -74,5 +78,7 @@ export function useLayout() {
const getPrimary = computed(() => layoutConfig.primary);
- return { layoutConfig: readonly(layoutConfig), layoutState: readonly(layoutState), onMenuToggle, isSidebarActive, isDarkTheme, getPrimary, setActiveMenuItem, toggleDarkMode, setPrimary, setSurface, setPreset, resetMenu };
+ const getSurface = computed(() => layoutConfig.surface);
+
+ return { layoutConfig: readonly(layoutConfig), layoutState: readonly(layoutState), onMenuToggle, isSidebarActive, isDarkTheme, getPrimary, getSurface, setActiveMenuItem, toggleDarkMode, setPrimary, setSurface, setPreset, resetMenu, setMenuMode };
}
diff --git a/src/main.js b/src/main.js
index 8f9d627..625e05b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,12 +2,10 @@ import { createApp } from 'vue';
import App from './App.vue';
import router from './router';
-import PrimeVue from 'primevue/config';
import Aura from '@primevue/themes/aura';
-import ToastService from 'primevue/toastservice';
+import PrimeVue from 'primevue/config';
import ConfirmationService from 'primevue/confirmationservice';
-
-import BlockViewer from '@/components/BlockViewer.vue';
+import ToastService from 'primevue/toastservice';
import '@/assets/styles.scss';
import '@/assets/tailwind.css';
@@ -26,6 +24,4 @@ app.use(PrimeVue, {
app.use(ToastService);
app.use(ConfirmationService);
-app.component('BlockViewer', BlockViewer);
-
app.mount('#app');
diff --git a/src/router/index.js b/src/router/index.js
index 2ef452c..d3fdabd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -59,28 +59,6 @@ const router = createRouter({
name: 'media',
component: () => import('@/views/uikit/MediaDoc.vue')
},
- {
- path: '/uikit/menu',
- component: () => import('@/views/uikit/MenuDoc.vue'),
- children: [
- {
- path: '/uikit/menu',
- component: () => import('@/views/uikit/menu/PersonalDemo.vue')
- },
- {
- path: '/uikit/menu/seat',
- component: () => import('@/views/uikit/menu/SeatDemo.vue')
- },
- {
- path: '/uikit/menu/payment',
- component: () => import('@/views/uikit/menu/PaymentDemo.vue')
- },
- {
- path: '/uikit/menu/confirmation',
- component: () => import('@/views/uikit/menu/ConfirmationDemo.vue')
- }
- ]
- },
{
path: '/uikit/message',
name: 'message',
@@ -91,6 +69,11 @@ const router = createRouter({
name: 'file',
component: () => import('@/views/uikit/FileDoc.vue')
},
+ {
+ path: '/uikit/menu',
+ name: 'menu',
+ component: () => import('@/views/uikit/MenuDoc.vue')
+ },
{
path: '/uikit/charts',
name: 'charts',
@@ -102,19 +85,9 @@ const router = createRouter({
component: () => import('@/views/uikit/MiscDoc.vue')
},
{
- path: '/blocks',
- name: 'blocks',
- component: () => import('@/views/utilities/Blocks.vue')
- },
- {
- path: '/utilities/icons',
- name: 'icons',
- component: () => import('@/views/utilities/Icons.vue')
- },
- {
- path: '/pages/timeline',
+ path: '/uikit/timeline',
name: 'timeline',
- component: () => import('@/views/pages/TimelineDoc.vue')
+ component: () => import('@/views/uikit/TimelineDoc.vue')
},
{
path: '/pages/empty',
@@ -129,7 +102,7 @@ const router = createRouter({
{
path: '/documentation',
name: 'documentation',
- component: () => import('@/views/utilities/Documentation.vue')
+ component: () => import('@/views/pages/Documentation.vue')
}
]
},
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 6e4e3c9..949eab3 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -3,7 +3,7 @@ import { useLayout } from '@/layout/composables/layout';
import { ProductService } from '@/service/ProductService';
import { onMounted, ref, watch } from 'vue';
-const { getPrimary, isDarkTheme } = useLayout();
+const { getPrimary, getSurface, isDarkTheme } = useLayout();
const products = ref(null);
const chartData = ref(null);
@@ -99,7 +99,7 @@ watch(isDarkTheme, () => {
chartOptions.value = setChartOptions();
});
-watch(getPrimary, () => {
+watch([getPrimary, getSurface], () => {
chartData.value = setChartData();
chartOptions.value = setChartOptions();
});
@@ -191,8 +191,8 @@ watch(getPrimary, () => {