diff --git a/src/components/admin/club/calendar/CalendarLinkModal.vue b/src/components/admin/club/calendar/CalendarLinkModal.vue index e304e6e..93b051c 100644 --- a/src/components/admin/club/calendar/CalendarLinkModal.vue +++ b/src/components/admin/club/calendar/CalendarLinkModal.vue @@ -73,11 +73,7 @@
- +

@@ -105,8 +101,8 @@ 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 { useCalendarTypeStore } from "@/stores/admin/configuration/calendarType"; +import type { CalendarTypeViewModel } from "@/viewmodels/admin/configuration/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"; @@ -119,7 +115,7 @@ export default defineComponent({ data() { return { selectedTypes: [] as Array, - provideNSCDR: false as boolean + provideNSCDR: false as boolean, }; }, computed: { @@ -133,7 +129,7 @@ export default defineComponent({ }, generatedLink() { let extend = this.selectedTypes.map((t) => [t.type, t.passphrase].filter((at) => at).join(":")); - return `webcal://${host || window.location.host}/api/public/calendar${extend.length == 0 ? "" : "?types=" + extend.join("&types=")}${this.provideNSCDR && extend.length != 0 ? '&nscdr=true':''}`; + return `webcal://${host || window.location.host}/api/public/calendar${extend.length == 0 ? "" : "?types=" + extend.join("&types=")}${this.provideNSCDR && extend.length != 0 ? "&nscdr=true" : ""}`; }, }, mounted() { diff --git a/src/components/admin/club/calendar/CreateCalendarModal.vue b/src/components/admin/club/calendar/CreateCalendarModal.vue index a032a3f..6256bb7 100644 --- a/src/components/admin/club/calendar/CreateCalendarModal.vue +++ b/src/components/admin/club/calendar/CreateCalendarModal.vue @@ -166,8 +166,8 @@ import { useCalendarStore } from "@/stores/admin/club/calendar"; import type { CreateCalendarViewModel } from "@/viewmodels/admin/club/calendar.models"; import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue"; import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid"; -import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType"; -import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models"; +import { useCalendarTypeStore } from "@/stores/admin/configuration/calendarType"; +import type { CalendarTypeViewModel } from "@/viewmodels/admin/configuration/calendarType.models"; diff --git a/src/components/admin/club/member/MemberAwardEditModal.vue b/src/components/admin/club/member/MemberAwardEditModal.vue index e21b7e5..ff977d2 100644 --- a/src/components/admin/club/member/MemberAwardEditModal.vue +++ b/src/components/admin/club/member/MemberAwardEditModal.vue @@ -100,7 +100,7 @@ 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 { useAwardStore } from "@/stores/admin/settings/award"; +import { useAwardStore } from "@/stores/admin/configuration/award"; import type { CreateMemberAwardViewModel, MemberAwardViewModel, diff --git a/src/components/admin/club/member/MemberCommunicationCreateModal.vue b/src/components/admin/club/member/MemberCommunicationCreateModal.vue index ecb2fe7..ba45472 100644 --- a/src/components/admin/club/member/MemberCommunicationCreateModal.vue +++ b/src/components/admin/club/member/MemberCommunicationCreateModal.vue @@ -131,8 +131,8 @@ import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } f import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid"; import { useCommunicationStore } from "@/stores/admin/club/member/communication"; import type { CreateCommunicationViewModel } from "@/viewmodels/admin/club/member/communication.models"; -import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType"; -import type { CommunicationTypeViewModel } from "@/viewmodels/admin/settings/communicationType.models"; +import { useCommunicationTypeStore } from "@/stores/admin/configuration/communicationType"; +import type { CommunicationTypeViewModel } from "@/viewmodels/admin/configuration/communicationType.models"; diff --git a/src/components/admin/club/member/MemberExecutivePositionEditModal.vue b/src/components/admin/club/member/MemberExecutivePositionEditModal.vue index f3a4e4d..e59292a 100644 --- a/src/components/admin/club/member/MemberExecutivePositionEditModal.vue +++ b/src/components/admin/club/member/MemberExecutivePositionEditModal.vue @@ -106,7 +106,7 @@ 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 { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition"; +import { useExecutivePositionStore } from "@/stores/admin/configuration/executivePosition"; import type { CreateMemberExecutivePositionViewModel, MemberExecutivePositionViewModel, diff --git a/src/components/admin/club/member/MemberQualificationCreateModal.vue b/src/components/admin/club/member/MemberQualificationCreateModal.vue index 9566636..817e452 100644 --- a/src/components/admin/club/member/MemberQualificationCreateModal.vue +++ b/src/components/admin/club/member/MemberQualificationCreateModal.vue @@ -106,12 +106,12 @@ 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 { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus"; -import type { MembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models"; +import { useMembershipStatusStore } from "@/stores/admin/configuration/membershipStatus"; +import type { MembershipStatusViewModel } from "@/viewmodels/admin/configuration/membershipStatus.models"; import type { CreateMembershipViewModel } from "@/viewmodels/admin/club/member/membership.models"; import { useMembershipStore } from "@/stores/admin/club/member/membership"; -import { useQualificationStore } from "@/stores/admin/settings/qualification"; -import type { QualificationViewModel } from "@/viewmodels/admin/settings/qualification.models"; +import { useQualificationStore } from "@/stores/admin/configuration/qualification"; +import type { QualificationViewModel } from "@/viewmodels/admin/configuration/qualification.models"; import type { CreateMemberQualificationViewModel } from "@/viewmodels/admin/club/member/memberQualification.models"; import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification"; diff --git a/src/components/admin/club/member/MemberQualificationDeleteModal.vue b/src/components/admin/club/member/MemberQualificationDeleteModal.vue index 260713b..16a3bfc 100644 --- a/src/components/admin/club/member/MemberQualificationDeleteModal.vue +++ b/src/components/admin/club/member/MemberQualificationDeleteModal.vue @@ -41,7 +41,7 @@ import { useModalStore } from "@/stores/modal"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; -import { useQualificationStore } from "@/stores/admin/settings/qualification"; +import { useQualificationStore } from "@/stores/admin/configuration/qualification"; import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification"; diff --git a/src/components/admin/club/member/MemberQualificationEditModal.vue b/src/components/admin/club/member/MemberQualificationEditModal.vue index 8c38b67..6355561 100644 --- a/src/components/admin/club/member/MemberQualificationEditModal.vue +++ b/src/components/admin/club/member/MemberQualificationEditModal.vue @@ -107,7 +107,7 @@ 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 { useQualificationStore } from "@/stores/admin/settings/qualification"; +import { useQualificationStore } from "@/stores/admin/configuration/qualification"; import type { CreateMemberQualificationViewModel, MemberQualificationViewModel, diff --git a/src/components/admin/club/member/MembershipCreateModal.vue b/src/components/admin/club/member/MembershipCreateModal.vue index b7372f9..48aa0f9 100644 --- a/src/components/admin/club/member/MembershipCreateModal.vue +++ b/src/components/admin/club/member/MembershipCreateModal.vue @@ -94,8 +94,8 @@ 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 { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus"; -import type { MembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models"; +import { useMembershipStatusStore } from "@/stores/admin/configuration/membershipStatus"; +import type { MembershipStatusViewModel } from "@/viewmodels/admin/configuration/membershipStatus.models"; import type { CreateMembershipViewModel } from "@/viewmodels/admin/club/member/membership.models"; import { useMembershipStore } from "@/stores/admin/club/member/membership"; diff --git a/src/components/admin/club/member/MembershipEditModal.vue b/src/components/admin/club/member/MembershipEditModal.vue index 2b05623..a376800 100644 --- a/src/components/admin/club/member/MembershipEditModal.vue +++ b/src/components/admin/club/member/MembershipEditModal.vue @@ -103,7 +103,7 @@ 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 { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus"; +import { useMembershipStatusStore } from "@/stores/admin/configuration/membershipStatus"; import type { CreateMembershipViewModel, MembershipViewModel, diff --git a/src/components/admin/settings/award/AwardListItem.vue b/src/components/admin/configuration/award/AwardListItem.vue similarity index 91% rename from src/components/admin/settings/award/AwardListItem.vue rename to src/components/admin/configuration/award/AwardListItem.vue index 67fc63a..433a6c9 100644 --- a/src/components/admin/settings/award/AwardListItem.vue +++ b/src/components/admin/configuration/award/AwardListItem.vue @@ -23,7 +23,7 @@ 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 { AwardViewModel } from "@/viewmodels/admin/settings/award.models"; +import type { AwardViewModel } from "@/viewmodels/admin/configuration/award.models"; @@ -52,12 +54,12 @@ export default defineComponent({ configs: [] as Array, }; }, - computed:{ + computed: { ...mapState(useNewsletterConfigStore, ["config"]), ...mapState(useAbilityStore, ["can"]), newsletterConfig() { - return this.config.find(c => c.comTypeId == this.comType.id) - } + return this.config.find((c) => c.comTypeId == this.comType.id); + }, }, mounted() { this.configs = Object.values(NewsletterConfigType); @@ -74,25 +76,26 @@ export default defineComponent({ const fromData = e.target.elements; const config = fromData.config.value === "def" ? null : fromData.config.value; - this.status = "loading" - let request: Promise> - if(config){ + this.status = "loading"; + let request: Promise>; + if (config) { request = this.setNewsletterConfig({ comTypeId: this.comType.id, - config: config - }) + config: config, + }); } else { - request = this.deleteNewsletterConfig(this.comType.id) + request = this.deleteNewsletterConfig(this.comType.id); } - request.then(() => { - this.status = { status: "success" }; - this.timeout = setTimeout(() => { - this.status = null; - }, 2000); - }) - .catch(() => { - this.status = { status: "failed" }; - }); + request + .then(() => { + this.status = { status: "success" }; + this.timeout = setTimeout(() => { + this.status = null; + }, 2000); + }) + .catch(() => { + this.status = { status: "failed" }; + }); }, resetForm() { (this.$refs.config as HTMLSelectElement).value = String(this.newsletterConfig?.config ?? "def"); diff --git a/src/components/admin/settings/qualification/CreateQualificationModal.vue b/src/components/admin/configuration/qualification/CreateQualificationModal.vue similarity index 95% rename from src/components/admin/settings/qualification/CreateQualificationModal.vue rename to src/components/admin/configuration/qualification/CreateQualificationModal.vue index c2ac0ab..51d644e 100644 --- a/src/components/admin/settings/qualification/CreateQualificationModal.vue +++ b/src/components/admin/configuration/qualification/CreateQualificationModal.vue @@ -38,8 +38,8 @@ import { useModalStore } from "@/stores/modal"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; -import { useQualificationStore } from "@/stores/admin/settings/qualification"; -import type { CreateQualificationViewModel } from "@/viewmodels/admin/settings/qualification.models"; +import { useQualificationStore } from "@/stores/admin/configuration/qualification"; +import type { CreateQualificationViewModel } from "@/viewmodels/admin/configuration/qualification.models"; diff --git a/src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue b/src/components/admin/configuration/queryStore/DeleteQueryStoreModal.vue similarity index 96% rename from src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue rename to src/components/admin/configuration/queryStore/DeleteQueryStoreModal.vue index a623deb..f8b3197 100644 --- a/src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue +++ b/src/components/admin/configuration/queryStore/DeleteQueryStoreModal.vue @@ -31,7 +31,7 @@ import { useModalStore } from "@/stores/modal"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; -import { useQueryStoreStore } from "@/stores/admin/settings/queryStore"; +import { useQueryStoreStore } from "@/stores/admin/configuration/queryStore"; @@ -45,7 +45,9 @@ export default defineComponent({ }, openDeleteModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/settings/queryStore/DeleteQueryStoreModal.vue"))), + markRaw( + defineAsyncComponent(() => import("@/components/admin/configuration/queryStore/DeleteQueryStoreModal.vue")) + ), this.queryItem.id ); }, diff --git a/src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue b/src/components/admin/configuration/queryStore/UpdateQueryStoreModal.vue similarity index 91% rename from src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue rename to src/components/admin/configuration/queryStore/UpdateQueryStoreModal.vue index 82b10f4..2148bf5 100644 --- a/src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue +++ b/src/components/admin/configuration/queryStore/UpdateQueryStoreModal.vue @@ -36,8 +36,8 @@ import { useModalStore } from "@/stores/modal"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; -import { useQueryStoreStore } from "@/stores/admin/settings/queryStore"; -import type { CreateQueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/settings/query.models"; +import { useQueryStoreStore } from "@/stores/admin/configuration/queryStore"; +import type { CreateQueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/configuration/query.models"; import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder"; @@ -67,7 +67,9 @@ export default defineComponent({ ...mapActions(useQueryStoreStore, ["updateActiveQueryStore"]), changeToCreate() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/settings/queryStore/CreateQueryStoreModal.vue"))) + markRaw( + defineAsyncComponent(() => import("@/components/admin/configuration/queryStore/CreateQueryStoreModal.vue")) + ) ); }, triggerUpdate() { diff --git a/src/components/admin/settings/salutation/CreateSalutationModal.vue b/src/components/admin/configuration/salutation/CreateSalutationModal.vue similarity index 95% rename from src/components/admin/settings/salutation/CreateSalutationModal.vue rename to src/components/admin/configuration/salutation/CreateSalutationModal.vue index 3efc6de..fd0b610 100644 --- a/src/components/admin/settings/salutation/CreateSalutationModal.vue +++ b/src/components/admin/configuration/salutation/CreateSalutationModal.vue @@ -34,8 +34,8 @@ 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"; +import { useSalutationStore } from "@/stores/admin/configuration/salutation"; +import type { CreateSalutationViewModel } from "@/viewmodels/admin/configuration/salutation.models"; diff --git a/src/components/admin/settings/templateUsage/TemplatePreviewModal.vue b/src/components/admin/configuration/templateUsage/TemplatePreviewModal.vue similarity index 91% rename from src/components/admin/settings/templateUsage/TemplatePreviewModal.vue rename to src/components/admin/configuration/templateUsage/TemplatePreviewModal.vue index e3d5d77..dbe69e2 100644 --- a/src/components/admin/settings/templateUsage/TemplatePreviewModal.vue +++ b/src/components/admin/configuration/templateUsage/TemplatePreviewModal.vue @@ -14,7 +14,7 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import { useModalStore } from "@/stores/modal"; import Spinner from "@/components/Spinner.vue"; -import { useTemplateUsageStore } from "@/stores/admin/settings/templateUsage"; +import { useTemplateUsageStore } from "@/stores/admin/configuration/templateUsage"; diff --git a/src/components/admin/user/backup/UploadBackupModal.vue b/src/components/admin/management/backup/UploadBackupModal.vue similarity index 97% rename from src/components/admin/user/backup/UploadBackupModal.vue rename to src/components/admin/management/backup/UploadBackupModal.vue index 8b194b1..fc627a3 100644 --- a/src/components/admin/user/backup/UploadBackupModal.vue +++ b/src/components/admin/management/backup/UploadBackupModal.vue @@ -51,7 +51,7 @@ import { useModalStore } from "@/stores/modal"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; -import { useBackupStore } from "@/stores/admin/user/backup"; +import { useBackupStore } from "@/stores/admin/management/backup"; diff --git a/src/views/account/Me.vue b/src/views/account/Me.vue index 8e2990e..af500de 100644 --- a/src/views/account/Me.vue +++ b/src/views/account/Me.vue @@ -48,7 +48,7 @@ @@ -44,7 +44,7 @@ export default defineComponent({ ...mapActions(useModalStore, ["openModal"]), openCreateModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/settings/award/CreateAwardModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/configuration/award/CreateAwardModal.vue"))) ); }, }, diff --git a/src/views/admin/settings/award/AwardEdit.vue b/src/views/admin/configuration/award/AwardEdit.vue similarity index 97% rename from src/views/admin/settings/award/AwardEdit.vue rename to src/views/admin/configuration/award/AwardEdit.vue index 9cff484..b85350d 100644 --- a/src/views/admin/settings/award/AwardEdit.vue +++ b/src/views/admin/configuration/award/AwardEdit.vue @@ -40,12 +40,12 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useAwardStore } from "@/stores/admin/settings/award"; +import { useAwardStore } from "@/stores/admin/configuration/award"; 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 { AwardViewModel, UpdateAwardViewModel } from "@/viewmodels/admin/settings/award.models"; +import type { AwardViewModel, UpdateAwardViewModel } from "@/viewmodels/admin/configuration/award.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; diff --git a/src/views/admin/settings/calendarType/CalendarType.vue b/src/views/admin/configuration/calendarType/CalendarType.vue similarity index 82% rename from src/views/admin/settings/calendarType/CalendarType.vue rename to src/views/admin/configuration/calendarType/CalendarType.vue index fcc314d..3a25c07 100644 --- a/src/views/admin/settings/calendarType/CalendarType.vue +++ b/src/views/admin/configuration/calendarType/CalendarType.vue @@ -28,8 +28,8 @@ import { defineComponent, defineAsyncComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType"; -import CalendarTypeListItem from "@/components/admin/settings/calendarType/CalendarTypeListItem.vue"; +import { useCalendarTypeStore } from "@/stores/admin/configuration/calendarType"; +import CalendarTypeListItem from "@/components/admin/configuration/calendarType/CalendarTypeListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -49,7 +49,9 @@ export default defineComponent({ openCreateModal() { this.openModal( markRaw( - defineAsyncComponent(() => import("@/components/admin/settings/calendarType/CreateCalendarTypeModal.vue")) + defineAsyncComponent( + () => import("@/components/admin/configuration/calendarType/CreateCalendarTypeModal.vue") + ) ) ); }, diff --git a/src/views/admin/settings/calendarType/CalendarTypeEdit.vue b/src/views/admin/configuration/calendarType/CalendarTypeEdit.vue similarity index 96% rename from src/views/admin/settings/calendarType/CalendarTypeEdit.vue rename to src/views/admin/configuration/calendarType/CalendarTypeEdit.vue index 83785c1..d9e407f 100644 --- a/src/views/admin/settings/calendarType/CalendarTypeEdit.vue +++ b/src/views/admin/configuration/calendarType/CalendarTypeEdit.vue @@ -53,7 +53,7 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType"; +import { useCalendarTypeStore } from "@/stores/admin/configuration/calendarType"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; @@ -61,7 +61,7 @@ import { RouterLink } from "vue-router"; import type { CalendarTypeViewModel, UpdateCalendarTypeViewModel, -} from "@/viewmodels/admin/settings/calendarType.models"; +} from "@/viewmodels/admin/configuration/calendarType.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; diff --git a/src/views/admin/settings/communicationType/CommunicationType.vue b/src/views/admin/configuration/communicationType/CommunicationType.vue similarity index 75% rename from src/views/admin/settings/communicationType/CommunicationType.vue rename to src/views/admin/configuration/communicationType/CommunicationType.vue index e4a4664..d4ab34d 100644 --- a/src/views/admin/settings/communicationType/CommunicationType.vue +++ b/src/views/admin/configuration/communicationType/CommunicationType.vue @@ -15,7 +15,12 @@ />
-
@@ -28,8 +33,8 @@ import { defineComponent, defineAsyncComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType"; -import CommunicationTypeListItem from "@/components/admin/settings/communicationType/CommunicationTypeListItem.vue"; +import { useCommunicationTypeStore } from "@/stores/admin/configuration/communicationType"; +import CommunicationTypeListItem from "@/components/admin/configuration/communicationType/CommunicationTypeListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -50,7 +55,7 @@ export default defineComponent({ this.openModal( markRaw( defineAsyncComponent( - () => import("@/components/admin/settings/communicationType/CreateCommunicationTypeModal.vue") + () => import("@/components/admin/configuration/communicationType/CreateCommunicationTypeModal.vue") ) ) ); diff --git a/src/views/admin/settings/communicationType/CommunicationTypeEdit.vue b/src/views/admin/configuration/communicationType/CommunicationTypeEdit.vue similarity index 97% rename from src/views/admin/settings/communicationType/CommunicationTypeEdit.vue rename to src/views/admin/configuration/communicationType/CommunicationTypeEdit.vue index 5ba1628..08804ff 100644 --- a/src/views/admin/settings/communicationType/CommunicationTypeEdit.vue +++ b/src/views/admin/configuration/communicationType/CommunicationTypeEdit.vue @@ -85,7 +85,7 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType"; +import { useCommunicationTypeStore } from "@/stores/admin/configuration/communicationType"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; @@ -93,7 +93,7 @@ import { RouterLink } from "vue-router"; import type { CommunicationTypeViewModel, UpdateCommunicationTypeViewModel, -} from "@/viewmodels/admin/settings/communicationType.models"; +} from "@/viewmodels/admin/configuration/communicationType.models"; import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue"; import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid"; import cloneDeep from "lodash.clonedeep"; diff --git a/src/views/admin/settings/executivePosition/ExecutivePosition.vue b/src/views/admin/configuration/executivePosition/ExecutivePosition.vue similarity index 84% rename from src/views/admin/settings/executivePosition/ExecutivePosition.vue rename to src/views/admin/configuration/executivePosition/ExecutivePosition.vue index e8ea8fe..000dc21 100644 --- a/src/views/admin/settings/executivePosition/ExecutivePosition.vue +++ b/src/views/admin/configuration/executivePosition/ExecutivePosition.vue @@ -33,8 +33,8 @@ import { defineComponent, defineAsyncComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition"; -import ExecutivePositionListItem from "@/components/admin/settings/executivePosition/ExecutivePositionListItem.vue"; +import { useExecutivePositionStore } from "@/stores/admin/configuration/executivePosition"; +import ExecutivePositionListItem from "@/components/admin/configuration/executivePosition/ExecutivePositionListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -55,7 +55,7 @@ export default defineComponent({ this.openModal( markRaw( defineAsyncComponent( - () => import("@/components/admin/settings/executivePosition/CreateExecutivePositionModal.vue") + () => import("@/components/admin/configuration/executivePosition/CreateExecutivePositionModal.vue") ) ) ); diff --git a/src/views/admin/settings/executivePosition/ExecutivePositionEdit.vue b/src/views/admin/configuration/executivePosition/ExecutivePositionEdit.vue similarity index 96% rename from src/views/admin/settings/executivePosition/ExecutivePositionEdit.vue rename to src/views/admin/configuration/executivePosition/ExecutivePositionEdit.vue index 9fcb863..50175e3 100644 --- a/src/views/admin/settings/executivePosition/ExecutivePositionEdit.vue +++ b/src/views/admin/configuration/executivePosition/ExecutivePositionEdit.vue @@ -40,7 +40,7 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition"; +import { useExecutivePositionStore } from "@/stores/admin/configuration/executivePosition"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; @@ -48,7 +48,7 @@ import { RouterLink } from "vue-router"; import type { ExecutivePositionViewModel, UpdateExecutivePositionViewModel, -} from "@/viewmodels/admin/settings/executivePosition.models"; +} from "@/viewmodels/admin/configuration/executivePosition.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; diff --git a/src/views/admin/settings/membershipStatus/MembershipStatus.vue b/src/views/admin/configuration/membershipStatus/MembershipStatus.vue similarity index 83% rename from src/views/admin/settings/membershipStatus/MembershipStatus.vue rename to src/views/admin/configuration/membershipStatus/MembershipStatus.vue index 8216e31..db5c19c 100644 --- a/src/views/admin/settings/membershipStatus/MembershipStatus.vue +++ b/src/views/admin/configuration/membershipStatus/MembershipStatus.vue @@ -24,8 +24,8 @@ import { defineComponent, defineAsyncComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus"; -import MembershipStatusListItem from "@/components/admin/settings/membershipStatus/MembershipStatusListItem.vue"; +import { useMembershipStatusStore } from "@/stores/admin/configuration/membershipStatus"; +import MembershipStatusListItem from "@/components/admin/configuration/membershipStatus/MembershipStatusListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -46,7 +46,7 @@ export default defineComponent({ this.openModal( markRaw( defineAsyncComponent( - () => import("@/components/admin/settings/membershipStatus/CreateMembershipStatusModal.vue") + () => import("@/components/admin/configuration/membershipStatus/CreateMembershipStatusModal.vue") ) ) ); diff --git a/src/views/admin/settings/membershipStatus/MembershipStatusEdit.vue b/src/views/admin/configuration/membershipStatus/MembershipStatusEdit.vue similarity index 96% rename from src/views/admin/settings/membershipStatus/MembershipStatusEdit.vue rename to src/views/admin/configuration/membershipStatus/MembershipStatusEdit.vue index cd41e26..18e8027 100644 --- a/src/views/admin/settings/membershipStatus/MembershipStatusEdit.vue +++ b/src/views/admin/configuration/membershipStatus/MembershipStatusEdit.vue @@ -40,7 +40,7 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus"; +import { useMembershipStatusStore } from "@/stores/admin/configuration/membershipStatus"; import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; @@ -48,7 +48,7 @@ import { RouterLink } from "vue-router"; import type { UpdateMembershipStatusViewModel, MembershipStatusViewModel, -} from "@/viewmodels/admin/settings/membershipStatus.models"; +} from "@/viewmodels/admin/configuration/membershipStatus.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; diff --git a/src/views/admin/settings/newsletterConfig/NewsletterConfig.vue b/src/views/admin/configuration/newsletterConfig/NewsletterConfig.vue similarity index 65% rename from src/views/admin/settings/newsletterConfig/NewsletterConfig.vue rename to src/views/admin/configuration/newsletterConfig/NewsletterConfig.vue index 4775587..d87cc74 100644 --- a/src/views/admin/settings/newsletterConfig/NewsletterConfig.vue +++ b/src/views/admin/configuration/newsletterConfig/NewsletterConfig.vue @@ -7,10 +7,10 @@ @@ -18,29 +18,29 @@ diff --git a/src/views/admin/settings/qualification/Qualification.vue b/src/views/admin/configuration/qualification/Qualification.vue similarity index 82% rename from src/views/admin/settings/qualification/Qualification.vue rename to src/views/admin/configuration/qualification/Qualification.vue index c2bf690..ea30d99 100644 --- a/src/views/admin/settings/qualification/Qualification.vue +++ b/src/views/admin/configuration/qualification/Qualification.vue @@ -28,8 +28,8 @@ import { defineComponent, defineAsyncComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useQualificationStore } from "@/stores/admin/settings/qualification"; -import QualificationListItem from "@/components/admin/settings/qualification/QualificationListItem.vue"; +import { useQualificationStore } from "@/stores/admin/configuration/qualification"; +import QualificationListItem from "@/components/admin/configuration/qualification/QualificationListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -49,7 +49,9 @@ export default defineComponent({ openCreateModal() { this.openModal( markRaw( - defineAsyncComponent(() => import("@/components/admin/settings/qualification/CreateQualificationModal.vue")) + defineAsyncComponent( + () => import("@/components/admin/configuration/qualification/CreateQualificationModal.vue") + ) ) ); }, diff --git a/src/views/admin/settings/qualification/QualificationEdit.vue b/src/views/admin/configuration/qualification/QualificationEdit.vue similarity index 94% rename from src/views/admin/settings/qualification/QualificationEdit.vue rename to src/views/admin/configuration/qualification/QualificationEdit.vue index c973ece..71a5d30 100644 --- a/src/views/admin/settings/qualification/QualificationEdit.vue +++ b/src/views/admin/configuration/qualification/QualificationEdit.vue @@ -44,12 +44,15 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useQualificationStore } from "@/stores/admin/settings/qualification"; +import { useQualificationStore } from "@/stores/admin/configuration/qualification"; 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 { UpdateQualificationViewModel, QualificationViewModel } from "@/viewmodels/admin/settings/qualification.models"; +import type { + UpdateQualificationViewModel, + QualificationViewModel, +} from "@/viewmodels/admin/configuration/qualification.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; diff --git a/src/views/admin/settings/queryStore/QueryStore.vue b/src/views/admin/configuration/queryStore/QueryStore.vue similarity index 90% rename from src/views/admin/settings/queryStore/QueryStore.vue rename to src/views/admin/configuration/queryStore/QueryStore.vue index ebd45e6..09d57bb 100644 --- a/src/views/admin/settings/queryStore/QueryStore.vue +++ b/src/views/admin/configuration/queryStore/QueryStore.vue @@ -32,8 +32,8 @@ import { mapState, mapActions, mapWritableState } from "pinia"; import MainTemplate from "@/templates/Main.vue"; import { useAbilityStore } from "@/stores/ability"; import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder"; -import { useQueryStoreStore } from "@/stores/admin/settings/queryStore"; -import QueryStoreListItem from "@/components/admin/settings/queryStore/QueryStoreListItem.vue"; +import { useQueryStoreStore } from "@/stores/admin/configuration/queryStore"; +import QueryStoreListItem from "@/components/admin/configuration/queryStore/QueryStoreListItem.vue"; @@ -44,7 +44,9 @@ export default defineComponent({ ...mapActions(useModalStore, ["openModal"]), openCreateModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/settings/salutation/CreateSalutationModal.vue"))) + markRaw( + defineAsyncComponent(() => import("@/components/admin/configuration/salutation/CreateSalutationModal.vue")) + ) ); }, }, diff --git a/src/views/admin/settings/salutation/SalutationEdit.vue b/src/views/admin/configuration/salutation/SalutationEdit.vue similarity index 94% rename from src/views/admin/settings/salutation/SalutationEdit.vue rename to src/views/admin/configuration/salutation/SalutationEdit.vue index 35def41..51d49f5 100644 --- a/src/views/admin/settings/salutation/SalutationEdit.vue +++ b/src/views/admin/configuration/salutation/SalutationEdit.vue @@ -40,12 +40,15 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useSalutationStore } from "@/stores/admin/settings/salutation"; +import { useSalutationStore } from "@/stores/admin/configuration/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 type { + SalutationViewModel, + UpdateSalutationViewModel, +} from "@/viewmodels/admin/configuration/salutation.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; diff --git a/src/views/admin/settings/template/Template.vue b/src/views/admin/configuration/template/Template.vue similarity index 88% rename from src/views/admin/settings/template/Template.vue rename to src/views/admin/configuration/template/Template.vue index a6b648b..caad0a6 100644 --- a/src/views/admin/settings/template/Template.vue +++ b/src/views/admin/configuration/template/Template.vue @@ -27,8 +27,8 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import TemplateListItem from "@/components/admin/settings/template/TemplateListItem.vue"; -import { useTemplateStore } from "@/stores/admin/settings/template"; +import TemplateListItem from "@/components/admin/configuration/template/TemplateListItem.vue"; +import { useTemplateStore } from "@/stores/admin/configuration/template"; import { useAbilityStore } from "@/stores/ability"; import { useModalStore } from "@/stores/modal"; import { RouterLink } from "vue-router"; @@ -49,7 +49,7 @@ export default defineComponent({ ...mapActions(useModalStore, ["openModal"]), openCreateModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/settings/template/CreateTemplateModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/configuration/template/CreateTemplateModal.vue"))) ); }, }, diff --git a/src/views/admin/settings/template/TemplateEdit.vue b/src/views/admin/configuration/template/TemplateEdit.vue similarity index 97% rename from src/views/admin/settings/template/TemplateEdit.vue rename to src/views/admin/configuration/template/TemplateEdit.vue index a8d7e8a..e5376f6 100644 --- a/src/views/admin/settings/template/TemplateEdit.vue +++ b/src/views/admin/configuration/template/TemplateEdit.vue @@ -54,8 +54,8 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; import { RouterLink } from "vue-router"; import { configureEditor } from "@/helpers/grapesEditor"; -import type { TemplateViewModel, UpdateTemplateViewModel } from "@/viewmodels/admin/settings/template.models"; -import { useTemplateStore } from "@/stores/admin/settings/template"; +import type { TemplateViewModel, UpdateTemplateViewModel } from "@/viewmodels/admin/configuration/template.models"; +import { useTemplateStore } from "@/stores/admin/configuration/template"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; import grapesjs, { Editor } from "grapesjs"; diff --git a/src/views/admin/settings/template/UsageInfo.vue b/src/views/admin/configuration/template/UsageInfo.vue similarity index 100% rename from src/views/admin/settings/template/UsageInfo.vue rename to src/views/admin/configuration/template/UsageInfo.vue diff --git a/src/views/admin/settings/templateUsage/TemplateUsage.vue b/src/views/admin/configuration/templateUsage/TemplateUsage.vue similarity index 77% rename from src/views/admin/settings/templateUsage/TemplateUsage.vue rename to src/views/admin/configuration/templateUsage/TemplateUsage.vue index ac08bef..5dcfd37 100644 --- a/src/views/admin/settings/templateUsage/TemplateUsage.vue +++ b/src/views/admin/configuration/templateUsage/TemplateUsage.vue @@ -15,9 +15,9 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useTemplateUsageStore } from "@/stores/admin/settings/templateUsage"; -import TemplateUsageListItem from "@/components/admin/settings/templateUsage/TemplateUsageListItem.vue"; -import { useTemplateStore } from "@/stores/admin/settings/template"; +import { useTemplateUsageStore } from "@/stores/admin/configuration/templateUsage"; +import TemplateUsageListItem from "@/components/admin/configuration/templateUsage/TemplateUsageListItem.vue"; +import { useTemplateStore } from "@/stores/admin/configuration/template"; @@ -65,12 +65,12 @@ export default defineComponent({ ...mapActions(useModalStore, ["openModal"]), openCreateModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/CreateBackupModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/management/backup/CreateBackupModal.vue"))) ); }, openUploadModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/UploadBackupModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/management/backup/UploadBackupModal.vue"))) ); }, }, diff --git a/src/views/admin/user/backup/GeneratedBackup.vue b/src/views/admin/management/backup/GeneratedBackup.vue similarity index 83% rename from src/views/admin/user/backup/GeneratedBackup.vue rename to src/views/admin/management/backup/GeneratedBackup.vue index b42d93b..22446c1 100644 --- a/src/views/admin/user/backup/GeneratedBackup.vue +++ b/src/views/admin/management/backup/GeneratedBackup.vue @@ -15,8 +15,8 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useBackupStore } from "@/stores/admin/user/backup"; -import BackupListItem from "@/components/admin/user/backup/BackupListItem.vue"; +import { useBackupStore } from "@/stores/admin/management/backup"; +import BackupListItem from "@/components/admin/management/backup/BackupListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -35,12 +35,12 @@ export default defineComponent({ ...mapActions(useModalStore, ["openModal"]), openCreateModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/CreateBackupModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/management/backup/CreateBackupModal.vue"))) ); }, openUploadModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/UploadBackupModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/management/backup/UploadBackupModal.vue"))) ); }, }, diff --git a/src/views/admin/user/backup/UploadedBackup.vue b/src/views/admin/management/backup/UploadedBackup.vue similarity index 83% rename from src/views/admin/user/backup/UploadedBackup.vue rename to src/views/admin/management/backup/UploadedBackup.vue index b5f975c..4915a21 100644 --- a/src/views/admin/user/backup/UploadedBackup.vue +++ b/src/views/admin/management/backup/UploadedBackup.vue @@ -15,8 +15,8 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useBackupStore } from "@/stores/admin/user/backup"; -import BackupListItem from "@/components/admin/user/backup/BackupListItem.vue"; +import { useBackupStore } from "@/stores/admin/management/backup"; +import BackupListItem from "@/components/admin/management/backup/BackupListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -35,12 +35,12 @@ export default defineComponent({ ...mapActions(useModalStore, ["openModal"]), openCreateModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/CreateBackupModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/management/backup/CreateBackupModal.vue"))) ); }, openUploadModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/UploadBackupModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/management/backup/UploadBackupModal.vue"))) ); }, }, diff --git a/src/views/admin/user/role/Role.vue b/src/views/admin/management/role/Role.vue similarity index 82% rename from src/views/admin/user/role/Role.vue rename to src/views/admin/management/role/Role.vue index 346210e..256c0c5 100644 --- a/src/views/admin/user/role/Role.vue +++ b/src/views/admin/management/role/Role.vue @@ -24,8 +24,8 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useRoleStore } from "@/stores/admin/user/role"; -import RoleListItem from "@/components/admin/user/role/RoleListItem.vue"; +import { useRoleStore } from "@/stores/admin/management/role"; +import RoleListItem from "@/components/admin/management/role/RoleListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -43,7 +43,9 @@ export default defineComponent({ ...mapActions(useRoleStore, ["fetchRoles"]), ...mapActions(useModalStore, ["openModal"]), openCreateModal() { - this.openModal(markRaw(defineAsyncComponent(() => import("@/components/admin/user/role/CreateRoleModal.vue")))); + this.openModal( + markRaw(defineAsyncComponent(() => import("@/components/admin/management/role/CreateRoleModal.vue"))) + ); }, }, }); diff --git a/src/views/admin/user/role/RoleEdit.vue b/src/views/admin/management/role/RoleEdit.vue similarity index 96% rename from src/views/admin/user/role/RoleEdit.vue rename to src/views/admin/management/role/RoleEdit.vue index aea09de..714bdfc 100644 --- a/src/views/admin/user/role/RoleEdit.vue +++ b/src/views/admin/management/role/RoleEdit.vue @@ -40,14 +40,14 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useRoleStore } from "@/stores/admin/user/role"; +import { useRoleStore } from "@/stores/admin/management/role"; 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 { RoleViewModel } from "@/viewmodels/admin/user/role.models"; +import type { RoleViewModel } from "@/viewmodels/admin/management/role.models"; @@ -47,7 +47,9 @@ export default defineComponent({ ...mapActions(useUserStore, ["fetchUsers"]), ...mapActions(useModalStore, ["openModal"]), inviteUser() { - this.openModal(markRaw(defineAsyncComponent(() => import("@/components/admin/user/user/InviteUserModal.vue")))); + this.openModal( + markRaw(defineAsyncComponent(() => import("@/components/admin/management/user/InviteUserModal.vue"))) + ); }, }, }); diff --git a/src/views/admin/user/user/UserEdit.vue b/src/views/admin/management/user/UserEdit.vue similarity index 97% rename from src/views/admin/user/user/UserEdit.vue rename to src/views/admin/management/user/UserEdit.vue index 05e4898..53554f7 100644 --- a/src/views/admin/user/user/UserEdit.vue +++ b/src/views/admin/management/user/UserEdit.vue @@ -56,8 +56,8 @@ import Spinner from "@/components/Spinner.vue"; import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; import { RouterLink } from "vue-router"; -import { useUserStore } from "@/stores/admin/user/user"; -import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user/user.models"; +import { useUserStore } from "@/stores/admin/management/user"; +import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/management/user.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; diff --git a/src/views/admin/user/user/UserEditPermission.vue b/src/views/admin/management/user/UserEditPermission.vue similarity index 94% rename from src/views/admin/user/user/UserEditPermission.vue rename to src/views/admin/management/user/UserEditPermission.vue index b34dd62..ea374bc 100644 --- a/src/views/admin/user/user/UserEditPermission.vue +++ b/src/views/admin/management/user/UserEditPermission.vue @@ -28,9 +28,9 @@ import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; import Permission from "@/components/admin/Permission.vue"; import Spinner from "@/components/Spinner.vue"; -import { useUserStore } from "@/stores/admin/user/user"; +import { useUserStore } from "@/stores/admin/management/user"; import type { PermissionObject } from "@/types/permissionTypes"; -import type { UserViewModel } from "@/viewmodels/admin/user/user.models"; +import type { UserViewModel } from "@/viewmodels/admin/management/user.models"; diff --git a/src/views/admin/user/version/VersionDisplay.vue b/src/views/admin/management/version/VersionDisplay.vue similarity index 100% rename from src/views/admin/user/version/VersionDisplay.vue rename to src/views/admin/management/version/VersionDisplay.vue diff --git a/src/views/admin/user/webapi/Webapi.vue b/src/views/admin/management/webapi/Webapi.vue similarity index 88% rename from src/views/admin/user/webapi/Webapi.vue rename to src/views/admin/management/webapi/Webapi.vue index 75f264f..4c6683b 100644 --- a/src/views/admin/user/webapi/Webapi.vue +++ b/src/views/admin/management/webapi/Webapi.vue @@ -24,8 +24,8 @@ 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 { useWebapiStore } from "@/stores/admin/management/webapi"; +import WebapiListItem from "@/components/admin/management/webapi/WebapiListItem.vue"; import { useModalStore } from "@/stores/modal"; import { useAbilityStore } from "@/stores/ability"; @@ -44,7 +44,7 @@ export default defineComponent({ ...mapActions(useModalStore, ["openModal"]), openCreateModal() { this.openModal( - markRaw(defineAsyncComponent(() => import("@/components/admin/user/webapi/CreateWebapiModal.vue"))) + markRaw(defineAsyncComponent(() => import("@/components/admin/management/webapi/CreateWebapiModal.vue"))) ); }, }, diff --git a/src/views/admin/user/webapi/WebapiEdit.vue b/src/views/admin/management/webapi/WebapiEdit.vue similarity index 97% rename from src/views/admin/user/webapi/WebapiEdit.vue rename to src/views/admin/management/webapi/WebapiEdit.vue index 8eb85f7..84f6743 100644 --- a/src/views/admin/user/webapi/WebapiEdit.vue +++ b/src/views/admin/management/webapi/WebapiEdit.vue @@ -44,14 +44,14 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useWebapiStore } from "@/stores/admin/user/webapi"; +import { useWebapiStore } from "@/stores/admin/management/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 { UpdateWebapiViewModel, WebapiViewModel } from "@/viewmodels/admin/management/webapi.models"; import type { Update } from "vite/types/hmrPayload.js"; diff --git a/src/views/admin/user/webapi/WebapiEditPermission.vue b/src/views/admin/management/webapi/WebapiEditPermission.vue similarity index 94% rename from src/views/admin/user/webapi/WebapiEditPermission.vue rename to src/views/admin/management/webapi/WebapiEditPermission.vue index 44b6020..823ab58 100644 --- a/src/views/admin/user/webapi/WebapiEditPermission.vue +++ b/src/views/admin/management/webapi/WebapiEditPermission.vue @@ -25,11 +25,11 @@ import { defineComponent } from "vue"; import { mapState, mapActions } from "pinia"; import MainTemplate from "@/templates/Main.vue"; -import { useWebapiStore } from "@/stores/admin/user/webapi"; +import { useWebapiStore } from "@/stores/admin/management/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"; +import type { WebapiViewModel } from "@/viewmodels/admin/management/webapi.models";