Compare commits
4 Commits
song-usage
...
angular-up
| Author | SHA1 | Date | |
|---|---|---|---|
| 28b669fc2d | |||
| 2f5a732ffc | |||
| d71bd41495 | |||
| c19e115b43 |
17
angular.json
17
angular.json
@@ -49,7 +49,8 @@
|
|||||||
"optimization": false,
|
"optimization": false,
|
||||||
"namedChunks": true,
|
"namedChunks": true,
|
||||||
"allowedCommonJsDependencies": [
|
"allowedCommonJsDependencies": [
|
||||||
"lodash", "docx"
|
"lodash",
|
||||||
|
"docx"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
@@ -88,18 +89,18 @@
|
|||||||
"serve": {
|
"serve": {
|
||||||
"builder": "@angular-devkit/build-angular:dev-server",
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
"options": {
|
"options": {
|
||||||
"browserTarget": "wgenerator:build"
|
"buildTarget": "wgenerator:build"
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
"browserTarget": "wgenerator:build:production"
|
"buildTarget": "wgenerator:build:production"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"extract-i18n": {
|
"extract-i18n": {
|
||||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
"options": {
|
"options": {
|
||||||
"browserTarget": "wgenerator:build"
|
"buildTarget": "wgenerator:build"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"test": {
|
"test": {
|
||||||
@@ -147,5 +148,13 @@
|
|||||||
"schematicCollections": [
|
"schematicCollections": [
|
||||||
"@angular-eslint/schematics"
|
"@angular-eslint/schematics"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"schematics": {
|
||||||
|
"@angular-eslint/schematics:application": {
|
||||||
|
"setParserOptionsProject": true
|
||||||
|
},
|
||||||
|
"@angular-eslint/schematics:library": {
|
||||||
|
"setParserOptionsProject": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
42277
package-lock.json
generated
42277
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
72
package.json
72
package.json
@@ -6,58 +6,56 @@
|
|||||||
"build": "ng build",
|
"build": "ng build",
|
||||||
"deploy": "ng build --configuration production && firebase deploy",
|
"deploy": "ng build --configuration production && firebase deploy",
|
||||||
"test": "ng test",
|
"test": "ng test",
|
||||||
"lint": "ng lint --fix",
|
"lint": "ng lint --fix"
|
||||||
"postinstall": "ngcc"
|
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^14.2.10",
|
"@angular/animations": "^17.1.3",
|
||||||
"@angular/cdk": "^14.2.6",
|
"@angular/cdk": "^17.1.2",
|
||||||
"@angular/common": "^14.2.10",
|
"@angular/common": "^17.1.3",
|
||||||
"@angular/compiler": "^14.2.10",
|
"@angular/compiler": "^17.1.3",
|
||||||
"@angular/core": "^14.2.10",
|
"@angular/core": "^17.1.3",
|
||||||
"@angular/fire": "^7.4.1",
|
"@angular/fire": "^17.0.1",
|
||||||
"@angular/forms": "^14.2.10",
|
"@angular/forms": "^17.1.3",
|
||||||
"@angular/material": "^14.2.6",
|
"@angular/material": "^17.1.2",
|
||||||
"@angular/platform-browser": "^14.2.10",
|
"@angular/platform-browser": "^17.1.3",
|
||||||
"@angular/platform-browser-dynamic": "^14.2.10",
|
"@angular/platform-browser-dynamic": "^17.1.3",
|
||||||
"@angular/router": "^14.2.10",
|
"@angular/router": "^17.1.3",
|
||||||
"@angular/service-worker": "^14.2.10",
|
"@angular/service-worker": "^17.1.3",
|
||||||
"@fortawesome/angular-fontawesome": "^0.11.1",
|
"@fortawesome/angular-fontawesome": "^0.13.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.1.2",
|
"@fortawesome/fontawesome-svg-core": "^6.4.2",
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.1.2",
|
"@fortawesome/free-solid-svg-icons": "^6.4.2",
|
||||||
"docx": "^7.4.1",
|
"docx": "^7.4.1",
|
||||||
"firebase": "^9.6.10",
|
"firebase": "^10.0.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"ngx-mat-select-search": "^4.2.1",
|
"ngx-mat-select-search": "^7.0.5",
|
||||||
"ngx-perfect-scrollbar": "^10.1.1",
|
|
||||||
"rxfire": "^6.0.3",
|
"rxfire": "^6.0.3",
|
||||||
"rxjs": "~7.5.6",
|
"rxjs": "~7.8.1",
|
||||||
"swiper": "^9.3.2",
|
"swiper": "^9.3.2",
|
||||||
"tslib": "^2.4.0",
|
"tslib": "^2.4.0",
|
||||||
"uuid": "^8.3.2",
|
"uuid": "^8.3.2",
|
||||||
"zone.js": "~0.11.8"
|
"zone.js": "~0.14.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/architect": "0.1402.9",
|
"@angular-devkit/architect": "0.1701.3",
|
||||||
"@angular-devkit/build-angular": "^14.2.9",
|
"@angular-devkit/build-angular": "^17.1.3",
|
||||||
"@angular-eslint/builder": "14.1.2",
|
"@angular-eslint/builder": "17.2.1",
|
||||||
"@angular-eslint/eslint-plugin": "14.1.2",
|
"@angular-eslint/eslint-plugin": "17.2.1",
|
||||||
"@angular-eslint/eslint-plugin-template": "14.1.2",
|
"@angular-eslint/eslint-plugin-template": "17.2.1",
|
||||||
"@angular-eslint/schematics": "14.1.2",
|
"@angular-eslint/schematics": "17.2.1",
|
||||||
"@angular-eslint/template-parser": "14.1.2",
|
"@angular-eslint/template-parser": "17.2.1",
|
||||||
"@angular/cli": "^14.2.9",
|
"@angular/cli": "^17.1.3",
|
||||||
"@angular/compiler-cli": "^14.2.10",
|
"@angular/compiler-cli": "^17.1.3",
|
||||||
"@angular/language-service": "^14.2.10",
|
"@angular/language-service": "^17.1.3",
|
||||||
"@types/jasmine": "~4.0.3",
|
"@types/jasmine": "~4.0.3",
|
||||||
"@types/jasminewd2": "~2.0.10",
|
"@types/jasminewd2": "~2.0.10",
|
||||||
"@types/lodash": "^4.14.182",
|
"@types/lodash": "^4.14.182",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.33.0",
|
"@typescript-eslint/eslint-plugin": "^6.10.0",
|
||||||
"@typescript-eslint/parser": "^5.33.0",
|
"@typescript-eslint/parser": "^6.10.0",
|
||||||
"eslint": "^8.22.0",
|
"eslint": "^8.53.0",
|
||||||
"eslint-config-prettier": "^8.5.0",
|
"eslint-config-prettier": "^8.5.0",
|
||||||
"eslint-plugin-prettier": "^4.2.1",
|
"eslint-plugin-prettier": "^4.2.1",
|
||||||
"firebase-tools": "^11.6.0",
|
"firebase-tools": "^13.2.1",
|
||||||
"fuzzy": "^0.1.3",
|
"fuzzy": "^0.1.3",
|
||||||
"inquirer": "^9.1.0",
|
"inquirer": "^9.1.0",
|
||||||
"inquirer-autocomplete-prompt": "^2.0.0",
|
"inquirer-autocomplete-prompt": "^2.0.0",
|
||||||
@@ -70,6 +68,6 @@
|
|||||||
"karma-jasmine-html-reporter": "^2.0.0",
|
"karma-jasmine-html-reporter": "^2.0.0",
|
||||||
"prettier": "^2.7.1",
|
"prettier": "^2.7.1",
|
||||||
"protractor": "~7.0.0",
|
"protractor": "~7.0.0",
|
||||||
"typescript": "~4.7.4"
|
"typescript": "~5.3.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ const routes: Routes = [
|
|||||||
imports: [
|
imports: [
|
||||||
RouterModule.forRoot(routes, {
|
RouterModule.forRoot(routes, {
|
||||||
preloadingStrategy: PreloadAllModules,
|
preloadingStrategy: PreloadAllModules,
|
||||||
relativeLinkResolution: 'legacy',
|
// relativeLinkResolution: 'legacy',
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
exports: [RouterModule],
|
exports: [RouterModule],
|
||||||
|
|||||||
@@ -1,12 +1,6 @@
|
|||||||
<app-navigation></app-navigation>
|
<app-navigation></app-navigation>
|
||||||
<perfect-scrollbar
|
|
||||||
#scrollbar
|
<div [@fader]="o.isActivated ? o.activatedRoute : ''" class="content">
|
||||||
(psScrollY)="onScoll($event)"
|
|
||||||
[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>
|
<router-outlet #o="outlet"></router-outlet>
|
||||||
</div>
|
</div>
|
||||||
</perfect-scrollbar>
|
|
||||||
|
|||||||
@@ -1,10 +1,3 @@
|
|||||||
h1 {
|
h1 {
|
||||||
color: red;
|
color: red;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.manager {
|
|
||||||
//display: grid;
|
|
||||||
//grid-template-columns: 1fr 1fr;
|
|
||||||
//transition: all 1s ease-in-out;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import {ChangeDetectionStrategy, Component, OnInit, ViewChild} from '@angular/core';
|
import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core';
|
||||||
import {fader} from './animations';
|
import {fader} from './animations';
|
||||||
import {ScrollService} from './services/scroll.service';
|
import {ScrollService} from './services/scroll.service';
|
||||||
import {PerfectScrollbarComponent} from 'ngx-perfect-scrollbar';
|
|
||||||
import {register} from 'swiper/element/bundle';
|
import {register} from 'swiper/element/bundle';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@@ -12,12 +11,7 @@ import {register} from 'swiper/element/bundle';
|
|||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class AppComponent implements OnInit {
|
export class AppComponent implements OnInit {
|
||||||
@ViewChild('scrollbar', {static: false}) public scrollbar: PerfectScrollbarComponent | null = null;
|
|
||||||
|
|
||||||
public constructor(private scrollService: ScrollService) {
|
public constructor(private scrollService: ScrollService) {
|
||||||
scrollService.restoreScrollPosition$.subscribe(pos => {
|
|
||||||
if (this.scrollbar && pos) this.scrollbar.directiveRef?.scrollTo(0, pos, 300);
|
|
||||||
});
|
|
||||||
register();
|
register();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import {AngularFireAuthModule} from '@angular/fire/compat/auth';
|
|||||||
import {AngularFireAuthGuardModule} from '@angular/fire/compat/auth-guard';
|
import {AngularFireAuthGuardModule} from '@angular/fire/compat/auth-guard';
|
||||||
import {MAT_DATE_LOCALE} from '@angular/material/core';
|
import {MAT_DATE_LOCALE} from '@angular/material/core';
|
||||||
import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
|
import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
|
||||||
import {PerfectScrollbarModule} from 'ngx-perfect-scrollbar';
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [AppComponent],
|
declarations: [AppComponent],
|
||||||
@@ -37,7 +36,6 @@ import {PerfectScrollbarModule} from 'ngx-perfect-scrollbar';
|
|||||||
AngularFireAuthModule,
|
AngularFireAuthModule,
|
||||||
AngularFireAuthGuardModule,
|
AngularFireAuthGuardModule,
|
||||||
FontAwesomeModule,
|
FontAwesomeModule,
|
||||||
PerfectScrollbarModule,
|
|
||||||
],
|
],
|
||||||
providers: [{provide: MAT_DATE_LOCALE, useValue: 'de-DE'}],
|
providers: [{provide: MAT_DATE_LOCALE, useValue: 'de-DE'}],
|
||||||
bootstrap: [AppComponent],
|
bootstrap: [AppComponent],
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<div class="brand">
|
<div class="brand">
|
||||||
<app-logo></app-logo>
|
<app-logo></app-logo>
|
||||||
<div class="copyright">© 2019 - 2023 - Benjamin Ifland</div>
|
<div class="copyright">© 2019 - 2024 - Benjamin Ifland</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
|
|
||||||
<div *ngIf="show" class="div-bottom">
|
<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>
|
<fa-icon [icon]="faDesktop"></fa-icon>
|
||||||
Präsentation starten
|
Präsentation starten
|
||||||
</button>
|
</button>
|
||||||
@@ -98,17 +98,19 @@
|
|||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<mat-slider
|
<mat-slider
|
||||||
(ngModelChange)="onZoom($event, show.id)"
|
|
||||||
[max]="100"
|
[max]="100"
|
||||||
[min]="10"
|
[min]="10"
|
||||||
[ngModel]="show.presentationZoom"
|
|
||||||
[step]="2"
|
[step]="2"
|
||||||
[thumbLabel]="true"
|
|
||||||
color="primary"
|
color="primary"
|
||||||
class="zoom-slider"
|
class="zoom-slider"
|
||||||
>
|
#slider
|
||||||
|
ngDefaultControl
|
||||||
|
><input (ngModelChange)="onZoom($event, show.id)"
|
||||||
|
[ngModel]="show.presentationZoom"
|
||||||
|
matSliderThumb>
|
||||||
</mat-slider>
|
</mat-slider>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<app-add-song
|
<app-add-song
|
||||||
|
|||||||
@@ -47,21 +47,17 @@
|
|||||||
outline: 0.5px solid #eee;
|
outline: 0.5px solid #eee;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
.card-1;
|
outline: 0.5px solid var(--color-primary-light);
|
||||||
outline: 0 solid transparent;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&.active {
|
&.active {
|
||||||
.card-2;
|
outline: 0.5px solid var(--color-primary);
|
||||||
outline: 0 solid transparent;
|
|
||||||
|
|
||||||
.head {
|
.head {
|
||||||
background: #4286f4;
|
background-color: var(--color-primary);
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fragment {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,7 +75,11 @@
|
|||||||
.div-bottom {
|
.div-bottom {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 20px;
|
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) {
|
@media screen and (max-width: 860px) {
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import {FormControl, FormGroup, Validators} from '@angular/forms';
|
|||||||
import {ActivatedRoute, Router} from '@angular/router';
|
import {ActivatedRoute, Router} from '@angular/router';
|
||||||
import {faSave} from '@fortawesome/free-solid-svg-icons';
|
import {faSave} from '@fortawesome/free-solid-svg-icons';
|
||||||
import {map, switchMap} from 'rxjs/operators';
|
import {map, switchMap} from 'rxjs/operators';
|
||||||
|
import firebase from 'firebase/compat/app';
|
||||||
|
import Timestamp = firebase.firestore.Timestamp;
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-edit',
|
selector: 'app-edit',
|
||||||
@@ -56,7 +58,7 @@ export class EditComponent implements OnInit {
|
|||||||
await this.showService.update$(
|
await this.showService.update$(
|
||||||
this.form.value.id as string,
|
this.form.value.id as string,
|
||||||
{
|
{
|
||||||
date: this.form.value.date,
|
date: Timestamp.fromDate(this.form.value.date),
|
||||||
showType: this.form.value.showType,
|
showType: this.form.value.showType,
|
||||||
} as Partial<Show>
|
} as Partial<Show>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -7,9 +7,10 @@
|
|||||||
<div *ngIf="!show.published && !fullscreen" class="song">
|
<div *ngIf="!show.published && !fullscreen" class="song">
|
||||||
<span class="title">{{ iSong.title }}</span>
|
<span class="title">{{ iSong.title }}</span>
|
||||||
<span *ngIf="!edit" class="keys">
|
<span *ngIf="!edit" class="keys">
|
||||||
<span *ngIf="iSong.keyOriginal !== iSong.key">{{ iSong.keyOriginal }} → </span>
|
<span *ngIf="iSong.keyOriginal !== iSong.key">{{ iSong.keyOriginal }} → </span><span
|
||||||
<mat-form-field *ngIf="keys" appearance="standard" class="keys">
|
(click)="openKeySelect()">{{ iSong.key }}</span>
|
||||||
<mat-select [formControl]="keyFormControl">
|
<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-option *ngFor="let key of keys" [value]="key">{{ key }}</mat-option>
|
||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|||||||
@@ -17,8 +17,18 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.keys {
|
.keys {
|
||||||
width: 40px;
|
position: relative;
|
||||||
margin: -24px 0 -20px 0;
|
margin-right: 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: var(--color-primary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.transpose {
|
||||||
|
height: 0;
|
||||||
|
position: absolute;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-up {
|
.btn-up {
|
||||||
@@ -54,6 +64,7 @@
|
|||||||
grid-area: delete;
|
grid-area: delete;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-edit {
|
.btn-edit {
|
||||||
grid-area: edit;
|
grid-area: edit;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
|
|||||||
@@ -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 {ShowSongService} from '../../services/show-song.service';
|
||||||
import {ShowSong} from '../../services/show-song';
|
import {ShowSong} from '../../services/show-song';
|
||||||
import {getScale} from '../../../songs/services/key.helper';
|
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 {Show} from '../../services/show';
|
||||||
import {faEraser, faPenToSquare, faSave, faTrash} from '@fortawesome/free-solid-svg-icons';
|
import {faEraser, faPenToSquare, faSave, faTrash} from '@fortawesome/free-solid-svg-icons';
|
||||||
import {fade} from '../../../../animations';
|
import {fade} from '../../../../animations';
|
||||||
|
import {MatSelect} from '@angular/material/select';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-song',
|
selector: 'app-song',
|
||||||
@@ -21,6 +22,8 @@ export class SongComponent implements OnInit {
|
|||||||
@Input() public index = -1;
|
@Input() public index = -1;
|
||||||
@Input() public fullscreen = false;
|
@Input() public fullscreen = false;
|
||||||
|
|
||||||
|
@ViewChild('option') private keyOptions: MatSelect;
|
||||||
|
|
||||||
public keys: string[] = [];
|
public keys: string[] = [];
|
||||||
public faDelete = faTrash;
|
public faDelete = faTrash;
|
||||||
public faEdit = faPenToSquare;
|
public faEdit = faPenToSquare;
|
||||||
@@ -75,4 +78,8 @@ export class SongComponent implements OnInit {
|
|||||||
chordMode: value,
|
chordMode: value,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public openKeySelect(): void {
|
||||||
|
this.keyOptions.open();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import {Injectable} from '@angular/core';
|
import {Injectable} from '@angular/core';
|
||||||
import {Resolve} from '@angular/router';
|
|
||||||
import {Observable} from 'rxjs';
|
import {Observable} from 'rxjs';
|
||||||
import {SongService} from './song.service';
|
import {SongService} from './song.service';
|
||||||
import {Song} from './song';
|
import {Song} from './song';
|
||||||
@@ -8,7 +8,7 @@ import {filter} from 'rxjs/operators';
|
|||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class SongListResolver implements Resolve<Song[]> {
|
export class SongListResolver {
|
||||||
public constructor(private songService: SongService) {}
|
public constructor(private songService: SongService) {}
|
||||||
|
|
||||||
public resolve(): Observable<Song[]> {
|
public resolve(): Observable<Song[]> {
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import {Injectable} from '@angular/core';
|
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 {Observable} from 'rxjs';
|
||||||
import {EditComponent} from './edit.component';
|
import {EditComponent} from './edit.component';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class EditSongGuard implements CanDeactivate<EditComponent> {
|
export class EditSongGuard {
|
||||||
public canDeactivate(
|
public canDeactivate(
|
||||||
component: EditComponent,
|
component: EditComponent,
|
||||||
currentRoute: ActivatedRouteSnapshot,
|
currentRoute: ActivatedRouteSnapshot,
|
||||||
|
|||||||
@@ -95,16 +95,15 @@
|
|||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<mat-form-field appearance="outline">
|
<mat-form-field appearance="outline">
|
||||||
<mat-chip-list #chipList>
|
<mat-chip-grid #chipList>
|
||||||
<mat-chip
|
<mat-chip-row
|
||||||
(removed)="removeFlag(flag)"
|
(removed)="removeFlag(flag)"
|
||||||
*ngFor="let flag of flags"
|
*ngFor="let flag of flags"
|
||||||
[removable]="true"
|
[removable]="true"
|
||||||
[selectable]="false"
|
|
||||||
>
|
>
|
||||||
{{ flag }}
|
{{ flag }}
|
||||||
<fa-icon (click)="removeFlag(flag)" [icon]="faRemove"></fa-icon>
|
<fa-icon (click)="removeFlag(flag)" [icon]="faRemove"></fa-icon>
|
||||||
</mat-chip>
|
</mat-chip-row>
|
||||||
<input
|
<input
|
||||||
(matChipInputTokenEnd)="addFlag($event)"
|
(matChipInputTokenEnd)="addFlag($event)"
|
||||||
[matChipInputAddOnBlur]="true"
|
[matChipInputAddOnBlur]="true"
|
||||||
@@ -112,7 +111,7 @@
|
|||||||
[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
|
[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
|
||||||
placeholder="Attribute"
|
placeholder="Attribute"
|
||||||
/>
|
/>
|
||||||
</mat-chip-list>
|
</mat-chip-grid>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<div class="half">
|
<div class="half">
|
||||||
|
|||||||
@@ -40,14 +40,15 @@
|
|||||||
[text]="song.text"
|
[text]="song.text"
|
||||||
></app-song-text>
|
></app-song-text>
|
||||||
|
|
||||||
<mat-chip-list
|
<mat-chip-listbox
|
||||||
*appRole="['leader', 'contributor']"
|
*appRole="['leader', 'contributor']"
|
||||||
aria-label="Attribute"
|
aria-label="Attribute"
|
||||||
>
|
>
|
||||||
<mat-chip *ngFor="let flag of getFlags(song.flags)">{{
|
<mat-chip-option *ngFor="let flag of getFlags(song.flags)">{{
|
||||||
flag
|
flag
|
||||||
}}</mat-chip>
|
}}
|
||||||
</mat-chip-list>
|
</mat-chip-option>
|
||||||
|
</mat-chip-listbox>
|
||||||
|
|
||||||
<div *appRole="['leader', 'contributor']" class="text">
|
<div *appRole="['leader', 'contributor']" class="text">
|
||||||
{{ song.comment }}
|
{{ song.comment }}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export class DbService {
|
|||||||
return typeof ref === 'string' ? this.afs.doc<T>(ref) : ref;
|
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)
|
return this.doc(ref)
|
||||||
.valueChanges({idField: 'id'})
|
.valueChanges({idField: 'id'})
|
||||||
.pipe(map(_ => (_ ? _ : null)));
|
.pipe(map(_ => (_ ? _ : null)));
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import {Injectable} from '@angular/core';
|
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 {Observable} from 'rxjs';
|
||||||
import {UserService} from '../../services/user/user.service';
|
import {UserService} from '../../services/user/user.service';
|
||||||
import {map} from 'rxjs/operators';
|
import {map} from 'rxjs/operators';
|
||||||
@@ -7,7 +7,7 @@ import {map} from 'rxjs/operators';
|
|||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class RoleGuard implements CanActivate {
|
export class RoleGuard {
|
||||||
public constructor(private userService: UserService, private router: Router) {}
|
public constructor(private userService: UserService, private router: Router) {}
|
||||||
|
|
||||||
public canActivate(next: ActivatedRouteSnapshot): Observable<boolean | UrlTree> {
|
public canActivate(next: ActivatedRouteSnapshot): Observable<boolean | UrlTree> {
|
||||||
|
|||||||
@@ -7,6 +7,15 @@
|
|||||||
// Include the common styles for Angular Material. We include this here so that you only
|
// 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.
|
// have to load a single css file for Angular Material in your app.
|
||||||
// Be sure that you only ever include this mixin once!
|
// 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();
|
@include mat.core();
|
||||||
|
|
||||||
// Define the palettes for your theme using the Material Design palettes available in palette.scss
|
// 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
|
// 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.
|
// have to load a single css file for Angular Material in your app.
|
||||||
// Be sure that you only ever include this mixin once!
|
// 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();
|
@include mat.core();
|
||||||
|
|
||||||
// Define the palettes for your theme using the Material Design palettes available in palette.scss
|
// 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
|
// 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.
|
// have to load a single css file for Angular Material in your app.
|
||||||
// Be sure that you only ever include this mixin once!
|
// 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();
|
@include mat.core();
|
||||||
|
|
||||||
// Define the palettes for your theme using the Material Design palettes available in palette.scss
|
// Define the palettes for your theme using the Material Design palettes available in palette.scss
|
||||||
|
|||||||
@@ -4,9 +4,11 @@
|
|||||||
|
|
||||||
@transition: all 300ms ease-in-out;
|
@transition: all 300ms ease-in-out;
|
||||||
|
|
||||||
//html, body {
|
:root {
|
||||||
// height: 100%;
|
--color-primary: #4286f4;
|
||||||
//}
|
--color-primary-light: #639af3;
|
||||||
|
}
|
||||||
|
|
||||||
html {
|
html {
|
||||||
scroll-behavior: smooth;
|
scroll-behavior: smooth;
|
||||||
}
|
}
|
||||||
@@ -37,17 +39,11 @@ a {
|
|||||||
color: inherit;
|
color: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mat-form-field {
|
.mat-mdc-form-field {
|
||||||
width: 100%;
|
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) {
|
.content > *:not(router-outlet) {
|
||||||
@@ -79,49 +75,6 @@ body {
|
|||||||
font-family: Roboto, "Helvetica Neue", sans-serif;
|
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 {
|
body {
|
||||||
.swiper-button-next, .swiper-button-prev {
|
.swiper-button-next, .swiper-button-prev {
|
||||||
@@ -131,4 +84,7 @@ body {
|
|||||||
.swiper-button-next.swiper-button-disabled, .swiper-button-prev.swiper-button-disabled {
|
.swiper-button-next.swiper-button-disabled, .swiper-button-prev.swiper-button-disabled {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
--mat-form-field-container-text-line-height: 16px;
|
||||||
|
--mat-form-field-container-text-size: 16px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,11 +5,6 @@ import {getTestBed} from '@angular/core/testing';
|
|||||||
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
|
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
|
||||||
|
|
||||||
type req = {keys: () => {map: (context: req) => void}};
|
type req = {keys: () => {map: (context: req) => void}};
|
||||||
declare const require: {context: (a: string, b: boolean, c: RegExp) => req};
|
|
||||||
|
|
||||||
// First, initialize the Angular testing environment.
|
// First, initialize the Angular testing environment.
|
||||||
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
|
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);
|
|
||||||
|
|||||||
@@ -11,15 +11,16 @@
|
|||||||
"module": "es2020",
|
"module": "es2020",
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "node",
|
||||||
"importHelpers": true,
|
"importHelpers": true,
|
||||||
"target": "es2020",
|
"target": "ES2022",
|
||||||
"strict": true,
|
"strict": false,
|
||||||
"typeRoots": [
|
"typeRoots": [
|
||||||
"node_modules/@types"
|
"node_modules/@types"
|
||||||
],
|
],
|
||||||
"lib": [
|
"lib": [
|
||||||
"es2018",
|
"es2018",
|
||||||
"dom"
|
"dom"
|
||||||
]
|
],
|
||||||
|
"useDefineForClassFields": false
|
||||||
},
|
},
|
||||||
"angularCompilerOptions": {
|
"angularCompilerOptions": {
|
||||||
"fullTemplateTypeCheck": true,
|
"fullTemplateTypeCheck": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user