HTWK/htwkalender-pwa
1
0
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender-pwa.git synced 2025-07-16 09:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5-room-finder-for-each-week' of ssh://git.imn.htwk-leipzig.de:2244/ekresse/htwkalender into 5-room-finder-for-each-week

Browse Source
This commit is contained in:
survellow
2024-01-25 22:43:50 +01:00
parent 01c79929b0 7c3daa9c50
commit e5571e899c
3 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
frontend/src/components/MenuBar.vue
View File

@ -9,43 +9,44 @@ const items = computed(() => [
{
label: t("createCalendar"),
icon: "pi pi-fw pi-plus",
route: "/",
route: "/"
},
{
label: t("editCalendar"),
icon: "pi pi-fw pi-pencil",
route: "/edit",
route: "/edit"
},
{
label: t("rooms"),
icon: "pi pi-fw pi-angle-down",
info: "rooms",
items: [
{
label: t("roomFinderPage.roomSchedule"),
icon: "pi pi-fw pi-hourglass",
route: "/rooms",
route: "/rooms/occupancy"
},
{
label: t("freeRooms.freeRooms"),
icon: "pi pi-fw pi-calendar",
route: "/rooms/free",
route: "/rooms/free"
},
],
},
{
label: t("faq"),
icon: "pi pi-fw pi-book",
route: "/faq",
route: "/faq"
},
{
label: t("imprint"),
icon: "pi pi-fw pi-id-card",
route: "/imprint",
route: "/imprint"
},
{
label: t("privacy"),
icon: "pi pi-fw pi-exclamation-triangle",
route: "/privacy-policy",
route: "/privacy-policy"
},
]);
</script>
@ -59,7 +60,7 @@ const items = computed(() => [
</Button>
</router-link>
</template>
<template #item="{ item, props, root }">
<template #item="{ item, props }">
<router-link
v-if="item.route"
v-slot="{ navigate }"
@ -68,7 +69,7 @@ const items = computed(() => [
>
<a
:class="
item.route === $route.path
$route.path == item.route
? 'flex align-items-center active'
: 'flex align-items-center'
"
@ -77,22 +78,12 @@ const items = computed(() => [
>
<span :class="item.icon" />
<span class="ml-2 p-menuitem-label">{{ item.label }}</span>
<Badge
v-if="item.badge"
:class="{ 'ml-auto': !root, 'ml-2': root }"
:value="item.badge"
/>
<span
v-if="item.shortcut"
class="ml-auto border-1 surface-border border-round surface-100 text-xs p-1"
>{{ item.shortcut }}</span
>
</a>
</router-link>
<a
v-else
:class="
item.route === $route.path
$route.path.includes(item.info)
? 'flex align-items-center active'
: 'flex align-items-center'
"
@ -100,16 +91,6 @@ const items = computed(() => [
>
<span :class="item.icon" />
<span class="ml-2 p-menuitem-label">{{ item.label }}</span>
<Badge
v-if="item.badge"
:class="{ 'ml-auto': !root, 'ml-2': root }"
:value="item.badge"
/>
<span
v-if="item.shortcut"
class="ml-auto border-1 surface-border border-round surface-100 text-xs p-1"
>{{ item.shortcut }}</span
>
</a>
</template>
<template #end>

2
frontend/src/router/index.ts
View File

@ -25,7 +25,7 @@ const router = createRouter({
component: CourseSelection,
},
{
path: "/rooms",
path: "/rooms/occupancy",
name: "room-schedule",
component: RoomFinder,
},

6
frontend/src/view/FreeRooms.vue
View File

@ -20,7 +20,7 @@
:empty-message="$t('roomFinderPage.noRoomsAvailable')"
date-format="dd.mm.yy"
panel-class="min-w-min"
touchUI
touch-u-i
/>
<div class="break"/>
<Calendar
@ -34,7 +34,7 @@
date-format="HH:mm"
:class="[{'p-invalid':isLater}, flexSpecs]"
panel-class="min-w-min"
touchUI
touch-u-i
/>
<Calendar
v-model="end"
@ -47,7 +47,7 @@
date-format="HH:mm"
:class="[{'p-invalid':isLater}, flexSpecs]"
panel-class="min-w-min"
touchUI
touch-u-i
/>
<div
class="flex-grow-1 relative mb-2"