add song usage (experimental)

.run/build.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="build" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json"/>
-    <command value="run"/>
-    <scripts>
-      <script value="build"/>
-    </scripts>
-    <node-interpreter value="project"/>
-    <envs/>
-    <method v="2"/>
-  </configuration>
-</component>

.run/deploy.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="deploy" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json"/>
-    <command value="run"/>
-    <scripts>
-      <script value="deploy"/>
-    </scripts>
-    <node-interpreter value="project"/>
-    <envs/>
-    <method v="2"/>
-  </configuration>
-</component>

.run/start.run.xml

@@ -1,15 +1,12 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="start" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json" />
+    <package-json value="$PROJECT_DIR$/package.json"/>
-    <command value="run" />
+    <command value="run"/>
     <scripts>
-      <script value="start" />
+      <script value="start"/>
     </scripts>
-    <node-interpreter value="project" />
+    <node-interpreter value="project"/>
-    <envs />
+    <envs/>
-    <EXTENSION ID="com.intellij.lang.javascript.buildTools.npm.rc.StartBrowserRunConfigurationExtension">
+    <method v="2"/>
-      <browser name="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" start="true" with-js-debugger="true" url="http://localhost.4200" />
-    </EXTENSION>
-    <method v="2" />
   </configuration>
 </component>

angular.json

@@ -15,15 +15,12 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:application",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": {
+            "outputPath": "dist/wgenerator",
-              "base": "dist/wgenerator"
-            },
             "index": "src/index.html",
-            "polyfills": [
+            "main": "src/main.ts",
-              "src/polyfills.ts"
+            "polyfills": "src/polyfills.ts",
-            ],
             "tsConfig": "tsconfig.app.json",
             "aot": false,
             "assets": [
@@ -45,16 +42,15 @@
               "src/styles/shadow.less"
             ],
             "scripts": [],
+            "vendorChunk": true,
             "extractLicenses": false,
+            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
             "namedChunks": true,
             "allowedCommonJsDependencies": [
-              "lodash",
+              "lodash", "docx"
-              "docx",
+            ]
-              "qrcode"
-            ],
-            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -70,6 +66,8 @@
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -82,25 +80,26 @@
                   "maximumError": "10kb"
                 }
               ],
-              "serviceWorker": "ngsw-config.json"
+              "serviceWorker": true,
+              "ngswConfigPath": "ngsw-config.json"
             }
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "buildTarget": "wgenerator:build"
+            "browserTarget": "wgenerator:build"
           },
           "configurations": {
             "production": {
-              "buildTarget": "wgenerator:build:production"
+              "browserTarget": "wgenerator:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "buildTarget": "wgenerator:build"
+            "browserTarget": "wgenerator:build"
           }
         },
         "test": {
@@ -148,13 +147,5 @@
     "schematicCollections": [
       "@angular-eslint/schematics"
     ]
-  },
-  "schematics": {
-    "@angular-eslint/schematics:application": {
-      "setParserOptionsProject": true
-    },
-    "@angular-eslint/schematics:library": {
-      "setParserOptionsProject": true
-    }
   }
 }

firebase.json

@@ -4,7 +4,7 @@
     "indexes": "firestore.indexes.json"
   },
   "hosting": {
-    "public": "dist/wgenerator/browser",
+    "public": "dist/wgenerator",
     "ignore": [
       "firebase.json",
       "**/.*",

firestore.rules

@@ -17,10 +17,6 @@ service cloud.firestore {
       allow read: if request.auth.uid != null;
     }
 
-    match /guest/{guestId} {
-      allow read: if true;
-      allow write: if request.auth.uid != null;
-    }
     match /songs/{song} {
       allow read: if request.auth.uid != null;
       allow write: if request.auth.uid != null;

package.json

@@ -1,70 +1,75 @@
 {
   "name": "wgenerator",
-  "version": "1.6",
+  "version": "1.3",
   "scripts": {
     "start": "ng serve",
     "build": "ng build",
     "deploy": "ng build --configuration production && firebase deploy",
     "test": "ng test",
     "lint": "ng lint --fix",
-    "update": "ng update @angular/cdk @angular/cli @angular/core @angular/material && ncu -u && npm i && npm fix"
+    "postinstall": "ngcc"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^19.0.5",
+    "@angular/animations": "^14.2.10",
-    "@angular/cdk": "^19.0.4",
+    "@angular/cdk": "^14.2.6",
-    "@angular/common": "^19.0.5",
+    "@angular/common": "^14.2.10",
-    "@angular/compiler": "^19.0.5",
+    "@angular/compiler": "^14.2.10",
-    "@angular/core": "^19.0.5",
+    "@angular/core": "^14.2.10",
-    "@angular/fire": "^18.0.1",
+    "@angular/fire": "^7.4.1",
-    "@angular/forms": "^19.0.5",
+    "@angular/forms": "^14.2.10",
-    "@angular/material": "^19.0.4",
+    "@angular/material": "^14.2.6",
-    "@angular/platform-browser": "^19.0.5",
+    "@angular/platform-browser": "^14.2.10",
-    "@angular/platform-browser-dynamic": "^19.0.5",
+    "@angular/platform-browser-dynamic": "^14.2.10",
-    "@angular/router": "^19.0.5",
+    "@angular/router": "^14.2.10",
-    "@angular/service-worker": "^19.0.5",
+    "@angular/service-worker": "^14.2.10",
-    "@fortawesome/angular-fontawesome": "^0.14.1",
+    "@fortawesome/angular-fontawesome": "^0.11.1",
-    "@fortawesome/fontawesome-svg-core": "^6.5.1",
+    "@fortawesome/fontawesome-svg-core": "^6.1.2",
-    "@fortawesome/free-solid-svg-icons": "^6.5.1",
+    "@fortawesome/free-solid-svg-icons": "^6.1.2",
-    "docx": "^8.5.0",
+    "docx": "^7.4.1",
-    "firebase": "^10.8.0",
+    "firebase": "^9.6.10",
     "lodash": "^4.17.21",
-    "ngx-mat-select-search": "^7.0.5",
+    "ngx-mat-select-search": "^4.2.1",
-    "qrcode": "^1.5.3",
+    "ngx-perfect-scrollbar": "^10.1.1",
-    "rxfire": "^6.0.5",
+    "rxfire": "^6.0.3",
-    "rxjs": "~7.8.1",
+    "rxjs": "~7.5.6",
-    "swiper": "^11.0.6",
+    "swiper": "^9.3.2",
-    "tslib": "^2.6.2",
+    "tslib": "^2.4.0",
-    "zone.js": "~0.15.0"
+    "uuid": "^8.3.2",
+    "zone.js": "~0.11.8"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1900.6",
+    "@angular-devkit/architect": "0.1402.9",
-    "@angular-devkit/build-angular": "^19.0.6",
+    "@angular-devkit/build-angular": "^14.2.9",
-    "@angular-eslint/builder": "19.0.2",
+    "@angular-eslint/builder": "14.1.2",
-    "@angular-eslint/eslint-plugin": "19.0.2",
+    "@angular-eslint/eslint-plugin": "14.1.2",
-    "@angular-eslint/eslint-plugin-template": "19.0.2",
+    "@angular-eslint/eslint-plugin-template": "14.1.2",
-    "@angular-eslint/schematics": "19.0.2",
+    "@angular-eslint/schematics": "14.1.2",
-    "@angular-eslint/template-parser": "19.0.2",
+    "@angular-eslint/template-parser": "14.1.2",
-    "@angular/cli": "^19.0.6",
+    "@angular/cli": "^14.2.9",
-    "@angular/compiler-cli": "^19.0.5",
+    "@angular/compiler-cli": "^14.2.10",
-    "@angular/language-service": "^19.0.5",
+    "@angular/language-service": "^14.2.10",
-    "@types/jasmine": "~5.1.4",
+    "@types/jasmine": "~4.0.3",
-    "@types/jasminewd2": "~2.0.13",
+    "@types/jasminewd2": "~2.0.10",
-    "@types/lodash": "^4.14.202",
+    "@types/lodash": "^4.14.182",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
-    "@typescript-eslint/parser": "^7.2.0",
+    "@typescript-eslint/parser": "^5.33.0",
-    "eslint": "^8.57.0",
+    "eslint": "^8.22.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^4.2.1",
-    "firebase-tools": "^13.3.1",
+    "firebase-tools": "^11.6.0",
-    "jasmine-core": "~5.1.2",
+    "fuzzy": "^0.1.3",
+    "inquirer": "^9.1.0",
+    "inquirer-autocomplete-prompt": "^2.0.0",
+    "jasmine-core": "~4.3.0",
     "jasmine-spec-reporter": "~7.0.0",
-    "karma": "~6.4.2",
+    "karma": "~6.4.0",
-    "karma-chrome-launcher": "~3.2.0",
+    "karma-chrome-launcher": "~3.1.1",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "^2.1.0",
+    "karma-jasmine-html-reporter": "^2.0.0",
-    "prettier": "^3.2.5",
+    "prettier": "^2.7.1",
-    "typescript": "~5.5.4"
+    "protractor": "~7.0.0",
+    "typescript": "~4.7.4"
   }
 }

src/app/app-routing.module.ts

@@ -54,8 +54,7 @@ const routes: Routes = [
   imports: [
     RouterModule.forRoot(routes, {
       preloadingStrategy: PreloadAllModules,
-      scrollPositionRestoration: 'enabled',
+      relativeLinkResolution: 'legacy',
-      // relativeLinkResolution: 'legacy',
     }),
   ],
   exports: [RouterModule],

src/app/app.component.html

@@ -1,6 +1,12 @@
 <app-navigation></app-navigation>
-
+<perfect-scrollbar
-<div [@fader]="o.isActivated ? o.activatedRoute : ''" class="content">
+  #scrollbar
-  <router-outlet #o="outlet"></router-outlet>
+  (psScrollY)="onScoll($event)"
-</div>
+  [perfectScrollbar]
-
+  class="scroll"
+  style="max-height: calc(100vh); width: 100%; overflow: hidden"
+>
+  <div [@fader]="o.isActivated ? o.activatedRoute : ''" class="content">
+    <router-outlet #o="outlet"></router-outlet>
+  </div>
+</perfect-scrollbar>

src/app/app.component.less

@@ -1,3 +1,10 @@
 h1 {
   color: red;
 }
+
+
+.manager {
+  //display: grid;
+  //grid-template-columns: 1fr 1fr;
+  //transition: all 1s ease-in-out;
+}

src/app/app.component.spec.ts

@@ -3,11 +3,14 @@ import {RouterTestingModule} from '@angular/router/testing';
 import {AppComponent} from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [RouterTestingModule, AppComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        imports: [RouterTestingModule],
-  }));
+        declarations: [AppComponent],
+      }).compileComponents();
+    })
+  );
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);

src/app/app.component.ts

@@ -1,9 +1,8 @@
-import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core';
+import {ChangeDetectionStrategy, Component, OnInit, ViewChild} from '@angular/core';
 import {fader} from './animations';
 import {ScrollService} from './services/scroll.service';
+import {PerfectScrollbarComponent} from 'ngx-perfect-scrollbar';
 import {register} from 'swiper/element/bundle';
-import {RouterOutlet} from '@angular/router';
-import {NavigationComponent} from './widget-modules/components/application-frame/navigation/navigation.component';
 
 @Component({
   selector: 'app-root',
@@ -11,10 +10,14 @@ import {NavigationComponent} from './widget-modules/components/application-frame
   styleUrls: ['./app.component.less'],
   animations: [fader],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [RouterOutlet, NavigationComponent],
 })
 export class AppComponent implements OnInit {
+  @ViewChild('scrollbar', {static: false}) public scrollbar: PerfectScrollbarComponent | null = null;
+
   public constructor(private scrollService: ScrollService) {
+    scrollService.restoreScrollPosition$.subscribe(pos => {
+      if (this.scrollbar && pos) this.scrollbar.directiveRef?.scrollTo(0, pos, 300);
+    });
     register();
   }
 

src/app/app.module.ts

@@ -0,0 +1,45 @@
+import {BrowserModule} from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
+
+import {AppRoutingModule} from './app-routing.module';
+import {AppComponent} from './app.component';
+import {ServiceWorkerModule} from '@angular/service-worker';
+import {environment} from '../environments/environment';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {ApplicationFrameModule} from './widget-modules/components/application-frame/application-frame.module';
+import {AngularFireModule} from '@angular/fire/compat';
+import {AngularFirestoreModule} from '@angular/fire/compat/firestore';
+import {AngularFireStorageModule} from '@angular/fire/compat/storage';
+import {AngularFireDatabaseModule} from '@angular/fire/compat/database';
+import {AngularFireAuthModule} from '@angular/fire/compat/auth';
+import {AngularFireAuthGuardModule} from '@angular/fire/compat/auth-guard';
+import {MAT_DATE_LOCALE} from '@angular/material/core';
+import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
+import {PerfectScrollbarModule} from 'ngx-perfect-scrollbar';
+
+@NgModule({
+  declarations: [AppComponent],
+  imports: [
+    BrowserModule,
+    BrowserAnimationsModule,
+    AppRoutingModule,
+    ServiceWorkerModule.register('ngsw-worker.js', {
+      enabled: environment.production,
+    }),
+    BrowserAnimationsModule,
+
+    ApplicationFrameModule,
+
+    AngularFireModule.initializeApp(environment.firebase),
+    AngularFirestoreModule.enablePersistence({synchronizeTabs: true}),
+    AngularFireStorageModule,
+    AngularFireDatabaseModule,
+    AngularFireAuthModule,
+    AngularFireAuthGuardModule,
+    FontAwesomeModule,
+    PerfectScrollbarModule,
+  ],
+  providers: [{provide: MAT_DATE_LOCALE, useValue: 'de-DE'}],
+  bootstrap: [AppComponent],
+})
+export class AppModule {}

src/app/modules/brand/brand.component.html

@@ -1,4 +1,4 @@
 <div class="brand">
   <app-logo></app-logo>
-  <div class="copyright">© 2019 - 2024 - Benjamin Ifland</div>
+  <div class="copyright">© 2019 - 2023 - Benjamin Ifland</div>
 </div>

src/app/modules/brand/brand.component.spec.ts

@@ -6,11 +6,13 @@ describe('BrandComponent', () => {
   let component: BrandComponent;
   let fixture: ComponentFixture<BrandComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [BrandComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [BrandComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(BrandComponent);

src/app/modules/brand/brand.component.ts

@@ -1,10 +1,8 @@
 import {Component} from '@angular/core';
-import {LogoComponent} from '../../widget-modules/components/logo/logo.component';
 
 @Component({
   selector: 'app-brand',
   templateUrl: './brand.component.html',
   styleUrls: ['./brand.component.less'],
-  imports: [LogoComponent],
 })
 export class BrandComponent {}

src/app/modules/brand/brand.module.ts

@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {BrandComponent} from './brand.component';
 import {RouterModule, Routes} from '@angular/router';
-
+import {LogoModule} from '../../widget-modules/components/logo/logo.module';
 import {NewUserComponent} from './new-user/new-user.component';
 
 const routes: Routes = [
@@ -18,6 +18,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [CommonModule, RouterModule.forChild(routes), BrandComponent, NewUserComponent],
+  declarations: [BrandComponent, NewUserComponent],
+  imports: [CommonModule, RouterModule.forChild(routes), LogoModule],
 })
 export class BrandModule {}

src/app/modules/brand/new-user/new-user.component.spec.ts

@@ -6,11 +6,13 @@ describe('NewUserComponent', () => {
   let component: NewUserComponent;
   let fixture: ComponentFixture<NewUserComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [NewUserComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [NewUserComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NewUserComponent);

src/app/modules/brand/new-user/new-user.component.ts

@@ -2,14 +2,11 @@ import {Component} from '@angular/core';
 import {UserService} from '../../../services/user/user.service';
 import {Observable} from 'rxjs';
 import {User} from '../../../services/user/user';
-import {BrandComponent} from '../brand.component';
-import {AsyncPipe, NgIf} from '@angular/common';
 
 @Component({
   selector: 'app-new-user',
   templateUrl: './new-user.component.html',
   styleUrls: ['./new-user.component.less'],
-  imports: [BrandComponent, NgIf, AsyncPipe],
 })
 export class NewUserComponent {
   public user$: Observable<User | null> | null = null;

src/app/modules/guest/guest-show-data.service.ts

@@ -1,23 +0,0 @@
-import {Injectable} from '@angular/core';
-import {BehaviorSubject, Observable} from 'rxjs';
-import {map} from 'rxjs/operators';
-import {DbService} from 'src/app/services/db.service';
-import {GuestShow} from './guest-show';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class GuestShowDataService {
-  public list$: BehaviorSubject<GuestShow[]> = new BehaviorSubject<GuestShow[]>([]);
-  private collection = 'guest';
-
-  public constructor(private dbService: DbService) {
-    this.dbService.col$<GuestShow>(this.collection).subscribe(_ => this.list$.next(_));
-  }
-
-  public read$: (id: string) => Observable<GuestShow | null> = (id: string): Observable<GuestShow | null> => this.list$.pipe(map(_ => _.find(s => s.id === id) || null));
-  public update$: (id: string, data: Partial<GuestShow>) => Promise<void> = async (id: string, data: Partial<GuestShow>): Promise<void> =>
-    await this.dbService.doc(this.collection + '/' + id).update(data);
-  public add: (data: Partial<GuestShow>) => Promise<string> = async (data: Partial<GuestShow>): Promise<string> => (await this.dbService.col(this.collection).add(data)).id;
-  public delete: (id: string) => Promise<void> = async (id: string): Promise<void> => await this.dbService.doc(this.collection + '/' + id).delete();
-}

src/app/modules/guest/guest-show.service.ts

@@ -1,32 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Show} from '../shows/services/show';
-import {Song} from '../songs/services/song';
-import {GuestShowDataService} from './guest-show-data.service';
-import {ShowService} from '../shows/services/show.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class GuestShowService {
-  public constructor(
-    private showService: ShowService,
-    private guestShowDataService: GuestShowDataService
-  ) {}
-
-  public async share(show: Show, songs: Song[]): Promise<string> {
-    const data = {
-      showType: show.showType,
-      date: show.date,
-      songs: songs,
-    };
-
-    if (!show.shareId) {
-      const shareId = await this.guestShowDataService.add(data);
-      await this.showService.update$(show.id, {shareId});
-    } else {
-      await this.guestShowDataService.update$(show.shareId, data);
-    }
-
-    return window.location.protocol + '//' + window.location.host + '/guest/' + show.shareId;
-  }
-}

src/app/modules/guest/guest-show.ts

@@ -1,10 +0,0 @@
-import firebase from 'firebase/compat/app';
-import {Song} from '../songs/services/song';
-import Timestamp = firebase.firestore.Timestamp;
-
-export interface GuestShow {
-  id: string;
-  showType: string;
-  date: Timestamp;
-  songs: Song[];
-}

src/app/modules/guest/guest.component.html

@@ -1,25 +1,11 @@
-<div *ngIf="show$|async as show" class="page">
+<div *ngIf="songs$ | async as songs" class="view">
-  <div class="title">
+<!--  <swiper>-->
-    <div class="left">{{ show.showType|showType }}</div>
+<!--    <div *ngFor="let song of songs" class="song">-->
-    <div class="right">{{ show.date.toDate() | date: 'dd.MM.yyyy' }}</div>
+<!--      <app-song-text-->
-  </div>
+<!--        [showSwitch]="false"-->
-
+<!--        [text]="song"-->
-  <div class="view">
+<!--        chordMode="hide"-->
-    <swiper-container scrollbar="true">
+<!--      ></app-song-text>-->
-      <swiper-slide *ngFor="let song of show.songs; let i = index; trackBy: trackBy"
+<!--    </div>-->
-                    class="song-swipe">
+<!--  </swiper>-->
-        <div class="song-title">{{ song.title }}</div>
-
-        <div class="legal">
-          <p *ngIf="song.artist">{{ song.artist }}</p>
-        </div>
-
-        <app-song-text
-          [text]="song.text"
-        ></app-song-text>
-      </swiper-slide>
-    </swiper-container>
-  </div>
 </div>
-
-

src/app/modules/guest/guest.component.less

@@ -1,49 +1,12 @@
-.page {
-  background: #0009;
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  backdrop-filter: blur(8px);
-
-  --swiper-scrollbar-bg-color: #fff3;
-  --swiper-scrollbar-drag-bg-color: #fff9;
-  --swiper-scrollbar-sides-offset: 20px;
-  --swiper-scrollbar-top: 100px;
-  --swiper-scrollbar-bottom: auto;
-}
-
-.title {
-  color: white;
-  padding: 70px 20px 0;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  .left {
-    font-size: 1.8em;
-    color: #fff;
-  }
-}
-
-.song-title {
-  padding: 20px 20px 0;
-  font-size: 1.3em;
-}
-
-.legal {
-  padding: 0 20px;
-  font-size: 0.6em;
-  color: #fff9;
-}
-
 .view {
   position: fixed;
   top: 0;
   bottom: 0;
   left: 0;
   right: 0;
+  background: #0003;
+  backdrop-filter: blur(10px);
+  z-index: 1;
   color: white;
 }
 
@@ -51,9 +14,3 @@ app-song-text {
   margin: 20px;
   display: block;
 }
-
-.song-swipe {
-  margin-top: 100px;
-  margin-bottom: 50px;
-  min-height: calc(100vh - 150px);
-}

src/app/modules/guest/guest.component.spec.ts

@@ -6,11 +6,13 @@ describe('GuestComponent', () => {
   let component: GuestComponent;
   let fixture: ComponentFixture<GuestComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [GuestComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [GuestComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(GuestComponent);

src/app/modules/guest/guest.component.ts

@@ -1,32 +1,32 @@
-import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
+import {Component} from '@angular/core';
-import {GuestShowDataService} from './guest-show-data.service';
+import {SongService} from '../songs/services/song.service';
-import {ActivatedRoute} from '@angular/router';
+import {GlobalSettingsService} from '../../services/global-settings.service';
-import {map, switchMap} from 'rxjs/operators';
+import {Observable} from 'rxjs';
-import {Song} from '../songs/services/song';
+import {filter, map, switchMap} from 'rxjs/operators';
-import {ConfigService} from '../../services/config.service';
+import {ShowSongService} from '../shows/services/show-song.service';
-import {AsyncPipe, DatePipe, NgFor, NgIf} from '@angular/common';
+import {GlobalSettings} from '../../services/global-settings';
-import {SongTextComponent} from '../../widget-modules/components/song-text/song-text.component';
+import {ShowService} from '../shows/services/show.service';
-import {ShowTypePipe} from '../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @Component({
   selector: 'app-guest',
   templateUrl: './guest.component.html',
   styleUrls: ['./guest.component.less'],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA],
-  imports: [NgIf, NgFor, SongTextComponent, AsyncPipe, DatePipe, ShowTypePipe],
 })
 export class GuestComponent {
-  public show$ = this.currentRoute.params.pipe(
+  public songs$: Observable<string[]> = this.globalSettingsService.get$.pipe(
-    map(param => param.id as string),
+    filter(_ => !!_),
-    switchMap(id => this.service.read$(id))
+    map(_ => _ as GlobalSettings),
+    map(_ => _.currentShow),
+    switchMap(_ => this.showSongService.list$(_).pipe(map(l => ({showSongs: l, currentShow: _})))),
+    switchMap(_ => this.showService.read$(_.currentShow).pipe(map(l => ({showSongs: _.showSongs, show: l})))),
+    filter(_ => !!_.showSongs),
+    map(_ => (_?.show ? _.show.order.map(o => _.showSongs.find(f => f.id === o) ?? _.showSongs[0]).map(m => m.text) : []))
   );
-  public config$ = this.configService.get$();
 
   public constructor(
-    private currentRoute: ActivatedRoute,
+    private songService: SongService,
-    private service: GuestShowDataService,
+    private showService: ShowService,
-    private configService: ConfigService
+    private globalSettingsService: GlobalSettingsService,
+    private showSongService: ShowSongService
   ) {}
-
-  public trackBy = (index: number, show: Song) => show.id;
 }

src/app/modules/guest/guest.module.ts

@@ -1,23 +1,11 @@
-import {CUSTOM_ELEMENTS_SCHEMA, NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {GuestComponent} from './guest.component';
 import {RouterModule} from '@angular/router';
-import {SongTextComponent} from '../../widget-modules/components/song-text/song-text.component';
+import {SongTextModule} from '../../widget-modules/components/song-text/song-text.module';
-import {ShowTypePipe} from '../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @NgModule({
-  imports: [
+  declarations: [GuestComponent],
-    CommonModule,
+  imports: [CommonModule, RouterModule.forChild([{path: '', component: GuestComponent}]), SongTextModule],
-    RouterModule.forChild([
-      {
-        path: ':id',
-        component: GuestComponent,
-      },
-    ]),
-    SongTextComponent,
-    ShowTypePipe,
-    GuestComponent,
-  ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class GuestModule {}

src/app/modules/presentation/monitor/legal/legal.component.spec.ts

@@ -6,11 +6,13 @@ describe('LegalComponent', () => {
   let component: LegalComponent;
   let fixture: ComponentFixture<LegalComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [LegalComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [LegalComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LegalComponent);

src/app/modules/presentation/monitor/legal/legal.component.ts

@@ -1,13 +1,11 @@
 import {Component, Input} from '@angular/core';
 import {Song} from '../../../songs/services/song';
 import {Config} from '../../../../services/config';
-import {NgIf} from '@angular/common';
 
 @Component({
   selector: 'app-legal',
   templateUrl: './legal.component.html',
   styleUrls: ['./legal.component.less'],
-  imports: [NgIf],
 })
 export class LegalComponent {
   @Input() public song: Song | null = null;

src/app/modules/presentation/monitor/logo/logo.component.spec.ts

@@ -6,11 +6,13 @@ describe('LogoComponent', () => {
   let component: LogoComponent;
   let fixture: ComponentFixture<LogoComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [LogoComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [LogoComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LogoComponent);

src/app/modules/presentation/monitor/monitor.component.html

@@ -1,18 +1,18 @@
 <div class="fullscreen background"></div>
 <div *ngIf="song && showType" [style.font-size.px]="zoom" class="fullscreen background">
 
-  <div [class.visible]="presentationBackground==='blue'" class="bg-blue fullscreen bg-image"></div>
+  <div class="bg-blue fullscreen bg-image" [class.visible]="presentationBackground==='blue'"></div>
-  <div [class.visible]="presentationBackground==='green'" class="bg-green fullscreen bg-image"></div>
+  <div class="bg-green fullscreen bg-image" [class.visible]="presentationBackground==='green'"></div>
-  <div [class.visible]="presentationBackground==='leder'" class="bg-leder fullscreen bg-image"></div>
+  <div class="bg-leder fullscreen bg-image" [class.visible]="presentationBackground==='leder'"></div>
-  <div [class.visible]="presentationBackground==='praise'" class="bg-praise fullscreen bg-image"></div>
+  <div class="bg-praise fullscreen bg-image" [class.visible]="presentationBackground==='praise'"></div>
-  <div [class.visible]="presentationBackground==='bible'" class="bg-bible fullscreen bg-image"></div>
+  <div class="bg-bible fullscreen bg-image" [class.visible]="presentationBackground==='bible'"></div>
 
 
   <div
     [@songSwitch]="songId"
     [class.blur]="songId === 'title' || songId === 'dynamicText'"
-    [class.hide]="songId !== 'title' && songId !== 'empty' && songId !== 'dynamicText'"
     [class.no-logo]="presentationBackground!=='none'"
+    [class.hide]="songId !== 'title' && songId !== 'empty' && songId !== 'dynamicText'"
     class="start fullscreen logo"
   >
     <app-logo></app-logo>
@@ -29,12 +29,11 @@
   </div>
 
   <app-song-text
+    [header]="song.title"
     *ngIf="songId !== 'title' && songId !== 'empty'"
     [@songSwitch]="songId"
     [fullscreen]="true"
-    [header]="song.title"
     [index]="index??0"
-    [showComments]="false"
     [showSwitch]="false"
     [text]="song.text"
     chordMode="hide"

src/app/modules/presentation/monitor/monitor.component.less

@@ -34,7 +34,6 @@
 .bg-blue {
   background-image: url("/assets/bg-dark-blue.jpg");
   filter: blur(10px);
-
   &.visible {
     opacity: 0.5;
   }
@@ -43,7 +42,6 @@
 .bg-green {
   background-image: url("/assets/bg-dark-green.jpg");
   filter: blur(5px);
-
   &.visible {
     opacity: 0.9;
   }
@@ -52,7 +50,6 @@
 .bg-leder {
   background-image: url("/assets/bg-leder.jpg");
   filter: blur(5px);
-
   &.visible {
     opacity: 0.4;
   }
@@ -61,7 +58,6 @@
 .bg-praise {
   background-image: url("/assets/bg-praise.jpg");
   filter: blur(8px);
-
   &.visible {
     opacity: 0.2;
   }
@@ -70,7 +66,6 @@
 .bg-bible {
   background-image: url("/assets/bg-bible.jpg");
   filter: blur(8px);
-
   &.visible {
     opacity: 0.2;
   }

src/app/modules/presentation/monitor/monitor.component.spec.ts

@@ -6,11 +6,13 @@ describe('MonitorComponent', () => {
   let component: MonitorComponent;
   let fixture: ComponentFixture<MonitorComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [MonitorComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [MonitorComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MonitorComponent);

src/app/modules/presentation/monitor/monitor.component.ts

@@ -10,20 +10,15 @@ import {ConfigService} from '../../../services/config.service';
 import {songSwitch} from '../../../widget-modules/components/song-text/animation';
 import {TextRenderingService} from '../../songs/services/text-rendering.service';
 import {PresentationBackground, Show} from '../../shows/services/show';
+import {GlobalSettings} from '../../../services/global-settings';
 import {ShowSongService} from '../../shows/services/show-song.service';
 import {openFullscreen} from '../../../services/fullscreen';
-import {AsyncPipe, DatePipe, NgIf} from '@angular/common';
-import {LogoComponent} from './logo/logo.component';
-import {SongTextComponent} from '../../../widget-modules/components/song-text/song-text.component';
-import {LegalComponent} from './legal/legal.component';
-import {ShowTypePipe} from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @Component({
   selector: 'app-monitor',
   templateUrl: './monitor.component.html',
   styleUrls: ['./monitor.component.less'],
   animations: [songSwitch],
-  imports: [NgIf, LogoComponent, SongTextComponent, LegalComponent, AsyncPipe, DatePipe, ShowTypePipe],
 })
 export class MonitorComponent implements OnInit {
   public song: Song | null = null;
@@ -56,7 +51,7 @@ export class MonitorComponent implements OnInit {
       .pipe(
         debounceTime(100),
         filter(_ => !!_),
-        map(_ => _),
+        map(_ => _ as GlobalSettings),
         map(_ => _.currentShow),
         distinctUntilChanged(),
         tap(_ => (this.currentShowId = _))
@@ -64,7 +59,7 @@ export class MonitorComponent implements OnInit {
       .pipe(
         switchMap(_ => this.showService.read$(_)),
         filter(_ => !!_),
-        map(_ => _),
+        map(_ => _ as Show),
         tap<Show>(_ => {
           this.showType = _.showType;
           this.date = _.date.toDate();

src/app/modules/presentation/presentation.module.ts

@@ -4,45 +4,43 @@ import {CommonModule} from '@angular/common';
 import {PresentationRoutingModule} from './presentation-routing.module';
 import {MonitorComponent} from './monitor/monitor.component';
 import {RemoteComponent} from './remote/remote.component';
-
+import {CardModule} from '../../widget-modules/components/card/card.module';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {MatSelectModule} from '@angular/material/select';
+import {ShowTypeTranslaterModule} from '../../widget-modules/pipes/show-type-translater/show-type-translater.module';
+import {SectionTypeTranslatorModule} from '../../widget-modules/pipes/section-type-translator/section-type-translator.module';
+import {SongTextModule} from '../../widget-modules/components/song-text/song-text.module';
 import {LegalComponent} from './monitor/legal/legal.component';
 import {MatButtonModule} from '@angular/material/button';
 import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
 import {MatSliderModule} from '@angular/material/slider';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {AddSongModule} from '../../widget-modules/components/add-song/add-song.module';
 import {LogoComponent} from './monitor/logo/logo.component';
 import {SelectComponent} from './select/select.component';
 import {MatInputModule} from '@angular/material/input';
-
+import {UserNameModule} from '../../services/user/user-name/user-name.module';
-import {SongTextComponent} from '../../widget-modules/components/song-text/song-text.component';
-import {AddSongComponent} from '../../widget-modules/components/add-song/add-song.component';
-import {SectionTypePipe} from '../../widget-modules/pipes/section-type-translator/section-type.pipe';
-import {ShowTypePipe} from '../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @NgModule({
+  declarations: [MonitorComponent, RemoteComponent, LegalComponent, LogoComponent, SelectComponent],
   exports: [RemoteComponent],
   imports: [
     CommonModule,
     PresentationRoutingModule,
+    CardModule,
     MatFormFieldModule,
     MatSelectModule,
-    ShowTypePipe,
+    ShowTypeTranslaterModule,
-    SectionTypePipe,
+    SectionTypeTranslatorModule,
-    SongTextComponent,
+    SongTextModule,
     MatButtonModule,
     FontAwesomeModule,
     MatSliderModule,
     FormsModule,
-    AddSongComponent,
+    AddSongModule,
     ReactiveFormsModule,
     MatInputModule,
-    MonitorComponent,
+    UserNameModule,
-    RemoteComponent,
-    LegalComponent,
-    LogoComponent,
-    SelectComponent,
   ],
 })
 export class PresentationModule {}

src/app/modules/presentation/remote/remote.component.html

@@ -1,6 +1,6 @@
 <div *ngIf="show" @fade>
-  <app-card [closeIcon]="faIcon" [heading]="show.showType | showType"
+  <app-card [heading]="show.showType | showType" [subheading]="show.date.toDate() | date:'dd.MM.yyyy'"
-            [subheading]="show.date.toDate() | date:'dd.MM.yyyy'" closeLink="/presentation/select">
+            closeLink="/presentation/select" [closeIcon]="faIcon">
 
     <ng-container *ngIf="!progress">
       <div class="song">
@@ -61,8 +61,7 @@
 
         <mat-form-field appearance="outline">
           <mat-label>Überschrift</mat-label>
-          <input (ngModelChange)="onDynamicCaption($event, show.id)" [ngModel]="show.presentationDynamicCaption"
+          <input (ngModelChange)="onDynamicCaption($event, show.id)" [ngModel]="show.presentationDynamicCaption" autocomplete="off" id="dynamic-caption"
-                 autocomplete="off" id="dynamic-caption"
                  matInput
                  type="text">
         </mat-form-field>
@@ -78,7 +77,7 @@
 
       <div *ngIf="show" class="div-bottom">
 
-        <button class="btn-start-presentation" mat-button routerLink="/presentation/monitor">
+        <button routerLink="/presentation/monitor" mat-button>
           <fa-icon [icon]="faDesktop"></fa-icon>
           Präsentation starten
         </button>
@@ -87,8 +86,8 @@
         <mat-form-field appearance="outline">
           <mat-label>Hintergrund</mat-label>
           <mat-select
-            (ngModelChange)="onBackground($event, show.id)"
+            [ngModel]="show.presentationBackground"
-            [ngModel]="show.presentationBackground">
+            (ngModelChange)="onBackground($event, show.id)">
             <mat-option value="none">kein Hintergrund</mat-option>
             <mat-option value="blue">Sternenhimmel</mat-option>
             <mat-option value="green">Blätter</mat-option>
@@ -99,27 +98,25 @@
         </mat-form-field>
 
         <mat-slider
-          #slider
+          (ngModelChange)="onZoom($event, show.id)"
           [max]="100"
           [min]="10"
+          [ngModel]="show.presentationZoom"
           [step]="2"
-          class="zoom-slider"
+          [thumbLabel]="true"
           color="primary"
-          ngDefaultControl
+          class="zoom-slider"
-        ><input (ngModelChange)="onZoom($event, show.id)"
+        >
-                [ngModel]="show.presentationZoom"
-                matSliderThumb>
         </mat-slider>
 
-
       </div>
 
       <app-add-song
         *ngIf="show"
         [addedLive]="true"
         [showSongs]="showSongs"
-        [show]="show"
         [songs]="songs$|async"
+        [show]="show"
       ></app-add-song>
     </ng-container>
   </app-card>

src/app/modules/presentation/remote/remote.component.less

@@ -47,17 +47,21 @@
   outline: 0.5px solid #eee;
 
   &:hover {
-    outline: 0.5px solid var(--color-primary-light);
+    .card-1;
+    outline: 0 solid transparent;
   }
 
   &.active {
-    outline: 0.5px solid var(--color-primary);
+    .card-2;
+    outline: 0 solid transparent;
 
     .head {
-      background-color: var(--color-primary);
+      background: #4286f4;
       color: white;
     }
 
+    .fragment {
+    }
   }
 }
 
@@ -75,11 +79,7 @@
 .div-bottom {
   display: grid;
   gap: 20px;
-  grid-template-columns: 1fr 1fr 1fr;
+  grid-template-columns: min-content min-content auto;
-
-  .btn-start-presentation {
-    height: 56px;
-  }
 
   @media screen and (max-width: 860px) {
     gap: 10px;

src/app/modules/presentation/remote/remote.component.spec.ts

@@ -6,11 +6,13 @@ describe('RemoteComponent', () => {
   let component: RemoteComponent;
   let fixture: ComponentFixture<RemoteComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [RemoteComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [RemoteComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(RemoteComponent);

src/app/modules/presentation/remote/remote.component.ts

@@ -11,21 +11,7 @@ import {debounceTime, filter, map} from 'rxjs/operators';
 import {fade} from '../../../animations';
 import {TextRenderingService} from '../../songs/services/text-rendering.service';
 import {Section} from '../../songs/services/section';
-import {LineType} from '../../songs/services/line-type';
+import {GlobalSettings} from '../../../services/global-settings';
-import {AsyncPipe, DatePipe, NgFor, NgIf} from '@angular/common';
-import {CardComponent} from '../../../widget-modules/components/card/card.component';
-import {MatFormField, MatLabel} from '@angular/material/form-field';
-import {MatInput} from '@angular/material/input';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatButton} from '@angular/material/button';
-import {RouterLink} from '@angular/router';
-import {FaIconComponent} from '@fortawesome/angular-fontawesome';
-import {MatSelect} from '@angular/material/select';
-import {MatOption} from '@angular/material/core';
-import {MatSlider, MatSliderThumb} from '@angular/material/slider';
-import {AddSongComponent} from '../../../widget-modules/components/add-song/add-song.component';
-import {ShowTypePipe} from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
-import {SectionTypePipe} from '../../../widget-modules/pipes/section-type-translator/section-type.pipe';
 
 export interface PresentationSong {
   id: string;
@@ -39,28 +25,6 @@ export interface PresentationSong {
   styleUrls: ['./remote.component.less'],
   animations: [fade],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [
-    NgIf,
-    CardComponent,
-    NgFor,
-    MatFormField,
-    MatLabel,
-    MatInput,
-    ReactiveFormsModule,
-    FormsModule,
-    MatButton,
-    RouterLink,
-    FaIconComponent,
-    MatSelect,
-    MatOption,
-    MatSlider,
-    MatSliderThumb,
-    AddSongComponent,
-    AsyncPipe,
-    DatePipe,
-    ShowTypePipe,
-    SectionTypePipe,
-  ],
 })
 export class RemoteComponent {
   public show: Show | null = null;
@@ -71,37 +35,13 @@ export class RemoteComponent {
   public faIcon = faFolderOpen;
 
   public faDesktop = faDesktop;
-  public presentationDynamicCaptionChanged$ = new Subject<{presentationDynamicCaption: string; showId: string}>();
-  public presentationDynamicTextChanged$ = new Subject<{presentationDynamicText: string; showId: string}>();
-
-  public constructor(
-    private showService: ShowService,
-    private showSongService: ShowSongService,
-    private songService: SongService,
-    private textRenderingService: TextRenderingService,
-    globalSettingsService: GlobalSettingsService,
-    private cRef: ChangeDetectorRef
-  ) {
-    globalSettingsService.get$
-      .pipe(
-        filter(_ => !!_),
-        map(_ => _.currentShow)
-      )
-      .subscribe(_ => {
-        this.onShowChanged(_);
-        this.cRef.markForCheck();
-      });
-
-    this.presentationDynamicCaptionChanged$
-      .pipe(debounceTime(1000))
-      .subscribe(_ => void this.showService.update$(_.showId, {presentationDynamicCaption: _.presentationDynamicCaption}));
-    this.presentationDynamicTextChanged$.pipe(debounceTime(1000)).subscribe(_ => void this.showService.update$(_.showId, {presentationDynamicText: _.presentationDynamicText}));
-  }
 
   public trackBy(index: number, item: PresentationSong): string {
     return item.id;
   }
 
+  public presentationDynamicCaptionChanged$ = new Subject<{presentationDynamicCaption: string; showId: string}>();
+
   public onShowChanged(change: string): void {
     combineLatest([this.showService.read$(change), this.showSongService.list$(change)]).subscribe(([show, list]) => {
       this.showSongs = list;
@@ -109,7 +49,7 @@ export class RemoteComponent {
       const presentationSongs = list.map(song => ({
         id: song.id,
         title: song.title,
-        sections: this.textRenderingService.parse(song.text, null, false),
+        sections: this.textRenderingService.parse(song.text, null),
       }));
       this.presentationSongs = show?.order.map(_ => presentationSongs.filter(f => f.id === _)[0]) ?? [];
       this.cRef.markForCheck();
@@ -117,7 +57,7 @@ export class RemoteComponent {
   }
 
   public getFirstLine(section: Section): string {
-    return section.lines.filter(_ => _.type === LineType.text)[0].text;
+    return section.lines.filter(_ => _.type === 1)[0].text;
   }
 
   public async onSectionClick(id: string, index: number, showId: string): Promise<void> {
@@ -134,6 +74,32 @@ export class RemoteComponent {
   public async onBackground(presentationBackground: PresentationBackground, showId: string): Promise<void> {
     await this.showService.update$(showId, {presentationBackground});
   }
+  public presentationDynamicTextChanged$ = new Subject<{presentationDynamicText: string; showId: string}>();
+
+  public constructor(
+    private showService: ShowService,
+    private showSongService: ShowSongService,
+    private songService: SongService,
+    private textRenderingService: TextRenderingService,
+    private globalSettingsService: GlobalSettingsService,
+    private cRef: ChangeDetectorRef
+  ) {
+    globalSettingsService.get$
+      .pipe(
+        filter(_ => !!_),
+        map(_ => _ as GlobalSettings),
+        map(_ => _.currentShow)
+      )
+      .subscribe(_ => {
+        this.onShowChanged(_);
+        this.cRef.markForCheck();
+      });
+
+    this.presentationDynamicCaptionChanged$
+      .pipe(debounceTime(1000))
+      .subscribe(_ => void this.showService.update$(_.showId, {presentationDynamicCaption: _.presentationDynamicCaption}));
+    this.presentationDynamicTextChanged$.pipe(debounceTime(1000)).subscribe(_ => void this.showService.update$(_.showId, {presentationDynamicText: _.presentationDynamicText}));
+  }
 
   public onDynamicCaption(presentationDynamicCaption: string, showId: string): void {
     this.presentationDynamicCaptionChanged$.next({presentationDynamicCaption, showId});

src/app/modules/presentation/select/select.component.html

@@ -1,11 +1,11 @@
 <div *ngIf="shows$ | async as shows" @fade>
-  <app-card *ngIf="visible" heading="Bitte eine Veranstaltung auswählen">
+  <app-card heading="Bitte eine Veranstaltung auswählen" *ngIf="visible">
     <p *ngIf="!shows.length">
       Es ist derzeit keine Veranstaltung vorhanden
     </p>
 
     <div *ngIf="shows.length>0" class="list">
-      <button (click)="selectShow(show)" *ngFor="let show of shows" mat-stroked-button>
+      <button mat-stroked-button *ngFor="let show of shows" (click)="selectShow(show)">
         <app-user-name [userId]="show.owner"></app-user-name>
         ,
         {{ show.showType | showType }},

src/app/modules/presentation/select/select.component.ts

@@ -5,31 +5,21 @@ import {Show} from '../../shows/services/show';
 import {GlobalSettingsService} from '../../../services/global-settings.service';
 import {Router} from '@angular/router';
 import {fade} from '../../../animations';
-import {AsyncPipe, DatePipe, NgFor, NgIf} from '@angular/common';
-import {CardComponent} from '../../../widget-modules/components/card/card.component';
-import {MatButton} from '@angular/material/button';
-import {UserNameComponent} from '../../../services/user/user-name/user-name.component';
-import {ShowTypePipe} from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @Component({
   selector: 'app-select',
   templateUrl: './select.component.html',
   styleUrls: ['./select.component.less'],
   animations: [fade],
-  imports: [NgIf, CardComponent, NgFor, MatButton, UserNameComponent, AsyncPipe, DatePipe, ShowTypePipe],
 })
 export class SelectComponent implements OnInit {
+  public constructor(private showService: ShowService, private globalSettingsService: GlobalSettingsService, private router: Router) {}
   public visible = false;
+
   public shows$ = this.showService
     .list$(true)
     .pipe(map(_ => _.filter(_ => _.date.toDate() > new Date(new Date().setMonth(new Date().getMonth() - 1))).sort((a, b) => (b.date < a.date ? -1 : b.date > a.date ? 1 : 0))));
 
-  public constructor(
-    private showService: ShowService,
-    private globalSettingsService: GlobalSettingsService,
-    private router: Router
-  ) {}
-
   public async selectShow(show: Show) {
     this.visible = false;
 

src/app/modules/shows/dialog/archive-dialog/archive-dialog.component.spec.ts

@@ -8,7 +8,7 @@ describe('ArchiveDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ArchiveDialogComponent],
+      declarations: [ArchiveDialogComponent],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ArchiveDialogComponent);
@@ -17,6 +17,6 @@ describe('ArchiveDialogComponent', () => {
   });
 
   it('should create', () => {
-    void expect(component).toBeTruthy();
+    expect(component).toBeTruthy();
   });
 });

src/app/modules/shows/dialog/archive-dialog/archive-dialog.component.ts

@@ -1,11 +1,8 @@
 import {Component} from '@angular/core';
-import {MatDialogActions, MatDialogClose, MatDialogContent} from '@angular/material/dialog';
-import {MatButton} from '@angular/material/button';
 
 @Component({
   selector: 'app-archive-dialog',
   templateUrl: './archive-dialog.component.html',
   styleUrls: ['./archive-dialog.component.less'],
-  imports: [MatDialogContent, MatDialogActions, MatButton, MatDialogClose],
 })
 export class ArchiveDialogComponent {}

src/app/modules/shows/dialog/share-dialog/share-dialog.component.html

@@ -1,13 +0,0 @@
-<div mat-dialog-content>
-  <a [href]="data.url">{{ data.url }}</a>
-  <div [style.background-image]="'url('+qrCode+')'" alt="qrcode" class="qrcode">
-  </div>
-</div>
-<div mat-dialog-actions>
-  <button [mat-dialog-close]="true" cdkFocusInitial mat-button>
-    Schließen
-  </button>
-  <button (click)="share()" mat-button>
-    Teilen
-  </button>
-</div>

src/app/modules/shows/dialog/share-dialog/share-dialog.component.less

@@ -1,7 +0,0 @@
-.qrcode {
-  width: 300px;
-  height: 300px;
-  background-size: contain;
-  background-repeat: no-repeat;
-  background-position: center;
-}

src/app/modules/shows/dialog/share-dialog/share-dialog.component.spec.ts

@@ -1,22 +0,0 @@
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {ShareDialogComponent} from './share-dialog.component';
-
-describe('ShareDialogComponent', () => {
-  let component: ShareDialogComponent;
-  let fixture: ComponentFixture<ShareDialogComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [ShareDialogComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ShareDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    void expect(component).toBeTruthy();
-  });
-});

src/app/modules/shows/dialog/share-dialog/share-dialog.component.ts

@@ -1,47 +0,0 @@
-import {Component, Inject} from '@angular/core';
-import {MAT_DIALOG_DATA, MatDialogActions, MatDialogClose, MatDialogContent} from '@angular/material/dialog';
-import {MatButton} from '@angular/material/button';
-import QRCode from 'qrcode';
-import {ShowTypePipe} from '../../../../widget-modules/pipes/show-type-translater/show-type.pipe';
-import {Show} from '../../services/show';
-
-export interface ShareDialogData {
-  url: string;
-  show: Show;
-}
-
-@Component({
-  selector: 'app-share-dialog',
-  imports: [MatButton, MatDialogActions, MatDialogContent, MatDialogClose],
-  templateUrl: './share-dialog.component.html',
-  styleUrl: './share-dialog.component.less',
-})
-export class ShareDialogComponent {
-  public qrCode: string;
-
-  public constructor(@Inject(MAT_DIALOG_DATA) public data: ShareDialogData) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-    QRCode.toDataURL(data.url, {
-      type: 'image/jpeg',
-      quality: 0.92,
-      width: 1280,
-      height: 1280,
-      color: {
-        dark: '#010414',
-        light: '#ffffff',
-      },
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-return
-    }).then(_ => (this.qrCode = _));
-  }
-
-  public async share() {
-    if (navigator.clipboard) await navigator.clipboard.writeText(this.data.url);
-
-    if (navigator.share)
-      await navigator.share({
-        title: new ShowTypePipe().transform(this.data.show.showType),
-        text: new ShowTypePipe().transform(this.data.show.showType) + ' am ' + this.data.show.date.toDate().toLocaleString('de'),
-        url: this.data.url,
-      });
-  }
-}

src/app/modules/shows/edit/edit.component.html

@@ -6,21 +6,19 @@
         <mat-select formControlName="showType">
           <mat-optgroup label="öffentlich">
             <mat-option *ngFor="let key of showTypePublic" [value]="key">{{
-                key | showType
+              key | showType
-              }}
+              }}</mat-option>
-            </mat-option>
           </mat-optgroup>
           <mat-optgroup label="privat">
             <mat-option *ngFor="let key of showTypePrivate" [value]="key">{{
-                key | showType
+              key | showType
-              }}
+              }}</mat-option>
-            </mat-option>
           </mat-optgroup>
         </mat-select>
       </mat-form-field>
       <mat-form-field appearance="outline">
         <mat-label>Datum</mat-label>
-        <input [matDatepicker]="picker" formControlName="date" matInput />
+        <input [matDatepicker]="picker" formControlName="date" matInput/>
         <mat-datepicker-toggle [for]="picker" matSuffix></mat-datepicker-toggle>
         <mat-datepicker #picker touchUi></mat-datepicker>
       </mat-form-field>

src/app/modules/shows/edit/edit.component.ts

@@ -3,45 +3,15 @@ import {ShowDataService} from '../services/show-data.service';
 import {Observable, take} from 'rxjs';
 import {Show} from '../services/show';
 import {ShowService} from '../services/show.service';
-import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
+import {FormControl, FormGroup, Validators} from '@angular/forms';
 import {ActivatedRoute, Router} from '@angular/router';
 import {faSave} from '@fortawesome/free-solid-svg-icons';
 import {map, switchMap} from 'rxjs/operators';
-import firebase from 'firebase/compat/app';
-import {CardComponent} from '../../../widget-modules/components/card/card.component';
-import {MatFormField, MatLabel, MatSuffix} from '@angular/material/form-field';
-import {MatSelect} from '@angular/material/select';
-import {MatOptgroup, MatOption} from '@angular/material/core';
-import {NgFor} from '@angular/common';
-import {MatInput} from '@angular/material/input';
-import {MatDatepicker, MatDatepickerInput, MatDatepickerToggle} from '@angular/material/datepicker';
-import {ButtonRowComponent} from '../../../widget-modules/components/button-row/button-row.component';
-import {ButtonComponent} from '../../../widget-modules/components/button/button.component';
-import {ShowTypePipe} from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
-import Timestamp = firebase.firestore.Timestamp;
 
 @Component({
   selector: 'app-edit',
   templateUrl: './edit.component.html',
   styleUrls: ['./edit.component.less'],
-  imports: [
-    CardComponent,
-    ReactiveFormsModule,
-    MatFormField,
-    MatLabel,
-    MatSelect,
-    MatOptgroup,
-    NgFor,
-    MatOption,
-    MatInput,
-    MatDatepickerInput,
-    MatDatepickerToggle,
-    MatSuffix,
-    MatDatepicker,
-    ButtonRowComponent,
-    ButtonComponent,
-    ShowTypePipe,
-  ],
 })
 export class EditComponent implements OnInit {
   public shows$: Observable<Show[]>;
@@ -54,12 +24,7 @@ export class EditComponent implements OnInit {
   });
   public faSave = faSave;
 
-  public constructor(
+  public constructor(private showService: ShowService, showDataService: ShowDataService, private router: Router, private activatedRoute: ActivatedRoute) {
-    private showService: ShowService,
-    showDataService: ShowDataService,
-    private router: Router,
-    private activatedRoute: ActivatedRoute
-  ) {
     this.shows$ = showDataService.list$;
   }
 
@@ -88,10 +53,13 @@ export class EditComponent implements OnInit {
       return;
     }
 
-    await this.showService.update$(this.form.value.id, {
+    await this.showService.update$(
-      date: Timestamp.fromDate(this.form.value.date),
+      this.form.value.id as string,
-      showType: this.form.value.showType,
+      {
-    } as Partial<Show>);
+        date: this.form.value.date,
+        showType: this.form.value.showType,
+      } as Partial<Show>
+    );
     await this.router.navigateByUrl(`/shows/${this.form.value.id ?? ''}`);
   }
 }

src/app/modules/shows/list/filter/filter-values.ts

@@ -1,5 +1,3 @@
 export interface FilterValues {
   time: number;
-  owner: string;
-  showType: string;
 }

src/app/modules/shows/list/filter/filter.component.html

@@ -5,37 +5,8 @@
       <mat-label>Zeitraum</mat-label>
       <mat-select formControlName="time">
         <mat-option *ngFor="let time of times" [value]="time.key">{{
-            time.value
+          time.value
-          }}
+          }}</mat-option>
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-
-    <mat-form-field appearance="outline">
-      <mat-label>Ersteller</mat-label>
-      <mat-select formControlName="owner">
-        <mat-option *ngFor="let owner of owners" [value]="owner.key">{{
-            owner.value
-          }}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-
-    <mat-form-field appearance="outline">
-      <mat-label>Art der Veranstaltung</mat-label>
-      <mat-select formControlName="showType">
-        <mat-optgroup label="öffentlich">
-          <mat-option *ngFor="let key of showTypePublic" [value]="key">{{
-              key | showType
-            }}
-          </mat-option>
-        </mat-optgroup>
-        <mat-optgroup label="privat">
-          <mat-option *ngFor="let key of showTypePrivate" [value]="key">{{
-              key | showType
-            }}
-          </mat-option>
-        </mat-optgroup>
       </mat-select>
     </mat-form-field>
 

src/app/modules/shows/list/filter/filter.component.less

@@ -1,5 +1,5 @@
 .third {
   display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
+  grid-template-columns: 1fr 1fr 1fr 1fr;
   column-gap: 20px;
 }

src/app/modules/shows/list/filter/filter.component.spec.ts

@@ -8,7 +8,7 @@ describe('FilterComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FilterComponent],
+      declarations: [FilterComponent],
     }).compileComponents();
   });
 
@@ -19,6 +19,6 @@ describe('FilterComponent', () => {
   });
 
   it('should create', () => {
-    void expect(component).toBeTruthy();
+    expect(component).toBeTruthy();
   });
 });

src/app/modules/shows/list/filter/filter.component.ts

@@ -1,33 +1,19 @@
 import {Component, Input} from '@angular/core';
-import {KeyValue, NgFor} from '@angular/common';
+import {KeyValue} from '@angular/common';
 import {ActivatedRoute, Router} from '@angular/router';
-import {ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {FilterValues} from './filter-values';
 import {Show} from '../../services/show';
-import {ShowService} from '../../services/show.service';
-import {distinctUntilChanged, map} from 'rxjs/operators';
-import {combineLatest, Observable} from 'rxjs';
-import {dynamicSort, onlyUnique} from '../../../../services/filter.helper';
-import {UserService} from '../../../../services/user/user.service';
-import {isEqual} from 'lodash';
-import {MatFormField, MatLabel} from '@angular/material/form-field';
-import {MatSelect} from '@angular/material/select';
-import {MatOptgroup, MatOption} from '@angular/material/core';
-import {ShowTypePipe} from '../../../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @Component({
   selector: 'app-filter',
   templateUrl: './filter.component.html',
   styleUrls: ['./filter.component.less'],
-  imports: [ReactiveFormsModule, MatFormField, MatLabel, MatSelect, NgFor, MatOption, MatOptgroup, ShowTypePipe],
 })
 export class FilterComponent {
   @Input() public route = '/shows/';
   @Input() public shows: Show[] = [];
 
-  public showTypePublic = ShowService.SHOW_TYPE_PUBLIC;
-  public showTypePrivate = ShowService.SHOW_TYPE_PRIVATE;
-
   public filterFormGroup: UntypedFormGroup;
   public times: KeyValue<number, string>[] = [
     {key: 1, value: 'letzter Monat'},
@@ -36,19 +22,9 @@ export class FilterComponent {
     {key: 99999, value: 'alle'},
   ];
 
-  public owners: {key: string; value: string}[] = [];
+  public constructor(private router: Router, activatedRoute: ActivatedRoute, fb: UntypedFormBuilder) {
-
-  public constructor(
-    private router: Router,
-    private showService: ShowService,
-    private userService: UserService,
-    activatedRoute: ActivatedRoute,
-    fb: UntypedFormBuilder
-  ) {
     this.filterFormGroup = fb.group({
       time: 1,
-      owner: null,
-      showType: null,
     });
 
     activatedRoute.queryParams.subscribe(params => {
@@ -57,34 +33,8 @@ export class FilterComponent {
     });
 
     this.filterFormGroup.controls.time.valueChanges.subscribe(_ => void this.filerValueChanged('time', _ as number));
-    this.filterFormGroup.controls.owner.valueChanges.subscribe(_ => void this.filerValueChanged('owner', _ as string));
-    this.filterFormGroup.controls.showType.valueChanges.subscribe(_ => void this.filerValueChanged('showType', _ as string));
-
-    this.owners$().subscribe(owners => (this.owners = owners));
   }
 
-  public owners$ = (): Observable<{key: string; value: string}[]> => {
-    return combineLatest([
-      this.showService.list$().pipe(
-        map(shows => {
-          return shows.map(show => show.owner).filter(onlyUnique);
-        })
-      ),
-      this.userService.users$,
-    ]).pipe(
-      map(([owners, users]) => {
-        return owners
-          .map(ownerId => ({
-            key: ownerId,
-            value: users.find(user => user.id === ownerId)?.name,
-          }))
-          .sort(dynamicSort('value'));
-      }),
-      distinctUntilChanged(isEqual),
-      map(_ => _ as {key: string; value: string}[])
-    );
-  };
-
   private async filerValueChanged<T>(key: string, value: T): Promise<void> {
     const route = this.router.createUrlTree([this.route], {
       queryParams: {[key]: value},

src/app/modules/shows/list/list-item/list-item.component.html

@@ -1,7 +1,5 @@
-<div *ngIf="show" class="list-item">
+<div class="list-item" *ngIf="show">
   <div>{{ show.date.toDate() | date: "dd.MM.yyyy" }}</div>
-  <div>
+  <div><app-user-name [userId]="show.owner"></app-user-name></div>
-    <app-user-name [userId]="show.owner"></app-user-name>
-  </div>
   <div>{{ show.showType | showType }}</div>
 </div>

src/app/modules/shows/list/list-item/list-item.component.spec.ts

@@ -6,11 +6,13 @@ describe('ListItemComponent', () => {
   let component: ListItemComponent;
   let fixture: ComponentFixture<ListItemComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [ListItemComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [ListItemComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ListItemComponent);

src/app/modules/shows/list/list-item/list-item.component.ts

@@ -1,14 +1,10 @@
 import {Component, Input} from '@angular/core';
 import {Show} from '../../services/show';
-import {DatePipe, NgIf} from '@angular/common';
-import {UserNameComponent} from '../../../../services/user/user-name/user-name.component';
-import {ShowTypePipe} from '../../../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @Component({
   selector: 'app-list-item',
   templateUrl: './list-item.component.html',
   styleUrls: ['./list-item.component.less'],
-  imports: [NgIf, UserNameComponent, DatePipe, ShowTypePipe],
 })
 export class ListItemComponent {
   @Input() public show: Show | null = null;

src/app/modules/shows/list/list.component.html

@@ -1,5 +1,5 @@
 <div>
-  <!--  <app-list-header *appRole="['leader']"></app-list-header>-->
+<!--  <app-list-header *appRole="['leader']"></app-list-header>-->
   <app-list-header *appRole="['leader']">
     <app-filter *ngIf="shows$ | async as shows" [shows]="publicShows$ | async"></app-filter>
   </app-list-header>
@@ -9,7 +9,7 @@
       <app-card
         *ngIf="shows.length > 0"
         [padding]="false"
-        heading="Meine Veranstaltungen"
+        heading="meine Veranstaltungen"
       >
         <app-list-item
           *ngFor="let show of shows | sortBy: 'desc':'date'"
@@ -24,7 +24,7 @@
     <app-card
       *ngIf="shows.length > 0"
       [padding]="false"
-      heading="Veröffentlichte Veranstaltungen"
+      heading="veröffentlichte Veranstaltungen"
     >
       <app-list-item
         *ngFor="let show of shows | sortBy: 'desc':'date'; trackBy: trackBy"

src/app/modules/shows/list/list.component.spec.ts

@@ -6,11 +6,13 @@ describe('ListComponent', () => {
   let component: ListComponent;
   let fixture: ComponentFixture<ListComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [ListComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [ListComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ListComponent);

src/app/modules/shows/list/list.component.ts

@@ -4,22 +4,14 @@ import {Show} from '../services/show';
 import {fade} from '../../../animations';
 import {ShowService} from '../services/show.service';
 import {FilterValues} from './filter/filter-values';
-import {ActivatedRoute, RouterLink} from '@angular/router';
+import {ActivatedRoute} from '@angular/router';
 import {map} from 'rxjs/operators';
-import {RoleDirective} from '../../../services/user/role.directive';
-import {ListHeaderComponent} from '../../../widget-modules/components/list-header/list-header.component';
-import {AsyncPipe, NgFor, NgIf} from '@angular/common';
-import {FilterComponent} from './filter/filter.component';
-import {CardComponent} from '../../../widget-modules/components/card/card.component';
-import {ListItemComponent} from './list-item/list-item.component';
-import {SortByPipe} from '../../../widget-modules/pipes/sort-by/sort-by.pipe';
 
 @Component({
   selector: 'app-list',
   templateUrl: './list.component.html',
   styleUrls: ['./list.component.less'],
   animations: [fade],
-  imports: [RoleDirective, ListHeaderComponent, NgIf, FilterComponent, CardComponent, NgFor, ListItemComponent, RouterLink, AsyncPipe, SortByPipe],
 })
 export class ListComponent {
   public shows$ = this.showService.list$();
@@ -31,29 +23,18 @@ export class ListComponent {
       return +filterValues.time;
     })
   );
-  public owner$ = this.activatedRoute.queryParams.pipe(
-    map(params => {
-      const filterValues = params as FilterValues;
-      return filterValues?.owner;
-    })
-  );
 
-  public publicShows$ = combineLatest([this.shows$, this.lastMonths$, this.owner$]).pipe(
+  public publicShows$ = combineLatest([this.shows$, this.lastMonths$]).pipe(
-    map(([shows, lastMonths, owner]) =>
+    map(_ =>
-      shows
+      _[0].filter(f => {
-        .filter(f => {
+        const d = new Date();
-          const d = new Date();
+        d.setMonth(d.getMonth() - _[1]);
-          d.setMonth(d.getMonth() - lastMonths);
+        return f.published && f.date.toDate() >= d;
-          return f.published && f.date.toDate() >= d;
+      })
-        })
-        .filter(show => !owner || show.owner === owner)
     )
   );
 
-  public constructor(
+  public constructor(private showService: ShowService, private activatedRoute: ActivatedRoute) {}
-    private showService: ShowService,
-    private activatedRoute: ActivatedRoute
-  ) {}
 
   public trackBy = (index: number, show: unknown) => (show as Show).id;
 }

src/app/modules/shows/new/new.component.html

@@ -6,21 +6,19 @@
         <mat-select formControlName="showType">
           <mat-optgroup label="öffentlich">
             <mat-option *ngFor="let key of showTypePublic" [value]="key">{{
-                key | showType
+              key | showType
-              }}
+              }}</mat-option>
-            </mat-option>
           </mat-optgroup>
           <mat-optgroup label="privat">
             <mat-option *ngFor="let key of showTypePrivate" [value]="key">{{
-                key | showType
+              key | showType
-              }}
+              }}</mat-option>
-            </mat-option>
           </mat-optgroup>
         </mat-select>
       </mat-form-field>
       <mat-form-field appearance="outline">
         <mat-label>Datum</mat-label>
-        <input [matDatepicker]="picker" formControlName="date" matInput />
+        <input [matDatepicker]="picker" formControlName="date" matInput/>
         <mat-datepicker-toggle [for]="picker" matSuffix></mat-datepicker-toggle>
         <mat-datepicker #picker touchUi></mat-datepicker>
       </mat-form-field>

src/app/modules/shows/new/new.component.spec.ts

@@ -6,11 +6,13 @@ describe('NewComponent', () => {
   let component: NewComponent;
   let fixture: ComponentFixture<NewComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [NewComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [NewComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NewComponent);

src/app/modules/shows/new/new.component.ts

@@ -3,42 +3,14 @@ import {ShowDataService} from '../services/show-data.service';
 import {Observable} from 'rxjs';
 import {Show} from '../services/show';
 import {ShowService} from '../services/show.service';
-import {ReactiveFormsModule, UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms';
+import {UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms';
 import {Router} from '@angular/router';
 import {faSave} from '@fortawesome/free-solid-svg-icons';
-import {CardComponent} from '../../../widget-modules/components/card/card.component';
-import {MatFormField, MatLabel, MatSuffix} from '@angular/material/form-field';
-import {MatSelect} from '@angular/material/select';
-import {MatOptgroup, MatOption} from '@angular/material/core';
-import {NgFor} from '@angular/common';
-import {MatInput} from '@angular/material/input';
-import {MatDatepicker, MatDatepickerInput, MatDatepickerToggle} from '@angular/material/datepicker';
-import {ButtonRowComponent} from '../../../widget-modules/components/button-row/button-row.component';
-import {ButtonComponent} from '../../../widget-modules/components/button/button.component';
-import {ShowTypePipe} from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @Component({
   selector: 'app-new',
   templateUrl: './new.component.html',
   styleUrls: ['./new.component.less'],
-  imports: [
-    CardComponent,
-    ReactiveFormsModule,
-    MatFormField,
-    MatLabel,
-    MatSelect,
-    MatOptgroup,
-    NgFor,
-    MatOption,
-    MatInput,
-    MatDatepickerInput,
-    MatDatepickerToggle,
-    MatSuffix,
-    MatDatepicker,
-    ButtonRowComponent,
-    ButtonComponent,
-    ShowTypePipe,
-  ],
 })
 export class NewComponent implements OnInit {
   public shows$: Observable<Show[]>;
@@ -50,11 +22,7 @@ export class NewComponent implements OnInit {
   });
   public faSave = faSave;
 
-  public constructor(
+  public constructor(private showService: ShowService, showDataService: ShowDataService, private router: Router) {
-    private showService: ShowService,
-    showDataService: ShowDataService,
-    private router: Router
-  ) {
     this.shows$ = showDataService.list$;
   }
 

src/app/modules/shows/services/docx.service.ts

@@ -4,6 +4,7 @@ import {ShowService} from './show.service';
 import {ShowTypePipe} from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
 import {ShowSongService} from './show-song.service';
 import {Song} from '../../songs/services/song';
+import {SongService} from '../../songs/services/song.service';
 import {ShowSong} from './show-song';
 import {Show} from './show';
 import {ChordMode} from '../../../widget-modules/components/song-text/song-text.component';
@@ -29,6 +30,7 @@ export class DocxService {
   public constructor(
     private showService: ShowService,
     private showSongService: ShowSongService,
+    private songService: SongService,
     private textRenderingService: TextRenderingService,
     private userService: UserService,
     private configService: ConfigService
@@ -92,14 +94,7 @@ export class DocxService {
     });
   }
 
-  private renderSongs(
+  private renderSongs(songs: {showSong: ShowSong; sections: Section[]}[], options: DownloadOptions, config: Config): Paragraph[] {
-    songs: {
-      showSong: ShowSong;
-      sections: Section[];
-    }[],
-    options: DownloadOptions,
-    config: Config
-  ): Paragraph[] {
     return songs.reduce((p: Paragraph[], song) => [...p, ...this.renderSong(song.showSong, song.showSong, song.sections, options, config)], []);
   }
 
@@ -204,16 +199,8 @@ export class DocxService {
         sections,
       };
     });
-    const songsLoaded = (await Promise.all(songsAsync))
+    const songsLoaded = (await Promise.all(songsAsync)).filter(_ => !!_).map(_ => _ as {showSong: ShowSong; sections: Section[]});
-      .filter(_ => !!_)
+    const songs = show.order.map(_ => songsLoaded.filter(f => f.showSong.id === _)[0]);
-      .map(
-        _ =>
-          _ as {
-            showSong: ShowSong;
-            sections: Section[];
-          }
-      );
-    const songs = show.order.map(_ => songsLoaded.find(f => f.showSong.id === _)).filter(_ => !!_);
     return {songs, show, user, config};
   }
 

src/app/modules/shows/services/show-data.service.ts

@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {BehaviorSubject, Observable} from 'rxjs';
+import {BehaviorSubject, firstValueFrom, Observable} from 'rxjs';
 import {DbService} from '../../../services/db.service';
 import {Show} from './show';
 import {map} from 'rxjs/operators';
@@ -8,14 +8,14 @@ import {map} from 'rxjs/operators';
   providedIn: 'root',
 })
 export class ShowDataService {
-  public list$ = new BehaviorSubject<Show[]>([]);
   private collection = 'shows';
 
   public constructor(private dbService: DbService) {
     this.dbService.col$<Show>(this.collection).subscribe(_ => this.list$.next(_));
   }
 
-  public listRaw$ = () => this.dbService.col$<Show>(this.collection);
+  public list$ = new BehaviorSubject<Show[]>([]);
+  public list = () => firstValueFrom(this.dbService.col$<Show>(this.collection));
 
   public read$ = (showId: string): Observable<Show | null> => this.list$.pipe(map(_ => _.find(s => s.id === showId) || null));
 

src/app/modules/shows/services/show-song-data.service.ts

@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {DbService} from '../../../services/db.service';
-import {Observable} from 'rxjs';
+import {firstValueFrom, Observable} from 'rxjs';
 import {ShowSong} from './show-song';
 import {QueryFn} from '@angular/fire/compat/firestore/interfaces';
 
@@ -14,6 +14,8 @@ export class ShowSongDataService {
   public constructor(private dbService: DbService) {}
 
   public list$ = (showId: string, queryFn?: QueryFn): Observable<ShowSong[]> => this.dbService.col$(`${this.collection}/${showId}/${this.subCollection}`, queryFn);
+  public list = (showId: string): Promise<ShowSong[]> => firstValueFrom(this.list$(showId));
+
   public read$ = (showId: string, songId: string): Observable<ShowSong | null> => this.dbService.doc$(`${this.collection}/${showId}/${this.subCollection}/${songId}`);
   public update$ = async (showId: string, songId: string, data: Partial<ShowSong>): Promise<void> =>
     await this.dbService.doc(`${this.collection}/${showId}/${this.subCollection}/${songId}`).update(data);

src/app/modules/shows/services/show-song.service.ts

@@ -1,10 +1,12 @@
 import {Injectable} from '@angular/core';
 import {ShowSongDataService} from './show-song-data.service';
-import {firstValueFrom, Observable} from 'rxjs';
+import {firstValueFrom, forkJoin, mergeMap, Observable} from 'rxjs';
 import {ShowSong} from './show-song';
 import {SongDataService} from '../../songs/services/song-data.service';
 import {UserService} from '../../../services/user/user.service';
 import {ShowService} from './show.service';
+import {map, switchMap} from 'rxjs/operators';
+import {ShowDataService} from './show-data.service';
 
 @Injectable({
   providedIn: 'root',
@@ -14,7 +16,8 @@ export class ShowSongService {
     private showSongDataService: ShowSongDataService,
     private songDataService: SongDataService,
     private userService: UserService,
-    private showService: ShowService
+    private showService: ShowService,
+    private showDataService: ShowDataService
   ) {}
 
   public async new$(showId: string, songId: string, addedLive = false): Promise<string | null> {
@@ -29,7 +32,6 @@ export class ShowSongService {
       chordMode: user.chordMode,
       addedLive,
     };
-    await this.userService.incSongCount(songId);
     return await this.showSongDataService.add(showId, data);
   }
 
@@ -39,15 +41,47 @@ export class ShowSongService {
   public list$ = (showId: string): Observable<ShowSong[]> => this.showSongDataService.list$(showId);
   public list = (showId: string): Promise<ShowSong[]> => firstValueFrom(this.list$(showId));
 
-  public async delete$(showId: string, showSongId: string, index: number): Promise<void> {
+  public async delete$(showId: string, songId: string, index: number): Promise<void> {
-    const showSong = await this.read(showId, showSongId);
+    await this.showSongDataService.delete(showId, songId);
-    await this.showSongDataService.delete(showId, showSongId);
     const show = await firstValueFrom(this.showService.read$(showId));
     if (!show) return;
     const order = show.order;
     order.splice(index, 1);
     await this.showService.update$(showId, {order});
-    await this.userService.decSongCount(showSong.songId);
+  }
+
+  public countSongUsage$(songId: string) {
+    return this.userService.user$.pipe(
+      switchMap(user =>
+        this.showService.list$().pipe(
+          map(shows => {
+            const myShows = shows.filter(_ => _.owner === user?.id);
+            return myShows.map(show => this.list$(show.id));
+          }),
+          mergeMap(songs => forkJoin(songs)),
+          map(songs => songs.reduce((pn, u) => [...pn, ...u], [])),
+          map(songs => songs.reduce((count, song) => (song.songId === songId ? 1 : 0), 0))
+        )
+      )
+    );
+  }
+
+  public async countSongUsage(songId: string) {
+    // return 0; // todo
+
+    const user = await this.userService.currentUser();
+    const userId = user?.id;
+    if (!userId) return null;
+    const shows = await this.showDataService.list();
+    let count = 0;
+    for (const show of shows.filter(_ => _.owner === userId)) {
+      const songs = await this.showSongDataService.list(show.id);
+      for (const song of songs) {
+        if (song.songId === songId) count++;
+      }
+    }
+
+    return count;
   }
 
   public update$ = async (showId: string, songId: string, data: Partial<ShowSong>): Promise<void> => await this.showSongDataService.update$(showId, songId, data);

src/app/modules/shows/services/show.service.ts

@@ -15,10 +15,7 @@ export class ShowService {
   public static SHOW_TYPE_PRIVATE = ['home-group', 'prayer-group', 'misc-private'];
   private user: User | null = null;
 
-  public constructor(
+  public constructor(private showDataService: ShowDataService, private userService: UserService) {
-    private showDataService: ShowDataService,
-    private userService: UserService
-  ) {
     userService.user$.subscribe(_ => (this.user = _));
   }
 

src/app/modules/shows/services/show.ts

@@ -13,7 +13,6 @@ export interface Show {
   published: boolean;
   archived: boolean;
   order: string[];
-  shareId: string;
 
   presentationSongId: string;
   presentationDynamicCaption: string;

src/app/modules/shows/show/show.component.html

@@ -6,7 +6,7 @@
       show.date.toDate() | date: 'dd.MM.yyyy'
     }} - {{ getStatus(show) }}"
   >
-    <p *ngIf="!useSwiper">{{ show.public ? 'öffentliche' : 'geschlossene' }} Veranstaltung von
+    <p *ngIf="!useSwiper">{{show.public ? 'öffentliche' : 'geschlossene'}} Veranstaltung von
       <app-user-name [userId]="show.owner"></app-user-name>
     </p>
     <div class="head">
@@ -14,36 +14,34 @@
         <mat-checkbox *ngIf="!useSwiper" [(ngModel)]="showText">Text anzeigen</mat-checkbox>
       </div>
       <div [class.floating]="useSwiper">
-        <app-menu-button (click)="onZoomOut()" @fade [icon]="faZoomOut" class="btn-delete btn-icon"
+        <app-menu-button @fade (click)="onZoomOut()" [icon]="faZoomOut" class="btn-delete btn-icon"
                          matTooltip="Verkleinern"></app-menu-button>
-        <app-menu-button (click)="onZoomIn()" @fade [icon]="faZoomIn" class="btn-delete btn-icon"
+        <app-menu-button @fade (click)="onZoomIn()" [icon]="faZoomIn" class="btn-delete btn-icon"
                          matTooltip="Vergrößern"></app-menu-button>
         <app-menu-button (click)="useSwiper=!useSwiper;fullscreen(useSwiper)" @fade
-                         [icon]="useSwiper ? faRestore : faMaximize" class="btn-delete btn-icon"
+                         [icon]="useSwiper ? faFileLines : faFile" class="btn-delete btn-icon"
-                         matTooltip="Vollbild"></app-menu-button>
+                         matTooltip="Swiper umschalten"></app-menu-button>
       </div>
     </div>
-    <div (cdkDropListDropped)="drop($event, show)" *ngIf="showSongs && !useSwiper"
+    <div *ngIf="showSongs && !useSwiper" [cdkDropListDisabled]="show.published || showText" cdkDropList
-         [cdkDropListDisabled]="show.published || showText"
+         class="song-list"
          [style.cursor]="!(show.published || showText) ? 'drag' : 'inherit'"
          [style.font-size]="textSize + 'em'"
-         cdkDropList
+         (cdkDropListDropped)="drop($event, show)">
-         class="song-list">
+      <div *ngFor="let song of orderedShowSongs(show); let i = index; trackBy: trackBy" class="song-row" cdkDrag>
-      <div *ngFor="let song of orderedShowSongs(show); let i = index; trackBy: trackBy" cdkDrag class="song-row">
         <app-song
-          [fullscreen]="useSwiper"
-          [index]="i"
-          [showId]="showId"
           [showSong]="song"
+          [showId]="showId"
           [showText]="showText"
           [show]="show"
+          [fullscreen]="useSwiper"
+          [index]="i"
         ></app-song>
       </div>
     </div>
 
     <swiper-container *ngIf="useSwiper" scrollbar="true">
-      <swiper-slide *ngFor="let song of orderedShowSongs(show); let i = index; trackBy: trackBy"
+      <swiper-slide *ngFor="let song of orderedShowSongs(show); let i = index; trackBy: trackBy" [style.font-size]="textSize + 'em'"
-                    [style.font-size]="textSize + 'em'"
                     class="song-swipe">
         <app-song
           [fullscreen]="true"
@@ -53,17 +51,13 @@
           [showText]="true"
           [show]="show"
         ></app-song>
-        <div class="time">{{ currentTime | date: 'HH:mm' }}</div>
-        <div *ngIf="getNextSong(orderedShowSongs(show), i) as next" class="next-song">{{ next }}
-          <fa-icon [icon]="faNextSong"></fa-icon>
-        </div>
       </swiper-slide>
     </swiper-container>
 
     <app-add-song
       *ngIf="songs && !show.published && !useSwiper"
-      [showSongs]="showSongs"
       [show]="show"
+      [showSongs]="showSongs"
       [songs]="songs"
     ></app-add-song>
 
@@ -82,10 +76,7 @@
           <app-button (click)="onPublish(false)" *ngIf="show.published" [icon]="faUnpublish">
             Veröffentlichung zurückziehen
           </app-button>
-          <app-button (click)="onShare(show)" *ngIf="show.published" [icon]="faShare">
+          <app-button (click)="onChange(show.id)" [icon]="faSliders" *ngIf="!show.published">
-            Teilen
-          </app-button>
-          <app-button (click)="onChange(show.id)" *ngIf="!show.published" [icon]="faSliders">
             Ändern
           </app-button>
         </ng-container>

src/app/modules/shows/show/show.component.less

@@ -49,21 +49,3 @@
   top: 12px;
   z-index: 5;
 }
-
-.next-song {
-  color: #0008;
-  position: fixed;
-  bottom: 0;
-  right: 10px;
-
-  fa-icon {
-    padding: 6px;
-  }
-}
-
-.time {
-  color: #0008;
-  position: fixed;
-  bottom: 0;
-  left: 10px;
-}

src/app/modules/shows/show/show.component.spec.ts

@@ -6,11 +6,13 @@ describe('ShowComponent', () => {
   let component: ShowComponent;
   let fixture: ComponentFixture<ShowComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [ShowComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [ShowComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ShowComponent);

src/app/modules/shows/show/show.component.ts

@@ -1,4 +1,4 @@
-import {ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, HostListener, OnDestroy, OnInit} from '@angular/core';
+import {ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit} from '@angular/core';
 import {filter, map, switchMap, tap} from 'rxjs/operators';
 import {ActivatedRoute, Router} from '@angular/router';
 import {ShowService} from '../services/show.service';
@@ -10,76 +10,30 @@ import {ShowSongService} from '../services/show-song.service';
 import {ShowSong} from '../services/show-song';
 import {DocxService} from '../services/docx.service';
 import {
-  faArrowUpRightFromSquare,
   faBox,
   faBoxOpen,
-  faChevronRight,
+  faExternalLinkAlt,
+  faFile,
   faFileDownload,
+  faFileLines,
   faLock,
   faMagnifyingGlassMinus,
   faMagnifyingGlassPlus,
-  faMaximize,
-  faMinimize,
   faSliders,
-  faUnlock,
   faUser,
   faUsers,
 } from '@fortawesome/free-solid-svg-icons';
-import {CdkDrag, CdkDragDrop, CdkDropList, moveItemInArray} from '@angular/cdk/drag-drop';
+import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop';
 import {fade} from '../../../animations';
 import {MatDialog} from '@angular/material/dialog';
 import {ArchiveDialogComponent} from '../dialog/archive-dialog/archive-dialog.component';
 import {closeFullscreen, openFullscreen} from '../../../services/fullscreen';
-import {GuestShowService} from '../../guest/guest-show.service';
-import {ShareDialogComponent} from '../dialog/share-dialog/share-dialog.component';
-import {AsyncPipe, DatePipe, NgFor, NgIf} from '@angular/common';
-import {CardComponent} from '../../../widget-modules/components/card/card.component';
-import {UserNameComponent} from '../../../services/user/user-name/user-name.component';
-import {MatCheckbox} from '@angular/material/checkbox';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MenuButtonComponent} from '../../../widget-modules/components/menu-button/menu-button.component';
-import {MatTooltip} from '@angular/material/tooltip';
-import {SongComponent} from './song/song.component';
-import {FaIconComponent} from '@fortawesome/angular-fontawesome';
-import {AddSongComponent} from '../../../widget-modules/components/add-song/add-song.component';
-import {ButtonRowComponent} from '../../../widget-modules/components/button-row/button-row.component';
-import {RoleDirective} from '../../../services/user/role.directive';
-import {OwnerDirective} from '../../../services/user/owner.directive';
-import {ButtonComponent} from '../../../widget-modules/components/button/button.component';
-import {MatMenu, MatMenuTrigger} from '@angular/material/menu';
-import {ShowTypePipe} from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
 
 @Component({
   selector: 'app-show',
   templateUrl: './show.component.html',
   styleUrls: ['./show.component.less'],
   animations: [fade],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA],
-  imports: [
-    NgIf,
-    CardComponent,
-    UserNameComponent,
-    MatCheckbox,
-    ReactiveFormsModule,
-    FormsModule,
-    MenuButtonComponent,
-    MatTooltip,
-    CdkDropList,
-    NgFor,
-    CdkDrag,
-    SongComponent,
-    FaIconComponent,
-    AddSongComponent,
-    ButtonRowComponent,
-    RoleDirective,
-    OwnerDirective,
-    ButtonComponent,
-    MatMenuTrigger,
-    MatMenu,
-    AsyncPipe,
-    DatePipe,
-    ShowTypePipe,
-  ],
 })
 export class ShowComponent implements OnInit, OnDestroy {
   public show$: Observable<Show | null> | null = null;
@@ -90,22 +44,18 @@ export class ShowComponent implements OnInit, OnDestroy {
 
   public faBox = faBox;
   public faBoxOpen = faBoxOpen;
-  public faPublish = faUnlock;
+  public faPublish = faExternalLinkAlt;
   public faUnpublish = faLock;
-  public faShare = faArrowUpRightFromSquare;
   public faDownload = faFileDownload;
   public faSliders = faSliders;
   public faUser = faUser;
   public faUsers = faUsers;
   public faZoomIn = faMagnifyingGlassPlus;
   public faZoomOut = faMagnifyingGlassMinus;
-  public useSwiper = false;
+  public faPage = faFile;
-  public textSize = 1;
+  public faLines = faFileLines;
-  public faRestore = faMinimize;
-  public faMaximize = faMaximize;
-  public faNextSong = faChevronRight;
-  public currentTime: Date;
   private subs: Subscription[] = [];
+  public useSwiper = false;
 
   public constructor(
     private activatedRoute: ActivatedRoute,
@@ -115,15 +65,10 @@ export class ShowComponent implements OnInit, OnDestroy {
     private docxService: DocxService,
     private router: Router,
     private cRef: ChangeDetectorRef,
-    public dialog: MatDialog,
+    public dialog: MatDialog
-    private guestShowService: GuestShowService
   ) {}
 
   public ngOnInit(): void {
-    this.currentTime = new Date();
-    setInterval(() => {
-      this.currentTime = new Date();
-    }, 10000);
     this.show$ = this.activatedRoute.params.pipe(
       map(param => param as {showId: string}),
       map(param => param.showId),
@@ -156,6 +101,8 @@ export class ShowComponent implements OnInit, OnDestroy {
     this.subs.forEach(_ => _.unsubscribe());
   }
 
+  public textSize = 1;
+
   public onZoomIn() {
     this.textSize += 0.1;
   }
@@ -181,11 +128,6 @@ export class ShowComponent implements OnInit, OnDestroy {
     if (this.showId != null) await this.showService.update$(this.showId, {published});
   }
 
-  public onShare = async (show: Show): Promise<void> => {
-    const url = await this.guestShowService.share(show, this.orderedShowSongs(show));
-    this.dialog.open(ShareDialogComponent, {data: {url, show}});
-  };
-
   public getStatus(show: Show): string {
     if (show.published) {
       return 'veröffentlicht';
@@ -220,15 +162,17 @@ export class ShowComponent implements OnInit, OnDestroy {
     return show.order.map(_ => list.filter(f => f.id === _)[0]);
   }
 
-  public trackBy = (_: number, show: ShowSong) => show?.id;
+  public trackBy = (index: number, show: ShowSong) => show.id;
 
   public async onChange(showId: string) {
     await this.router.navigateByUrl('/shows/' + showId + '/edit');
   }
 
+  public faFileLines = faFileLines;
+  public faFile = faFile;
+
   @HostListener('document:keydown', ['$event'])
   public handleKeyboardEvent(event: KeyboardEvent) {
-    if (!this.useSwiper) return;
     const swiperEl = document.querySelector('swiper-container') as unknown as Swiper;
     switch (event.code) {
       case 'ArrowRight':
@@ -243,16 +187,9 @@ export class ShowComponent implements OnInit, OnDestroy {
   }
 
   public fullscreen(useSwiper: boolean) {
-    this.textSize = useSwiper ? 2 : 1;
     if (useSwiper) openFullscreen();
     else closeFullscreen();
   }
-
-  public getNextSong(showSongs: ShowSong[], i: number): string {
-    if (!showSongs || showSongs.length === 0) return '';
-    const song = showSongs[i + 1];
-    return song?.title ?? '';
-  }
 }
 
 export interface Swiper {

src/app/modules/shows/show/song/song.component.html

@@ -7,10 +7,9 @@
   <div *ngIf="!show.published && !fullscreen" class="song">
     <span class="title">{{ iSong.title }}</span>
     <span *ngIf="!edit" class="keys">
-      <span *ngIf="iSong.keyOriginal !== iSong.key">{{ iSong.keyOriginal }}&nbsp;→&nbsp;</span><span
+      <span *ngIf="iSong.keyOriginal !== iSong.key">{{ iSong.keyOriginal }}&nbsp;→&nbsp;</span>
-      (click)="openKeySelect()">{{ iSong.key }}</span>
+      <mat-form-field *ngIf="keys" appearance="standard" class="keys">
-      <mat-form-field (click)="option.open()" *ngIf="keys" class="transpose">
+        <mat-select [formControl]="keyFormControl">
-        <mat-select #option [formControl]="keyFormControl">
           <mat-option *ngFor="let key of keys" [value]="key">{{ key }}</mat-option>
         </mat-select>
       </mat-form-field>
@@ -23,11 +22,10 @@
 
   <mat-form-field *ngIf="edit" appearance="outline">
     <mat-label>Songtext</mat-label>
-    <textarea [cdkTextareaAutosize]="true"
+    <textarea matTooltip="Tonart ändern"
+              [cdkTextareaAutosize]="true"
               [formControl]="editSongControl"
-              class="edit"
               matInput
-              matTooltip="Tonart ändern"
     ></textarea>
   </mat-form-field>
   <div *ngIf="edit">Es wird nur der Liedtext für dieser Veranstaltung geändert.</div>

src/app/modules/shows/show/song/song.component.less

@@ -17,18 +17,8 @@
 }
 
 .keys {
-  position: relative;
+  width: 40px;
-  margin-right: 10px;
+  margin: -24px 0 -20px 0;
-  cursor: pointer;
-
-  &:hover {
-    color: var(--color-primary);
-  }
-}
-
-.transpose {
-  height: 0;
-  position: absolute;
 }
 
 .btn-up {
@@ -64,7 +54,6 @@
   grid-area: delete;
   justify-content: flex-end;
 }
-
 .btn-edit {
   grid-area: edit;
   justify-content: flex-end;
@@ -78,6 +67,6 @@ button {
 
 }
 
-textarea.edit {
+textarea {
   font-family: 'Ubuntu Mono', monospace;
 }

src/app/modules/shows/show/song/song.component.spec.ts

@@ -6,11 +6,13 @@ describe('SongComponent', () => {
   let component: SongComponent;
   let fixture: ComponentFixture<SongComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [SongComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [SongComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SongComponent);

src/app/modules/shows/show/song/song.component.ts

@@ -1,44 +1,18 @@
-import {Component, Input, OnInit, ViewChild} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 import {ShowSongService} from '../../services/show-song.service';
 import {ShowSong} from '../../services/show-song';
 import {getScale} from '../../../songs/services/key.helper';
-import {ReactiveFormsModule, UntypedFormControl} from '@angular/forms';
+import {UntypedFormControl} from '@angular/forms';
-import {ChordMode, SongTextComponent} from '../../../../widget-modules/components/song-text/song-text.component';
+import {ChordMode} from '../../../../widget-modules/components/song-text/song-text.component';
 import {Show} from '../../services/show';
 import {faEraser, faPenToSquare, faSave, faTrash} from '@fortawesome/free-solid-svg-icons';
 import {fade} from '../../../../animations';
-import {MatSelect} from '@angular/material/select';
-import {NgFor, NgIf} from '@angular/common';
-import {MatFormField, MatLabel} from '@angular/material/form-field';
-import {MatOption} from '@angular/material/core';
-import {MenuButtonComponent} from '../../../../widget-modules/components/menu-button/menu-button.component';
-import {MatTooltip} from '@angular/material/tooltip';
-import {MatInput} from '@angular/material/input';
-import {CdkTextareaAutosize} from '@angular/cdk/text-field';
-import {ButtonRowComponent} from '../../../../widget-modules/components/button-row/button-row.component';
-import {ButtonComponent} from '../../../../widget-modules/components/button/button.component';
 
 @Component({
   selector: 'app-song',
   templateUrl: './song.component.html',
   styleUrls: ['./song.component.less'],
   animations: [fade],
-  imports: [
-    NgIf,
-    MatFormField,
-    MatSelect,
-    ReactiveFormsModule,
-    NgFor,
-    MatOption,
-    MenuButtonComponent,
-    MatTooltip,
-    MatLabel,
-    MatInput,
-    CdkTextareaAutosize,
-    ButtonRowComponent,
-    ButtonComponent,
-    SongTextComponent,
-  ],
 })
 export class SongComponent implements OnInit {
   @Input() public show: Show | null = null;
@@ -46,6 +20,7 @@ export class SongComponent implements OnInit {
   @Input() public showText: boolean | null = null;
   @Input() public index = -1;
   @Input() public fullscreen = false;
+
   public keys: string[] = [];
   public faDelete = faTrash;
   public faEdit = faPenToSquare;
@@ -55,7 +30,6 @@ export class SongComponent implements OnInit {
   public iSong: ShowSong | null = null;
   public edit = false;
   public editSongControl = new UntypedFormControl();
-  @ViewChild('option') private keyOptions: MatSelect;
 
   public constructor(private showSongService: ShowSongService) {}
 
@@ -101,8 +75,4 @@ export class SongComponent implements OnInit {
       chordMode: value,
     });
   }
-
-  public openKeySelect(): void {
-    this.keyOptions.open();
-  }
 }

src/app/modules/shows/shows.module.ts

@@ -3,69 +3,72 @@ import {CommonModule} from '@angular/common';
 
 import {ShowsRoutingModule} from './shows-routing.module';
 import {NewComponent} from './new/new.component';
-
+import {CardModule} from '../../widget-modules/components/card/card.module';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {MatInputModule} from '@angular/material/input';
 import {ListComponent} from './list/list.component';
 import {ListItemComponent} from './list/list-item/list-item.component';
-
+import {ListHeaderModule} from '../../widget-modules/components/list-header/list-header.module';
 import {MatCheckboxModule} from '@angular/material/checkbox';
-
+import {ButtonRowModule} from '../../widget-modules/components/button-row/button-row.module';
 import {MatButtonModule} from '@angular/material/button';
 import {MatDatepickerModule} from '@angular/material/datepicker';
 import {MatSelectModule} from '@angular/material/select';
+import {ShowTypeTranslaterModule} from '../../widget-modules/pipes/show-type-translater/show-type-translater.module';
 import {MatNativeDateModule} from '@angular/material/core';
 import {ShowComponent} from './show/show.component';
 import {SongComponent} from './show/song/song.component';
 import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
-
+import {MenuButtonModule} from '../../widget-modules/components/menu-button/menu-button.module';
+import {SongTextModule} from '../../widget-modules/components/song-text/song-text.module';
 import {NgxMatSelectSearchModule} from 'ngx-mat-select-search';
-
+import {AddSongModule} from '../../widget-modules/components/add-song/add-song.module';
+import {ButtonModule} from '../../widget-modules/components/button/button.module';
+import {OwnerModule} from '../../services/user/owner.module';
+import {UserNameModule} from '../../services/user/user-name/user-name.module';
 import {MatMenuModule} from '@angular/material/menu';
 import {DragDropModule} from '@angular/cdk/drag-drop';
-
+import {RoleModule} from '../../services/user/role.module';
+import {SortByModule} from '../../widget-modules/pipes/sort-by/sort-by.module';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {FilterComponent} from './list/filter/filter.component';
 import {EditComponent} from './edit/edit.component';
 import {ArchiveDialogComponent} from './dialog/archive-dialog/archive-dialog.component';
 import {MatDialogModule} from '@angular/material/dialog';
-import {SongTextComponent} from '../../widget-modules/components/song-text/song-text.component';
-import {AddSongComponent} from '../../widget-modules/components/add-song/add-song.component';
-import {ShowTypePipe} from '../../widget-modules/pipes/show-type-translater/show-type.pipe';
-import {SortByPipe} from '../../widget-modules/pipes/sort-by/sort-by.pipe';
 
 @NgModule({
+  declarations: [NewComponent, ListComponent, ListItemComponent, ShowComponent, SongComponent, FilterComponent, EditComponent, ArchiveDialogComponent],
   imports: [
     CommonModule,
     ShowsRoutingModule,
+    CardModule,
     MatFormFieldModule,
     ReactiveFormsModule,
     MatInputModule,
+    ListHeaderModule,
     MatCheckboxModule,
+    ButtonRowModule,
     MatButtonModule,
     MatDatepickerModule,
     MatNativeDateModule,
     MatSelectModule,
-    ShowTypePipe,
+    ShowTypeTranslaterModule,
     FontAwesomeModule,
+    MenuButtonModule,
     FormsModule,
-    SongTextComponent,
+    SongTextModule,
     NgxMatSelectSearchModule,
-    AddSongComponent,
+    AddSongModule,
+    ButtonModule,
+    OwnerModule,
+    UserNameModule,
     MatMenuModule,
     DragDropModule,
-    SortByPipe,
+    RoleModule,
+    SortByModule,
     MatTooltipModule,
     MatDialogModule,
-    NewComponent,
-    ListComponent,
-    ListItemComponent,
-    ShowComponent,
-    SongComponent,
-    FilterComponent,
-    EditComponent,
-    ArchiveDialogComponent,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })

src/app/modules/songs/services/file.service.ts

@@ -7,10 +7,7 @@ import {FileDataService} from './file-data.service';
   providedIn: 'root',
 })
 export class FileService {
-  public constructor(
+  public constructor(private storage: AngularFireStorage, private fileDataService: FileDataService) {}
-    private storage: AngularFireStorage,
-    private fileDataService: FileDataService
-  ) {}
 
   public getDownloadUrl(path: string): Observable<string> {
     const ref = this.storage.ref(path);

src/app/modules/songs/services/section-type.ts

@@ -2,5 +2,4 @@ export enum SectionType {
   Verse,
   Chorus,
   Bridge,
-  Comment,
 }

src/app/modules/songs/services/song-data.service.spec.ts

@@ -1,8 +1,8 @@
-import {TestBed} from '@angular/core/testing';
+import {TestBed, waitForAsync} from '@angular/core/testing';
 
 import {SongDataService} from './song-data.service';
 import {AngularFirestore} from '@angular/fire/compat/firestore';
-import {firstValueFrom, of} from 'rxjs';
+import {of} from 'rxjs';
 
 describe('SongDataService', () => {
   const songs = [{title: 'title1'}];
@@ -27,9 +27,13 @@ describe('SongDataService', () => {
     void expect(service).toBeTruthy();
   });
 
-  it('should list songs', async () => {
+  it(
-    const service: SongDataService = TestBed.inject(SongDataService);
+    'should list songs',
-    const list = await firstValueFrom(service.list$);
+    waitForAsync(() => {
-    void expect(list[0].title).toEqual('title1');
+      const service: SongDataService = TestBed.inject(SongDataService);
-  });
+      service.list$().subscribe(s => {
+        void expect(s[0].title).toEqual('title1');
+      });
+    })
+  );
 });

src/app/modules/songs/services/song-data.service.ts

@@ -8,15 +8,14 @@ import {map} from 'rxjs/operators';
   providedIn: 'root',
 })
 export class SongDataService {
-  public list$ = new BehaviorSubject<Song[]>([]);
   private collection = 'songs';
 
   public constructor(private dbService: DbService) {
     this.dbService.col$<Song>(this.collection).subscribe(_ => this.list$.next(_));
   }
 
+  public list$ = new BehaviorSubject<Song[]>([]);
   // public list$ = (): Observable<Song[]> => this.dbService.col$(this.collection);
-
   //public read$ = (songId: string): Observable<Song | null> => this.dbService.doc$(this.collection + '/' + songId);
   public read$ = (songId: string): Observable<Song | null> => this.list$.pipe(map(_ => _.find(s => s.id === songId) || null));
   public update$ = async (songId: string, data: Partial<Song>): Promise<void> => await this.dbService.doc(this.collection + '/' + songId).update(data);

src/app/modules/songs/services/song-list.resolver.ts

@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-
+import {Resolve} from '@angular/router';
 import {Observable} from 'rxjs';
 import {SongService} from './song.service';
 import {Song} from './song';
@@ -8,7 +8,7 @@ import {filter} from 'rxjs/operators';
 @Injectable({
   providedIn: 'root',
 })
-export class SongListResolver {
+export class SongListResolver implements Resolve<Song[]> {
   public constructor(private songService: SongService) {}
 
   public resolve(): Observable<Song[]> {

src/app/modules/songs/services/song.service.spec.ts

@@ -23,10 +23,13 @@ describe('SongService', () => {
     void expect(service).toBeTruthy();
   });
 
-  it('should list songs', waitForAsync(() => {
+  it(
-    const service: SongService = TestBed.inject(SongService);
+    'should list songs',
-    service.list$().subscribe(s => {
+    waitForAsync(() => {
-      void expect(s[0].title).toEqual('title1');
+      const service: SongService = TestBed.inject(SongService);
-    });
+      service.list$().subscribe(s => {
-  }));
+        void expect(s[0].title).toEqual('title1');
+      });
+    })
+  );
 });

src/app/modules/songs/services/song.service.ts

@@ -25,10 +25,7 @@ export class SongService {
 
   // private list: Song[];
 
-  public constructor(
+  public constructor(private songDataService: SongDataService, private userService: UserService) {
-    private songDataService: SongDataService,
-    private userService: UserService
-  ) {
     // importCCLI = (songs: Song[]) => this.updateFromCLI(songs);
   }
 

src/app/modules/songs/services/text-rendering.service.ts

@@ -15,11 +15,11 @@ export class TextRenderingService {
 
   public constructor(private transposeService: TransposeService) {}
 
-  public parse(text: string, transpose: TransposeMode | null, withComments = true): Section[] {
+  public parse(text: string, transpose: TransposeMode | null): Section[] {
     if (!text) {
       return [];
     }
-    const arrayOfLines = text.split(/\r?\n/).filter(_ => _ && (!_.startsWith('#') || withComments));
+    const arrayOfLines = text.split(/\r?\n/).filter(_ => _);
     const indices = {
       [SectionType.Bridge]: 0,
       [SectionType.Chorus]: 0,

src/app/modules/songs/services/upload.service.ts

@@ -10,10 +10,7 @@ import {FileServer} from './fileServer';
   providedIn: 'root',
 })
 export class UploadService extends FileBase {
-  public constructor(
+  public constructor(private fileDataService: FileDataService, private angularFireStorage: AngularFireStorage) {
-    private fileDataService: FileDataService,
-    private angularFireStorage: AngularFireStorage
-  ) {
     super();
   }
 

src/app/modules/songs/song-list/filter/filter.component.html

@@ -1,7 +1,7 @@
 <div [formGroup]="filterFormGroup">
   <mat-form-field appearance="outline">
     <mat-label>Titel oder Text</mat-label>
-    <input formControlName="q" matInput />
+    <input formControlName="q" matInput/>
   </mat-form-field>
 
   <div class="third">
@@ -10,9 +10,8 @@
       <mat-select formControlName="type">
         <mat-option [value]="null">- kein Filter -</mat-option>
         <mat-option *ngFor="let type of types" [value]="type">{{
-            type | songType
+          type | songType
-          }}
+          }}</mat-option>
-        </mat-option>
       </mat-select>
     </mat-form-field>
 
@@ -21,9 +20,8 @@
       <mat-select formControlName="key">
         <mat-option [value]="null">- kein Filter -</mat-option>
         <mat-option *ngFor="let key of keys" [value]="key">{{
-            key | key
+          key | key
-          }}
+          }}</mat-option>
-        </mat-option>
       </mat-select>
     </mat-form-field>
 
@@ -32,9 +30,8 @@
       <mat-select formControlName="legalType">
         <mat-option [value]="null">- kein Filter -</mat-option>
         <mat-option *ngFor="let key of legalType" [value]="key">{{
-            key | legalType
+          key | legalType
-          }}
+          }}</mat-option>
-        </mat-option>
       </mat-select>
     </mat-form-field>
 
@@ -43,9 +40,8 @@
       <mat-select formControlName="flag">
         <mat-option [value]="null">- kein Filter -</mat-option>
         <mat-option *ngFor="let flag of getFlags()" [value]="flag">{{
-            flag
+          flag
-          }}
+          }}</mat-option>
-        </mat-option>
       </mat-select>
     </mat-form-field>
   </div>

src/app/modules/songs/song-list/filter/filter.component.spec.ts

@@ -6,11 +6,13 @@ describe('FilterComponent', () => {
   let component: FilterComponent;
   let fixture: ComponentFixture<FilterComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [FilterComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [FilterComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(FilterComponent);

src/app/modules/songs/song-list/filter/filter.component.ts

@@ -1,24 +1,15 @@
 import {Component, Input} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
-import {ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
+import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
 import {SongService} from '../../services/song.service';
 import {FilterValues} from './filter-values';
 import {Song} from '../../services/song';
 import {KEYS} from '../../services/key.helper';
-import {MatFormField, MatLabel} from '@angular/material/form-field';
-import {MatInput} from '@angular/material/input';
-import {MatSelect} from '@angular/material/select';
-import {MatOption} from '@angular/material/core';
-import {NgFor} from '@angular/common';
-import {LegalTypePipe} from '../../../../widget-modules/pipes/legal-type-translator/legal-type.pipe';
-import {KeyPipe} from '../../../../widget-modules/pipes/key-translator/key.pipe';
-import {SongTypePipe} from '../../../../widget-modules/pipes/song-type-translater/song-type.pipe';
 
 @Component({
   selector: 'app-filter',
   templateUrl: './filter.component.html',
   styleUrls: ['./filter.component.less'],
-  imports: [ReactiveFormsModule, MatFormField, MatLabel, MatInput, MatSelect, MatOption, NgFor, LegalTypePipe, KeyPipe, SongTypePipe],
 })
 export class FilterComponent {
   public filterFormGroup: UntypedFormGroup;
@@ -28,11 +19,7 @@ export class FilterComponent {
   public legalType = SongService.LEGAL_TYPE;
   public keys = KEYS;
 
-  public constructor(
+  public constructor(private router: Router, activatedRoute: ActivatedRoute, fb: UntypedFormBuilder) {
-    private router: Router,
-    activatedRoute: ActivatedRoute,
-    fb: UntypedFormBuilder
-  ) {
     this.filterFormGroup = fb.group({
       q: '',
       type: '',

src/app/modules/songs/song-list/song-list.component.html

@@ -9,19 +9,11 @@
       <div>{{ song.title }}</div>
       <div>
         <ng-container *appRole="['contributor']">
-          <div *ngIf="song.status === 'draft'" class="warning">
+          <div *ngIf="song.status === 'draft'" class="warning"><fa-icon [icon]="faDraft"></fa-icon></div>
-            <fa-icon [icon]="faDraft"></fa-icon>
+          <div *ngIf="song.status === 'set'" class="neutral"><fa-icon [icon]="faDraft"></fa-icon></div>
-          </div>
+          <div *ngIf="song.status === 'final'" class="success"><fa-icon [icon]="faFinal"></fa-icon></div>
-          <div *ngIf="song.status === 'set'" class="neutral">
-            <fa-icon [icon]="faDraft"></fa-icon>
-          </div>
-          <div *ngIf="song.status === 'final'" class="success">
-            <fa-icon [icon]="faFinal"></fa-icon>
-          </div>
         </ng-container>
-        <div *ngIf="song.legalType === 'open'" class="warning">
+        <div *ngIf="song.legalType === 'open'" class="warning" ><fa-icon [icon]="faLegal"></fa-icon></div>
-          <fa-icon [icon]="faLegal"></fa-icon>
-        </div>
       </div>
       <div>{{ song.key }}</div>
     </div>

src/app/modules/songs/song-list/song-list.component.less

@@ -29,7 +29,7 @@
 }
 
 .neutral, .warning, .success {
-  width: 30px;
+    width: 30px;
 }
 
 .neutral {

src/app/modules/songs/song-list/song-list.component.spec.ts

@@ -15,13 +15,15 @@ describe('SongListComponent', () => {
     list: () => of(songs),
   };
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [SongListComponent],
+      void TestBed.configureTestingModule({
-      providers: [{provide: SongService, useValue: mockSongService}],
+        declarations: [SongListComponent],
-      schemas: [NO_ERRORS_SCHEMA],
+        providers: [{provide: SongService, useValue: mockSongService}],
-    }).compileComponents();
+        schemas: [NO_ERRORS_SCHEMA],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SongListComponent);

src/app/modules/songs/song-list/song-list.component.ts

@@ -4,17 +4,11 @@ import {Song} from '../services/song';
 import {map} from 'rxjs/operators';
 import {combineLatest, Observable} from 'rxjs';
 import {fade} from '../../../animations';
-import {ActivatedRoute, RouterLink} from '@angular/router';
+import {ActivatedRoute} from '@angular/router';
 import {filterSong} from '../../../services/filter.helper';
 import {FilterValues} from './filter/filter-values';
 import {ScrollService} from '../../../services/scroll.service';
 import {faBalanceScaleRight, faCheck, faPencilRuler} from '@fortawesome/free-solid-svg-icons';
-import {AsyncPipe, NgFor, NgIf} from '@angular/common';
-import {ListHeaderComponent} from '../../../widget-modules/components/list-header/list-header.component';
-import {FilterComponent} from './filter/filter.component';
-import {CardComponent} from '../../../widget-modules/components/card/card.component';
-import {RoleDirective} from '../../../services/user/role.directive';
-import {FaIconComponent} from '@fortawesome/angular-fontawesome';
 
 @Component({
   selector: 'app-songs',
@@ -22,10 +16,8 @@ import {FaIconComponent} from '@fortawesome/angular-fontawesome';
   styleUrls: ['./song-list.component.less'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fade],
-  imports: [NgIf, ListHeaderComponent, FilterComponent, CardComponent, NgFor, RouterLink, RoleDirective, FaIconComponent, AsyncPipe],
 })
 export class SongListComponent implements OnInit, OnDestroy {
-  public anyFilterActive = false;
   public songs$: Observable<Song[]> | null = combineLatest([
     this.activatedRoute.queryParams.pipe(map(_ => _ as FilterValues)),
     this.activatedRoute.data.pipe(
@@ -37,18 +29,15 @@ export class SongListComponent implements OnInit, OnDestroy {
       const songs = _[1];
       const filter = _[0];
       this.anyFilterActive = this.checkIfFilterActive(filter);
-      return songs.filter(song => this.filter(song, filter)).sort((a, b) => a.title?.localeCompare(b.title));
+      return songs.filter(song => this.filter(song, filter)).sort((a, b) => a.title.localeCompare(b.title));
     })
   );
+  public anyFilterActive = false;
   public faLegal = faBalanceScaleRight;
   public faDraft = faPencilRuler;
   public faFinal = faCheck;
 
-  public constructor(
+  public constructor(private songService: SongService, private activatedRoute: ActivatedRoute, private scrollService: ScrollService) {}
-    private songService: SongService,
-    private activatedRoute: ActivatedRoute,
-    private scrollService: ScrollService
-  ) {}
 
   public ngOnInit(): void {
     setTimeout(() => this.scrollService.restoreScrollPositionFor('songlist'), 100);
@@ -59,8 +48,6 @@ export class SongListComponent implements OnInit, OnDestroy {
     this.scrollService.storeScrollPositionFor('songlist');
   }
 
-  public trackBy = (index: number, show: Song) => show.id;
-
   private filter(song: Song, filter: FilterValues): boolean {
     let baseFilter = filterSong(song, filter.q);
     baseFilter = baseFilter && (!filter.type || filter.type === song.type);
@@ -87,4 +74,6 @@ export class SongListComponent implements OnInit, OnDestroy {
 
     return flagStrings.indexOf(flag) !== -1;
   }
+
+  public trackBy = (index: number, show: Song) => show.id;
 }

src/app/modules/songs/song-list/song-list.module.ts

@@ -0,0 +1,40 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {SongListComponent} from './song-list.component';
+import {CardModule} from '../../../widget-modules/components/card/card.module';
+import {RouterModule} from '@angular/router';
+import {LegalTypeTranslatorModule} from '../../../widget-modules/pipes/legal-type-translator/legal-type-translator.module';
+import {ListHeaderModule} from '../../../widget-modules/components/list-header/list-header.module';
+import {MatFormFieldModule} from '@angular/material/form-field';
+import {MatInputModule} from '@angular/material/input';
+import {FilterComponent} from './filter/filter.component';
+import {ReactiveFormsModule} from '@angular/forms';
+import {MatSelectModule} from '@angular/material/select';
+import {SongTypeTranslaterModule} from '../../../widget-modules/pipes/song-type-translater/song-type-translater.module';
+import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
+import {MatTooltipModule} from '@angular/material/tooltip';
+import {RoleModule} from '../../../services/user/role.module';
+import {KeyTranslatorModule} from '../../../widget-modules/pipes/key-translator/key-translator.module';
+
+@NgModule({
+  declarations: [SongListComponent, FilterComponent],
+  exports: [SongListComponent],
+  imports: [
+    CommonModule,
+    RouterModule,
+
+    CardModule,
+    LegalTypeTranslatorModule,
+    ListHeaderModule,
+    MatFormFieldModule,
+    MatInputModule,
+    ReactiveFormsModule,
+    MatSelectModule,
+    SongTypeTranslaterModule,
+    FontAwesomeModule,
+    MatTooltipModule,
+    RoleModule,
+    KeyTranslatorModule,
+  ],
+})
+export class SongListModule {}

src/app/modules/songs/song/edit/edit-file/edit-file.component.html

@@ -11,7 +11,7 @@
   </div>
   <div class="upload">
     <label>
-      <input (change)="detectFiles($event)" type="file" />
+      <input (change)="detectFiles($event)" type="file"/>
     </label>
 
     <button

src/app/modules/songs/song/edit/edit-file/edit-file.component.spec.ts

@@ -6,11 +6,13 @@ describe('EditFileComponent', () => {
   let component: EditFileComponent;
   let fixture: ComponentFixture<EditFileComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [EditFileComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [EditFileComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EditFileComponent);

src/app/modules/songs/song/edit/edit-file/edit-file.component.ts

@@ -6,17 +6,11 @@ import {map, switchMap} from 'rxjs/operators';
 import {FileDataService} from '../../../services/file-data.service';
 import {Observable} from 'rxjs';
 import {File} from '../../../services/file';
-import {CardComponent} from '../../../../../widget-modules/components/card/card.component';
-import {AsyncPipe, NgFor, NgIf, NgStyle} from '@angular/common';
-import {MatIconButton} from '@angular/material/button';
-import {MatIcon} from '@angular/material/icon';
-import {FileComponent} from './file/file.component';
 
 @Component({
   selector: 'app-edit-file',
   templateUrl: './edit-file.component.html',
   styleUrls: ['./edit-file.component.less'],
-  imports: [CardComponent, NgIf, NgStyle, MatIconButton, MatIcon, NgFor, FileComponent, AsyncPipe],
 })
 export class EditFileComponent {
   public selectedFiles: FileList | null = null;
@@ -24,11 +18,7 @@ export class EditFileComponent {
   public songId: string | null = null;
   public files$: Observable<File[]>;
 
-  public constructor(
+  public constructor(private activatedRoute: ActivatedRoute, private uploadService: UploadService, private fileService: FileDataService) {
-    private activatedRoute: ActivatedRoute,
-    private uploadService: UploadService,
-    private fileService: FileDataService
-  ) {
     this.activatedRoute.params
       .pipe(
         map(param => param as {songId: string}),

src/app/modules/songs/song/edit/edit-file/file/file.component.spec.ts

@@ -6,11 +6,13 @@ describe('FileComponent', () => {
   let component: FileComponent;
   let fixture: ComponentFixture<FileComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(
-    void TestBed.configureTestingModule({
+    waitForAsync(() => {
-      imports: [FileComponent],
+      void TestBed.configureTestingModule({
-    }).compileComponents();
+        declarations: [FileComponent],
-  }));
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(FileComponent);