diff --git a/src/app/app.component.html b/src/app/app.component.html index 0e5599c..321da3c 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -3,4 +3,3 @@
- diff --git a/src/app/modules/brand/new-user/new-user.component.html b/src/app/modules/brand/new-user/new-user.component.html index e521165..423707f 100644 --- a/src/app/modules/brand/new-user/new-user.component.html +++ b/src/app/modules/brand/new-user/new-user.component.html @@ -1,13 +1,10 @@
@if (user$ | async; as user) { -
-
WILLKOMMEN
-
{{ user.name }}
-
- Es wurden noch keine Berechtigungen zugeteilt, bitte wende Dich an den - Administrator! -
-
+
+
WILLKOMMEN
+
{{ user.name }}
+
Es wurden noch keine Berechtigungen zugeteilt, bitte wende Dich an den Administrator!
+
}
diff --git a/src/app/modules/guest/guest.component.html b/src/app/modules/guest/guest.component.html index 17550dc..9e8b63f 100644 --- a/src/app/modules/guest/guest.component.html +++ b/src/app/modules/guest/guest.component.html @@ -1,28 +1,23 @@ @if (show$|async; as show) { -
-
-
{{ show.showType|showType }}
-
{{ show.date.toDate() | date: 'dd.MM.yyyy' }}
-
-
- - @for (song of show.songs; track trackBy(i, song); let i = $index) { - -
{{ song.title }}
-
- @if (song.artist) { -

{{ song.artist }}

- } -
- - - } - -
+
+
+
{{ show.showType|showType }}
+
{{ show.date.toDate() | date: 'dd.MM.yyyy' }}
+
+ + @for (song of show.songs; track trackBy(i, song); let i = $index) { + +
{{ song.title }}
+
+ @if (song.artist) { +

{{ song.artist }}

+ } +
+ + + } + +
+
} - - diff --git a/src/app/modules/presentation/monitor/legal/legal.component.html b/src/app/modules/presentation/monitor/legal/legal.component.html index ca283f9..8555da2 100644 --- a/src/app/modules/presentation/monitor/legal/legal.component.html +++ b/src/app/modules/presentation/monitor/legal/legal.component.html @@ -1,27 +1,17 @@ -@if (song) { - @if (song.artist) { -

{{ song.artist }}

+@if (song) { @if (song.artist) { +

{{ song.artist }}

+} @if (song.label) { +

{{ song.label }}

+} @if (song.termsOfUse) { +

{{ song.termsOfUse }}

+} @if (song.origin) { +

{{ song.origin }}

+} @if (song.legalOwnerId) { +
+ @if (song.legalOwner === 'CCLI' && config) { +

CCLI-Liednummer {{ song.legalOwnerId }}, CCLI-Lizenznummer {{ config.ccliLicenseId }}

+ } @if (song.legalOwner !== 'CCLI') { +

Liednummer {{ song.legalOwnerId }}

} - @if (song.label) { -

{{ song.label }}

- } - @if (song.termsOfUse) { -

{{ song.termsOfUse }}

- } - @if (song.origin) { -

{{ song.origin }}

- } - @if (song.legalOwnerId) { -
- @if (song.legalOwner === 'CCLI' && config) { -

- CCLI-Liednummer {{ song.legalOwnerId }}, CCLI-Lizenznummer - {{ config.ccliLicenseId }} -

- } - @if (song.legalOwner !== 'CCLI') { -

Liednummer {{ song.legalOwnerId }}

- } -
- } -} +
+} } diff --git a/src/app/modules/presentation/monitor/logo/logo.component.html b/src/app/modules/presentation/monitor/logo/logo.component.html index 6ba6891..f38b8ab 100644 --- a/src/app/modules/presentation/monitor/logo/logo.component.html +++ b/src/app/modules/presentation/monitor/logo/logo.component.html @@ -1,20 +1,9 @@ - + diff --git a/src/app/modules/presentation/monitor/monitor.component.html b/src/app/modules/presentation/monitor/monitor.component.html index ab4a95a..354770c 100644 --- a/src/app/modules/presentation/monitor/monitor.component.html +++ b/src/app/modules/presentation/monitor/monitor.component.html @@ -1,50 +1,43 @@
@if (showType) { -
-
-
-
-
-
- - @if (songId === 'title') { -
-
{{ showType | showType }}
-
{{ date | date: "dd.MM.yyyy" }}
-
- } - @if (songId === 'dynamicText') { -
-
{{ presentationDynamicCaption }}
-
{{ presentationDynamicText }}
-
- } - @if (song && songId !== 'title' && songId !== 'empty' && songId !== 'dynamicText') { - - } - @if (song && songId !== 'title' && songId !== 'empty' && songId !== 'dynamicText') { - - } +
+
+
+
+
+
+ + @if (songId === 'title') { +
+
{{ showType | showType }}
+
{{ date | date: "dd.MM.yyyy" }}
+
+ } @if (songId === 'dynamicText') { +
+
{{ presentationDynamicCaption }}
+
{{ presentationDynamicText }}
+
+ } @if (song && songId !== 'title' && songId !== 'empty' && songId !== 'dynamicText') { + + } @if (song && songId !== 'title' && songId !== 'empty' && songId !== 'dynamicText') { + + } +
} diff --git a/src/app/modules/presentation/remote/remote.component.html b/src/app/modules/presentation/remote/remote.component.html index e7b606e..ba69847 100644 --- a/src/app/modules/presentation/remote/remote.component.html +++ b/src/app/modules/presentation/remote/remote.component.html @@ -1,128 +1,83 @@ @if (show) { -
- - @if (!progress) { -
- @if (show) { -
-
-
Veranstaltung
-
-
-
Leer
-
-
- } +
+ + @if (!progress) { +
+ @if (show) { +
+
+
Veranstaltung
- @for (song of presentationSongs; track trackBy($index, song)) { -
- @if (show) { -
-
- {{ song.title }} -
-
- } - @if (show) { -
- @for (section of song.sections; track section.type + '-' + section.number + '-' + $index; let i = $index) { -
+
Leer
+
+
+ } +
+ @for (song of presentationSongs; track trackBy($index, song)) { +
+ @if (show) { +
+
{{ song.title }}
+
+ } @if (show) { +
+ @for (section of song.sections; track section.type + '-' + section.number + '-' + $index; let i = $index) { +
-
- {{ section.type | sectionType }} {{ section.number + 1 }} -
-
{{ getFirstLine(section) }}
-
- } -
- } -
- } -
- @if (show) { -
-
- Freier Text -
-
- } - - Überschrift - - - - Text - - + class="song-part" + > +
{{ section.type | sectionType }} {{ section.number + 1 }}
+
{{ getFirstLine(section) }}
- @if (show) { -
- - - Hintergrund - - kein Hintergrund - Sternenhimmel - Blätter - Leder - Lobpreis - Bibel - - - - -
- } - @if (show) { - } +
} - -
+
+ } +
+ @if (show) { +
+
Freier Text
+
+ } + + Überschrift + + + + Text + + +
+ @if (show) { +
+ + + Hintergrund + + kein Hintergrund + Sternenhimmel + Blätter + Leder + Lobpreis + Bibel + + + + +
+ } @if (show) { + + } } + +
} diff --git a/src/app/modules/presentation/select/select.component.html b/src/app/modules/presentation/select/select.component.html index 31039cc..6ef0bf4 100644 --- a/src/app/modules/presentation/select/select.component.html +++ b/src/app/modules/presentation/select/select.component.html @@ -1,25 +1,20 @@ @if (shows$ | async; as shows) { -
- @if (visible) { - - @if (!shows.length) { -

- Es ist derzeit keine Veranstaltung vorhanden -

- } - @if (shows.length>0) { -
- @for (show of shows; track show.id) { - - } -
- } - +
+ @if (visible) { + + @if (!shows.length) { +

Es ist derzeit keine Veranstaltung vorhanden

+ } @if (shows.length>0) { +
+ @for (show of shows; track show.id) { + + } +
} -
+ + } +
} diff --git a/src/app/modules/shows/dialog/archive-dialog/archive-dialog.component.html b/src/app/modules/shows/dialog/archive-dialog/archive-dialog.component.html index 69dab3c..25a3ab0 100644 --- a/src/app/modules/shows/dialog/archive-dialog/archive-dialog.component.html +++ b/src/app/modules/shows/dialog/archive-dialog/archive-dialog.component.html @@ -3,7 +3,5 @@
- +
diff --git a/src/app/modules/shows/dialog/report-dialog/report-dialog.component.html b/src/app/modules/shows/dialog/report-dialog/report-dialog.component.html index 03df23a..d1db650 100644 --- a/src/app/modules/shows/dialog/report-dialog/report-dialog.component.html +++ b/src/app/modules/shows/dialog/report-dialog/report-dialog.component.html @@ -1,7 +1,5 @@
-

- Bitte melde die in dieser Veranstaltung verwendeten CCLI-Titel. Die Meldung ist Teil der CCLI-Lizenz und sorgt dafür, dass Songwriter und Verlage korrekt vergütet werden. -

+

Bitte melde die in dieser Veranstaltung verwendeten CCLI-Titel. Die Meldung ist Teil der CCLI-Lizenz und sorgt dafür, dass Songwriter und Verlage korrekt vergütet werden.

Die Meldung erfolgt über {{ reportingUrl }}. @@ -14,31 +12,29 @@

@for (song of data.songs; track song.title + song.ccliNumber) { -
-
{{ song.title }}
-
- {{ song.ccliNumber }} - - - - @if (wasOpened(song.ccliNumber)) { - - } -
-
- } +
+
{{ song.title }}
+
+ {{ song.ccliNumber }} + + + + @if (wasOpened(song.ccliNumber)) { + + } +
+
+ }
- +
diff --git a/src/app/modules/shows/dialog/share-dialog/share-dialog.component.html b/src/app/modules/shows/dialog/share-dialog/share-dialog.component.html index f6ee94f..ac8b892 100644 --- a/src/app/modules/shows/dialog/share-dialog/share-dialog.component.html +++ b/src/app/modules/shows/dialog/share-dialog/share-dialog.component.html @@ -1,13 +1,8 @@
{{ data.url }} -
-
+
- - + +
diff --git a/src/app/modules/shows/dialog/share-dialog/share-dialog.component.ts b/src/app/modules/shows/dialog/share-dialog/share-dialog.component.ts index e4004cd..fa93dad 100644 --- a/src/app/modules/shows/dialog/share-dialog/share-dialog.component.ts +++ b/src/app/modules/shows/dialog/share-dialog/share-dialog.component.ts @@ -25,7 +25,7 @@ export class ShareDialogComponent { const data = this.data; // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment - QRCode.toDataURL(data.url, { + void QRCode.toDataURL(data.url, { type: 'image/jpeg', quality: 0.92, width: 1280, diff --git a/src/app/modules/shows/edit/edit.component.html b/src/app/modules/shows/edit/edit.component.html index fd38b1f..ef4ba6d 100644 --- a/src/app/modules/shows/edit/edit.component.html +++ b/src/app/modules/shows/edit/edit.component.html @@ -6,18 +6,12 @@ @for (key of showTypePublic; track key) { - {{ - key | showType - }} - + {{ key | showType }} } @for (key of showTypePrivate; track key) { - {{ - key | showType - }} - + {{ key | showType }} } diff --git a/src/app/modules/shows/list/filter/filter.component.html b/src/app/modules/shows/list/filter/filter.component.html index 9d4b545..01ab7b3 100644 --- a/src/app/modules/shows/list/filter/filter.component.html +++ b/src/app/modules/shows/list/filter/filter.component.html @@ -1,14 +1,10 @@
-
Zeitraum @for (time of times; track time) { - {{ - time.value - }} - + {{ time.value }} } @@ -18,10 +14,7 @@ Alle @for (owner of owners; track owner) { - {{ - owner.value - }} - + {{ owner.value }} } @@ -32,23 +25,16 @@ Alle @for (key of showTypePublic; track key) { - {{ - key | showType - }} - + {{ key | showType }} } @for (key of showTypePrivate; track key) { - {{ - key | showType - }} - + {{ key | showType }} } -
Anzahl der Suchergebnisse: {{ shows?.length ?? 0 }} diff --git a/src/app/modules/shows/list/list-item/list-item.component.html b/src/app/modules/shows/list/list-item/list-item.component.html index 10e3506..ff9f912 100644 --- a/src/app/modules/shows/list/list-item/list-item.component.html +++ b/src/app/modules/shows/list/list-item/list-item.component.html @@ -1,14 +1,14 @@ @if (show) { -
-
{{ show.date.toDate() | date: "dd.MM.yyyy" }}
-
- -
-
{{ show.showType | showType }}
-
- @if (showStatusBadge) { - {{ showStatusBadge }} - } -
+
+
{{ show.date.toDate() | date: "dd.MM.yyyy" }}
+
+
+
{{ show.showType | showType }}
+
+ @if (showStatusBadge) { + {{ showStatusBadge }} + } +
+
} diff --git a/src/app/modules/shows/list/list.component.html b/src/app/modules/shows/list/list.component.html index cd5b263..fd11a10 100644 --- a/src/app/modules/shows/list/list.component.html +++ b/src/app/modules/shows/list/list.component.html @@ -2,43 +2,30 @@ @if (shows$ | async; as shows) { - + } - @if (privateShows$ | async; as shows) { - @if (shows.length > 0) { - - @for (show of shows | sortBy: 'desc':'date'; track trackBy($index, show)) { - - } - + @if (privateShows$ | async; as shows) { @if (shows.length > 0) { + + @for (show of shows | sortBy: 'desc':'date'; track trackBy($index, show)) { + } - } + + } } - @if (publicShows$ | async; as shows) { - @if (shows.length > 0) { - - @for (show of shows | sortBy: 'desc':'date'; track trackBy($index, show)) { - - } - + @if (publicShows$ | async; as shows) { @if (shows.length > 0) { + + @for (show of shows | sortBy: 'desc':'date'; track trackBy($index, show)) { + } - } + + } }
diff --git a/src/app/modules/shows/list/list.component.ts b/src/app/modules/shows/list/list.component.ts index 9f1fccb..81cfa85 100644 --- a/src/app/modules/shows/list/list.component.ts +++ b/src/app/modules/shows/list/list.component.ts @@ -34,11 +34,7 @@ export class ListComponent { public showType$ = this.filter$.pipe(map((filterValues: FilterValues) => filterValues.showType)); public shows$ = this.showService.list$(); public privateShows$ = combineLatest([this.shows$, this.userService.user$]).pipe( - map(([shows, user]) => - shows - .filter(show => show.owner === user?.id) - .filter(show => !show.published || show.reportedType === 'pending') - ) + map(([shows, user]) => shows.filter(show => show.owner === user?.id).filter(show => !show.published || show.reportedType === 'pending')) ); public queriedPublicShows$ = this.lastMonths$.pipe(switchMap(lastMonths => this.showService.listPublicSince$(lastMonths))); public fallbackPublicShows$ = combineLatest([this.shows$, this.lastMonths$]).pipe( diff --git a/src/app/modules/shows/new/new.component.html b/src/app/modules/shows/new/new.component.html index fcf682b..8ba4050 100644 --- a/src/app/modules/shows/new/new.component.html +++ b/src/app/modules/shows/new/new.component.html @@ -6,18 +6,12 @@ @for (key of showTypePublic; track key) { - {{ - key | showType - }} - + {{ key | showType }} } @for (key of showTypePrivate; track key) { - {{ - key | showType - }} - + {{ key | showType }} } diff --git a/src/app/modules/shows/services/show.service.spec.ts b/src/app/modules/shows/services/show.service.spec.ts index 4ebd38c..84a7892 100644 --- a/src/app/modules/shows/services/show.service.spec.ts +++ b/src/app/modules/shows/services/show.service.spec.ts @@ -16,11 +16,9 @@ describe('ShowService', () => { beforeEach(async () => { user$ = new BehaviorSubject({id: 'user-1'}); - showDataServiceSpy = jasmine.createSpyObj( - 'ShowDataService', - ['read$', 'listPublicSince$', 'update', 'add'], - {list$: of(shows) as unknown as ShowDataService['list$']} - ); + showDataServiceSpy = jasmine.createSpyObj('ShowDataService', ['read$', 'listPublicSince$', 'update', 'add'], { + list$: of(shows) as unknown as ShowDataService['list$'], + }); showDataServiceSpy.read$.and.returnValue(of(shows[0])); showDataServiceSpy.listPublicSince$.and.returnValue(of([shows[1]])); showDataServiceSpy.update.and.resolveTo(); diff --git a/src/app/modules/shows/show/show.component.html b/src/app/modules/shows/show/show.component.html index a22d158..87029b6 100644 --- a/src/app/modules/shows/show/show.component.html +++ b/src/app/modules/shows/show/show.component.html @@ -1,148 +1,110 @@ @if (show$ | async; as show) { -
- + - @if (!useSwiper) { -

{{ show.public ? 'öffentliche' : 'geschlossene' }} Veranstaltung von - - - {{ show.published | publishedType }} - @if (show.reportedType) { - {{ show.reportedType | reportedType }} - } - -

- } -
-
- @if (!useSwiper) { - Text anzeigen - } -
-
- - - -
-
- @if (showSongs && !useSwiper) { -
- @for (song of orderedShowSongs(show); track trackBy(i, song); let i = $index) { -
- -
- } -
- } - @if (useSwiper) { - - @for (song of orderedShowSongs(show); track trackBy(i, song); let i = $index) { - - -
{{ currentTime | date: 'HH:mm' }}
- @if (getNextSong(orderedShowSongs(show), i); as next) { -
{{ next }} - -
- } - - } - - } - @if (songs$ | async; as songs) { - @if (songs && !show.published && !useSwiper) { - + > + @if (!useSwiper) { +

+ {{ show.public ? 'öffentliche' : 'geschlossene' }} Veranstaltung von + + + {{ show.published | publishedType }} + @if (show.reportedType) { + {{ show.reportedType | reportedType }} } + +

+ } +
+
+ @if (!useSwiper) { + Text anzeigen + } +
+
+ + + +
+
+ @if (showSongs && !useSwiper) { +
+ @for (song of orderedShowSongs(show); track trackBy(i, song); let i = $index) { +
+ +
} - @if (!useSwiper) { - - - - @if (!show.archived) { - - Archivieren - - } - @if (show.archived) { - - Wiederherstellen - - } - @if (!show.published) { - - Veröffentlichen - - } - @if (show.published) { - - Veröffentlichung zurückziehen - - } - @if (show.published) { - - Teilen - - } - @if (show.published && show.reportedType === 'pending') { - - Melden - - } - @if (!show.published) { - - Ändern - - } - - - - Herunterladen - - - - Ablauf für Lobpreisgruppe - - - Handout mit Copyright Infos - - - +
+ } @if (useSwiper) { + + @for (song of orderedShowSongs(show); track trackBy(i, song); let i = $index) { + + +
{{ currentTime | date: 'HH:mm' }}
+ @if (getNextSong(orderedShowSongs(show), i); as next) { +
+ {{ next }} + +
+ } + } - -
+ + } @if (songs$ | async; as songs) { @if (songs && !show.published && !useSwiper) { + + } } @if (!useSwiper) { + + + + @if (!show.archived) { + Archivieren + } @if (show.archived) { + Wiederherstellen + } @if (!show.published) { + Veröffentlichen + } @if (show.published) { + Veröffentlichung zurückziehen + } @if (show.published) { + Teilen + } @if (show.published && show.reportedType === 'pending') { + Melden + } @if (!show.published) { + Ändern + } + + + Herunterladen + + Ablauf für Lobpreisgruppe + Handout mit Copyright Infos + + + } + +
} diff --git a/src/app/modules/shows/show/show.component.ts b/src/app/modules/shows/show/show.component.ts index 197b4c8..0bcc3f7 100644 --- a/src/app/modules/shows/show/show.component.ts +++ b/src/app/modules/shows/show/show.component.ts @@ -188,9 +188,12 @@ export class ShowComponent implements OnInit, OnDestroy { width: '350px', }); - dialogRef.afterClosed().pipe(take(1)).subscribe((archive: boolean) => { - if (archive && this.showId != null) void this.setArchiveState(true); - }); + dialogRef + .afterClosed() + .pipe(take(1)) + .subscribe((archive: boolean) => { + if (archive && this.showId != null) void this.setArchiveState(true); + }); } } @@ -230,11 +233,14 @@ export class ShowComponent implements OnInit, OnDestroy { data: {songs}, }); - dialogRef.afterClosed().pipe(take(1)).subscribe((reported: boolean) => { - if (reported) { - void this.showService.update$(show.id, {reportedType: 'reported'}); - } - }); + dialogRef + .afterClosed() + .pipe(take(1)) + .subscribe((reported: boolean) => { + if (reported) { + void this.showService.update$(show.id, {reportedType: 'reported'}); + } + }); } public getStatus(show: Show): string { diff --git a/src/app/modules/shows/show/song/song.component.html b/src/app/modules/shows/show/song/song.component.html index a1f7bcf..65ae9a0 100644 --- a/src/app/modules/shows/show/song/song.component.html +++ b/src/app/modules/shows/show/song/song.component.html @@ -1,113 +1,81 @@ @if (iSong && iSong && show) { -
- @if (show.published || fullscreen) { -
-
{{ iSong.key }}
-
{{ iSong.title }}
+
+ @if (show.published || fullscreen) { +
+
{{ iSong.key }}
+
{{ iSong.title }}
+
+ } @if (!show.published && !fullscreen) { +
+ @if (dragHandle && !edit) { + + } + {{ iSong.title }} + @if (!edit) { +
+
+ @if (iSong.keyOriginal !== iSong.key) { + {{ iSong.keyOriginal }} →  + } + {{ iSong.key }}
- } - @if (!show.published && !fullscreen) { -
- @if (dragHandle && !edit) { - - } - {{ iSong.title }} - @if (!edit) { -
-
- @if (iSong.keyOriginal !== iSong.key) { - {{ iSong.keyOriginal }} →  - } - {{ iSong.key }} -
-
- } - @if (!edit) { - - } - @if (!edit) { - - } -
- @if (!edit) { - - } - } - @if (edit) { - - Songtext - - - } - @if (edit) { -
Es wird nur der Liedtext für dieser Veranstaltung geändert.
- } - @if (edit) { - - Speichern - Verwerfen - - } - @if (!edit && (showText)) { - +
+ } @if (!edit) { + + } @if (!edit) { + }
+ @if (!edit) { + + } } @if (edit) { + + Songtext + + + } @if (edit) { +
Es wird nur der Liedtext für dieser Veranstaltung geändert.
+ } @if (edit) { + + Speichern + Verwerfen + + } @if (!edit && (showText)) { + + } +
} diff --git a/src/app/modules/songs/song-list/filter/filter.component.html b/src/app/modules/songs/song-list/filter/filter.component.html index 4bb62ba..fec3258 100644 --- a/src/app/modules/songs/song-list/filter/filter.component.html +++ b/src/app/modules/songs/song-list/filter/filter.component.html @@ -10,10 +10,7 @@ - kein Filter - @for (type of types; track type) { - {{ - type | songType - }} - + {{ type | songType }} } @@ -23,10 +20,7 @@ - kein Filter - @for (key of keys; track key) { - {{ - key | key - }} - + {{ key | key }} } @@ -36,10 +30,7 @@ - kein Filter - @for (key of legalType; track key) { - {{ - key | legalType - }} - + {{ key | legalType }} } @@ -49,10 +40,7 @@ - kein Filter - @for (flag of getFlags(); track flag) { - {{ - flag - }} - + {{ flag }} } diff --git a/src/app/modules/songs/song-list/song-list.component.html b/src/app/modules/songs/song-list/song-list.component.html index 3fdca8e..f12f95a 100644 --- a/src/app/modules/songs/song-list/song-list.component.html +++ b/src/app/modules/songs/song-list/song-list.component.html @@ -1,45 +1,43 @@ @if (songs$ | async; as songs) { -
- - - - - @for (song of songs; track trackBy($index, song)) { -
-
{{ song.number }}
-
- {{ song.title }} - @if (song.hasChordValidationIssues) { - * - } +
+ + + + + @for (song of songs; track trackBy($index, song)) { +
+
{{ song.number }}
+
+ {{ song.title }} + @if (song.hasChordValidationIssues) { + * + } +
+
+ + @if (song.status === 'draft') { +
+
-
- - @if (song.status === 'draft') { -
- -
- } - @if (song.status === 'set') { -
- -
- } - @if (song.status === 'final') { -
- -
- } - - @if (song.legalType === 'open') { -
- -
- } + } @if (song.status === 'set') { +
+
-
{{ song.key }}
+ } @if (song.status === 'final') { +
+ +
+ } + + @if (song.legalType === 'open') { +
+
- } - -
+ } +
+
{{ song.key }}
+
+ } + +
} diff --git a/src/app/modules/songs/song/edit/edit-file/edit-file.component.html b/src/app/modules/songs/song/edit/edit-file/edit-file.component.html index 8a8b8ef..b056f2f 100644 --- a/src/app/modules/songs/song/edit/edit-file/edit-file.component.html +++ b/src/app/modules/songs/song/edit/edit-file/edit-file.component.html @@ -1,33 +1,25 @@ @if (currentUpload) { -
-
-
-
- Progress: {{ currentUpload?.name }} | {{ currentUpload?.progress }}% - Complete +
+
+
+ Progress: {{ currentUpload?.name }} | {{ currentUpload?.progress }}% Complete +
}
-
@for (file of files$ | async; track file.id) { -

- -

+

+ +

} diff --git a/src/app/modules/songs/song/edit/edit-song/edit-song.component.html b/src/app/modules/songs/song/edit/edit-song/edit-song.component.html index 61aef39..3c1b35b 100644 --- a/src/app/modules/songs/song/edit/edit-song/edit-song.component.html +++ b/src/app/modules/songs/song/edit/edit-song/edit-song.component.html @@ -1,202 +1,173 @@ @if (song) { - -
+ + + + Titel + + +
- Titel - - -
- - Typ - - @for (type of types; track type) { - {{ - type | songType - }} - - } - - - - Tonart - - @for (key of keys; track key) { - {{ - key | key - }} - - } - - - - Tempo - - - - Status - - @for (status of status; track status) { - {{ - status | status - }} - - } - - -
- - Songtext - - - @if (chordValidationIssues.length > 0) { -
-

Akkordschreibweise korrigieren

- @for (issue of chordValidationIssues; track issue.lineNumber + '-' + issue.token) { -
- Zeile {{ issue.lineNumber }}: - {{ issue.message }} - {{ issue.token }} - @if (issue.suggestion) { - -> - {{ issue.suggestion }} - } -
+ Typ + + @for (type of types; track type) { + {{ type | songType }} } -
+ + + + Tonart + + @for (key of keys; track key) { + {{ key | key }} + } + + + + Tempo + + + + Status + + @for (status of status; track status) { + {{ status | status }} + } + + +
+ + Songtext + + + @if (chordValidationIssues.length > 0) { +
+

Akkordschreibweise korrigieren

+ @for (issue of chordValidationIssues; track issue.lineNumber + '-' + issue.token) { +
+ Zeile {{ issue.lineNumber }}: + {{ issue.message }} + {{ issue.token }} + @if (issue.suggestion) { + -> + {{ issue.suggestion }} + } +
} - @if (songtextFocus) { -
-

Vorschau

- -

Hinweise zur Bearbeitung

-

Aufbau

- Der Liedtext wird hintereinander weg geschrieben. Dabei werden Strophen, - Refrain und Bridge jeweils durch eine zusätzliche Zeile Markiert. z.B. - 
+
+ } @if (songtextFocus) { +
+

Vorschau

+ +

Hinweise zur Bearbeitung

+

Aufbau

+ Der Liedtext wird hintereinander weg geschrieben. Dabei werden Strophen, Refrain und Bridge jeweils durch eine zusätzliche Zeile Markiert. z.B. + 
             Strophe
             Text der ersten Strophe
             Strophe
             Text der zweiten Strophe
             Refrain
             Und hier der Refrain
-
-

Akkorde

- Die Akktorde werden jeweils in der Zeile über dem jeweiligen Liedtext - geschrieben. Sie werden jeweils durch Leerzeichen an die entsprechende - Position gebracht. Bitte keine Tabulatoren verwenden! Folgende - Schreibweisen sind erlaubt: - 
+
+

Akkorde

+ Die Akktorde werden jeweils in der Zeile über dem jeweiligen Liedtext geschrieben. Sie werden jeweils durch Leerzeichen an die entsprechende Position gebracht. Bitte keine + Tabulatoren verwenden! Folgende Schreibweisen sind erlaubt: + 
             Dur: C  D  E
             Moll: c  d  e
             Kreuz/B-Tonarten: C#  f#  Eb  (Hb muss als B angegeben werden)
             Basstöne: C/E  D/C
             Obertöne: c7  E9  f#maj7
-
- Beispiel: - 
+
+ Beispiel: + 
             Strophe
             e            C/E        H7    a     D    C/E   H7/E
             Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
             F#        B      Eb      Cmaj7    C9                   e
             sed diam nonumy eirmod tempor invidunt ut labore et dolore
-
-
- } + +
+ } + + Kommentar + + + + + @for (flag of flags; track flag) { + + {{ flag }}  + + + } + + + +
- Kommentar - - - - - @for (flag of flags; track flag) { - - {{ flag }}  - - + Rechtlicher Status + + @for (key of legalType; track key) { + {{ key | legalType }} } - - + -
- - Rechtlicher Status - - @for (key of legalType; track key) { - {{ - key | legalType - }} - - } - - - - Rechteinhaber - - @for (key of legalOwner; track key) { - {{ - key | legalOwner - }} - - } - - - - Rechteinhaber ID (z.B. CCLI Liednummer) - - @if (form.value.legalOwner === 'CCLI') { - + Rechteinhaber + + @for (key of legalOwner; track key) { + {{ key | legalOwner }} + } + + + + Rechteinhaber ID (z.B. CCLI Liednummer) + + @if (form.value.legalOwner === 'CCLI') { + - - - } - - - Künstler - - - - Verlag / Copyright - - - - Nutzungsbedingungen - - - - abweichende Quelle - - -
- - - Speichern - - + matTooltipPosition="before" + target="_blank" + > + + + } + + + Künstler + + + + Verlag / Copyright + + + + Nutzungsbedingungen + + + + abweichende Quelle + + +
+ + + Speichern + +
} diff --git a/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.html b/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.html index a512b12..9cf61ba 100644 --- a/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.html +++ b/src/app/modules/songs/song/edit/edit-song/save-dialog/save-dialog.component.html @@ -4,7 +4,5 @@
- +
diff --git a/src/app/modules/songs/song/edit/history/history.component.html b/src/app/modules/songs/song/edit/history/history.component.html index 0f412cb..5756cfb 100644 --- a/src/app/modules/songs/song/edit/history/history.component.html +++ b/src/app/modules/songs/song/edit/history/history.component.html @@ -1,10 +1,10 @@ @if (song && song.edits) { - - @for (edit of song.edits; track edit.username + '-' + edit.timestamp.toMillis()) { -
-
{{ edit.username }}
-
{{ edit.timestamp.toDate() | date: "dd.MM.yyyy" }}
-
- } - + + @for (edit of song.edits; track edit.username + '-' + edit.timestamp.toMillis()) { +
+
{{ edit.username }}
+
{{ edit.timestamp.toDate() | date: "dd.MM.yyyy" }}
+
+ } + } diff --git a/src/app/modules/songs/song/file/file.component.html b/src/app/modules/songs/song/file/file.component.html index 6cc5af5..0dedda7 100644 --- a/src/app/modules/songs/song/file/file.component.html +++ b/src/app/modules/songs/song/file/file.component.html @@ -1,3 +1 @@ - - {{ name }} - + {{ name }} diff --git a/src/app/modules/songs/song/song.component.html b/src/app/modules/songs/song/song.component.html index d256ff7..ddf9a4d 100644 --- a/src/app/modules/songs/song/song.component.html +++ b/src/app/modules/songs/song/song.component.html @@ -1,110 +1,61 @@
@if (song$ | async; as song) { - -
-
-
-
Typ: {{ song.type | songType }}
-
Tonart: {{ song.key }}
-
Tempo: {{ song.tempo }}
-
Status: {{ (song.status | status) || "entwurf" }}
- @if (song.legalOwner) { -
- Rechteinhaber: {{ song.legalOwner | legalOwner }} -
- } - @if (song.legalOwnerId && song.legalOwner === 'CCLI') { - - } - @if (song.legalOwnerId && song.legalOwner !== 'CCLI') { -
- Rechteinhaber ID: {{ song.legalOwnerId }} -
- } - @if (song.artist) { -
Künstler: {{ song.artist }}
- } - @if (song.label) { -
Verlag: {{ song.label }}
- } - @if (song.origin) { -
Quelle: {{ song.origin }}
- } -
- Wie oft verwendet: {{ songCount$ | async }} -
+ +
+
+
+
Typ: {{ song.type | songType }}
+
Tonart: {{ song.key }}
+
Tempo: {{ song.tempo }}
+
Status: {{ (song.status | status) || "entwurf" }}
+ @if (song.legalOwner) { +
Rechteinhaber: {{ song.legalOwner | legalOwner }}
+ } @if (song.legalOwnerId && song.legalOwner === 'CCLI') { + -
- @if (user$ | async; as user) { - - } - - @for (flag of getFlags(song.flags); track flag) { - {{ - flag - }} - + } @if (song.legalOwnerId && song.legalOwner !== 'CCLI') { +
Rechteinhaber ID: {{ song.legalOwnerId }}
+ } @if (song.artist) { +
Künstler: {{ song.artist }}
+ } @if (song.label) { +
Verlag: {{ song.label }}
+ } @if (song.origin) { +
Quelle: {{ song.origin }}
} - -
- {{ song.comment }} +
Wie oft verwendet: {{ songCount$ | async }}
- - Löschen - - Bearbeiten - - - - Zu Veranstaltung hinzufügen - - - @for (show of privateShows$|async; track show.id) { - - {{ show.date.toDate() | date: "dd.MM.yyyy" }} {{ show.showType | showType }} - - } - - - - - } - @if (files$ | async; as files) { - @if (files.length > 0) { - - @for (file of files$ | async; track file.id) { -

- -

+ @if (user$ | async; as user) { + + } + + @for (flag of getFlags(song.flags); track flag) { + {{ flag }} } - + +
{{ song.comment }}
+
+ + Löschen + Bearbeiten + + Zu Veranstaltung hinzufügen + + @for (show of privateShows$|async; track show.id) { + {{ show.date.toDate() | date: "dd.MM.yyyy" }} {{ show.showType | showType }} + } + + + + + } @if (files$ | async; as files) { @if (files.length > 0) { + + @for (file of files$ | async; track file.id) { +

+ +

} - } + + } }
diff --git a/src/app/modules/user/info/info.component.html b/src/app/modules/user/info/info.component.html index f7d954c..6ead0f5 100644 --- a/src/app/modules/user/info/info.component.html +++ b/src/app/modules/user/info/info.component.html @@ -1,36 +1,25 @@ @if (user$ | async; as user) { - -

- @if (getUserRoles(user.role).length === 0) { - Es wurden noch keine Berechtigungen zugeteilt, bitte wende Dich an den - Administrator! - } - {{ transdormUserRoles(user.role) }} -

- - bevorzugte Anzeige der Akkorde - - - nur den Liedtext anzeigen - in Strophen die Akkorde nur für die erste anzeigen - - alle anzeigen - - Das ist nur die Voreinstellung, die Anzeige kann für jedes Lied geändert - werden. - - - - Abmelden - - - } + +

+ @if (getUserRoles(user.role).length === 0) { + Es wurden noch keine Berechtigungen zugeteilt, bitte wende Dich an den Administrator! + } + {{ transdormUserRoles(user.role) }} +

+ + bevorzugte Anzeige der Akkorde + + + nur den Liedtext anzeigen + in Strophen die Akkorde nur für die erste anzeigen + alle anzeigen + + Das ist nur die Voreinstellung, die Anzeige kann für jedes Lied geändert werden. + + + Abmelden + + +} - + diff --git a/src/app/modules/user/info/users/user/user.component.html b/src/app/modules/user/info/users/user/user.component.html index c5b8b73..a6ad3b2 100644 --- a/src/app/modules/user/info/users/user/user.component.html +++ b/src/app/modules/user/info/users/user/user.component.html @@ -1,37 +1,28 @@ @if (edit) { -
- - Name - - - - Rolle - - @for (role of ROLE_TYPES; track role) { - {{ - role | role - }} - - } - - - -
+
+ + Name + + + + Rolle + + @for (role of ROLE_TYPES; track role) { + {{ role | role }} + } + + + +
+} @if (!edit) { +
+ {{ name }} + @for (role of roles; track role) { + {{ role | role }}, + } +
} - -@if (!edit) { -
- {{ name }} - @for (role of roles; track role) { - {{ role | role }}, - } -
- } diff --git a/src/app/modules/user/info/users/users.component.html b/src/app/modules/user/info/users/users.component.html index 849b2ea..00cdb8a 100644 --- a/src/app/modules/user/info/users/users.component.html +++ b/src/app/modules/user/info/users/users.component.html @@ -1,5 +1,5 @@ @for (user of users$ | async | sortBy: 'asc':'name'; track user.id) { - + } diff --git a/src/app/modules/user/login/login.component.html b/src/app/modules/user/login/login.component.html index 425b5d1..7ba38ab 100644 --- a/src/app/modules/user/login/login.component.html +++ b/src/app/modules/user/login/login.component.html @@ -9,34 +9,14 @@ Passwort - + @if (errorMessage) { -

{{ errorMessage | authMessage }}

+

{{ errorMessage | authMessage }}

} - - - + + +
diff --git a/src/app/modules/user/new/new.component.html b/src/app/modules/user/new/new.component.html index 1004bfc..3fa23db 100644 --- a/src/app/modules/user/new/new.component.html +++ b/src/app/modules/user/new/new.component.html @@ -12,12 +12,10 @@ @if (errorMessage) { -

{{ errorMessage | authMessage }}

+

{{ errorMessage | authMessage }}

} - Benutzer anlegen - + Benutzer anlegen diff --git a/src/app/modules/user/password-send/password-send.component.html b/src/app/modules/user/password-send/password-send.component.html index 51c8411..54bb1e5 100644 --- a/src/app/modules/user/password-send/password-send.component.html +++ b/src/app/modules/user/password-send/password-send.component.html @@ -1,4 +1 @@ - - Eine E-Mail mit dem neuen Passwort wurde gesendet. Darin ist der link - enthalten, über den das neue Passwort eingegeben werden kann. - + Eine E-Mail mit dem neuen Passwort wurde gesendet. Darin ist der link enthalten, über den das neue Passwort eingegeben werden kann. diff --git a/src/app/modules/user/password/password.component.html b/src/app/modules/user/password/password.component.html index 219a6c2..ca3b84a 100644 --- a/src/app/modules/user/password/password.component.html +++ b/src/app/modules/user/password/password.component.html @@ -2,19 +2,13 @@
E-Mail Addresse - + - neues Passwort anfordern - + neues Passwort anfordern @if (errorMessage) { -

{{ errorMessage | authMessage }}

+

{{ errorMessage | authMessage }}

}
diff --git a/src/app/services/user/user.service.ts b/src/app/services/user/user.service.ts index 85cbfc7..8d254a8 100644 --- a/src/app/services/user/user.service.ts +++ b/src/app/services/user/user.service.ts @@ -36,6 +36,5 @@ export class UserService { public incSongCount = (songId: string): Promise => this.songUsage.incSongCount(songId); public decSongCount = (songId: string): Promise => this.songUsage.decSongCount(songId); public rebuildSongUsage = (): Promise => this.songUsage.rebuildSongUsage(); - public rebuildShowSongIds = (onProgress?: (progress: MigrationProgress) => void): Promise => - this.showSongIndex.rebuildShowSongIds(onProgress); + public rebuildShowSongIds = (onProgress?: (progress: MigrationProgress) => void): Promise => this.showSongIndex.rebuildShowSongIds(onProgress); } diff --git a/src/app/widget-modules/components/add-song/add-song.component.html b/src/app/widget-modules/components/add-song/add-song.component.html index a381ad7..263b7c5 100644 --- a/src/app/widget-modules/components/add-song/add-song.component.html +++ b/src/app/widget-modules/components/add-song/add-song.component.html @@ -1,15 +1,15 @@ @if (songs) { -
- - Lied hinzufügen... - - - - - @for (song of filteredSongs(); track song.id) { - {{ song.title }} - } - - -
+
+ + Lied hinzufügen... + + + + + @for (song of filteredSongs(); track song.id) { + {{ song.title }} + } + + +
} diff --git a/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.html b/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.html index fae16ca..1e7d787 100644 --- a/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.html +++ b/src/app/widget-modules/components/application-frame/navigation/brand/brand.component.html @@ -1,23 +1,10 @@
- + diff --git a/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.html b/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.html index a86c948..30641f5 100644 --- a/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.html +++ b/src/app/widget-modules/components/application-frame/navigation/filter/filter.component.html @@ -1,5 +1 @@ - + diff --git a/src/app/widget-modules/components/application-frame/navigation/navigation.component.html b/src/app/widget-modules/components/application-frame/navigation/navigation.component.html index 14f4f56..a34a84f 100644 --- a/src/app/widget-modules/components/application-frame/navigation/navigation.component.html +++ b/src/app/widget-modules/components/application-frame/navigation/navigation.component.html @@ -1,24 +1,9 @@
- - - + + +
diff --git a/src/app/widget-modules/components/button/button.component.html b/src/app/widget-modules/components/button/button.component.html index 476954d..e80bf7a 100644 --- a/src/app/widget-modules/components/button/button.component.html +++ b/src/app/widget-modules/components/button/button.component.html @@ -1,10 +1,8 @@ +   + } + + + + diff --git a/src/app/widget-modules/components/card/card.component.html b/src/app/widget-modules/components/card/card.component.html index 6823e5a..25afc59 100644 --- a/src/app/widget-modules/components/card/card.component.html +++ b/src/app/widget-modules/components/card/card.component.html @@ -1,18 +1,12 @@
@if (closeLink && !fullscreen) { - - } - @if (heading && !fullscreen) { -
{{ heading }}
- } - @if (subheading && !fullscreen) { -
{{ subheading }}
+ + } @if (heading && !fullscreen) { +
{{ heading }}
+ } @if (subheading && !fullscreen) { +
{{ subheading }}
}
diff --git a/src/app/widget-modules/components/list-header/list-header.component.html b/src/app/widget-modules/components/list-header/list-header.component.html index a9da0ae..53cc7cf 100644 --- a/src/app/widget-modules/components/list-header/list-header.component.html +++ b/src/app/widget-modules/components/list-header/list-header.component.html @@ -1,9 +1,5 @@
-
@if (filterVisible || anyFilterActive) { -
- - - -
+
+ + + +
} diff --git a/src/app/widget-modules/components/logo/logo.component.html b/src/app/widget-modules/components/logo/logo.component.html index 026e2d5..f9edc97 100644 --- a/src/app/widget-modules/components/logo/logo.component.html +++ b/src/app/widget-modules/components/logo/logo.component.html @@ -1,9 +1,4 @@ - + - + diff --git a/src/app/widget-modules/components/song-text/song-text.component.html b/src/app/widget-modules/components/song-text/song-text.component.html index 6a74c9f..17ef1ac 100644 --- a/src/app/widget-modules/components/song-text/song-text.component.html +++ b/src/app/widget-modules/components/song-text/song-text.component.html @@ -1,89 +1,49 @@ @if (sections && !fullscreen) { -
- @if (showSwitch) { - - } -
- @for (section of sections; track section.type + '-' + section.number + '-' + $index; let i = $index) { -
- @for (line of getLines(section); track (line.lineNumber ?? $index) + '-' + line.type + '-' + $index) { -
- @for (segment of getDisplaySegments(line); track $index) { - {{ segment.text }} - } -
- } -
- } - @if (sections.length===0) { -
- Es wurden keine Liedabschnitte gefunden! Bitte mindestens einen Abschnitt festlegen! -
+
+ @if (showSwitch) { + + } +
+ @for (section of sections; track section.type + '-' + section.number + '-' + $index; let i = $index) { +
+ @for (line of getLines(section); track (line.lineNumber ?? $index) + '-' + line.type + '-' + $index) { +
+ @for (segment of getDisplaySegments(line); track $index) { + {{ segment.text }} + } +
}
- -
-} - -@if (sections && fullscreen) { -
- @if (showSwitch) { - + } @if (sections.length===0) { +
Es wurden keine Liedabschnitte gefunden! Bitte mindestens einen Abschnitt festlegen!
} -
- @if (header) { -

{{ header }}

- } - @for (section of sections; track section.type + '-' + section.number + '-' + $index; let i = $index) { -
- @for (line of getLines(section); track (line.lineNumber ?? $index) + '-' + line.type + '-' + $index) { -
- @for (segment of getDisplaySegments(line, true); track $index) { - {{ segment.text }} - } -
- } -
+
+ +
+} @if (sections && fullscreen) { +
+ @if (showSwitch) { + + } +
+ @if (header) { +

{{ header }}

+ } @for (section of sections; track section.type + '-' + section.number + '-' + $index; let i = $index) { +
+ @for (line of getLines(section); track (line.lineNumber ?? $index) + '-' + line.type + '-' + $index) { +
+ @for (segment of getDisplaySegments(line, true); track $index) { + {{ segment.text }} + } +
}
- + }
+ +
} diff --git a/src/index.html b/src/index.html index 01e2394..4a377fe 100644 --- a/src/index.html +++ b/src/index.html @@ -1,146 +1,160 @@ - - - Worship Generator - - + + + Worship Generator + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + #gear-lg { + animation: spin 12s infinite linear; + transform-origin: 118.70226433741132px 128.5002496697699px; + } -
+ #gear-sm { + animation: spin 4s infinite reverse linear; + transform-origin: 230.07229448094552px 229.53152747947914px; + } - - - - - - - - - - - - - - - - - - - - - - - - - - - + @keyframes spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(359deg); + } + } + @keyframes fade { + 0% { + transform: translateX(0); + opacity: 1; + } + 99% { + transform: translateX(0); + opacity: 0; + } + to { + transform: translateX(-100%); + opacity: 0; + } + } + + + + + + + -
- - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/src/main.ts b/src/main.ts index 08f4231..87685a3 100644 --- a/src/main.ts +++ b/src/main.ts @@ -53,13 +53,10 @@ bootstrapApplication(AppComponent, { rebuildShowSongIds: async () => { console.info('[wgeneratorAdmin] rebuildShowSongIds started'); const result = await userService.rebuildShowSongIds(progress => { - console.info( - `[wgeneratorAdmin] rebuildShowSongIds ${progress.processed}/${progress.total} shows processed`, - { - showId: progress.showId, - showSongsProcessed: progress.showSongsProcessed, - } - ); + console.info(`[wgeneratorAdmin] rebuildShowSongIds ${progress.processed}/${progress.total} shows processed`, { + showId: progress.showId, + showSongsProcessed: progress.showSongsProcessed, + }); }); console.info('[wgeneratorAdmin] rebuildShowSongIds finished', result); return result; diff --git a/src/test.ts b/src/test.ts index 3d49554..09dfeaf 100644 --- a/src/test.ts +++ b/src/test.ts @@ -78,7 +78,7 @@ const defaultTestingProviders: TestingProviderList = [ }, ]; -const originalConfigureTestingModule = TestBed.configureTestingModule.bind(TestBed) as typeof TestBed.configureTestingModule; +const originalConfigureTestingModule = TestBed.configureTestingModule.bind(TestBed); const configureTestingModule: typeof TestBed.configureTestingModule = moduleDef => { const extraProviders: TestingProviderList = moduleDef?.providers ?? []; const mergedModuleDef: TestingModuleDefinition = moduleDef ? {...moduleDef} : {};