4 Commits

Author SHA1 Message Date
28b669fc2d ng update 17 2024-02-11 17:50:14 +01:00
2f5a732ffc fixes after ng update 2024-02-11 17:37:50 +01:00
d71bd41495 remove ngx scrollbar 2023-11-02 22:26:42 +01:00
c19e115b43 ng update 15 2023-11-02 22:03:55 +01:00
25 changed files with 19110 additions and 23485 deletions

View File

@@ -49,7 +49,8 @@
"optimization": false,
"namedChunks": true,
"allowedCommonJsDependencies": [
"lodash", "docx"
"lodash",
"docx"
]
},
"configurations": {
@@ -88,18 +89,18 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "wgenerator:build"
"buildTarget": "wgenerator:build"
},
"configurations": {
"production": {
"browserTarget": "wgenerator:build:production"
"buildTarget": "wgenerator:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "wgenerator:build"
"buildTarget": "wgenerator:build"
}
},
"test": {
@@ -147,5 +148,13 @@
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"schematics": {
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
}
}

42455
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -6,58 +6,56 @@
"build": "ng build",
"deploy": "ng build --configuration production && firebase deploy",
"test": "ng test",
"lint": "ng lint --fix",
"postinstall": "ngcc"
"lint": "ng lint --fix"
},
"private": true,
"dependencies": {
"@angular/animations": "^14.2.10",
"@angular/cdk": "^14.2.6",
"@angular/common": "^14.2.10",
"@angular/compiler": "^14.2.10",
"@angular/core": "^14.2.10",
"@angular/fire": "^7.4.1",
"@angular/forms": "^14.2.10",
"@angular/material": "^14.2.6",
"@angular/platform-browser": "^14.2.10",
"@angular/platform-browser-dynamic": "^14.2.10",
"@angular/router": "^14.2.10",
"@angular/service-worker": "^14.2.10",
"@fortawesome/angular-fontawesome": "^0.11.1",
"@fortawesome/fontawesome-svg-core": "^6.1.2",
"@fortawesome/free-solid-svg-icons": "^6.1.2",
"@angular/animations": "^17.1.3",
"@angular/cdk": "^17.1.2",
"@angular/common": "^17.1.3",
"@angular/compiler": "^17.1.3",
"@angular/core": "^17.1.3",
"@angular/fire": "^17.0.1",
"@angular/forms": "^17.1.3",
"@angular/material": "^17.1.2",
"@angular/platform-browser": "^17.1.3",
"@angular/platform-browser-dynamic": "^17.1.3",
"@angular/router": "^17.1.3",
"@angular/service-worker": "^17.1.3",
"@fortawesome/angular-fontawesome": "^0.13.0",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"docx": "^7.4.1",
"firebase": "^9.6.10",
"firebase": "^10.0.0",
"lodash": "^4.17.21",
"ngx-mat-select-search": "^4.2.1",
"ngx-perfect-scrollbar": "^10.1.1",
"ngx-mat-select-search": "^7.0.5",
"rxfire": "^6.0.3",
"rxjs": "~7.5.6",
"rxjs": "~7.8.1",
"swiper": "^9.3.2",
"tslib": "^2.4.0",
"uuid": "^8.3.2",
"zone.js": "~0.11.8"
"zone.js": "~0.14.3"
},
"devDependencies": {
"@angular-devkit/architect": "0.1402.9",
"@angular-devkit/build-angular": "^14.2.9",
"@angular-eslint/builder": "14.1.2",
"@angular-eslint/eslint-plugin": "14.1.2",
"@angular-eslint/eslint-plugin-template": "14.1.2",
"@angular-eslint/schematics": "14.1.2",
"@angular-eslint/template-parser": "14.1.2",
"@angular/cli": "^14.2.9",
"@angular/compiler-cli": "^14.2.10",
"@angular/language-service": "^14.2.10",
"@angular-devkit/architect": "0.1701.3",
"@angular-devkit/build-angular": "^17.1.3",
"@angular-eslint/builder": "17.2.1",
"@angular-eslint/eslint-plugin": "17.2.1",
"@angular-eslint/eslint-plugin-template": "17.2.1",
"@angular-eslint/schematics": "17.2.1",
"@angular-eslint/template-parser": "17.2.1",
"@angular/cli": "^17.1.3",
"@angular/compiler-cli": "^17.1.3",
"@angular/language-service": "^17.1.3",
"@types/jasmine": "~4.0.3",
"@types/jasminewd2": "~2.0.10",
"@types/lodash": "^4.14.182",
"@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0",
"eslint": "^8.22.0",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"eslint": "^8.53.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.2.1",
"firebase-tools": "^11.6.0",
"firebase-tools": "^13.2.1",
"fuzzy": "^0.1.3",
"inquirer": "^9.1.0",
"inquirer-autocomplete-prompt": "^2.0.0",
@@ -70,6 +68,6 @@
"karma-jasmine-html-reporter": "^2.0.0",
"prettier": "^2.7.1",
"protractor": "~7.0.0",
"typescript": "~4.7.4"
"typescript": "~5.3.3"
}
}

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,6 @@
import {ChangeDetectionStrategy, Component, OnInit, ViewChild} from '@angular/core';
import {ChangeDetectionStrategy, Component, OnInit} 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';
@Component({
@@ -12,12 +11,7 @@ import {register} from 'swiper/element/bundle';
changeDetection: ChangeDetectionStrategy.OnPush,
})
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();
}

View File

@@ -15,7 +15,6 @@ 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],
@@ -37,7 +36,6 @@ import {PerfectScrollbarModule} from 'ngx-perfect-scrollbar';
AngularFireAuthModule,
AngularFireAuthGuardModule,
FontAwesomeModule,
PerfectScrollbarModule,
],
providers: [{provide: MAT_DATE_LOCALE, useValue: 'de-DE'}],
bootstrap: [AppComponent],

View File

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

View File

@@ -77,7 +77,7 @@
<div *ngIf="show" class="div-bottom">
<button routerLink="/presentation/monitor" mat-button>
<button class="btn-start-presentation" mat-button routerLink="/presentation/monitor">
<fa-icon [icon]="faDesktop"></fa-icon>
Präsentation starten
</button>
@@ -98,17 +98,19 @@
</mat-form-field>
<mat-slider
(ngModelChange)="onZoom($event, show.id)"
[max]="100"
[min]="10"
[ngModel]="show.presentationZoom"
[step]="2"
[thumbLabel]="true"
color="primary"
class="zoom-slider"
>
#slider
ngDefaultControl
><input (ngModelChange)="onZoom($event, show.id)"
[ngModel]="show.presentationZoom"
matSliderThumb>
</mat-slider>
</div>
<app-add-song

View File

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

View File

@@ -7,6 +7,8 @@ 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 Timestamp = firebase.firestore.Timestamp;
@Component({
selector: 'app-edit',
@@ -56,7 +58,7 @@ export class EditComponent implements OnInit {
await this.showService.update$(
this.form.value.id as string,
{
date: this.form.value.date,
date: Timestamp.fromDate(this.form.value.date),
showType: this.form.value.showType,
} as Partial<Show>
);

View File

@@ -7,9 +7,10 @@
<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>
<mat-form-field *ngIf="keys" appearance="standard" class="keys">
<mat-select [formControl]="keyFormControl">
<span *ngIf="iSong.keyOriginal !== iSong.key">{{ iSong.keyOriginal }}&nbsp;&nbsp;</span><span
(click)="openKeySelect()">{{ iSong.key }}</span>
<mat-form-field (click)="option.open()" *ngIf="keys" class="transpose">
<mat-select #option [formControl]="keyFormControl">
<mat-option *ngFor="let key of keys" [value]="key">{{ key }}</mat-option>
</mat-select>
</mat-form-field>

View File

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

View File

@@ -1,4 +1,4 @@
import {Component, Input, OnInit} from '@angular/core';
import {Component, Input, OnInit, ViewChild} from '@angular/core';
import {ShowSongService} from '../../services/show-song.service';
import {ShowSong} from '../../services/show-song';
import {getScale} from '../../../songs/services/key.helper';
@@ -7,6 +7,7 @@ import {ChordMode} from '../../../../widget-modules/components/song-text/song-te
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';
@Component({
selector: 'app-song',
@@ -21,6 +22,8 @@ export class SongComponent implements OnInit {
@Input() public index = -1;
@Input() public fullscreen = false;
@ViewChild('option') private keyOptions: MatSelect;
public keys: string[] = [];
public faDelete = faTrash;
public faEdit = faPenToSquare;
@@ -75,4 +78,8 @@ export class SongComponent implements OnInit {
chordMode: value,
});
}
public openKeySelect(): void {
this.keyOptions.open();
}
}

View File

@@ -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 implements Resolve<Song[]> {
export class SongListResolver {
public constructor(private songService: SongService) {}
public resolve(): Observable<Song[]> {

View File

@@ -1,12 +1,12 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, CanDeactivate, RouterStateSnapshot, UrlTree} from '@angular/router';
import {ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree} from '@angular/router';
import {Observable} from 'rxjs';
import {EditComponent} from './edit.component';
@Injectable({
providedIn: 'root',
})
export class EditSongGuard implements CanDeactivate<EditComponent> {
export class EditSongGuard {
public canDeactivate(
component: EditComponent,
currentRoute: ActivatedRouteSnapshot,

View File

@@ -95,16 +95,15 @@
</mat-form-field>
<mat-form-field appearance="outline">
<mat-chip-list #chipList>
<mat-chip
<mat-chip-grid #chipList>
<mat-chip-row
(removed)="removeFlag(flag)"
*ngFor="let flag of flags"
[removable]="true"
[selectable]="false"
>
{{ flag }}&nbsp;
<fa-icon (click)="removeFlag(flag)" [icon]="faRemove"></fa-icon>
</mat-chip>
</mat-chip-row>
<input
(matChipInputTokenEnd)="addFlag($event)"
[matChipInputAddOnBlur]="true"
@@ -112,7 +111,7 @@
[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
placeholder="Attribute"
/>
</mat-chip-list>
</mat-chip-grid>
</mat-form-field>
<div class="half">

View File

@@ -40,14 +40,15 @@
[text]="song.text"
></app-song-text>
<mat-chip-list
<mat-chip-listbox
*appRole="['leader', 'contributor']"
aria-label="Attribute"
>
<mat-chip *ngFor="let flag of getFlags(song.flags)">{{
<mat-chip-option *ngFor="let flag of getFlags(song.flags)">{{
flag
}}</mat-chip>
</mat-chip-list>
}}
</mat-chip-option>
</mat-chip-listbox>
<div *appRole="['leader', 'contributor']" class="text">
{{ song.comment }}

View File

@@ -21,7 +21,7 @@ export class DbService {
return typeof ref === 'string' ? this.afs.doc<T>(ref) : ref;
}
public doc$<T>(ref: DocumentPredicate<T>): Observable<(T & {id: string}) | null> {
public doc$<T>(ref: DocumentPredicate<T>): Observable<(NonNullable<T> & {id?: string}) | null> {
return this.doc(ref)
.valueChanges({idField: 'id'})
.pipe(map(_ => (_ ? _ : null)));

View File

@@ -1,5 +1,5 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, CanActivate, Router, UrlTree} from '@angular/router';
import {ActivatedRouteSnapshot, Router, UrlTree} from '@angular/router';
import {Observable} from 'rxjs';
import {UserService} from '../../services/user/user.service';
import {map} from 'rxjs/operators';
@@ -7,7 +7,7 @@ import {map} from 'rxjs/operators';
@Injectable({
providedIn: 'root',
})
export class RoleGuard implements CanActivate {
export class RoleGuard {
public constructor(private userService: UserService, private router: Router) {}
public canActivate(next: ActivatedRouteSnapshot): Observable<boolean | UrlTree> {

View File

@@ -7,6 +7,15 @@
// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles.
// The following line adds:
// 1. Default typography styles for all components
// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1)
// If you specify typography styles for the components you use elsewhere, you should delete this line.
// If you don't need the default component typographies but still want the hierarchy styles,
// you can delete this line and instead use:
// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());`
@include mat.all-component-typographies();
@include mat.core();
// Define the palettes for your theme using the Material Design palettes available in palette.scss
@@ -34,6 +43,15 @@ $wgenerator-theme: mat.define-light-theme($wgenerator-primary, $wgenerator-accen
// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles.
// The following line adds:
// 1. Default typography styles for all components
// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1)
// If you specify typography styles for the components you use elsewhere, you should delete this line.
// If you don't need the default component typographies but still want the hierarchy styles,
// you can delete this line and instead use:
// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());`
@include mat.all-component-typographies();
@include mat.core();
// Define the palettes for your theme using the Material Design palettes available in palette.scss
@@ -60,6 +78,15 @@ $wgenerator-theme: mat.define-light-theme($wgenerator-primary, $wgenerator-accen
// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles.
// The following line adds:
// 1. Default typography styles for all components
// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1)
// If you specify typography styles for the components you use elsewhere, you should delete this line.
// If you don't need the default component typographies but still want the hierarchy styles,
// you can delete this line and instead use:
// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());`
@include mat.all-component-typographies();
@include mat.core();
// Define the palettes for your theme using the Material Design palettes available in palette.scss

View File

@@ -4,9 +4,11 @@
@transition: all 300ms ease-in-out;
//html, body {
// height: 100%;
//}
:root {
--color-primary: #4286f4;
--color-primary-light: #639af3;
}
html {
scroll-behavior: smooth;
}
@@ -37,17 +39,11 @@ a {
color: inherit;
}
.mat-form-field {
.mat-mdc-form-field {
width: 100%;
}
.mat-form-field .mat-form-field-infix {
width: unset;
}
.mat-form-field.mat-form-field-appearance-standard .mat-form-field-underline {
height: 0;
}
.content > *:not(router-outlet) {
@@ -79,49 +75,6 @@ body {
font-family: Roboto, "Helvetica Neue", sans-serif;
}
perfect-scrollbar.scroll > .ps.ps--scrolling-y > .ps__rail-y,
perfect-scrollbar.scroll > .ps .ps__rail-y:hover {
background-color: #222;
opacity: .3;
}
.mat-chip.mat-standard-chip {
background: #fffa;
}
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
textarea:-webkit-autofill,
textarea:-webkit-autofill:hover,
textarea:-webkit-autofill:focus,
select:-webkit-autofill,
select:-webkit-autofill:hover,
select:-webkit-autofill:focus {
-webkit-box-shadow: 0 0 0px 1000px #0000 inset;
transition: background-color 5000s ease-in-out 0s;
}
mat-dialog-container.mat-dialog-container {
background: #fffb;
backdrop-filter: blur(8px);
border-radius: 8px;
}
.mat-form-field-outline {
background: #fff4;
border-radius: 4px;
}
.mat-form-field-appearance-outline.mat-form-field-can-float.mat-form-field-should-float .mat-form-field-outline-gap {
border-top-color: inherit !important;
}
.mat-form-field-appearance-outline.mat-form-field-can-float.mat-form-field-should-float .mat-form-field-label,
.mat-form-field-appearance-outline.mat-form-field-can-float .mat-input-server:focus + .mat-form-field-label-wrapper .mat-form-field-label {
transform: translateY(-1.0em) scale(0.75);
}
body {
.swiper-button-next, .swiper-button-prev {
@@ -131,4 +84,7 @@ body {
.swiper-button-next.swiper-button-disabled, .swiper-button-prev.swiper-button-disabled {
opacity: 0;
}
--mat-form-field-container-text-line-height: 16px;
--mat-form-field-container-text-size: 16px;
}

View File

@@ -5,11 +5,6 @@ import {getTestBed} from '@angular/core/testing';
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
type req = {keys: () => {map: (context: req) => void}};
declare const require: {context: (a: string, b: boolean, c: RegExp) => req};
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

View File

@@ -11,15 +11,16 @@
"module": "es2020",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2020",
"strict": true,
"target": "ES2022",
"strict": false,
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2018",
"dom"
]
],
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,