Changeset 993189e

Timestamp:

10/30/20 02:04:06 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

1f4846d

Parents:

6f203af

Message:

Auth guards and services, refactored components

Location:

Farmatiko/ClientApp/src/app

Files:

• admin/admin.component.ts (modified) (2 diffs)
• app.module.ts (modified) (2 diffs)
• dashboard/dashboard.component.ts (modified) (2 diffs)
• korona/korona.component.html (modified) (8 diffs)
• korona/korona.component.ts (modified) (2 diffs)
• login/login.component.ts (modified) (3 diffs)
• shared/auth.guard.ts (added)
• shared/auth.service.ts (added)
• shared/data.service.ts (modified) (3 diffs)
• shared/interfaces.ts (modified) (1 diff)

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

@@ -18 +18 @@
   public heads: IPharmacyHead[] = [];
   public requests: IPharmacyHeadRequest[] = [];
-  public head: IPharmacyHead;
+  public head: IPharmacyHead = {
+    id: '',
+    PharmacyMedicines: null,
+    Pharmacy: null,
+    Email: '',
+    Passwd: '',
+    Name: ''
+  };
 
   constructor(private dataService: DataService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router) {
@@ -50 +57 @@
         (err: any) => console.log(err),
         () => console.log("PharmacyHead inserted"));
-    this.head = null;
+    this.head = {
+      id: '',
+      PharmacyMedicines: null,
+      Pharmacy: null,
+      Email: '',
+      Passwd: '',
+      Name: ''
+    };
   }
 

Farmatiko/ClientApp/src/app/app.module.ts

@@ -25 +25 @@
 import { EditPharmacyHeadDialogComponent } from './dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component';
 import { PharmacyHeadDialogComponent } from './nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component';
+import { AuthGuard } from './shared/auth.guard';
 
 @NgModule({
@@ -53 +54 @@
       { path: 'koronavirus', component: KoronaComponent },
       { path: 'admin', component: AdminComponent },
-      { path: 'dashboard', component: DashboardComponent },
-      { path: 'dashboard/:token', component: DashboardComponent },
+      { path: 'dashboard', component: DashboardComponent, canActivate: [AuthGuard] },
       { path: 'login', component: LoginComponent }
     ]),

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

@@ -8 +8 @@
 import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component';
 import { ActivatedRoute, Router } from '@angular/router';
+import { AuthService } from '../shared/auth.service';
 
 @Component({
@@ -20 +21 @@
   public filteredMedicines: IMedicine[] = [];
   public request: IPharmacyHeadRequest;
-  public token: string;
 
-  constructor(private dataService: DataService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router, private route: ActivatedRoute) {
+  constructor(private dataService: DataService, private authService: AuthService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router, private route: ActivatedRoute) {
 
   }
 
   ngOnInit(): void {
-    this.token = this.route.snapshot.params['token'];
-    this.dataService.getPharmacyHead(this.token)
-        .subscribe((hd: IPharmacyHead) => {
-          this.head = hd;
-        },
-        (err: any) => console.log(err),
-        () => console.log('Head data retrieved'));
-
+    this.head = this.authService.headValue;
     this.dataService.getPharmacies()
         .subscribe((pharmacy: IPharmacy[]) => {

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

@@ -5 +5 @@
     <br />
     <div class="col text-center">
-      <h2>{{korona[0].name}}</h2>
+      <h2>{{korona.name}}</h2>
       <p>статистика</p>
     </div>
@@ -12 +12 @@
     <div class="col">
       <div class="counter" *ngIf="korona">
-        <i class="fa fa-code fa-2x">{{korona[0].totalMK}}</i>
+        <i class="fa fa-code fa-2x">{{korona.totalMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Вкупно случаи во земјата</p>
@@ -19 +19 @@
     <div class="col">
       <div class="counter" *ngIf="korona">
-        <i class="fa fa-coffee fa-2x">{{korona[0].activeMK}}</i>
+        <i class="fa fa-coffee fa-2x">{{korona.activeMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Активни случаи во земјата</p>
@@ -26 +26 @@
     <div class="col">
       <div class="counter" *ngIf="korona">
-        <i class="fa fa-lightbulb-o fa-2x">{{korona[0].deathsMK}}</i>
+        <i class="fa fa-lightbulb-o fa-2x">{{korona.deathsMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Смртни случаи во земјата</p>
@@ -33 +33 @@
     <div class="col">
       <div class="counter" *ngIf="korona">
-        <i class="fa fa-bug fa-2x">{{korona[0].newMK}}</i>
+        <i class="fa fa-bug fa-2x">{{korona.newMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Нови случаи во земјата</p>
@@ -42 +42 @@
     <div class="col">
       <div class="counter" *ngIf="korona">
-        <i class="fa fa-bug fa-2x">{{korona[0].totalGlobal}}</i>
+        <i class="fa fa-bug fa-2x">{{korona.totalGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Вкупно случаи глобално</p>
@@ -49 +49 @@
     <div class="col">
       <div class="counter" *ngIf="korona">
-        <i class="fa fa-bug fa-2x">{{korona[0].activeGlobal}}</i>
+        <i class="fa fa-bug fa-2x">{{korona.activeGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Активни случаи глобално</p>
@@ -56 +56 @@
     <div class="col">
       <div class="counter" *ngIf="korona">
-        <i class="fa fa-bug fa-2x">{{korona[0].deathsGlobal}}</i>
+        <i class="fa fa-bug fa-2x">{{korona.deathsGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Смртни случаи глобално</p>

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

@@ -9 +9 @@
 })
 export class KoronaComponent implements OnInit {
-  public korona: IPandemic[];
+  public korona: IPandemic;
 
   constructor(private dataService: DataService) {
@@ -17 +17 @@
   ngOnInit(): void {
     this.dataService.getPandemic()
-        .subscribe((res: IPandemic[]) => {
+        .subscribe((res: IPandemic) => {
           this.korona = res;
           console.log(this.korona);

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

@@ -2 +2 @@
 import { FormGroup, FormControl, Validators } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
-import { DataService } from '../shared/data.service';
+import { first } from 'rxjs/operators';
+import { AuthService } from '../shared/auth.service';
 
 @Component({
@@ -15 +16 @@
   errorMessage: string;
 
-  constructor(private dataService: DataService,private router: Router, private route: ActivatedRoute) {
+  constructor(private authService: AuthService,private router: Router, private route: ActivatedRoute) {
     this.loginForm = new FormGroup({
       email: new FormControl('', [Validators.required, Validators.email]),
@@ -26 +27 @@
 
   loginPharmacyHead() {
-    this.dataService.loginPharmacyHead(this.email, this.passwd)
-                .subscribe((id: Number) => {
-                  if(id) {
-                    this.router.navigate(['/dashboard/' + id]);
-                  }
-                  else {
-                    this.errorMessage = 'There was a problem signing in!';
-                    console.log(this.errorMessage);
-                  }
-                },
-                (err: any) => console.log(err));
+    this.authService.login(this.email,this.passwd)
+        .pipe(first())
+        .subscribe((data) => {
+            if(data) {
+              this.router.navigate(['/dashboard']);
+            }},
+            (err: any) => {
+                this.errorMessage = err.toString();
+            });
+    this.loginForm.reset();
   }
 }

Farmatiko/ClientApp/src/app/shared/data.service.ts

@@ -1 @@
-import { Injectable,  } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 
@@ -95 +95 @@
 
 
-    getPandemic() : Observable<IPandemic[]> {
-        return this.http.get<IPandemic[]>(this.basePandemicUrl)
+    getPandemic() : Observable<IPandemic> {
+        return this.http.get<IPandemic>(this.basePandemicUrl)
                    .pipe(catchError(this.handleError));
     }
@@ -143 +143 @@
                         catchError(this.handleError)
                    );
-    }
-    loginPharmacyHead(email: string, passwd: string) : Observable<any> {
-        let postData = {email : email ,password :passwd};
-        return this.http.post<any>(this.basePharmacyHead + '/login', postData)
-                   .pipe(
-                        map((data) => {
-                            return data;
-                        }),
-                        catchError(this.handleError)
-                    );
-    }
-    getPharmacyHead(id: string) : Observable<IPharmacyHead> {
-        return this.http.get<IPharmacyHead>(this.basePharmacyHead + '/' + id)
-                   .pipe(catchError(this.handleError));
     }
     //PharmacyHead POST

Farmatiko/ClientApp/src/app/shared/interfaces.ts

@@ -29 +29 @@
 
 export interface IPandemic {
+    id?: string;
     name?: string;
     totalMK?: number;