Changeset ad60966 for Farmatiko/ClientApp/src/app/dashboard

Timestamp:

11/05/20 08:53:48 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

1db5673

Parents:

afc9a9a

Message:

Auth fixes, bug fixes etc.

Location:

Farmatiko/ClientApp/src/app/dashboard

Files:

• dashboard.component.html (modified) (1 diff)
• dashboard.component.ts (modified) (3 diffs)

Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html

@@ -12 +12 @@
         <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
           <ul class="navbar-nav flex-grow">
-            <li>Logged as ...<p *ngIf="head">{{head.Name}}</p> </li>
+            <li>Logged as <p *ngIf="head">{{head.Name}}</p> </li>
+            <li (click)="logout()" class="btn btn-link"><a>Logout</a></li>
           </ul>
         </div>

Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts

@@ -3 +3 @@
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { IPharmacy, IMedicine, IPharmacyHead, IPharmacyHeadRequest } from '../shared/interfaces';
-import { DataService } from '../shared/services/data.service';
+import { DataService } from '../shared/data.service';
 import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component';
 import { EditPharmacyDialogComponent } from '../dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component';
@@ -27 +27 @@
 
   ngOnInit(): void {
-    this.authService.getUser().subscribe((data : IPharmacyHead) => {
-        this.head = data;
-    });
+    this.authService.getUser()
+        .subscribe((data) => {
+          console.log(data);
+          this.head = data;
+        },
+        (err: any) => console.log(err),
+        () => console.log('User data retrieved'));
     this.dataService.getPharmacies()
         .subscribe((pharmacy: IPharmacy[]) => {
@@ -102 +106 @@
   }
 
+  logout() {
+    this.authService.logout();
+  }
+
   openPharmacyDialog(pharmacy: IPharmacy): void {
     this.dialog.open(PharmacyDialogComponent, {