Index: Farmatiko/ClientApp/src/app/admin/admin.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/admin/admin.component.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/admin/admin.component.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -4,5 +4,5 @@ import { Router } from '@angular/router'; import { IPharmacyHead, IPharmacyHeadRequest, IPharmacy } from '../shared/interfaces'; -import { DataService } from '../shared/services/data.service'; +import { DataService } from '../shared/data.service'; import { EditPharmacyHeadDialogComponent } from '../dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component'; import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component'; Index: Farmatiko/ClientApp/src/app/app.module.ts =================================================================== --- Farmatiko/ClientApp/src/app/app.module.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/app.module.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -10,5 +10,5 @@ import { AuthGuard } from './shared/guards/auth.guard'; -import { DataService } from './shared/services/data.service'; +import { DataService } from './shared/data.service'; import { AppComponent } from './app.component'; import { NavMenuComponent } from './nav-menu/nav-menu.component'; Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; import { IHealthFacilities, IHealthcareWorkers } from '../shared/interfaces'; -import { DataService } from '../shared/services/data.service'; +import { DataService } from '../shared/data.service'; import { MatDialog } from '@angular/material/dialog'; import { FacilityDialogComponent } from '../dialogs/facility-dialog/facility-dialog.component'; Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -12,5 +12,6 @@
Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -3,5 +3,5 @@ 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,7 +27,11 @@ 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,4 +106,8 @@ } + logout() { + this.authService.logout(); + } + openPharmacyDialog(pharmacy: IPharmacy): void { this.dialog.open(PharmacyDialogComponent, { Index: Farmatiko/ClientApp/src/app/home/home.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/home/home.component.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; import { IMedicine, IPharmacy } from '../shared/interfaces'; -import { DataService } from '../shared/services/data.service'; +import { DataService } from '../shared/data.service'; import { MatDialog } from '@angular/material/dialog'; import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component'; Index: Farmatiko/ClientApp/src/app/korona/korona.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -1,4 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { DataService } from '../shared/services/data.service'; +import { DataService } from '../shared/data.service'; import { IPandemic } from '../shared/interfaces'; Index: Farmatiko/ClientApp/src/app/login/login.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/login/login.component.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/login/login.component.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -53,6 +53,11 @@ .pipe(finalize(() => (this.busy = false))) .subscribe( - () => { - this.router.navigate(['/dashboard']); + (data) => { + if(data.role == 'Admin') { + this.router.navigate(['/admin']); + } + else { + this.router.navigate(['/dashboard']); + } }, () => { Index: Farmatiko/ClientApp/src/app/shared/data.service.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/data.service.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/shared/data.service.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -95,6 +95,6 @@ - getPandemic() : Observable { - return this.http.get(this.basePandemicUrl) + getPandemic() : Observable { + return this.http.get(this.basePandemicUrl) .pipe(catchError(this.handleError)); } Index: Farmatiko/ClientApp/src/app/shared/index.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/index.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) +++ Farmatiko/ClientApp/src/app/shared/index.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -0,0 +1,3 @@ +export * from './guards/auth.guard'; +export * from './services/auth.service'; +export * from './interfaces'; Index: Farmatiko/ClientApp/src/app/shared/interceptors/jwt.interceptor.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/interceptors/jwt.interceptor.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/shared/interceptors/jwt.interceptor.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -7,6 +7,6 @@ } from '@angular/common/http'; import { Observable } from 'rxjs'; +import { environment } from '../../../environments/environment'; import { AuthService } from '../services/auth.service'; -import { environment } from '../../../environments/environment'; @Injectable() Index: Farmatiko/ClientApp/src/app/shared/interfaces.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -53,6 +53,6 @@ Pharmacy?: IPharmacy[]; Email: string; + Name: string; Passwd: string; - Name: string; originalUserName?: string; Role?: string; Index: Farmatiko/ClientApp/src/app/shared/services/auth.service.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/services/auth.service.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ Farmatiko/ClientApp/src/app/shared/services/auth.service.ts (revision ad60966d7f1312d731802b6f0b7ce1e17a1028c4) @@ -36,8 +36,8 @@ this.http.get(`${this.apiUrl}/user`).subscribe((x) => { this._user.next({ - Email: x.head.Email, - Role: x.head.Role, - originalUserName: x.head.originalUserName, + Email: x.username, Passwd: x.head.Passwd, + Role: x.role, + originalUserName: x.originalUserName, Name: x.head.Name, PharmacyMedicines: x.head.PharmacyMedicines, @@ -64,8 +64,8 @@ map((x) => { this._user.next({ - Email: x.head.Email, - Role: x.head.Role, - originalUserName: x.head.originalUserName, + Email: x.username, Passwd: x.head.Passwd, + Role: x.role, + originalUserName: x.originalUserName, Name: x.head.Name, PharmacyMedicines: x.head.PharmacyMedicines, @@ -105,8 +105,8 @@ map((x) => { this._user.next({ - Email: x.head.Email, - Role: x.head.Role, - originalUserName: x.head.originalUserName, + Email: x.username, Passwd: x.head.Passwd, + Role: x.role, + originalUserName: x.originalUserName, Name: x.head.Name, PharmacyMedicines: x.head.PharmacyMedicines, Index: rmatiko/ClientApp/src/app/shared/services/data.service.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/services/data.service.ts (revision afc9a9a8069edf3822af53c7409b5bb2f64f87bb) +++ (revision ) @@ -1,194 +1,0 @@ -import { Injectable } from '@angular/core'; -import { HttpClient, HttpErrorResponse } from '@angular/common/http'; - -import { Observable } from 'rxjs'; -import { map, catchError } from 'rxjs/operators'; - -import { IHealthFacilities, IHealthcareWorkers, IMedicine, IPandemic, IPharmacy, IPharmacyHead, IPharmacyHeadRequest } from '../interfaces'; - -@Injectable() -export class DataService { - baseFacilitiesUrl: string = '/api/facilities'; - baseWorkersUrl: string = '/api/workers'; - baseMedicineUrl: string = '/api/medicines'; - basePandemicUrl: string = '/api/pandemic'; - basePharmacyUrl: string = '/api/pharmacy'; - basePharmacyHead: string = '/api/pharmacyhead'; - - constructor(private http: HttpClient) { - - } - - //Facility GET - getFacilities() : Observable { - return this.http.get(this.baseFacilitiesUrl) - .pipe( - map((facilities: IHealthFacilities[]) => { - return facilities; - }), - catchError(this.handleError) - ); - } - searchFacilities(searchquery: string) : Observable { - return this.http.get(this.baseFacilitiesUrl + '/search/' + searchquery) - .pipe( - map((facilities: IHealthFacilities[]) => { - return facilities; - }), - catchError(this.handleError) - ); - } - getFacility(id: string) : Observable { - return this.http.get(this.baseFacilitiesUrl + '/' + id) - .pipe(catchError(this.handleError)); - } - - - //Worker GET - getWorkers() : Observable { - return this.http.get(this.baseWorkersUrl) - .pipe( - map((workers: IHealthcareWorkers[]) => { - return workers; - }), - catchError(this.handleError) - ); - } - searchWorkers(searchquery: string) : Observable { - return this.http.get(this.baseWorkersUrl + '/search/' + searchquery) - .pipe( - map((workers: IHealthcareWorkers[]) => { - return workers; - }), - catchError(this.handleError) - ); - } - getWorker(id: string) : Observable { - return this.http.get(this.baseWorkersUrl + '/' + id) - .pipe(catchError(this.handleError)); - } - - - //Medicine GET - getMedicines() : Observable { - return this.http.get(this.baseMedicineUrl) - .pipe( - map((medicines: IMedicine[]) => { - return medicines; - }), - catchError(this.handleError) - ); - } - searchMedicines(searchquery: string) : Observable { - return this.http.get(this.baseMedicineUrl + '/search/' + searchquery) - .pipe( - map((medicines: IMedicine[]) => { - return medicines; - }), - catchError(this.handleError) - ); - } - getMedicine(id: string) : Observable { - return this.http.get(this.baseMedicineUrl + '/' + id) - .pipe(catchError(this.handleError)); - } - - - getPandemic() : Observable { - return this.http.get(this.basePandemicUrl) - .pipe(catchError(this.handleError)); - } - - - //Pharmacy GET - getPharmacies() : Observable { - return this.http.get(this.basePharmacyUrl) - .pipe( - map((pharmacies: IPharmacy[]) => { - return pharmacies; - }), - catchError(this.handleError) - ); - } - searchPharmacies(searchquery: string) : Observable { - return this.http.get(this.basePharmacyUrl + '/search/' + searchquery) - .pipe( - map((pharmacies: IPharmacy[]) => { - return pharmacies; - }), - catchError(this.handleError) - ); - } - getPharmacy(id: string) : Observable { - return this.http.get(this.basePharmacyUrl + '/' + id) - .pipe(catchError(this.handleError)); - } - - //PharmacyHead GET - getPharmacyHeads() : Observable { - return this.http.get(this.basePharmacyHead) - .pipe( - map((pharmacyheads: IPharmacyHead[]) => { - return pharmacyheads; - }), - catchError(this.handleError) - ); - } - getClaimingRequests() : Observable { - return this.http.get(this.basePharmacyHead + '/requests') - .pipe( - map((requests: IPharmacyHeadRequest[]) => { - return requests; - }), - catchError(this.handleError) - ); - } - //PharmacyHead POST - insertPharmacyHead(head: IPharmacyHead) : Observable { - return this.http.post(this.basePharmacyHead + '/add', head) - .pipe( - map((data) => { - return data; - }), - catchError(this.handleError) - ); - } - claimPharmacy(req: IPharmacyHeadRequest) : Observable { - return this.http.post(this.basePharmacyHead + '/requests', req) - .pipe( - map((data) => { - return data; - }), - catchError(this.handleError) - ); - } - //PharmacyHead PUT - updatePharmacyHead(head: IPharmacyHead) : Observable { - return this.http.put(this.basePharmacyHead + '/' + head.id, head) - .pipe( - map((data) => { - return data; - }), - catchError(this.handleError) - ); - } - //PharmacyHead DELETE - deletePharmacyHead(id: string) : Observable { - return this.http.delete(this.basePharmacyHead + '/delete/' + id) - .pipe(catchError(this.handleError)); - } - deleteClaimingRequest(id: string) : Observable { - return this.http.delete(this.basePharmacyHead + '/requests/' + id) - .pipe(catchError(this.handleError)); - } - - private handleError(error: HttpErrorResponse) { - console.error('server error:', error); - if (error.error instanceof Error) { - let errMessage = error.error.message; - return Observable.throw(errMessage); - } - return Observable.throw(error || 'ASP.NET Core server error'); - } - -}