From d71bd41495e649b6c2701aacf0a3fe9ccd380715 Mon Sep 17 00:00:00 2001 From: smuddyx Date: Thu, 2 Nov 2023 22:26:42 +0100 Subject: [PATCH] remove ngx scrollbar --- package-lock.json | 46 -------------------- package.json | 1 - src/app/app-routing.module.ts | 2 +- src/app/app.component.html | 12 ++--- src/app/app.component.ts | 8 +--- src/app/app.module.ts | 2 - src/app/modules/shows/edit/edit.component.ts | 4 +- src/app/services/db.service.ts | 2 +- tsconfig.json | 2 +- 9 files changed, 10 insertions(+), 69 deletions(-) diff --git a/package-lock.json b/package-lock.json index f60ba7e..2ecd132 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,6 @@ "firebase": "^10.0.0", "lodash": "^4.17.21", "ngx-mat-select-search": "^7.0.5", - "ngx-perfect-scrollbar": "^10.1.1", "rxfire": "^6.0.3", "rxjs": "~7.5.6", "swiper": "^9.3.2", @@ -21601,21 +21600,6 @@ "@angular/material": "^15.0.0 || ^16.0.0 || ^17.0.0" } }, - "node_modules/ngx-perfect-scrollbar": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-10.1.1.tgz", - "integrity": "sha512-f9IaDJGlBzSxnJ3Ki76n2JdzfQngUFyCf0E+CuVLaR5jL0IJDcTu7vOs8wexXunRMTd8xvIv0+sdIxf8hXAGWg==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dependencies": { - "perfect-scrollbar": "1.5.0", - "resize-observer-polyfill": "^1.5.0", - "tslib": "^2.0.0" - }, - "peerDependencies": { - "@angular/common": ">=9.0.0", - "@angular/core": ">=9.0.0" - } - }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -22824,11 +22808,6 @@ "node": ">=8" } }, - "node_modules/perfect-scrollbar": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz", - "integrity": "sha512-NrNHJn5mUGupSiheBTy6x+6SXCFbLlm8fVZh9moIzw/LgqElN5q4ncR4pbCBCYuCJ8Kcl9mYM0NgDxvW+b4LxA==" - }, "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -23992,11 +23971,6 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, - "node_modules/resize-observer-polyfill": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", - "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" - }, "node_modules/resolve": { "version": "1.22.2", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", @@ -43494,16 +43468,6 @@ "tslib": "^2.4.0" } }, - "ngx-perfect-scrollbar": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-10.1.1.tgz", - "integrity": "sha512-f9IaDJGlBzSxnJ3Ki76n2JdzfQngUFyCf0E+CuVLaR5jL0IJDcTu7vOs8wexXunRMTd8xvIv0+sdIxf8hXAGWg==", - "requires": { - "perfect-scrollbar": "1.5.0", - "resize-observer-polyfill": "^1.5.0", - "tslib": "^2.0.0" - } - }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -44399,11 +44363,6 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, - "perfect-scrollbar": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz", - "integrity": "sha512-NrNHJn5mUGupSiheBTy6x+6SXCFbLlm8fVZh9moIzw/LgqElN5q4ncR4pbCBCYuCJ8Kcl9mYM0NgDxvW+b4LxA==" - }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -45265,11 +45224,6 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, - "resize-observer-polyfill": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", - "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" - }, "resolve": { "version": "1.22.2", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", diff --git a/package.json b/package.json index 3b87275..e049377 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "firebase": "^10.0.0", "lodash": "^4.17.21", "ngx-mat-select-search": "^7.0.5", - "ngx-perfect-scrollbar": "^10.1.1", "rxfire": "^6.0.3", "rxjs": "~7.5.6", "swiper": "^9.3.2", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 3970b6d..c1d3c20 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -54,7 +54,7 @@ const routes: Routes = [ imports: [ RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules, - relativeLinkResolution: 'legacy', + // relativeLinkResolution: 'legacy', }), ], exports: [RouterModule], diff --git a/src/app/app.component.html b/src/app/app.component.html index 9ea7490..eb8cf46 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,12 +1,6 @@ - -
+ +
- + diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0ef7c45..11aa957 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -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(); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e37cedc..6f7f683 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -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], diff --git a/src/app/modules/shows/edit/edit.component.ts b/src/app/modules/shows/edit/edit.component.ts index c613854..5424a45 100644 --- a/src/app/modules/shows/edit/edit.component.ts +++ b/src/app/modules/shows/edit/edit.component.ts @@ -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 ); diff --git a/src/app/services/db.service.ts b/src/app/services/db.service.ts index e9ef141..cf70945 100644 --- a/src/app/services/db.service.ts +++ b/src/app/services/db.service.ts @@ -21,7 +21,7 @@ export class DbService { return typeof ref === 'string' ? this.afs.doc(ref) : ref; } - public doc$(ref: DocumentPredicate): Observable<(T & {id: string}) | null> { + public doc$(ref: DocumentPredicate): Observable<(NonNullable & {id?: string}) | null> { return this.doc(ref) .valueChanges({idField: 'id'}) .pipe(map(_ => (_ ? _ : null))); diff --git a/tsconfig.json b/tsconfig.json index ce431dd..58255b6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,7 @@ "moduleResolution": "node", "importHelpers": true, "target": "ES2022", - "strict": true, + "strict": false, "typeRoots": [ "node_modules/@types" ],