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

Merge branch 'milestone/ff-admin-unit' into unit/#70-build-ui-demo

Browse source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/router/club/newsletterGuard.ts
#	src/router/club/protocolGuard.ts
#	src/router/index.ts
#	src/types/permissionTypes.ts
#	src/views/admin/club/newsletter/NewsletterRecipients.vue
This commit is contained in:
Julian Krauser 2025-05-09 12:29:30 +02:00
commit bdc139f37f
107 changed files with 4984 additions and 1742 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/viewmodels/admin/club/calendar.models.ts
View file

@ -1,4 +1,4 @@
import type { CalendarTypeViewModel } from "../configuration/calendarType.models";
import type { CalendarTypeViewModel } from "@/viewmodels/admin/configuration/calendarType.models";
export interface CalendarViewModel {
id: string;

2
src/viewmodels/admin/club/member/communication.models.ts
View file

@ -1,4 +1,4 @@
import type { CommunicationTypeViewModel } from "../../configuration/communicationType.models";
import type { CommunicationTypeViewModel } from "@/viewmodels/admin/configuration/communicationType.models";
export interface CommunicationViewModel {
id: number;

2
src/viewmodels/admin/club/member/member.models.ts
View file

@ -1,6 +1,6 @@
import type { CommunicationViewModel } from "./communication.models";
import type { MembershipViewModel } from "./membership.models";
import type { SalutationViewModel } from "../../configuration/salutation.models";
import type { SalutationViewModel } from "@/viewmodels/admin/configuration/salutation.models";
export interface MemberViewModel {
id: string;

3
src/viewmodels/admin/club/newsletter/newsletter.models.ts
View file

@ -1,5 +1,3 @@
import type { QueryViewModel } from "../../configuration/query.models";
export interface NewsletterViewModel {
id: number;
title: string;
@ -9,7 +7,6 @@ export interface NewsletterViewModel {
newsletterSignatur: string;
isSent: boolean;
recipientsByQueryId?: string | null;
recipientsByQuery?: QueryViewModel | null;
}
export interface CreateNewsletterViewModel {

2
src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
View file

@ -1,4 +1,4 @@
import type { CalendarViewModel } from "../calendar.models";
import type { CalendarViewModel } from "@/viewmodels/admin/club/calendar.models";
export interface NewsletterDatesViewModel {
newsletterId: number;

2
src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
View file

@ -1,4 +1,4 @@
import type { MemberViewModel } from "../member/member.models";
import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
export interface NewsletterRecipientsViewModel {
newsletterId: number;

6
src/viewmodels/admin/configuration/newsletterConfig.models.ts
View file

@ -1,13 +1,13 @@
import type { NewsletterConfigType } from "@/enums/newsletterConfigType";
import type { NewsletterConfigEnum } from "@/enums/newsletterConfigEnum";
import type { CommunicationTypeViewModel } from "./communicationType.models";
export interface NewsletterConfigViewModel {
comTypeId: number;
config: NewsletterConfigType;
config: NewsletterConfigEnum;
comType: CommunicationTypeViewModel;
}
export interface SetNewsletterConfigViewModel {
comTypeId: number;
config: NewsletterConfigType;
config: NewsletterConfigEnum;
}

2
src/viewmodels/admin/management/backup.models.ts
View file

@ -1,4 +1,4 @@
import type { BackupSection } from "../../../types/backupTypes";
import type { BackupSection } from "@/types/backupTypes";
export interface BackupRestoreViewModel {
filename: string;