-
{{korona[0].deathsGlobal}}
+
{{korona.deathsGlobal}}
Смртни случаи глобално
Index: Farmatiko/ClientApp/src/app/korona/korona.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
+++ Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision 993189ebdd8ea7f88583498d4188a29688f0f069)
@@ -9,5 +9,5 @@
})
export class KoronaComponent implements OnInit {
- public korona: IPandemic[];
+ public korona: IPandemic;
constructor(private dataService: DataService) {
@@ -17,5 +17,5 @@
ngOnInit(): void {
this.dataService.getPandemic()
- .subscribe((res: IPandemic[]) => {
+ .subscribe((res: IPandemic) => {
this.korona = res;
console.log(this.korona);
Index: Farmatiko/ClientApp/src/app/login/login.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/login/login.component.ts (revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
+++ Farmatiko/ClientApp/src/app/login/login.component.ts (revision 993189ebdd8ea7f88583498d4188a29688f0f069)
@@ -2,5 +2,6 @@
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,5 +16,5 @@
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,15 +27,14 @@
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();
}
}
Index: Farmatiko/ClientApp/src/app/shared/auth.guard.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/auth.guard.ts (revision 993189ebdd8ea7f88583498d4188a29688f0f069)
+++ Farmatiko/ClientApp/src/app/shared/auth.guard.ts (revision 993189ebdd8ea7f88583498d4188a29688f0f069)
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Observable } from 'rxjs';
+
+import { AuthService } from './auth.service';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class AuthGuard implements CanActivate {
+ constructor(private router: Router, private authService: AuthService) {
+
+ }
+
+ canActivate(next: ActivatedRouteSnapshot,state: RouterStateSnapshot): Observable
| Promise | boolean | UrlTree {
+ const head = this.authService.headValue;
+ if(head) {
+ return true;
+ }
+ this.router.navigate(['/login']);
+ return false;
+ }
+
+}
Index: Farmatiko/ClientApp/src/app/shared/auth.service.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/auth.service.ts (revision 993189ebdd8ea7f88583498d4188a29688f0f069)
+++ Farmatiko/ClientApp/src/app/shared/auth.service.ts (revision 993189ebdd8ea7f88583498d4188a29688f0f069)
@@ -0,0 +1,54 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+import { IPharmacyHead } from './interfaces';
+import { DataService } from './data.service';
+
+
+@Injectable({
+ providedIn: 'root'
+})
+export class AuthService {
+ private headSubject: BehaviorSubject;
+ public head: Observable;
+ basePharmacyHead: string = '/api/pharmacyhead';
+
+ constructor(private router: Router, private http: HttpClient, private dataService: DataService) {
+ this.headSubject = new BehaviorSubject(JSON.parse(localStorage.getItem('head')));
+ this.head = this.headSubject.asObservable();
+ }
+
+ public get headValue(): IPharmacyHead {
+ return this.headSubject.value;
+ }
+
+ login(email: string, passwd: string) : Observable {
+ let postData = {email : email ,password : passwd};
+ return this.http.post(this.basePharmacyHead + '/login', postData)
+ .pipe(
+ map((data) => {
+ localStorage.setItem('head', JSON.stringify(data));
+ this.headSubject.next(data);
+ return data;
+ }),
+ catchError(this.handleError)
+ );
+ }
+
+ logout() {
+ localStorage.removeItem('user');
+ this.headSubject.next(null);
+ this.router.navigate(['/login']);
+ }
+
+ 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');
+ }
+}
Index: Farmatiko/ClientApp/src/app/shared/data.service.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/data.service.ts (revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
+++ Farmatiko/ClientApp/src/app/shared/data.service.ts (revision 993189ebdd8ea7f88583498d4188a29688f0f069)
@@ -1,3 +1,3 @@
-import { Injectable, } from '@angular/core';
+import { Injectable } from '@angular/core';
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
@@ -95,6 +95,6 @@
- getPandemic() : Observable {
- return this.http.get(this.basePandemicUrl)
+ getPandemic() : Observable {
+ return this.http.get(this.basePandemicUrl)
.pipe(catchError(this.handleError));
}
@@ -143,18 +143,4 @@
catchError(this.handleError)
);
- }
- loginPharmacyHead(email: string, passwd: string) : Observable {
- let postData = {email : email ,password :passwd};
- return this.http.post(this.basePharmacyHead + '/login', postData)
- .pipe(
- map((data) => {
- return data;
- }),
- catchError(this.handleError)
- );
- }
- getPharmacyHead(id: string) : Observable {
- return this.http.get(this.basePharmacyHead + '/' + id)
- .pipe(catchError(this.handleError));
}
//PharmacyHead POST
Index: Farmatiko/ClientApp/src/app/shared/interfaces.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
+++ Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision 993189ebdd8ea7f88583498d4188a29688f0f069)
@@ -29,4 +29,5 @@
export interface IPandemic {
+ id?: string;
name?: string;
totalMK?: number;