Compare commits

..

1 Commits

Author SHA1 Message Date
Sebastian cb45399998 chore(deps): update dependency vuetify to v4.1.8
Build Test / build (pull_request) Successful in 19s
JS Unit Tests / test (pull_request) Successful in 18s
PHP Unit Tests / test (pull_request) Successful in 1m23s
PHP Integration Tests / Integration Tests (pull_request) Failing after 2m1s
2026-08-10 03:02:06 +00:00
4 changed files with 57 additions and 56 deletions
+39 -50
View File
@@ -1,8 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, watch } from 'vue'; import { computed } from 'vue';
import { useLayoutStore, type MenuMode } from '@KTXC/stores/layoutStore'; import { useLayoutStore, type MenuMode } from '@KTXC/stores/layoutStore';
import { useIntegrationStore } from '@KTXC/stores/integrationStore'; import { useIntegrationStore } from '@KTXC/stores/integrationStore';
import type { IntegrationPointType } from '@KTXC/types/integrationTypes';
import { useL10n } from '@KTXC/composables/useL10n'; import { useL10n } from '@KTXC/composables/useL10n';
import Logo from '@KTXC/layouts/logo/LogoDark.vue'; import Logo from '@KTXC/layouts/logo/LogoDark.vue';
import SystemMenuGroupStatic from './LayoutSystemMenuGroupStatic.vue'; import SystemMenuGroupStatic from './LayoutSystemMenuGroupStatic.vue';
@@ -13,33 +12,25 @@ const layoutStore = useLayoutStore();
const integrationStore = useIntegrationStore(); const integrationStore = useIntegrationStore();
const { t } = useL10n('core'); const { t } = useL10n('core');
const menuPointByMode: Record<MenuMode, IntegrationPointType> = {
apps: 'app_menu',
'user-settings': 'user_settings_menu',
'admin-settings': 'admin_settings_menu',
};
// Get all entries based on current menu mode // Get all entries based on current menu mode
const menuEntries = computed(() => integrationStore.getPoint(menuPointByMode[layoutStore.menuMode])); const menuEntries = computed(() => {
switch (layoutStore.menuMode) {
// Only show menu modes that currently have visible items. case 'user-settings':
const menuModes = computed((): Array<{ value: MenuMode; icon: string; label: string }> => { return integrationStore.getPoint('user_settings_menu');
const modes: Array<{ value: MenuMode; icon: string; label: string }> = [ case 'admin-settings':
{ value: 'apps', icon: 'mdi-view-dashboard', label: t('systemMenu.apps', 'Applications') }, return integrationStore.getPoint('admin_settings_menu');
{ value: 'user-settings', icon: 'mdi-account-cog', label: t('systemMenu.personalSettings', 'Settings') }, case 'apps':
{ value: 'admin-settings', icon: 'mdi-shield-crown', label: t('systemMenu.adminSettings', 'System') }, default:
]; return integrationStore.getPoint('app_menu');
}
return modes.filter(mode => integrationStore.getPoint(menuPointByMode[mode.value]).length > 0);
}); });
// If the active menu becomes empty (for example, after a module is disabled), // Static list of menu modes shown as icon buttons
// move to the first menu that still has content. const menuModes = computed((): Array<{ value: MenuMode; icon: string; label: string }> => [
watch(menuModes, (availableModes) => { { value: 'apps', icon: 'mdi-view-dashboard', label: t('systemMenu.apps', 'Applications') },
if (availableModes.length > 0 && !availableModes.some(mode => mode.value === layoutStore.menuMode)) { { value: 'user-settings', icon: 'mdi-account-cog', label: t('systemMenu.personalSettings', 'Settings') },
layoutStore.setMenuMode(availableModes[0].value); { value: 'admin-settings', icon: 'mdi-shield-crown', label: t('systemMenu.adminSettings', 'System') },
} ]);
}, { immediate: true });
</script> </script>
<script lang="ts"> <script lang="ts">
@@ -93,30 +84,28 @@ export default {
<!-- Menu Mode Switcher --> <!-- Menu Mode Switcher -->
<template v-slot:append> <template v-slot:append>
<div v-if="menuModes.length"> <v-divider />
<v-divider /> <div class="menu-mode-switcher d-flex justify-space-around align-center py-2">
<div class="menu-mode-switcher d-flex justify-space-around align-center py-2"> <v-tooltip
<v-tooltip v-for="mode in menuModes"
v-for="mode in menuModes" :key="mode.value"
:key="mode.value" location="right"
location="right" >
> <template v-slot:activator="{ props }">
<template v-slot:activator="{ props }"> <v-btn
<v-btn v-bind="props"
v-bind="props" icon
icon variant="text"
variant="text" density="comfortable"
density="comfortable" :color="layoutStore.menuMode === mode.value ? 'primary' : undefined"
:color="layoutStore.menuMode === mode.value ? 'primary' : undefined" :class="['menu-mode-btn', { 'menu-mode-btn--active': layoutStore.menuMode === mode.value }]"
:class="['menu-mode-btn', { 'menu-mode-btn--active': layoutStore.menuMode === mode.value }]" @click="layoutStore.setMenuMode(mode.value)"
@click="layoutStore.setMenuMode(mode.value)" >
> <v-icon>{{ mode.icon }}</v-icon>
<v-icon>{{ mode.icon }}</v-icon> </v-btn>
</v-btn> </template>
</template> <span>{{ mode.label }}</span>
<span>{{ mode.label }}</span> </v-tooltip>
</v-tooltip>
</div>
</div> </div>
</template> </template>
</v-navigation-drawer> </v-navigation-drawer>
+16
View File
@@ -3,11 +3,13 @@ import { computed } from 'vue';
import { useUserStore } from '@KTXC/stores/userStore'; import { useUserStore } from '@KTXC/stores/userStore';
import { useIntegrationStore } from '@KTXC/stores/integrationStore'; import { useIntegrationStore } from '@KTXC/stores/integrationStore';
import { useLayoutStore } from '@KTXC/stores/layoutStore'; import { useLayoutStore } from '@KTXC/stores/layoutStore';
import { useRouter } from 'vue-router';
import { useL10n, t as tGlobal } from '@KTXC/composables/useL10n'; import { useL10n, t as tGlobal } from '@KTXC/composables/useL10n';
import defaultAvatar from '@KTXC/assets/images/users/avatar-1.png'; import defaultAvatar from '@KTXC/assets/images/users/avatar-1.png';
const { t } = useL10n('core'); const { t } = useL10n('core');
const router = useRouter();
const userStore = useUserStore(); const userStore = useUserStore();
const integrationStore = useIntegrationStore(); const integrationStore = useIntegrationStore();
const layoutStore = useLayoutStore(); const layoutStore = useLayoutStore();
@@ -41,6 +43,12 @@ const cycleTheme = () => {
layoutStore.setTheme(nextThemeMode.value); layoutStore.setTheme(nextThemeMode.value);
}; };
// Navigate to settings
const goToSettings = () => {
layoutStore.setMenuMode('settings');
// Navigate to first settings item or a default settings route
router.push('/modules'); // TODO: Make this dynamic based on first settings menu item
};
</script> </script>
<template> <template>
@@ -90,6 +98,14 @@ const cycleTheme = () => {
<v-list-item-title class="text-h6">{{ t(MODE_PRESENTATION[nextThemeMode].l10n, MODE_PRESENTATION[nextThemeMode].label) }}</v-list-item-title> <v-list-item-title class="text-h6">{{ t(MODE_PRESENTATION[nextThemeMode].l10n, MODE_PRESENTATION[nextThemeMode].label) }}</v-list-item-title>
</v-list-item> </v-list-item>
<!-- Go to Settings -->
<v-list-item @click="goToSettings" color="primary" rounded="0">
<template v-slot:prepend>
<v-icon>mdi-cog-outline</v-icon>
</template>
<v-list-item-title class="text-h6">{{ t('userMenu.settings', 'Settings') }}</v-list-item-title>
</v-list-item>
<v-divider class="my-2" /> <v-divider class="my-2" />
<!-- Logout --> <!-- Logout -->
-4
View File
@@ -156,10 +156,6 @@ export const useIntegrationStore = defineStore('integrationStore', {
return Array.from(point.items.values()) return Array.from(point.items.values())
.filter(entry => entry.visible !== false) .filter(entry => entry.visible !== false)
.map(entry => 'items' in entry
? { ...entry, items: entry.items.filter(item => item.visible !== false) }
: entry)
.filter(entry => !('items' in entry) || entry.items.length > 0)
.sort((a, b) => (a.priority ?? 100) - (b.priority ?? 100)); .sort((a, b) => (a.priority ?? 100) - (b.priority ?? 100));
}, },
+2 -2
View File
@@ -32,7 +32,7 @@ export const useLayoutStore = defineStore('layout', () => {
} }
const sidebarDrawer = ref<boolean>(booleanSetting('sidebar_drawer', true)); const sidebarDrawer = ref<boolean>(booleanSetting('sidebar_drawer', true));
const miniSidebar = ref<boolean>(booleanSetting('mini_sidebar', true)); const miniSidebar = ref<boolean>(booleanSetting('mini_sidebar', false));
const menuMode = ref<MenuMode>('apps'); const menuMode = ref<MenuMode>('apps');
// Theme mode - user choice, falling back to the tenant default // Theme mode - user choice, falling back to the tenant default
@@ -60,7 +60,7 @@ export const useLayoutStore = defineStore('layout', () => {
hydratingFromSettings = true; hydratingFromSettings = true;
try { try {
sidebarDrawer.value = booleanSetting('sidebar_drawer', true); sidebarDrawer.value = booleanSetting('sidebar_drawer', true);
miniSidebar.value = booleanSetting('mini_sidebar', true); miniSidebar.value = booleanSetting('mini_sidebar', false);
theme.value = initialTheme(); theme.value = initialTheme();
} finally { } finally {
hydratingFromSettings = false; hydratingFromSettings = false;