#155

StudyGrow · Aug 10, 2022 · fa0e4f5 · fa0e4f5
1 parent bf5b198
commit fa0e4f5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/angular-cards/src/app/cards/cards.component.ts b/angular-cards/src/app/cards/cards.component.ts
@@ -2,8 +2,8 @@ import { Component, OnInit, HostListener, ViewChild, ElementRef, OnDestroy } fro
 import { Vorlesung } from 'src/app/models/Vorlesung';
 import { Title } from '@angular/platform-browser';
 import { Store } from '@ngrx/store';
-import { Observable, Subscription } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import { Observable, Subscription, firstValueFrom } from 'rxjs';
+import { map, take, timeout } from 'rxjs/operators';
 import { fetchCards } from '../store/actions/CardActions';
 import { fadeInOnEnterAnimation } from 'angular-animations';
 import { changeTab, setSuggestionsMode, showNewCard } from '../store/actions/StateActions';
@@ -45,7 +45,12 @@ export class CardsComponent implements OnInit, OnDestroy {
 
   public lecture$: Observable<Vorlesung> = this.data$.pipe(map((data) => data.currLecture));
 
-  constructor(private store: Store<AppState>, private title: Title, private _snackBar: MatSnackBar) {}
+  constructor(
+    private store: Store<AppState>,
+    private title: Title,
+    private _snackBar: MatSnackBar,
+    private translate: TranslateService
+  ) {}
 
   ngOnInit(): void {
     this.title.setTitle('Cards');
@@ -87,15 +92,18 @@ export class CardsComponent implements OnInit, OnDestroy {
     this.store.dispatch(changeTab({ tab: index }));
   }
 
-  openSnackBar(card: Card) {
-    this._snackBar
-      .open('Do you want to pick up where you left off?', 'Yes', { duration: 5000, politeness: 'assertive' })
-      .onAction()
-      .subscribe(async () => {
-        this.store.dispatch(showNewCard({ card: card }));
-        const currentLecture = await this.store.select(SELECTED_LECTURE).pipe(take(1)).toPromise();
-        localStorage.remove(currentLecture._id);
-      });
+  async openSnackBar(card: Card) {
+    const message = this.translate.instant('notifications.pick-up');
+    await firstValueFrom(
+      this._snackBar
+        .open(message, 'Yes', { duration: 5000, politeness: 'assertive' })
+        .onAction()
+        .pipe(take(1), timeout(6000))
+    );
+
+    this.store.dispatch(showNewCard({ card: card }));
+    const currentLecture = await this.store.select(SELECTED_LECTURE).pipe(take(1)).toPromise();
+    localStorage.remove(currentLecture._id);
   }
 
   async ngOnDestroy() {

diff --git a/angular-cards/src/assets/i18n/de.json b/angular-cards/src/assets/i18n/de.json
@@ -196,7 +196,8 @@
   "flash-cards": "Karteikarten",
   "notifications": {
     "notifications": "Benachrichtigungen",
-    "add-card-success": "Deine Karte wurde erfolgreich hinzugefügt."
+    "add-card-success": "Deine Karte wurde erfolgreich hinzugefügt.",
+    "pick-up": "Möchtest du zu deiner zuletzt besuchten Karte zurückkehren?"
   },
   "report-type": "Report Typ",
   "users": "Nutzer",

diff --git a/angular-cards/src/assets/i18n/en.json b/angular-cards/src/assets/i18n/en.json
@@ -194,7 +194,11 @@
   "RANGE_PAGE_LABEL_1": "0 of {{length}}",
   "RANGE_PAGE_LABEL_2": "{{startIndex}} - {{endIndex}} of {{length}}",
   "flash-cards": "Flash cards",
-  "notifications": { "notifications": "Notifications", "add-card-success": "Your card has been added successfully" },
+  "notifications": {
+    "notifications": "Notifications",
+    "add-card-success": "Your card has been added successfully",
+    "pick-up": "Do you want to pick up where you left off?"
+  },
   "users": "Users",
   "number-of-cards": "Number of cards",
   "report-type": "Report Type",