Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript π€
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/refactor snack bars (#4273)
Thomas Kaul9ab21508a5c5
diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.tsindex 32ae7bfefa..34c5fbda23 100644--- a/apps/client/src/app/components/access-table/access-table.component.ts+++ b/apps/client/src/app/components/access-table/access-table.component.ts@@ -14,6 +14,7 @@ import {} from '@angular/core';import { MatSnackBar } from '@angular/material/snack-bar';import { MatTableDataSource } from '@angular/material/table';+import ms from 'ms';@Component({selector: 'gf-access-table',@@ -64,7 +65,7 @@ export class AccessTableComponent implements OnChanges {'β ' + $localize`Link has been copied to the clipboard`,undefined,{- duration: 3000+ duration: ms('3 seconds')});}diff --git a/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts b/apps/client/src/app/components/user-account-membership/user-account-membership.component.tsindex 6139d173ea..2214d91f91 100644--- a/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts+++ b/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts@@ -12,11 +12,7 @@ import {Component,OnDestroy} from '@angular/core';-import {- MatSnackBar,- MatSnackBarRef,- TextOnlySnackBar-} from '@angular/material/snack-bar';+import { MatSnackBar } from '@angular/material/snack-bar';import ms, { StringValue } from 'ms';import { StripeService } from 'ngx-stripe';import { EMPTY, Subject } from 'rxjs';@@ -41,7 +37,6 @@ export class UserAccountMembershipComponent implements OnDestroy {public price: number;public priceId: string;public routerLinkPricing = ['/' + $localize`:snake-case:pricing`];- public snackBarRef: MatSnackBarRef<TextOnlySnackBar>;public trySubscriptionMail ='mailto:[email protected]?Subject=Ghostfolio Premium Trial&body=Hello%0D%0DI am interested in Ghostfolio Premium. Can you please send me a coupon code to try it for some time?%0D%0DKind regards';public user: User;@@ -186,22 +181,22 @@ export class UserAccountMembershipComponent implements OnDestroy {takeUntil(this.unsubscribeSubject)).subscribe(() => {- this.snackBarRef = this.snackBar.open(+ const snackBarRef = this.snackBar.open('β ' + $localize`Coupon code has been redeemed`,$localize`Reload`,{- duration: 3000+ duration: ms('3 seconds')});- this.snackBarRef+ snackBarRef.afterDismissed().pipe(takeUntil(this.unsubscribeSubject)).subscribe(() => {window.location.reload();});- this.snackBarRef+ snackBarRef.onAction().pipe(takeUntil(this.unsubscribeSubject)).subscribe(() => {diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts b/apps/client/src/app/components/user-account-settings/user-account-settings.component.tsindex c1472515f0..ced617117b 100644--- a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts@@ -25,6 +25,7 @@ import { MatSlideToggleChange } from '@angular/material/slide-toggle';import { MatSnackBar } from '@angular/material/snack-bar';import { format, parseISO } from 'date-fns';import { uniq } from 'lodash';+import ms from 'ms';import { EMPTY, Subject, throwError } from 'rxjs';import { catchError, takeUntil } from 'rxjs/operators';@@ -301,7 +302,9 @@ export class UserAccountSettingsComponent implements OnDestroy, OnInit {this.snackBar.open($localize`Oops! There was an error setting up biometric authentication.`,undefined,- { duration: 3000 }+ {+ duration: ms('3 seconds')+ });return throwError(() => {diff --git a/apps/client/src/app/core/http-response.interceptor.ts b/apps/client/src/app/core/http-response.interceptor.tsindex 203d3adf50..018e441fc8 100644--- a/apps/client/src/app/core/http-response.interceptor.ts+++ b/apps/client/src/app/core/http-response.interceptor.ts@@ -19,6 +19,7 @@ import {} from '@angular/material/snack-bar';import { Router } from '@angular/router';import { StatusCodes } from 'http-status-codes';+import ms from 'ms';import { Observable, throwError } from 'rxjs';import { catchError, tap } from 'rxjs/operators';@@ -54,13 +55,17 @@ export class HttpResponseInterceptor implements HttpInterceptor {' ' +$localize`Please try again later.`,undefined,- { duration: 6000 }+ {+ duration: ms('6 seconds')+ });} else if (!error.url.includes('/auth')) {this.snackBarRef = this.snackBar.open($localize`This action is not allowed.`,undefined,- { duration: 6000 }+ {+ duration: ms('6 seconds')+ });}@@ -79,7 +84,9 @@ export class HttpResponseInterceptor implements HttpInterceptor {' ' +$localize`Please try again later.`,$localize`Okay`,- { duration: 6000 }+ {+ duration: ms('6 seconds')+ });this.snackBarRef.afterDismissed().subscribe(() => {diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.tsindex 2f5ead47aa..82e78a1809 100644--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts@@ -23,6 +23,7 @@ import { MatStepper } from '@angular/material/stepper';import { MatTableDataSource } from '@angular/material/table';import { AssetClass } from '@prisma/client';import { isArray, sortBy } from 'lodash';+import ms from 'ms';import { DeviceDetectorService } from 'ngx-device-detector';import { Subject, takeUntil } from 'rxjs';@@ -133,7 +134,7 @@ export class ImportActivitiesDialog implements OnDestroy {'β ' + $localize`Import has been completed`,undefined,{- duration: 3000+ duration: ms('3 seconds')});} catch (error) {@@ -142,7 +143,9 @@ export class ImportActivitiesDialog implements OnDestroy {' ' +$localize`Please try again later.`,$localize`Okay`,- { duration: 3000 }+ {+ duration: ms('3 seconds')+ });} finally {this.dialogRef.close();diff --git a/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.ts b/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.tsindex caa0b15e6e..7fbb1e6214 100644--- a/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.ts+++ b/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.ts@@ -261,7 +261,9 @@ export class GfHistoricalMarketDataEditorComponentthis.snackBar.open($localize`Oops! Could not parse historical data.`,undefined,- { duration: ms('3 seconds') }+ {+ duration: ms('3 seconds')+ });}}