Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 13 Pull requests Projects Releases 30 Packages Wiki Activity Actions

Merge branch 'develop' into milestone/ff-admin-unit

Browse source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Julian Krauser 2025-07-25 09:29:01 +02:00
commit 0b16599d2a
13 changed files with 198 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/Footer.vue
View file

@ -6,7 +6,7 @@
<div class="w-full flex flex-row gap-2 h-full align-middle">
<TopLevelLink
v-if="routeName == 'admin' || routeName.includes('admin-')"
v-for="item in topLevel"
v-for="item in topLevelObject"
:key="item.key"
:link="item"
:disableSubLink="true"
@ -34,7 +34,7 @@ import TopLevelLink from "./admin/TopLevelLink.vue";
export default defineComponent({
computed: {
...mapState(useAuthStore, ["authCheck"]),
...mapState(useNavigationStore, ["topLevel"]),
...mapState(useNavigationStore, ["topLevelObject"]),
routeName() {
return typeof this.$route.name == "string" ? this.$route.name : "";
},

4
src/components/Header.vue
View file

@ -10,7 +10,7 @@
<div v-if="authCheck" class="hidden md:flex flex-row gap-2 h-full align-middle">
<TopLevelLink
v-if="routeName == 'admin' || routeName.includes('admin-')"
v-for="item in topLevel"
v-for="item in topLevelObject"
:key="item.key"
:link="item"
/>
@ -46,7 +46,7 @@ import { useConfigurationStore } from "@/stores/configuration";
export default defineComponent({
computed: {
...mapState(useAuthStore, ["authCheck"]),
...mapState(useNavigationStore, ["topLevel"]),
...mapState(useNavigationStore, ["topLevelObject"]),
...mapState(useConfigurationStore, ["clubName"]),
routeName() {
return typeof this.$route.name == "string" ? this.$route.name : "";