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

patches v1.1.1 #46

Merged
jkeffects merged 3 commits from develop into main 2025-01-20 11:48:28 +00:00
Conversation 0 Commits 3 Files changed 11 +8 -8
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 45ad07a906 - Show all commits

2
src/components/admin/club/calendar/CreateCalendarModal.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div class="w-full md:max-w-md"> <div class="w-full md:max-w-md">
<div class="flex flex-col items-center"> <div class="flex flex-col items-center">
<p class="text-xl font-medium">Termintyp erstellen</p> <p class="text-xl font-medium">Termin erstellen</p>
</div> </div>
<br /> <br />
<form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreate"> <form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreate">

2
src/components/admin/club/calendar/UpdateCalendarModal.vue
View file

@ -6,7 +6,7 @@
@click="deleteCalendar" @click="deleteCalendar"
/> />
<div class="flex flex-col items-center"> <div class="flex flex-col items-center">
<p class="text-xl font-medium">Termintyp erstellen</p> <p class="text-xl font-medium">Termin erstellen</p>
</div> </div>
<br /> <br />
<Spinner v-if="loading == 'loading'" class="mx-auto" /> <Spinner v-if="loading == 'loading'" class="mx-auto" />

4
src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue
View file

@ -49,8 +49,6 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
import FailureXMark from "@/components/FailureXMark.vue"; import FailureXMark from "@/components/FailureXMark.vue";
import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType"; import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
import type { CreateCalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models"; import type { CreateCalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
</script> </script>
<script lang="ts"> <script lang="ts">
@ -76,7 +74,7 @@ export default defineComponent({
type: formData.type.value, type: formData.type.value,
color: formData.color.value, color: formData.color.value,
nscdr: formData.nscdr.checked, nscdr: formData.nscdr.checked,
passphrase: formData.passphrase.value, passphrase: formData.passphrase?.value,
}; };
this.status = "loading"; this.status = "loading";
this.createCalendarType(createCalendarType) this.createCalendarType(createCalendarType)

8
src/views/admin/settings/calendarType/CalendarTypeEdit.vue
View file

@ -58,8 +58,10 @@ import Spinner from "@/components/Spinner.vue";
import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
import FailureXMark from "@/components/FailureXMark.vue"; import FailureXMark from "@/components/FailureXMark.vue";
import { RouterLink } from "vue-router"; import { RouterLink } from "vue-router";
import type { CalendarTypeViewModel, UpdateCalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models"; import type {
import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid"; CalendarTypeViewModel,
UpdateCalendarTypeViewModel,
} from "@/viewmodels/admin/settings/calendarType.models";
import cloneDeep from "lodash.clonedeep"; import cloneDeep from "lodash.clonedeep";
import isEqual from "lodash.isequal"; import isEqual from "lodash.isequal";
</script> </script>
@ -115,7 +117,7 @@ export default defineComponent({
type: formData.type.value, type: formData.type.value,
color: formData.color.value, color: formData.color.value,
nscdr: formData.nscdr.checked, nscdr: formData.nscdr.checked,
passphrase: formData.passphrase.value, passphrase: formData.passphrase?.value,
}; };
this.status = "loading"; this.status = "loading";
this.updateActiveCalendarType(updateCalendarType) this.updateActiveCalendarType(updateCalendarType)