Compare commits
No commits in common. "main" and "v1.1.1" have entirely different histories.
41 changed files with 133 additions and 1640 deletions
4
package-lock.json
generated
4
package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "ff-admin",
|
||||
"version": "1.2.1",
|
||||
"version": "1.1.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "ff-admin",
|
||||
"version": "1.2.1",
|
||||
"version": "1.1.1",
|
||||
"license": "GPL-3.0-only",
|
||||
"dependencies": {
|
||||
"@fullcalendar/core": "^6.1.15",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "ff-admin",
|
||||
"version": "1.2.1",
|
||||
"version": "1.1.1",
|
||||
"description": "Feuerwehr/Verein Mitgliederverwaltung UI",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"id": "0",
|
||||
"name": "administration-db",
|
||||
"createdAt": "2025-01-25T11:15:11.340Z",
|
||||
"updatedAt": "2025-01-25T11:15:11.340Z",
|
||||
"createdAt": "2025-01-12T13:30:56.612Z",
|
||||
"updatedAt": "2025-01-12T13:30:56.612Z",
|
||||
"databaseType": "mariadb",
|
||||
"tables": [
|
||||
{
|
||||
|
|
@ -453,8 +453,8 @@
|
|||
"id": "35",
|
||||
"name": "membership",
|
||||
"schema": "administration",
|
||||
"x": 423.2353392314366,
|
||||
"y": -235.03350158007595,
|
||||
"x": 431.0493261325482,
|
||||
"y": -194.01007034924007,
|
||||
"fields": [
|
||||
{
|
||||
"id": "36",
|
||||
|
|
@ -698,8 +698,8 @@
|
|||
"id": "56",
|
||||
"name": "membership_status",
|
||||
"schema": "administration",
|
||||
"x": 704.4577624962558,
|
||||
"y": -196.5627932702164,
|
||||
"x": 712.2717493973673,
|
||||
"y": -155.53936203938048,
|
||||
"fields": [
|
||||
{
|
||||
"id": "57",
|
||||
|
|
@ -766,6 +766,21 @@
|
|||
},
|
||||
{
|
||||
"id": "62",
|
||||
"name": "salutation",
|
||||
"type": {
|
||||
"id": "varchar",
|
||||
"name": "varchar"
|
||||
},
|
||||
"primaryKey": false,
|
||||
"unique": false,
|
||||
"nullable": false,
|
||||
"character_maximum_length": "255",
|
||||
"default": "'none'",
|
||||
"collation": "utf8mb4_general_ci",
|
||||
"createdAt": 1734524896259
|
||||
},
|
||||
{
|
||||
"id": "63",
|
||||
"name": "firstname",
|
||||
"type": {
|
||||
"id": "varchar",
|
||||
|
|
@ -779,7 +794,7 @@
|
|||
"createdAt": 1734524896259
|
||||
},
|
||||
{
|
||||
"id": "63",
|
||||
"id": "64",
|
||||
"name": "lastname",
|
||||
"type": {
|
||||
"id": "varchar",
|
||||
|
|
@ -793,7 +808,7 @@
|
|||
"createdAt": 1734524896259
|
||||
},
|
||||
{
|
||||
"id": "64",
|
||||
"id": "65",
|
||||
"name": "nameaffix",
|
||||
"type": {
|
||||
"id": "varchar",
|
||||
|
|
@ -807,7 +822,7 @@
|
|||
"createdAt": 1734524896259
|
||||
},
|
||||
{
|
||||
"id": "65",
|
||||
"id": "66",
|
||||
"name": "birthdate",
|
||||
"type": {
|
||||
"id": "date",
|
||||
|
|
@ -819,7 +834,7 @@
|
|||
"createdAt": 1734524896259
|
||||
},
|
||||
{
|
||||
"id": "66",
|
||||
"id": "67",
|
||||
"name": "internalId",
|
||||
"type": {
|
||||
"name": "varchar",
|
||||
|
|
@ -830,21 +845,6 @@
|
|||
"primaryKey": false,
|
||||
"createdAt": 1736351121650
|
||||
},
|
||||
{
|
||||
"id": "67",
|
||||
"name": "salutationId",
|
||||
"type": {
|
||||
"name": "int",
|
||||
"id": "int"
|
||||
},
|
||||
"primaryKey": false,
|
||||
"unique": false,
|
||||
"nullable": false,
|
||||
"character_maximum_length": "255",
|
||||
"default": "'none'",
|
||||
"collation": "utf8mb4_general_ci",
|
||||
"createdAt": 1734524896259
|
||||
},
|
||||
{
|
||||
"id": "68",
|
||||
"name": "sendNewsletterId",
|
||||
|
|
@ -889,8 +889,8 @@
|
|||
"id": "71",
|
||||
"name": "communication_type",
|
||||
"schema": "administration",
|
||||
"x": 735.756546723297,
|
||||
"y": 175.00748910518985,
|
||||
"x": 712.818422135433,
|
||||
"y": 325.42673695158805,
|
||||
"fields": [
|
||||
{
|
||||
"id": "72",
|
||||
|
|
@ -1231,8 +1231,8 @@
|
|||
"id": "96",
|
||||
"name": "communication",
|
||||
"schema": "administration",
|
||||
"x": 451.18827622650076,
|
||||
"y": 30.864861528371677,
|
||||
"x": 428.2501516386368,
|
||||
"y": 181.28410937476986,
|
||||
"fields": [
|
||||
{
|
||||
"id": "97",
|
||||
|
|
@ -1682,48 +1682,11 @@
|
|||
"isMaterializedView": false,
|
||||
"createdAt": 1734524896260,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "132",
|
||||
"name": "salutation",
|
||||
"x": 428.6069830535669,
|
||||
"y": 516.5938067201159,
|
||||
"fields": [
|
||||
{
|
||||
"id": "133",
|
||||
"name": "id",
|
||||
"type": {
|
||||
"name": "int",
|
||||
"id": "int"
|
||||
},
|
||||
"unique": true,
|
||||
"nullable": false,
|
||||
"primaryKey": true,
|
||||
"createdAt": 1737803524494
|
||||
},
|
||||
{
|
||||
"id": "134",
|
||||
"name": "salutation",
|
||||
"type": {
|
||||
"name": "varchar",
|
||||
"id": "varchar"
|
||||
},
|
||||
"unique": false,
|
||||
"nullable": false,
|
||||
"primaryKey": false,
|
||||
"createdAt": 1737803546875
|
||||
}
|
||||
],
|
||||
"indexes": [],
|
||||
"color": "#4dee8a",
|
||||
"createdAt": 1737803524494,
|
||||
"isView": false,
|
||||
"order": 15
|
||||
}
|
||||
],
|
||||
"relationships": [
|
||||
{
|
||||
"id": "135",
|
||||
"id": "132",
|
||||
"name": "FK_1fd52c8f109123e5a2c67dc2c83",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1737,7 +1700,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "136",
|
||||
"id": "133",
|
||||
"name": "FK_21994db635b47e07f45b2686a51",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1751,7 +1714,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "137",
|
||||
"id": "134",
|
||||
"name": "FK_2912b056a5d0b7977360a986164",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1765,7 +1728,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "138",
|
||||
"id": "135",
|
||||
"name": "FK_3b4b41597707b13086e71727422",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1779,7 +1742,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "139",
|
||||
"id": "136",
|
||||
"name": "FK_98b70e687c35709d2f01b3d7d74",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1793,7 +1756,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "140",
|
||||
"id": "137",
|
||||
"name": "FK_a47e04bfd3671d8a375d1896d25",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1807,7 +1770,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "141",
|
||||
"id": "138",
|
||||
"name": "FK_ba47b44c2ddf34c1bcc75df6675",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1821,7 +1784,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "142",
|
||||
"id": "139",
|
||||
"name": "FK_dbebe53df1caa0b6715a220b0ea",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1835,7 +1798,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "143",
|
||||
"id": "140",
|
||||
"name": "FK_e9fd4d37c4ac0fb08bd6eeeda3c",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1849,7 +1812,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "144",
|
||||
"id": "141",
|
||||
"name": "FK_fc5f59e5c9aafdedd25ed8ed36e",
|
||||
"sourceSchema": "administration",
|
||||
"targetSchema": "administration",
|
||||
|
|
@ -1861,24 +1824,11 @@
|
|||
"targetCardinality": "one",
|
||||
"createdAt": 1734524896262,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "145",
|
||||
"name": "member_salutationId_fk",
|
||||
"sourceSchema": "administration",
|
||||
"sourceTableId": "60",
|
||||
"targetSchema": "administration",
|
||||
"targetTableId": "132",
|
||||
"sourceFieldId": "67",
|
||||
"targetFieldId": "133",
|
||||
"sourceCardinality": "many",
|
||||
"targetCardinality": "one",
|
||||
"createdAt": 1737803651894
|
||||
}
|
||||
],
|
||||
"dependencies": [
|
||||
{
|
||||
"id": "146",
|
||||
"id": "142",
|
||||
"schema": "administration",
|
||||
"tableId": "60",
|
||||
"dependentSchema": "administration",
|
||||
|
|
@ -1887,7 +1837,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "147",
|
||||
"id": "143",
|
||||
"schema": "administration",
|
||||
"tableId": "127",
|
||||
"dependentSchema": "administration",
|
||||
|
|
@ -1896,7 +1846,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "148",
|
||||
"id": "144",
|
||||
"schema": "administration",
|
||||
"tableId": "112",
|
||||
"dependentSchema": "administration",
|
||||
|
|
@ -1905,7 +1855,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "149",
|
||||
"id": "145",
|
||||
"schema": "administration",
|
||||
"tableId": "60",
|
||||
"dependentSchema": "administration",
|
||||
|
|
@ -1914,7 +1864,7 @@
|
|||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "150",
|
||||
"id": "146",
|
||||
"schema": "administration",
|
||||
"tableId": "1",
|
||||
"dependentSchema": "administration",
|
||||
|
|
@ -1922,47 +1872,47 @@
|
|||
"createdAt": 1734524897283,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "147",
|
||||
"schema": "administration",
|
||||
"tableId": "60",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "21",
|
||||
"createdAt": 1734524897244,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "148",
|
||||
"schema": "administration",
|
||||
"tableId": "56",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "76",
|
||||
"createdAt": 1734524897297,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "149",
|
||||
"schema": "administration",
|
||||
"tableId": "35",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "76",
|
||||
"createdAt": 1734524897297,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "150",
|
||||
"schema": "administration",
|
||||
"tableId": "123",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "11",
|
||||
"createdAt": 1734524897283,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "151",
|
||||
"schema": "administration",
|
||||
"tableId": "60",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "21",
|
||||
"createdAt": 1734524897244,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "152",
|
||||
"schema": "administration",
|
||||
"tableId": "56",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "76",
|
||||
"createdAt": 1734524897297,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "153",
|
||||
"schema": "administration",
|
||||
"tableId": "35",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "76",
|
||||
"createdAt": 1734524897297,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "154",
|
||||
"schema": "administration",
|
||||
"tableId": "123",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "11",
|
||||
"createdAt": 1734524897283,
|
||||
"diagramId": "7gb18czobyir"
|
||||
},
|
||||
{
|
||||
"id": "155",
|
||||
"schema": "administration",
|
||||
"tableId": "60",
|
||||
"dependentSchema": "administration",
|
||||
"dependentTableId": "86",
|
||||
"createdAt": 1734524897266,
|
||||
"diagramId": "7gb18czobyir"
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 478 KiB After Width: | Height: | Size: 650 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 12 MiB After Width: | Height: | Size: 11 MiB |
|
|
@ -19,25 +19,13 @@
|
|||
<ComboboxOptions
|
||||
class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-none sm:text-sm"
|
||||
>
|
||||
<ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
|
||||
<li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
|
||||
<Spinner />
|
||||
<span class="font-normal block truncate">suche</span>
|
||||
</li>
|
||||
</ComboboxOption>
|
||||
<ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
|
||||
<ComboboxOption v-if="filtered.length === 0" as="template" disabled>
|
||||
<li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
|
||||
<span class="font-normal block truncate">tippe, um zu suchen...</span>
|
||||
</li>
|
||||
</ComboboxOption>
|
||||
<ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
|
||||
<li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
|
||||
<span class="font-normal block truncate">Keine Auswahl gefunden.</span>
|
||||
<span class="font-normal block truncate">Keine Auswahl</span>
|
||||
</li>
|
||||
</ComboboxOption>
|
||||
|
||||
<ComboboxOption
|
||||
v-if="!(loading || deferingSearch)"
|
||||
v-for="member in filtered"
|
||||
as="template"
|
||||
:key="member.id"
|
||||
|
|
@ -86,7 +74,6 @@ import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
|
|||
import { useMemberStore } from "@/stores/admin/club/member/member";
|
||||
import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
|
||||
import difference from "lodash.difference";
|
||||
import Spinner from "../Spinner.vue";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
|
|
@ -155,7 +142,6 @@ export default defineComponent({
|
|||
...mapActions(useMemberStore, ["searchMembers", "getMembersByIds"]),
|
||||
search() {
|
||||
this.filtered = [];
|
||||
if (this.query == "") return;
|
||||
this.loading = true;
|
||||
this.searchMembers(this.query)
|
||||
.then((res) => {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
<br />
|
||||
<form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreate">
|
||||
<div>
|
||||
<Listbox v-model="selectedSalutation" name="salutation" by="id">
|
||||
<Listbox v-model="selectedSalutation" name="salutation">
|
||||
<ListboxLabel>Anrede</ListboxLabel>
|
||||
<div class="relative mt-1">
|
||||
<ListboxButton
|
||||
class="rounded-md shadow-sm relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-0 focus:z-10 sm:text-sm resize-none"
|
||||
>
|
||||
<span class="block truncate w-full text-start"> {{ selectedSalutation?.salutation }}</span>
|
||||
<span class="block truncate w-full text-start"> {{ selectedSalutation }}</span>
|
||||
<span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
|
||||
<ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
|
||||
</span>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<ListboxOption
|
||||
v-slot="{ active, selected }"
|
||||
v-for="salutation in salutations"
|
||||
:key="salutation.id"
|
||||
:key="salutation"
|
||||
:value="salutation"
|
||||
as="template"
|
||||
>
|
||||
|
|
@ -39,9 +39,7 @@
|
|||
'relative cursor-default select-none py-2 pl-10 pr-4',
|
||||
]"
|
||||
>
|
||||
<span :class="[selected ? 'font-medium' : 'font-normal', 'block truncate']">{{
|
||||
salutation.salutation
|
||||
}}</span>
|
||||
<span :class="[selected ? 'font-medium' : 'font-normal', 'block truncate']">{{ salutation }}</span>
|
||||
<span v-if="selected" class="absolute inset-y-0 left-0 flex items-center pl-3 text-primary">
|
||||
<CheckIcon class="h-5 w-5" aria-hidden="true" />
|
||||
</span>
|
||||
|
|
@ -99,10 +97,9 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
|
|||
import FailureXMark from "@/components/FailureXMark.vue";
|
||||
import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
|
||||
import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
|
||||
import { Salutation } from "@/enums/salutation";
|
||||
import { useMemberStore } from "@/stores/admin/club/member/member";
|
||||
import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
|
||||
import { useSalutationStore } from "../../../../stores/admin/settings/salutation";
|
||||
import type { SalutationViewModel } from "../../../../viewmodels/admin/settings/salutation.models";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
|
|
@ -111,14 +108,12 @@ export default defineComponent({
|
|||
return {
|
||||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
timeout: undefined as any,
|
||||
selectedSalutation: null as null | SalutationViewModel,
|
||||
salutations: [] as Array<string>,
|
||||
selectedSalutation: Salutation.none as Salutation,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapState(useSalutationStore, ["salutations"]),
|
||||
},
|
||||
mounted() {
|
||||
this.fetchSalutations();
|
||||
this.salutations = Object.values(Salutation);
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
|
|
@ -128,12 +123,10 @@ export default defineComponent({
|
|||
methods: {
|
||||
...mapActions(useModalStore, ["closeModal"]),
|
||||
...mapActions(useMemberStore, ["createMember"]),
|
||||
...mapActions(useSalutationStore, ["fetchSalutations"]),
|
||||
triggerCreate(e: any) {
|
||||
if (!this.selectedSalutation) return;
|
||||
let formData = e.target.elements;
|
||||
let createMember: CreateMemberViewModel = {
|
||||
salutationId: this.selectedSalutation.id,
|
||||
salutation: this.selectedSalutation,
|
||||
firstname: formData.firstname.value,
|
||||
lastname: formData.lastname.value,
|
||||
nameaffix: formData.nameaffix.value,
|
||||
|
|
|
|||
|
|
@ -41,6 +41,9 @@ import { useModalStore } from "@/stores/modal";
|
|||
import Spinner from "@/components/Spinner.vue";
|
||||
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
|
||||
import FailureXMark from "@/components/FailureXMark.vue";
|
||||
import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
|
||||
import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
|
||||
import { Salutation } from "@/enums/salutation";
|
||||
import { useMemberStore } from "@/stores/admin/club/member/member";
|
||||
import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
<template>
|
||||
<div class="w-full md:max-w-md">
|
||||
<div class="flex flex-col items-center">
|
||||
<p class="text-xl font-medium">Anrede erstellen</p>
|
||||
</div>
|
||||
<br />
|
||||
<form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreate">
|
||||
<div>
|
||||
<label for="salutation">Anrede</label>
|
||||
<input type="text" id="salutation" required />
|
||||
</div>
|
||||
<div class="flex flex-row gap-2">
|
||||
<button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">erstellen</button>
|
||||
<Spinner v-if="status == 'loading'" class="my-auto" />
|
||||
<SuccessCheckmark v-else-if="status?.status == 'success'" />
|
||||
<FailureXMark v-else-if="status?.status == 'failed'" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="flex flex-row justify-end">
|
||||
<div class="flex flex-row gap-4 py-2">
|
||||
<button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
|
||||
abbrechen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
import Spinner from "@/components/Spinner.vue";
|
||||
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
|
||||
import FailureXMark from "@/components/FailureXMark.vue";
|
||||
import { useSalutationStore } from "@/stores/admin/settings/salutation";
|
||||
import type { CreateSalutationViewModel } from "@/viewmodels/admin/settings/salutation.models";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
data() {
|
||||
return {
|
||||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
timeout: undefined as any,
|
||||
};
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
clearTimeout(this.timeout);
|
||||
} catch (error) {}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useModalStore, ["closeModal"]),
|
||||
...mapActions(useSalutationStore, ["createSalutation"]),
|
||||
triggerCreate(e: any) {
|
||||
let formData = e.target.elements;
|
||||
let createSalutation: CreateSalutationViewModel = {
|
||||
salutation: formData.salutation.value,
|
||||
};
|
||||
this.status = "loading";
|
||||
this.createSalutation(createSalutation)
|
||||
.then(() => {
|
||||
this.status = { status: "success" };
|
||||
this.timeout = setTimeout(() => {
|
||||
this.closeModal();
|
||||
}, 1500);
|
||||
})
|
||||
.catch(() => {
|
||||
this.status = { status: "failed" };
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
<template>
|
||||
<div class="w-full md:max-w-md">
|
||||
<div class="flex flex-col items-center">
|
||||
<p class="text-xl font-medium">Anrede {{ salutation?.salutation }} löschen?</p>
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<div class="flex flex-row gap-2">
|
||||
<button primary :disabled="status == 'loading' || status?.status == 'success'" @click="triggerDelete">
|
||||
unwiederuflich löschen
|
||||
</button>
|
||||
<Spinner v-if="status == 'loading'" class="my-auto" />
|
||||
<SuccessCheckmark v-else-if="status?.status == 'success'" />
|
||||
<FailureXMark v-else-if="status?.status == 'failed'" />
|
||||
</div>
|
||||
|
||||
<div class="flex flex-row justify-end">
|
||||
<div class="flex flex-row gap-4 py-2">
|
||||
<button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
|
||||
abbrechen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
import Spinner from "@/components/Spinner.vue";
|
||||
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
|
||||
import FailureXMark from "@/components/FailureXMark.vue";
|
||||
import { useRoleStore } from "@/stores/admin/user/role";
|
||||
import { useSalutationStore } from "@/stores/admin/settings/salutation";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
data() {
|
||||
return {
|
||||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
timeout: undefined as any,
|
||||
};
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
clearTimeout(this.timeout);
|
||||
} catch (error) {}
|
||||
},
|
||||
computed: {
|
||||
...mapState(useModalStore, ["data"]),
|
||||
...mapState(useSalutationStore, ["salutations"]),
|
||||
salutation() {
|
||||
return this.salutations.find((r) => r.id == this.data);
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useModalStore, ["closeModal"]),
|
||||
...mapActions(useSalutationStore, ["deleteSalutation"]),
|
||||
triggerDelete() {
|
||||
this.status = "loading";
|
||||
this.deleteSalutation(this.data)
|
||||
.then(() => {
|
||||
this.status = { status: "success" };
|
||||
this.timeout = setTimeout(() => {
|
||||
this.closeModal();
|
||||
}, 1500);
|
||||
})
|
||||
.catch(() => {
|
||||
this.status = { status: "failed" };
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
<template>
|
||||
<div class="flex flex-col h-fit w-full border border-primary rounded-md">
|
||||
<div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
|
||||
<p>{{ salutation.salutation }}</p>
|
||||
<div class="flex flex-row">
|
||||
<RouterLink
|
||||
v-if="can('update', 'settings', 'salutation')"
|
||||
:to="{ name: 'admin-settings-salutation-edit', params: { id: salutation.id } }"
|
||||
>
|
||||
<PencilIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
|
||||
</RouterLink>
|
||||
<div v-if="can('delete', 'settings', 'salutation')" @click="openDeleteModal">
|
||||
<TrashIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
|
||||
import { useAbilityStore } from "@/stores/ability";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
import type { SalutationViewModel } from "@/viewmodels/admin/settings/salutation.models";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
props: {
|
||||
salutation: { type: Object as PropType<SalutationViewModel>, default: {} },
|
||||
},
|
||||
computed: {
|
||||
...mapState(useAbilityStore, ["can"]),
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useModalStore, ["openModal"]),
|
||||
openDeleteModal() {
|
||||
this.openModal(
|
||||
markRaw(defineAsyncComponent(() => import("@/components/admin/settings/salutation/DeleteSalutationModal.vue"))),
|
||||
this.salutation.id
|
||||
);
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -24,11 +24,7 @@
|
|||
>
|
||||
<PencilIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
|
||||
</RouterLink>
|
||||
<div
|
||||
v-if="can('delete', 'user', 'user')"
|
||||
:class="user.isOwner ? 'opacity-75 pointer-events-none' : ''"
|
||||
@click="openDeleteModal"
|
||||
>
|
||||
<div v-if="can('delete', 'user', 'user')" @click="openDeleteModal">
|
||||
<TrashIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -74,7 +70,6 @@ export default defineComponent({
|
|||
methods: {
|
||||
...mapActions(useModalStore, ["openModal"]),
|
||||
openDeleteModal() {
|
||||
if (this.user.isOwner) return;
|
||||
this.openModal(
|
||||
markRaw(defineAsyncComponent(() => import("@/components/admin/user/user/DeleteUserModal.vue"))),
|
||||
this.user.id
|
||||
|
|
|
|||
|
|
@ -1,81 +0,0 @@
|
|||
<template>
|
||||
<div class="w-full md:max-w-md">
|
||||
<div class="flex flex-col items-center">
|
||||
<p class="text-xl font-medium">Webapi-Token erstellen</p>
|
||||
</div>
|
||||
<br />
|
||||
<form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreateWebapi">
|
||||
<div>
|
||||
<label for="title">Bezeichnung</label>
|
||||
<input type="text" id="title" required />
|
||||
</div>
|
||||
<div class="w-full">
|
||||
<label for="expiry">Ablaufdatum (optional)</label>
|
||||
<input type="date" id="expiry" step="1" />
|
||||
</div>
|
||||
<div class="flex flex-row gap-2">
|
||||
<button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">erstellen</button>
|
||||
<Spinner v-if="status == 'loading'" class="my-auto" />
|
||||
<SuccessCheckmark v-else-if="status?.status == 'success'" />
|
||||
<FailureXMark v-else-if="status?.status == 'failed'" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="flex flex-row justify-end">
|
||||
<div class="flex flex-row gap-4 py-2">
|
||||
<button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
|
||||
abbrechen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
import Spinner from "@/components/Spinner.vue";
|
||||
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
|
||||
import FailureXMark from "@/components/FailureXMark.vue";
|
||||
import { useWebapiStore } from "@/stores/admin/user/webapi";
|
||||
import type { CreateWebapiViewModel } from "../../../../viewmodels/admin/user/webapi.models";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
data() {
|
||||
return {
|
||||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
timeout: undefined as any,
|
||||
};
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
clearTimeout(this.timeout);
|
||||
} catch (error) {}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useModalStore, ["closeModal"]),
|
||||
...mapActions(useWebapiStore, ["createWebapi"]),
|
||||
triggerCreateWebapi(e: any) {
|
||||
let formData = e.target.elements;
|
||||
let createWebapi: CreateWebapiViewModel = {
|
||||
title: formData.title.value,
|
||||
expiry: formData.expiry.value,
|
||||
};
|
||||
this.status = "loading";
|
||||
this.createWebapi(createWebapi)
|
||||
.then(() => {
|
||||
this.status = { status: "success" };
|
||||
this.timeout = setTimeout(() => {
|
||||
this.closeModal();
|
||||
}, 1500);
|
||||
})
|
||||
.catch(() => {
|
||||
this.status = { status: "failed" };
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
<template>
|
||||
<div class="w-full md:max-w-md">
|
||||
<div class="flex flex-col items-center">
|
||||
<p class="text-xl font-medium">Webapi-Token {{ webapi?.title }} löschen?</p>
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<div class="flex flex-row gap-2">
|
||||
<button primary :disabled="status == 'loading' || status?.status == 'success'" @click="triggerDeleteWebapi">
|
||||
unwiederuflich löschen
|
||||
</button>
|
||||
<Spinner v-if="status == 'loading'" class="my-auto" />
|
||||
<SuccessCheckmark v-else-if="status?.status == 'success'" />
|
||||
<FailureXMark v-else-if="status?.status == 'failed'" />
|
||||
</div>
|
||||
|
||||
<div class="flex flex-row justify-end">
|
||||
<div class="flex flex-row gap-4 py-2">
|
||||
<button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
|
||||
abbrechen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
import Spinner from "@/components/Spinner.vue";
|
||||
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
|
||||
import FailureXMark from "@/components/FailureXMark.vue";
|
||||
import { useWebapiStore } from "@/stores/admin/user/webapi";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
data() {
|
||||
return {
|
||||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
timeout: undefined as any,
|
||||
};
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
clearTimeout(this.timeout);
|
||||
} catch (error) {}
|
||||
},
|
||||
computed: {
|
||||
...mapState(useModalStore, ["data"]),
|
||||
...mapState(useWebapiStore, ["webapis"]),
|
||||
webapi() {
|
||||
return this.webapis.find((r) => r.id == this.data);
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useModalStore, ["closeModal"]),
|
||||
...mapActions(useWebapiStore, ["deleteWebapi"]),
|
||||
triggerDeleteWebapi() {
|
||||
this.status = "loading";
|
||||
this.deleteWebapi(this.data)
|
||||
.then(() => {
|
||||
this.status = { status: "success" };
|
||||
this.timeout = setTimeout(() => {
|
||||
this.closeModal();
|
||||
}, 1500);
|
||||
})
|
||||
.catch(() => {
|
||||
this.status = { status: "failed" };
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
<template>
|
||||
<div class="flex flex-col h-fit w-full border border-primary rounded-md">
|
||||
<div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
|
||||
<p>{{ webapi.title }} <small v-if="webapi.permissions.admin">(Admin)</small></p>
|
||||
<div class="flex flex-row">
|
||||
<div v-if="can('admin', 'user', 'webapi')" @click="openTokenViewModal">
|
||||
<FingerPrintIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
|
||||
</div>
|
||||
<RouterLink
|
||||
v-if="can('admin', 'user', 'webapi')"
|
||||
:to="{ name: 'admin-user-webapi-permission', params: { id: webapi.id } }"
|
||||
>
|
||||
<WrenchScrewdriverIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
|
||||
</RouterLink>
|
||||
<RouterLink
|
||||
v-if="can('update', 'user', 'webapi')"
|
||||
:to="{ name: 'admin-user-webapi-edit', params: { id: webapi.id } }"
|
||||
>
|
||||
<PencilIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
|
||||
</RouterLink>
|
||||
<div v-if="can('delete', 'user', 'webapi')" @click="openDeleteModal">
|
||||
<TrashIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex flex-col p-2">
|
||||
<div class="flex flex-row gap-2">
|
||||
<p class="">erstellt:</p>
|
||||
<p class="grow overflow-hidden">
|
||||
{{
|
||||
new Date(webapi.createdAt).toLocaleDateString("de-DE", {
|
||||
day: "2-digit",
|
||||
month: "2-digit",
|
||||
year: "numeric",
|
||||
minute: "2-digit",
|
||||
hour: "2-digit",
|
||||
})
|
||||
}}
|
||||
</p>
|
||||
</div>
|
||||
<div class="flex flex-row gap-2">
|
||||
<p class="">letzte Verwendung:</p>
|
||||
<p class="grow overflow-hidden">
|
||||
{{
|
||||
webapi.lastUsage
|
||||
? new Date(webapi.lastUsage).toLocaleDateString("de-DE", {
|
||||
day: "2-digit",
|
||||
month: "2-digit",
|
||||
year: "numeric",
|
||||
minute: "2-digit",
|
||||
hour: "2-digit",
|
||||
})
|
||||
: "---"
|
||||
}}
|
||||
</p>
|
||||
</div>
|
||||
<div v-if="webapi.expiry" class="flex flex-row gap-2">
|
||||
<p class="">verwendbar bis:</p>
|
||||
<p class="grow overflow-hidden">
|
||||
{{
|
||||
new Date(webapi.expiry).toLocaleDateString("de-DE", {
|
||||
day: "2-digit",
|
||||
month: "2-digit",
|
||||
year: "numeric",
|
||||
})
|
||||
}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import { PencilIcon, WrenchScrewdriverIcon, TrashIcon, FingerPrintIcon } from "@heroicons/vue/24/outline";
|
||||
import type { WebapiViewModel } from "@/viewmodels/admin/user/webapi.models";
|
||||
import { RouterLink } from "vue-router";
|
||||
import { useAbilityStore } from "@/stores/ability";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
props: {
|
||||
webapi: { type: Object as PropType<WebapiViewModel>, default: {} },
|
||||
},
|
||||
computed: {
|
||||
...mapState(useAbilityStore, ["can"]),
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useModalStore, ["openModal"]),
|
||||
openTokenViewModal() {
|
||||
this.openModal(
|
||||
markRaw(defineAsyncComponent(() => import("@/components/admin/user/webapi/WebapiTokenModal.vue"))),
|
||||
this.webapi.id
|
||||
);
|
||||
},
|
||||
openDeleteModal() {
|
||||
this.openModal(
|
||||
markRaw(defineAsyncComponent(() => import("@/components/admin/user/webapi/DeleteWebapiModal.vue"))),
|
||||
this.webapi.id
|
||||
);
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
<template>
|
||||
<div class="relative w-full md:max-w-md">
|
||||
<div class="flex flex-col items-center">
|
||||
<p class="text-xl font-medium">Webapi-Token</p>
|
||||
</div>
|
||||
<br />
|
||||
<div class="flex flex-col gap-2">
|
||||
<TextCopy :copyText="token" />
|
||||
</div>
|
||||
|
||||
<div class="flex flex-row justify-end">
|
||||
<div class="flex flex-row gap-4 py-2">
|
||||
<button primary-outline @click="closeModal">schließen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import { RouterLink } from "vue-router";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
|
||||
import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
|
||||
import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
|
||||
import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
|
||||
import TextCopy from "@/components/TextCopy.vue";
|
||||
import { CalendarDaysIcon, InformationCircleIcon } from "@heroicons/vue/24/outline";
|
||||
import { host } from "@/serverCom";
|
||||
import { useWebapiStore } from "../../../../stores/admin/user/webapi";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
data() {
|
||||
return {
|
||||
token: "" as string,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapState(useModalStore, ["data"]),
|
||||
},
|
||||
mounted() {
|
||||
this.fetchWebapiTokenById(this.data)
|
||||
.then((res) => {
|
||||
this.token = res.data;
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useModalStore, ["closeModal"]),
|
||||
...mapActions(useWebapiStore, ["fetchWebapiTokenById"]),
|
||||
},
|
||||
});
|
||||
</script>
|
||||
6
src/enums/salutation.ts
Normal file
6
src/enums/salutation.ts
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
export enum Salutation {
|
||||
sir = "sir",
|
||||
madam = "madam",
|
||||
other = "other",
|
||||
none = "none",
|
||||
}
|
||||
|
|
@ -422,28 +422,6 @@ const router = createRouter({
|
|||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: "salutation",
|
||||
name: "admin-settings-salutation-route",
|
||||
component: () => import("@/views/RouterView.vue"),
|
||||
meta: { type: "read", section: "settings", module: "salutation" },
|
||||
beforeEnter: [abilityAndNavUpdate],
|
||||
children: [
|
||||
{
|
||||
path: "",
|
||||
name: "admin-settings-salutation",
|
||||
component: () => import("@/views/admin/settings/salutation/Salutation.vue"),
|
||||
},
|
||||
{
|
||||
path: ":id/edit",
|
||||
name: "admin-settings-salutation-edit",
|
||||
component: () => import("@/views/admin/settings/salutation/SalutationEdit.vue"),
|
||||
meta: { type: "update", section: "settings", module: "salutation" },
|
||||
beforeEnter: [abilityAndNavUpdate],
|
||||
props: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: "calendar-type",
|
||||
name: "admin-settings-calendar_type-route",
|
||||
|
|
@ -604,36 +582,6 @@ const router = createRouter({
|
|||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: "webapi",
|
||||
name: "admin-user-webapi-route",
|
||||
component: () => import("@/views/RouterView.vue"),
|
||||
meta: { type: "read", section: "user", module: "webapi" },
|
||||
beforeEnter: [abilityAndNavUpdate],
|
||||
children: [
|
||||
{
|
||||
path: "",
|
||||
name: "admin-user-webapi",
|
||||
component: () => import("@/views/admin/user/webapi/Webapi.vue"),
|
||||
},
|
||||
{
|
||||
path: ":id/edit",
|
||||
name: "admin-user-webapi-edit",
|
||||
component: () => import("@/views/admin/user/webapi/WebapiEdit.vue"),
|
||||
meta: { type: "update", section: "user", module: "webapi" },
|
||||
beforeEnter: [abilityAndNavUpdate],
|
||||
props: true,
|
||||
},
|
||||
{
|
||||
path: ":id/permission",
|
||||
name: "admin-user-webapi-permission",
|
||||
component: () => import("@/views/admin/user/webapi/WebapiEditPermission.vue"),
|
||||
meta: { type: "update", section: "user", module: "webapi" },
|
||||
beforeEnter: [abilityAndNavUpdate],
|
||||
props: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
|
|
@ -674,11 +622,6 @@ const router = createRouter({
|
|||
name: "account-administration",
|
||||
component: () => import("@/views/account/Administration.vue"),
|
||||
},
|
||||
{
|
||||
path: "version",
|
||||
name: "account-version",
|
||||
component: () => import("@/views/account/VersionDisplay.vue"),
|
||||
},
|
||||
{
|
||||
path: ":pathMatch(.*)*",
|
||||
name: "account-404",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
import { defineStore } from "pinia";
|
||||
import type {
|
||||
CreateMemberViewModel,
|
||||
MemberStatisticsViewModel,
|
||||
UpdateMemberViewModel,
|
||||
} from "@/viewmodels/admin/club/member/member.models";
|
||||
import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
|
||||
import { http } from "@/serverCom";
|
||||
import type { AxiosResponse } from "axios";
|
||||
import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
|
||||
|
|
@ -16,7 +12,6 @@ export const useMemberStore = defineStore("member", {
|
|||
loading: "loading" as "loading" | "fetched" | "failed",
|
||||
activeMember: null as number | null,
|
||||
activeMemberObj: null as MemberViewModel | null,
|
||||
activeMemberStatistics: null as MemberStatisticsViewModel | null,
|
||||
loadingActive: "loading" as "loading" | "fetched" | "failed",
|
||||
};
|
||||
},
|
||||
|
|
@ -45,11 +40,6 @@ export const useMemberStore = defineStore("member", {
|
|||
this.loading = "failed";
|
||||
});
|
||||
},
|
||||
async getAllMembers(): Promise<AxiosResponse<any, any>> {
|
||||
return await http.get(`/admin/member?noLimit=true`).then((res) => {
|
||||
return { ...res, data: res.data.members };
|
||||
});
|
||||
},
|
||||
async getMembersByIds(ids: Array<number>): Promise<AxiosResponse<any, any>> {
|
||||
return await http.get(`/admin/member?ids=${ids.join(",")}&noLimit=true`).then((res) => {
|
||||
return { ...res, data: res.data.members };
|
||||
|
|
@ -75,20 +65,9 @@ export const useMemberStore = defineStore("member", {
|
|||
fetchMemberById(id: number) {
|
||||
return http.get(`/admin/member/${id}`);
|
||||
},
|
||||
fetchMemberStatisticsByActiveId() {
|
||||
http
|
||||
.get(`/admin/member/${this.activeMember}/statistics`)
|
||||
.then((res) => {
|
||||
this.activeMemberStatistics = res.data;
|
||||
})
|
||||
.catch((err) => {});
|
||||
},
|
||||
fetchMemberStatisticsById(id: number) {
|
||||
return http.get(`/admin/member/${id}/statistics`);
|
||||
},
|
||||
async createMember(member: CreateMemberViewModel): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.post(`/admin/member`, {
|
||||
salutationId: member.salutationId,
|
||||
salutation: member.salutation,
|
||||
firstname: member.firstname,
|
||||
lastname: member.lastname,
|
||||
nameaffix: member.nameaffix,
|
||||
|
|
@ -100,7 +79,7 @@ export const useMemberStore = defineStore("member", {
|
|||
},
|
||||
async updateActiveMember(member: UpdateMemberViewModel): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.patch(`/admin/member/${member.id}`, {
|
||||
salutationId: member.salutationId,
|
||||
salutation: member.salutation,
|
||||
firstname: member.firstname,
|
||||
lastname: member.lastname,
|
||||
nameaffix: member.nameaffix,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.mode
|
|||
import { useMemberStore } from "./member";
|
||||
import type {
|
||||
CreateMembershipViewModel,
|
||||
MembershipStatisticsViewModel,
|
||||
MembershipViewModel,
|
||||
UpdateMembershipViewModel,
|
||||
} from "@/viewmodels/admin/club/member/membership.models";
|
||||
|
|
@ -15,7 +14,6 @@ export const useMembershipStore = defineStore("membership", {
|
|||
state: () => {
|
||||
return {
|
||||
memberships: [] as Array<MembershipViewModel>,
|
||||
membershipStatistics: [] as Array<MembershipStatisticsViewModel>,
|
||||
loading: "loading" as "loading" | "fetched" | "failed",
|
||||
};
|
||||
},
|
||||
|
|
@ -33,15 +31,6 @@ export const useMembershipStore = defineStore("membership", {
|
|||
this.loading = "failed";
|
||||
});
|
||||
},
|
||||
fetchMembershipStatisticsForMember() {
|
||||
const memberId = useMemberStore().activeMember;
|
||||
http
|
||||
.get(`/admin/member/${memberId}/memberships/statistics`)
|
||||
.then((result) => {
|
||||
this.membershipStatistics = result.data;
|
||||
})
|
||||
.catch((err) => {});
|
||||
},
|
||||
fetchMembershipById(id: number) {
|
||||
const memberId = useMemberStore().activeMember;
|
||||
return http.get(`/admin/member/${memberId}/membership/${id}`);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ export const useNavigationStore = defineStore("navigation", {
|
|||
{
|
||||
key: "settings",
|
||||
title: "Einstellungen",
|
||||
levelDefault: "salutation",
|
||||
levelDefault: "award",
|
||||
} as topLevelNavigationModel,
|
||||
]
|
||||
: []),
|
||||
|
|
@ -99,7 +99,6 @@ export const useNavigationStore = defineStore("navigation", {
|
|||
mainTitle: "Einstellungen",
|
||||
main: [
|
||||
{ key: "divider1", title: "Mitgliederdaten" },
|
||||
...(abilityStore.can("read", "settings", "salutation") ? [{ key: "salutation", title: "Anrede" }] : []),
|
||||
...(abilityStore.can("read", "settings", "award") ? [{ key: "award", title: "Auszeichnungen" }] : []),
|
||||
...(abilityStore.can("read", "settings", "communication_type")
|
||||
? [{ key: "communication_type", title: "Kommunikationsarten" }]
|
||||
|
|
@ -132,7 +131,6 @@ export const useNavigationStore = defineStore("navigation", {
|
|||
main: [
|
||||
...(abilityStore.can("read", "user", "user") ? [{ key: "user", title: "Benutzer" }] : []),
|
||||
...(abilityStore.can("read", "user", "role") ? [{ key: "role", title: "Rollen" }] : []),
|
||||
...(abilityStore.can("read", "user", "webapi") ? [{ key: "webapi", title: "Webapi-Token" }] : []),
|
||||
],
|
||||
},
|
||||
} as navigationModel;
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
import { defineStore } from "pinia";
|
||||
import type {
|
||||
CreateSalutationViewModel,
|
||||
UpdateSalutationViewModel,
|
||||
SalutationViewModel,
|
||||
} from "@/viewmodels/admin/settings/salutation.models";
|
||||
import { http } from "@/serverCom";
|
||||
import type { AxiosResponse } from "axios";
|
||||
|
||||
export const useSalutationStore = defineStore("salutation", {
|
||||
state: () => {
|
||||
return {
|
||||
salutations: [] as Array<SalutationViewModel>,
|
||||
loading: "loading" as "loading" | "fetched" | "failed",
|
||||
};
|
||||
},
|
||||
actions: {
|
||||
fetchSalutations() {
|
||||
this.loading = "loading";
|
||||
http
|
||||
.get("/admin/salutation")
|
||||
.then((result) => {
|
||||
this.salutations = result.data;
|
||||
this.loading = "fetched";
|
||||
})
|
||||
.catch((err) => {
|
||||
this.loading = "failed";
|
||||
});
|
||||
},
|
||||
fetchSalutationById(id: number): Promise<AxiosResponse<any, any>> {
|
||||
return http.get(`/admin/salutation/${id}`);
|
||||
},
|
||||
async createSalutation(salutation: CreateSalutationViewModel): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.post(`/admin/salutation`, {
|
||||
salutation: salutation.salutation,
|
||||
});
|
||||
this.fetchSalutations();
|
||||
return result;
|
||||
},
|
||||
async updateActiveSalutation(salutation: UpdateSalutationViewModel): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.patch(`/admin/salutation/${salutation.id}`, {
|
||||
salutation: salutation.salutation,
|
||||
});
|
||||
this.fetchSalutations();
|
||||
return result;
|
||||
},
|
||||
async deleteSalutation(salutation: number): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.delete(`/admin/salutation/${salutation}`);
|
||||
this.fetchSalutations();
|
||||
return result;
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
import { defineStore } from "pinia";
|
||||
import type {
|
||||
CreateWebapiViewModel,
|
||||
UpdateWebapiViewModel,
|
||||
WebapiViewModel,
|
||||
} from "@/viewmodels/admin/user/webapi.models";
|
||||
import { http } from "@/serverCom";
|
||||
import type { PermissionObject } from "@/types/permissionTypes";
|
||||
import type { AxiosResponse } from "axios";
|
||||
|
||||
export const useWebapiStore = defineStore("webapi", {
|
||||
state: () => {
|
||||
return {
|
||||
webapis: [] as Array<WebapiViewModel>,
|
||||
loading: null as null | "loading" | "success" | "failed",
|
||||
};
|
||||
},
|
||||
actions: {
|
||||
fetchWebapis() {
|
||||
this.loading = "loading";
|
||||
http
|
||||
.get("/admin/webapi")
|
||||
.then((result) => {
|
||||
this.webapis = result.data;
|
||||
this.loading = "success";
|
||||
})
|
||||
.catch((err) => {
|
||||
this.loading = "failed";
|
||||
});
|
||||
},
|
||||
fetchWebapiById(id: number): Promise<AxiosResponse<any, any>> {
|
||||
return http.get(`/admin/webapi/${id}`);
|
||||
},
|
||||
fetchWebapiTokenById(id: number): Promise<AxiosResponse<any, any>> {
|
||||
return http.get(`/admin/webapi/${id}/token`);
|
||||
},
|
||||
async createWebapi(webapi: CreateWebapiViewModel): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.post("/admin/webapi", webapi);
|
||||
this.fetchWebapis();
|
||||
return result;
|
||||
},
|
||||
async updateActiveWebapi(id: number, webapi: UpdateWebapiViewModel): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.patch(`/admin/webapi/${id}`, webapi);
|
||||
this.fetchWebapis();
|
||||
return result;
|
||||
},
|
||||
async updateActiveWebapiPermissions(
|
||||
webapi: number,
|
||||
permission: PermissionObject
|
||||
): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.patch(`/admin/webapi/${webapi}/permissions`, {
|
||||
permissions: permission,
|
||||
});
|
||||
this.fetchWebapis();
|
||||
return result;
|
||||
},
|
||||
async deleteWebapi(webapi: number): Promise<AxiosResponse<any, any>> {
|
||||
const result = await http.delete(`/admin/webapi/${webapi}`);
|
||||
this.fetchWebapis();
|
||||
return result;
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
@ -11,11 +11,9 @@ export type PermissionModule =
|
|||
| "executive_position"
|
||||
| "communication_type"
|
||||
| "membership_status"
|
||||
| "salutation"
|
||||
| "calendar_type"
|
||||
| "user"
|
||||
| "role"
|
||||
| "webapi"
|
||||
| "query"
|
||||
| "query_store"
|
||||
| "template"
|
||||
|
|
@ -54,11 +52,9 @@ export const permissionModules: Array<PermissionModule> = [
|
|||
"executive_position",
|
||||
"communication_type",
|
||||
"membership_status",
|
||||
"salutation",
|
||||
"calendar_type",
|
||||
"user",
|
||||
"role",
|
||||
"webapi",
|
||||
"query",
|
||||
"query_store",
|
||||
"template",
|
||||
|
|
@ -73,12 +69,11 @@ export const sectionsAndModules: SectionsAndModulesObject = {
|
|||
"executive_position",
|
||||
"communication_type",
|
||||
"membership_status",
|
||||
"salutation",
|
||||
"calendar_type",
|
||||
"query_store",
|
||||
"template",
|
||||
"template_usage",
|
||||
"newsletter_config",
|
||||
],
|
||||
user: ["user", "role", "webapi"],
|
||||
user: ["user", "role"],
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
import { Salutation } from "@/enums/salutation";
|
||||
import type { CommunicationViewModel } from "./communication.models";
|
||||
import type { MembershipViewModel } from "./membership.models";
|
||||
import type { SalutationViewModel } from "../../settings/salutation.models";
|
||||
|
||||
export interface MemberViewModel {
|
||||
id: number;
|
||||
salutation: SalutationViewModel;
|
||||
salutation: Salutation;
|
||||
firstname: string;
|
||||
lastname: string;
|
||||
nameaffix: string;
|
||||
|
|
@ -17,20 +17,8 @@ export interface MemberViewModel {
|
|||
preferredCommunication?: Array<CommunicationViewModel>;
|
||||
}
|
||||
|
||||
export interface MemberStatisticsViewModel {
|
||||
id: number;
|
||||
salutation: string;
|
||||
firstname: string;
|
||||
lastname: string;
|
||||
nameaffix: string;
|
||||
birthdate: Date;
|
||||
todayAge: number;
|
||||
ageThisYear: number;
|
||||
exactAge: string;
|
||||
}
|
||||
|
||||
export interface CreateMemberViewModel {
|
||||
salutationId: number;
|
||||
salutation: Salutation;
|
||||
firstname: string;
|
||||
lastname: string;
|
||||
nameaffix: string;
|
||||
|
|
@ -40,7 +28,7 @@ export interface CreateMemberViewModel {
|
|||
|
||||
export interface UpdateMemberViewModel {
|
||||
id: number;
|
||||
salutationId: number;
|
||||
salutation: Salutation;
|
||||
firstname: string;
|
||||
lastname: string;
|
||||
nameaffix: string;
|
||||
|
|
|
|||
|
|
@ -7,19 +7,6 @@ export interface MembershipViewModel {
|
|||
statusId: number;
|
||||
}
|
||||
|
||||
export interface MembershipStatisticsViewModel {
|
||||
durationInDays: number;
|
||||
durationInYears: string;
|
||||
status: string;
|
||||
statusId: number;
|
||||
memberId: number;
|
||||
memberSalutation: string;
|
||||
memberFirstname: string;
|
||||
memberLastname: string;
|
||||
memberNameaffix: string;
|
||||
memberBirthdate: Date;
|
||||
}
|
||||
|
||||
export interface CreateMembershipViewModel {
|
||||
start: Date;
|
||||
statusId: number;
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
export interface SalutationViewModel {
|
||||
id: number;
|
||||
salutation: string;
|
||||
}
|
||||
|
||||
export interface CreateSalutationViewModel {
|
||||
salutation: string;
|
||||
}
|
||||
|
||||
export interface UpdateSalutationViewModel {
|
||||
id: number;
|
||||
salutation: string;
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
import type { PermissionObject } from "@/types/permissionTypes";
|
||||
|
||||
export interface WebapiViewModel {
|
||||
id: number;
|
||||
permissions: PermissionObject;
|
||||
title: string;
|
||||
createdAt: Date;
|
||||
lastUsage?: Date;
|
||||
expiry?: Date;
|
||||
}
|
||||
|
||||
export interface CreateWebapiViewModel {
|
||||
title: string;
|
||||
expiry?: Date;
|
||||
}
|
||||
|
||||
export interface UpdateWebapiViewModel {
|
||||
title: string;
|
||||
expiry?: Date;
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
export interface Release {
|
||||
creator: string;
|
||||
title: string;
|
||||
link: string;
|
||||
pubDate: string;
|
||||
author: string;
|
||||
"content:encoded": string;
|
||||
"content:encodedSnippet": string;
|
||||
content: string;
|
||||
contentSnippet: string;
|
||||
guid: string;
|
||||
isoDate: string;
|
||||
}
|
||||
|
||||
export interface Releases {
|
||||
items: Release[];
|
||||
title: string;
|
||||
description: string;
|
||||
pubDate: string;
|
||||
link: string;
|
||||
}
|
||||
|
|
@ -15,9 +15,7 @@
|
|||
<div class="relative mt-1">
|
||||
<ComboboxInput
|
||||
class="rounded-md shadow-sm relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-0 focus:z-10 sm:text-sm resize-none"
|
||||
:displayValue="
|
||||
(person) => (person as UserViewModel)?.firstname + ' ' + (person as UserViewModel)?.lastname
|
||||
"
|
||||
:displayValue="(person) => person.firstname + ' ' + person.lastname"
|
||||
@input="query = $event.target.value"
|
||||
/>
|
||||
<ComboboxButton class="absolute inset-y-0 right-0 flex items-center pr-2">
|
||||
|
|
|
|||
|
|
@ -1,154 +0,0 @@
|
|||
<template>
|
||||
<MainTemplate :useStagedOverviewLink="false">
|
||||
<template #topBar>
|
||||
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
|
||||
<h1 class="font-bold text-xl h-8">Versions-Kontrolle</h1>
|
||||
</div>
|
||||
</template>
|
||||
<template #diffMain>
|
||||
<div class="h-full flex flex-col px-7 overflow-hidden">
|
||||
<div class="h-1/2 flex flex-col gap-2 p-2 border border-gray-300 rounded-t-md">
|
||||
<div class="flex flex-row justify-between border-b-2 border-gray-300">
|
||||
<h1 class="text-xl font-semibold">Client</h1>
|
||||
<p>V{{ clientVersion }}</p>
|
||||
</div>
|
||||
<div class="grow flex flex-col gap-4 overflow-y-scroll">
|
||||
<div v-for="version in newerClientVersions">
|
||||
<p>
|
||||
<span class="font-semibold text-lg">V{{ version.title }}</span> vom
|
||||
{{
|
||||
new Date(version.isoDate).toLocaleDateString("de", {
|
||||
month: "long",
|
||||
day: "2-digit",
|
||||
year: "numeric",
|
||||
})
|
||||
}}
|
||||
</p>
|
||||
<div class="flex flex-col" v-html="version['content:encoded']"></div>
|
||||
</div>
|
||||
<div v-if="newerClientVersions.length == 0" class="flex items-center justify-center">
|
||||
<p>Der Client ist auf der neuesten Version.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="h-1/2 flex flex-col gap-2 p-2 border border-gray-300 rounded-b-md">
|
||||
<div class="flex flex-row justify-between border-b-2 border-gray-300">
|
||||
<h1 class="text-xl font-semibold">Server</h1>
|
||||
<p>V{{ serverVersion }}</p>
|
||||
</div>
|
||||
<div class="grow flex flex-col gap-2 overflow-y-scroll">
|
||||
<div v-for="version in newerServerVersions">
|
||||
<p>
|
||||
<span class="font-semibold text-lg">V{{ version.title }}</span> vom
|
||||
{{
|
||||
new Date(version.isoDate).toLocaleDateString("de", {
|
||||
month: "long",
|
||||
day: "2-digit",
|
||||
year: "numeric",
|
||||
})
|
||||
}}
|
||||
</p>
|
||||
<div class="flex flex-col" v-html="version['content:encoded']"></div>
|
||||
</div>
|
||||
<div v-if="newerServerVersions.length == 0" class="flex items-center justify-center">
|
||||
<p>Der Server ist auf der neuesten Version.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</MainTemplate>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import MainTemplate from "@/templates/Main.vue";
|
||||
import clientPackage from "../../../package.json";
|
||||
import type { Releases } from "../../viewmodels/version.models";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
data() {
|
||||
return {
|
||||
serverVersion: "" as string,
|
||||
serverRss: null as null | Releases,
|
||||
clientVersion: "" as string,
|
||||
clientRss: null as null | Releases,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
newerServerVersions() {
|
||||
if (!this.serverRss) return [];
|
||||
return this.serverRss.items.filter((i) => this.compareVersionStrings(this.serverVersion, i.title) < 0);
|
||||
},
|
||||
newerClientVersions() {
|
||||
if (!this.clientRss) return [];
|
||||
return this.clientRss.items.filter((i) => this.compareVersionStrings(this.clientVersion, i.title) < 0);
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.clientVersion = clientPackage.version;
|
||||
this.getServerVersion();
|
||||
this.getServerFeed();
|
||||
this.getClientFeed();
|
||||
},
|
||||
methods: {
|
||||
getServerVersion() {
|
||||
this.$http
|
||||
.get("/server/version")
|
||||
.then((res) => {
|
||||
this.serverVersion = res.data.version;
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
async getServerFeed() {
|
||||
this.$http
|
||||
.get("/server/serverrss")
|
||||
.then((res) => {
|
||||
this.serverRss = res.data;
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
async getClientFeed() {
|
||||
this.$http
|
||||
.get("/server/clientrss")
|
||||
.then((res) => {
|
||||
this.clientRss = res.data;
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
compareVersionStrings(activeVersion: string, compareVersion: string) {
|
||||
const parseVersion = (version: string) => {
|
||||
const [main, tag] = version.split("-");
|
||||
const [major, minor, patch] = main.split(".").map(Number);
|
||||
return { major, minor, patch, tag };
|
||||
};
|
||||
|
||||
if (!activeVersion || !compareVersion) return 0;
|
||||
|
||||
const versionA = parseVersion(activeVersion);
|
||||
const versionB = parseVersion(compareVersion);
|
||||
|
||||
if (versionA.major !== versionB.major) {
|
||||
return versionA.major - versionB.major;
|
||||
}
|
||||
if (versionA.minor !== versionB.minor) {
|
||||
return versionA.minor - versionB.minor;
|
||||
}
|
||||
if (versionA.patch !== versionB.patch) {
|
||||
return versionA.patch - versionB.patch;
|
||||
}
|
||||
|
||||
if (versionA.tag && !versionB.tag) return -1;
|
||||
if (!versionA.tag && versionB.tag) return 1;
|
||||
if (versionA.tag && versionB.tag) {
|
||||
const tags = ["alpha", "beta", ""];
|
||||
return tags.indexOf(versionA.tag) - tags.indexOf(versionB.tag);
|
||||
}
|
||||
|
||||
return 0;
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,22 +1,13 @@
|
|||
<template>
|
||||
<SidebarLayout>
|
||||
<template #sidebar>
|
||||
<SidebarTemplate
|
||||
mainTitle="Mein Account"
|
||||
:topTitle="config.app_name_overwrite || 'FF Admin'"
|
||||
:showTopList="isOwner"
|
||||
>
|
||||
<SidebarTemplate mainTitle="Mein Account" :topTitle="config.app_name_overwrite || 'FF Admin'" :showTopList="isOwner">
|
||||
<template v-if="isOwner" #topList>
|
||||
<RoutingLink
|
||||
title="Administration"
|
||||
:link="{ name: 'account-administration' }"
|
||||
:active="activeRouteName == 'account-administration'"
|
||||
/>
|
||||
<RoutingLink
|
||||
title="Versions-Verwaltung"
|
||||
:link="{ name: 'account-version' }"
|
||||
:active="activeRouteName == 'account-version'"
|
||||
/>
|
||||
</template>
|
||||
<template #list>
|
||||
<RoutingLink title="Mein Account" :link="{ name: 'account-me' }" :active="activeRouteName == 'account-me'" />
|
||||
|
|
@ -47,7 +38,7 @@ import SidebarTemplate from "@/templates/Sidebar.vue";
|
|||
import RoutingLink from "@/components/admin/RoutingLink.vue";
|
||||
import { RouterView } from "vue-router";
|
||||
import { useAbilityStore } from "@/stores/ability";
|
||||
import { config } from "@/config";
|
||||
import { config } from "@/config"
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
>
|
||||
<p class="mx-auto">Mitglied bearbeiten</p>
|
||||
<div>
|
||||
<Listbox v-model="member.salutation" name="salutation" by="id">
|
||||
<Listbox v-model="member.salutation" name="salutation">
|
||||
<ListboxLabel>Anrede</ListboxLabel>
|
||||
<div class="relative mt-1">
|
||||
<ListboxButton
|
||||
class="rounded-md shadow-sm relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-0 focus:z-10 sm:text-sm resize-none"
|
||||
>
|
||||
<span class="block truncate w-full text-start"> {{ member.salutation.salutation }}</span>
|
||||
<span class="block truncate w-full text-start"> {{ member.salutation }}</span>
|
||||
<span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
|
||||
<ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
|
||||
</span>
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
<ListboxOption
|
||||
v-slot="{ active, selected }"
|
||||
v-for="salutation in salutations"
|
||||
:key="salutation.id"
|
||||
:key="salutation"
|
||||
:value="salutation"
|
||||
as="template"
|
||||
>
|
||||
|
|
@ -42,9 +42,7 @@
|
|||
'relative cursor-default select-none py-2 pl-10 pr-4',
|
||||
]"
|
||||
>
|
||||
<span :class="[selected ? 'font-medium' : 'font-normal', 'block truncate']">{{
|
||||
salutation.salutation
|
||||
}}</span>
|
||||
<span :class="[selected ? 'font-medium' : 'font-normal', 'block truncate']">{{ salutation }}</span>
|
||||
<span v-if="selected" class="absolute inset-y-0 left-0 flex items-center pl-3 text-primary">
|
||||
<CheckIcon class="h-5 w-5" aria-hidden="true" />
|
||||
</span>
|
||||
|
|
@ -103,7 +101,7 @@ import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } f
|
|||
import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
|
||||
import cloneDeep from "lodash.clonedeep";
|
||||
import isEqual from "lodash.isequal";
|
||||
import { useSalutationStore } from "../../../../stores/admin/settings/salutation";
|
||||
import { Salutation } from "@/enums/salutation";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
|
|
@ -125,6 +123,7 @@ export default defineComponent({
|
|||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
member: null as null | MemberViewModel,
|
||||
timeout: null as any,
|
||||
salutations: [] as Array<string>,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -132,11 +131,10 @@ export default defineComponent({
|
|||
return isEqual(this.activeMemberObj, this.member);
|
||||
},
|
||||
...mapState(useMemberStore, ["activeMemberObj", "loadingActive"]),
|
||||
...mapState(useSalutationStore, ["salutations"]),
|
||||
},
|
||||
mounted() {
|
||||
this.fetchItem();
|
||||
this.fetchSalutations();
|
||||
this.salutations = Object.values(Salutation);
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
|
|
@ -145,7 +143,6 @@ export default defineComponent({
|
|||
},
|
||||
methods: {
|
||||
...mapActions(useMemberStore, ["fetchMemberByActiveId", "updateActiveMember"]),
|
||||
...mapActions(useSalutationStore, ["fetchSalutations"]),
|
||||
resetForm() {
|
||||
this.member = cloneDeep(this.activeMemberObj);
|
||||
},
|
||||
|
|
@ -157,11 +154,11 @@ export default defineComponent({
|
|||
let formData = e.target.elements;
|
||||
let updateMember: UpdateMemberViewModel = {
|
||||
id: this.member.id,
|
||||
salutationId: formData.salutation.value,
|
||||
salutation: formData.salutation.value,
|
||||
firstname: formData.firstname.value,
|
||||
lastname: formData.lastname.value,
|
||||
nameaffix: formData.nameaffix.value,
|
||||
birthdate: formData.birthdate.value,
|
||||
birthdate: formData.birthdate.value,
|
||||
internalId: formData.internalId.value,
|
||||
};
|
||||
this.status = "loading";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</div>
|
||||
<div>
|
||||
<label for="salutation">Anrede</label>
|
||||
<input type="text" id="salutation" :value="activeMemberObj.salutation.salutation" readonly />
|
||||
<input type="text" id="salutation" :value="activeMemberObj.salutation" readonly />
|
||||
</div>
|
||||
<div>
|
||||
<label for="firstname">Vorname</label>
|
||||
|
|
@ -25,20 +25,6 @@
|
|||
<label for="birthdate">Geburtsdatum</label>
|
||||
<input type="date" id="birthdate" :value="activeMemberObj.birthdate" readonly />
|
||||
</div>
|
||||
<div v-if="membershipStatistics.length != 0">
|
||||
<p>Statistiken zur Mitgliedschaft</p>
|
||||
<div class="flex flex-col h-fit w-full border border-primary rounded-md">
|
||||
<div
|
||||
v-for="stat in membershipStatistics"
|
||||
class="bg-primary p-2 text-white flex flex-row justify-between items-center"
|
||||
>
|
||||
<p>
|
||||
{{ stat.status }} für gesamt {{ stat.durationInDays }} Tage
|
||||
<span class="whitespace-nowrap"> ~> {{ stat.durationInYears.replace("_", "") }} Jahre</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="activeMemberObj.firstMembershipEntry">
|
||||
<p>Erster Eintrag Mitgliedschaft</p>
|
||||
<div class="flex flex-col h-fit w-full border border-primary rounded-md">
|
||||
|
|
@ -139,7 +125,6 @@ import { defineComponent } from "vue";
|
|||
import { mapActions, mapState } from "pinia";
|
||||
import Spinner from "@/components/Spinner.vue";
|
||||
import { useMemberStore } from "@/stores/admin/club/member/member";
|
||||
import { useMembershipStore } from "@/stores/admin/club/member/membership";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
|
|
@ -148,17 +133,13 @@ export default defineComponent({
|
|||
memberId: String,
|
||||
},
|
||||
computed: {
|
||||
...mapState(useMemberStore, ["activeMemberObj", "activeMemberStatistics", "loadingActive"]),
|
||||
...mapState(useMembershipStore, ["membershipStatistics"]),
|
||||
...mapState(useMemberStore, ["activeMemberObj", "loadingActive"]),
|
||||
},
|
||||
mounted() {
|
||||
this.fetchMemberByActiveId();
|
||||
this.fetchMemberStatisticsByActiveId();
|
||||
this.fetchMembershipStatisticsForMember();
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useMemberStore, ["fetchMemberByActiveId", "fetchMemberStatisticsByActiveId"]),
|
||||
...mapActions(useMembershipStore, ["fetchMembershipStatisticsForMember"]),
|
||||
...mapActions(useMemberStore, ["fetchMemberByActiveId"]),
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
title="weitere Empfänger suchen"
|
||||
v-model="recipients"
|
||||
:disabled="!can('create', 'club', 'newsletter')"
|
||||
@add:member="(s) => members.push(s)"
|
||||
@add:member-by-array="(s) => members.push(...s)"
|
||||
/>
|
||||
|
||||
<p>Ausgewählte Empfänger</p>
|
||||
|
|
@ -147,10 +149,9 @@ export default defineComponent({
|
|||
// this.fetchNewsletterRecipients();
|
||||
this.fetchQueries();
|
||||
this.loadQuery();
|
||||
this.loadMembers();
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useMemberStore, ["getAllMembers"]),
|
||||
...mapActions(useMemberStore, ["fetchMembers"]),
|
||||
...mapActions(useNewsletterRecipientsStore, ["fetchNewsletterRecipients"]),
|
||||
...mapActions(useQueryStoreStore, ["fetchQueries"]),
|
||||
...mapActions(useQueryBuilderStore, ["sendQuery"]),
|
||||
|
|
@ -160,13 +161,6 @@ export default defineComponent({
|
|||
this.recipients.splice(index, 1);
|
||||
}
|
||||
},
|
||||
loadMembers() {
|
||||
this.getAllMembers()
|
||||
.then((res) => {
|
||||
this.members = res.data;
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
loadQuery() {
|
||||
if (this.recipientsByQuery) {
|
||||
this.sendQuery(0, 1000, this.recipientsByQuery.query);
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
<template>
|
||||
<MainTemplate>
|
||||
<template #topBar>
|
||||
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
|
||||
<h1 class="font-bold text-xl h-8">Anrede</h1>
|
||||
</div>
|
||||
</template>
|
||||
<template #diffMain>
|
||||
<div class="flex flex-col gap-4 h-full pl-7">
|
||||
<div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
|
||||
<SalutationListItem v-for="salutation in salutations" :key="salutation.id" :salutation="salutation" />
|
||||
</div>
|
||||
<div class="flex flex-row gap-4">
|
||||
<button v-if="can('create', 'settings', 'salutation')" primary class="!w-fit" @click="openCreateModal">
|
||||
Anrede erstellen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</MainTemplate>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent, defineAsyncComponent, markRaw } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import MainTemplate from "@/templates/Main.vue";
|
||||
import { useSalutationStore } from "@/stores/admin/settings/salutation";
|
||||
import SalutationListItem from "@/components/admin/settings/salutation/SalutationListItem.vue";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
import { useAbilityStore } from "@/stores/ability";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
computed: {
|
||||
...mapState(useSalutationStore, ["salutations"]),
|
||||
...mapState(useAbilityStore, ["can"]),
|
||||
},
|
||||
mounted() {
|
||||
this.fetchSalutations();
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useSalutationStore, ["fetchSalutations"]),
|
||||
...mapActions(useModalStore, ["openModal"]),
|
||||
openCreateModal() {
|
||||
this.openModal(
|
||||
markRaw(defineAsyncComponent(() => import("@/components/admin/settings/salutation/CreateSalutationModal.vue")))
|
||||
);
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
<template>
|
||||
<MainTemplate>
|
||||
<template #headerInsert>
|
||||
<RouterLink to="../" class="text-primary">zurück zur Liste (abbrechen)</RouterLink>
|
||||
</template>
|
||||
<template #topBar>
|
||||
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
|
||||
<h1 class="font-bold text-xl h-8">Anrede {{ origin?.salutation }} - Daten bearbeiten</h1>
|
||||
</div>
|
||||
</template>
|
||||
<template #main>
|
||||
<Spinner v-if="loading == 'loading'" class="mx-auto" />
|
||||
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
|
||||
<form
|
||||
v-else-if="salutation != null"
|
||||
class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
|
||||
@submit.prevent="triggerUpdate"
|
||||
>
|
||||
<div>
|
||||
<label for="salutation">Anrede</label>
|
||||
<input type="text" id="salutation" required v-model="salutation.salutation" />
|
||||
</div>
|
||||
<div class="flex flex-row justify-end gap-2">
|
||||
<button primary-outline type="reset" class="!w-fit" :disabled="canSaveOrReset" @click="resetForm">
|
||||
verwerfen
|
||||
</button>
|
||||
<button primary type="submit" class="!w-fit" :disabled="status == 'loading' || canSaveOrReset">
|
||||
speichern
|
||||
</button>
|
||||
<Spinner v-if="status == 'loading'" class="my-auto" />
|
||||
<SuccessCheckmark v-else-if="status?.status == 'success'" />
|
||||
<FailureXMark v-else-if="status?.status == 'failed'" />
|
||||
</div>
|
||||
</form>
|
||||
</template>
|
||||
</MainTemplate>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import MainTemplate from "@/templates/Main.vue";
|
||||
import { useSalutationStore } from "@/stores/admin/settings/salutation";
|
||||
import Spinner from "@/components/Spinner.vue";
|
||||
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
|
||||
import FailureXMark from "@/components/FailureXMark.vue";
|
||||
import { RouterLink } from "vue-router";
|
||||
import type { SalutationViewModel, UpdateSalutationViewModel } from "@/viewmodels/admin/settings/salutation.models";
|
||||
import cloneDeep from "lodash.clonedeep";
|
||||
import isEqual from "lodash.isequal";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
props: {
|
||||
id: String,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: "loading" as "loading" | "fetched" | "failed",
|
||||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
origin: null as null | SalutationViewModel,
|
||||
salutation: null as null | SalutationViewModel,
|
||||
timeout: null as any,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
canSaveOrReset(): boolean {
|
||||
return isEqual(this.origin, this.salutation);
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.fetchItem();
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
clearTimeout(this.timeout);
|
||||
} catch (error) {}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useSalutationStore, ["fetchSalutationById", "updateActiveSalutation"]),
|
||||
resetForm() {
|
||||
this.salutation = cloneDeep(this.origin);
|
||||
},
|
||||
fetchItem() {
|
||||
this.fetchSalutationById(parseInt(this.id ?? ""))
|
||||
.then((result) => {
|
||||
this.salutation = result.data;
|
||||
this.origin = cloneDeep(result.data);
|
||||
this.loading = "fetched";
|
||||
})
|
||||
.catch((err) => {
|
||||
this.loading = "failed";
|
||||
});
|
||||
},
|
||||
triggerUpdate(e: any) {
|
||||
if (this.salutation == null) return;
|
||||
let formData = e.target.elements;
|
||||
let updateSalutation: UpdateSalutationViewModel = {
|
||||
id: this.salutation.id,
|
||||
salutation: formData.salutation.value,
|
||||
};
|
||||
this.status = "loading";
|
||||
this.updateActiveSalutation(updateSalutation)
|
||||
.then(() => {
|
||||
this.fetchItem();
|
||||
this.status = { status: "success" };
|
||||
})
|
||||
.catch((err) => {
|
||||
this.status = { status: "failed" };
|
||||
})
|
||||
.finally(() => {
|
||||
this.timeout = setTimeout(() => {
|
||||
this.status = null;
|
||||
}, 2000);
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
<template>
|
||||
<MainTemplate>
|
||||
<template #topBar>
|
||||
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
|
||||
<h1 class="font-bold text-xl h-8">Webapi-Token</h1>
|
||||
</div>
|
||||
</template>
|
||||
<template #diffMain>
|
||||
<div class="flex flex-col gap-4 h-full pl-7">
|
||||
<div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
|
||||
<WebapiListItem v-for="webapi in webapis" :key="webapi.id" :webapi="webapi" />
|
||||
</div>
|
||||
<div class="flex flex-row gap-4">
|
||||
<button v-if="can('create', 'user', 'webapi')" primary class="!w-fit" @click="openCreateModal">
|
||||
Webapi-Token erstellen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</MainTemplate>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineAsyncComponent, defineComponent, markRaw } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import MainTemplate from "@/templates/Main.vue";
|
||||
import { useWebapiStore } from "@/stores/admin/user/webapi";
|
||||
import WebapiListItem from "@/components/admin/user/webapi/WebapiListItem.vue";
|
||||
import { useModalStore } from "@/stores/modal";
|
||||
import { useAbilityStore } from "@/stores/ability";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
computed: {
|
||||
...mapState(useWebapiStore, ["webapis"]),
|
||||
...mapState(useAbilityStore, ["can"]),
|
||||
},
|
||||
mounted() {
|
||||
this.fetchWebapis();
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useWebapiStore, ["fetchWebapis"]),
|
||||
...mapActions(useModalStore, ["openModal"]),
|
||||
openCreateModal() {
|
||||
this.openModal(
|
||||
markRaw(defineAsyncComponent(() => import("@/components/admin/user/webapi/CreateWebapiModal.vue")))
|
||||
);
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
<template>
|
||||
<MainTemplate>
|
||||
<template #headerInsert>
|
||||
<RouterLink to="../" class="text-primary">zurück zur Liste (abbrechen)</RouterLink>
|
||||
</template>
|
||||
<template #topBar>
|
||||
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
|
||||
<h1 class="font-bold text-xl h-8">Webapi-Token {{ origin?.title }} - Daten bearbeiten</h1>
|
||||
</div>
|
||||
</template>
|
||||
<template #main>
|
||||
<Spinner v-if="loading == 'loading'" class="mx-auto" />
|
||||
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
|
||||
<form
|
||||
v-else-if="webapi"
|
||||
class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
|
||||
@submit.prevent="triggerWebapiUpdate"
|
||||
>
|
||||
<div>
|
||||
<label for="title">Bezeichnung</label>
|
||||
<input type="text" id="title" required v-model="webapi.title" />
|
||||
</div>
|
||||
<div class="w-full">
|
||||
<label for="expiry">Ablaufdatum (optional)</label>
|
||||
<input type="date" id="expiry" step="1" v-model="webapi.expiry" />
|
||||
</div>
|
||||
<div class="flex flex-row justify-end gap-2">
|
||||
<button primary-outline type="reset" class="!w-fit" :disabled="canSaveOrReset" @click="resetForm">
|
||||
verwerfen
|
||||
</button>
|
||||
<button primary type="submit" class="!w-fit" :disabled="status == 'loading' || canSaveOrReset">
|
||||
speichern
|
||||
</button>
|
||||
<Spinner v-if="status == 'loading'" class="my-auto" />
|
||||
<SuccessCheckmark v-else-if="status?.status == 'success'" />
|
||||
<FailureXMark v-else-if="status?.status == 'failed'" />
|
||||
</div>
|
||||
</form>
|
||||
</template>
|
||||
</MainTemplate>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import MainTemplate from "@/templates/Main.vue";
|
||||
import { useWebapiStore } from "@/stores/admin/user/webapi";
|
||||
import Spinner from "@/components/Spinner.vue";
|
||||
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
|
||||
import FailureXMark from "@/components/FailureXMark.vue";
|
||||
import { RouterLink } from "vue-router";
|
||||
import cloneDeep from "lodash.clonedeep";
|
||||
import isEqual from "lodash.isequal";
|
||||
import type { UpdateWebapiViewModel, WebapiViewModel } from "@/viewmodels/admin/user/webapi.models";
|
||||
import type { Update } from "vite/types/hmrPayload.js";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
props: {
|
||||
id: String,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: "loading" as "loading" | "fetched" | "failed",
|
||||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
origin: null as null | WebapiViewModel,
|
||||
webapi: null as null | WebapiViewModel,
|
||||
timeout: null as any,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
canSaveOrReset(): boolean {
|
||||
return isEqual(this.origin, this.webapi);
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.fetchItem();
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
clearTimeout(this.timeout);
|
||||
} catch (error) {}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useWebapiStore, ["fetchWebapiById", "updateActiveWebapi"]),
|
||||
resetForm() {
|
||||
this.webapi = cloneDeep(this.origin);
|
||||
},
|
||||
fetchItem() {
|
||||
this.fetchWebapiById(parseInt(this.id ?? ""))
|
||||
.then((result) => {
|
||||
this.webapi = result.data;
|
||||
this.origin = cloneDeep(result.data);
|
||||
this.loading = "fetched";
|
||||
})
|
||||
.catch((err) => {
|
||||
this.loading = "failed";
|
||||
});
|
||||
},
|
||||
triggerWebapiUpdate(e: any) {
|
||||
if (this.webapi == null) return;
|
||||
let formData = e.target.elements;
|
||||
let updateWebapi: UpdateWebapiViewModel = {
|
||||
title: formData.title.value,
|
||||
expiry: formData.expiry.value,
|
||||
};
|
||||
|
||||
this.status = "loading";
|
||||
this.updateActiveWebapi(this.webapi.id, updateWebapi)
|
||||
.then(() => {
|
||||
this.fetchItem();
|
||||
this.status = { status: "success" };
|
||||
})
|
||||
.catch((err) => {
|
||||
this.status = { status: "failed" };
|
||||
})
|
||||
.finally(() => {
|
||||
this.timeout = setTimeout(() => {
|
||||
this.status = null;
|
||||
}, 2000);
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
<template>
|
||||
<MainTemplate>
|
||||
<template #headerInsert>
|
||||
<RouterLink to="../" class="text-primary">zurück zur Liste (abbrechen)</RouterLink>
|
||||
</template>
|
||||
<template #topBar>
|
||||
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
|
||||
<h1 class="font-bold text-xl h-8">Webapi-Token {{ webapi?.title }} - Berechtigungen bearbeiten</h1>
|
||||
</div>
|
||||
</template>
|
||||
<template #main>
|
||||
<Spinner v-if="loading == 'loading'" class="mx-auto" />
|
||||
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
|
||||
<Permission
|
||||
v-else-if="webapi != null"
|
||||
:permissions="webapi.permissions"
|
||||
:status="status"
|
||||
@savePermissions="triggerUpdate"
|
||||
/>
|
||||
</template>
|
||||
</MainTemplate>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
import { mapState, mapActions } from "pinia";
|
||||
import MainTemplate from "@/templates/Main.vue";
|
||||
import { useWebapiStore } from "@/stores/admin/user/webapi";
|
||||
import Permission from "@/components/admin/Permission.vue";
|
||||
import Spinner from "@/components/Spinner.vue";
|
||||
import type { PermissionObject } from "@/types/permissionTypes";
|
||||
import type { WebapiViewModel } from "@/viewmodels/admin/user/webapi.models";
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
export default defineComponent({
|
||||
props: {
|
||||
id: String,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: "loading" as "loading" | "fetched" | "failed",
|
||||
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
|
||||
webapi: null as null | WebapiViewModel,
|
||||
timeout: null as any,
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.fetchItem();
|
||||
},
|
||||
beforeUnmount() {
|
||||
try {
|
||||
clearTimeout(this.timeout);
|
||||
} catch (error) {}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useWebapiStore, ["fetchWebapiById", "updateActiveWebapiPermissions"]),
|
||||
fetchItem() {
|
||||
this.fetchWebapiById(parseInt(this.id ?? ""))
|
||||
.then((result) => {
|
||||
this.webapi = result.data;
|
||||
this.loading = "fetched";
|
||||
})
|
||||
.catch((err) => {
|
||||
this.loading = "failed";
|
||||
});
|
||||
},
|
||||
triggerUpdate(e: PermissionObject) {
|
||||
if (this.webapi == null) return;
|
||||
this.status = "loading";
|
||||
this.updateActiveWebapiPermissions(this.webapi.id, e)
|
||||
.then(() => {
|
||||
this.fetchItem();
|
||||
this.status = { status: "success" };
|
||||
})
|
||||
.catch((err) => {
|
||||
this.status = { status: "failed" };
|
||||
})
|
||||
.finally(() => {
|
||||
this.timeout = setTimeout(() => {
|
||||
this.status = null;
|
||||
}, 2000);
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
{
|
||||
"extends": "@vue/tsconfig/tsconfig.dom.json",
|
||||
"include": ["env.d.ts", "src/**/*", "src/**/*.vue", "package.json", "config.example.ts", "config.ts"],
|
||||
"include": ["env.d.ts", "src/**/*", "src/**/*.vue", "config.example.ts", "config.ts"],
|
||||
"exclude": ["src/**/__tests__/*"],
|
||||
"compilerOptions": {
|
||||
"composite": true,
|
||||
"resolveJsonModule": true,
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
|
||||
"baseUrl": ".",
|
||||
|
|
|
|||
Loading…
Reference in a new issue