benjamin/wgenerator
1
0
Fork 0
Code Actions Releases Activity

update angular

Browse Source
This commit is contained in:
benjamin
2025-01-02 15:01:59 +01:00
parent 73d3ecfd42
commit 802c309679
199 changed files with 13745 additions and 11691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/modules/presentation/monitor/legal/legal.component.spec.ts
View File

@@ -11,7 +11,7 @@ describe('LegalComponent', () => {
void TestBed.configureTestingModule({
declarations: [LegalComponent],
}).compileComponents();
})
}),
);
beforeEach(() => {

1
src/app/modules/presentation/monitor/legal/legal.component.ts
View File

@@ -6,6 +6,7 @@ import {Config} from '../../../../services/config';
selector: 'app-legal',
templateUrl: './legal.component.html',
styleUrls: ['./legal.component.less'],
standalone: false,
})
export class LegalComponent {
@Input() public song: Song | null = null;

2
src/app/modules/presentation/monitor/logo/logo.component.spec.ts
View File

@@ -11,7 +11,7 @@ describe('LogoComponent', () => {
void TestBed.configureTestingModule({
declarations: [LogoComponent],
}).compileComponents();
})
}),
);
beforeEach(() => {

4
src/app/modules/presentation/monitor/logo/logo.component.ts
View File

@@ -4,5 +4,7 @@ import {Component} from '@angular/core';
selector: 'app-logo',
templateUrl: './logo.component.html',
styleUrls: ['./logo.component.less'],
standalone: false,
})
export class LogoComponent {}
export class LogoComponent {
}

14
src/app/modules/presentation/monitor/monitor.component.html
View File

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

5
src/app/modules/presentation/monitor/monitor.component.less
View File

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

2
src/app/modules/presentation/monitor/monitor.component.spec.ts
View File

@@ -11,7 +11,7 @@ describe('MonitorComponent', () => {
void TestBed.configureTestingModule({
declarations: [MonitorComponent],
}).compileComponents();
})
}),
);
beforeEach(() => {

7
src/app/modules/presentation/monitor/monitor.component.ts
View File

@@ -19,6 +19,7 @@ import {openFullscreen} from '../../../services/fullscreen';
templateUrl: './monitor.component.html',
styleUrls: ['./monitor.component.less'],
animations: [songSwitch],
standalone: false,
})
export class MonitorComponent implements OnInit {
public song: Song | null = null;
@@ -40,7 +41,7 @@ export class MonitorComponent implements OnInit {
private textRenderingService: TextRenderingService,
private globalSettingsService: GlobalSettingsService,
private configService: ConfigService,
private cRef: ChangeDetectorRef
private cRef: ChangeDetectorRef,
) {
this.config$ = configService.get$();
}
@@ -54,7 +55,7 @@ export class MonitorComponent implements OnInit {
map(_ => _ as GlobalSettings),
map(_ => _.currentShow),
distinctUntilChanged(),
tap(_ => (this.currentShowId = _))
tap(_ => (this.currentShowId = _)),
)
.pipe(
switchMap(_ => this.showService.read$(_)),
@@ -76,7 +77,7 @@ export class MonitorComponent implements OnInit {
}),
switchMap((_: Show) => this.showSongService.read$(_.id, _.presentationSongId)),
filter(_ => !!_),
map(_ => _ as Song)
map(_ => _ as Song),
)
.subscribe(_ => {
this.song = _;