diff --git a/src/app/admin/utils/navbar-admin/navbar-admin.component.html b/src/app/admin/utils/navbar-admin/navbar-admin.component.html
index 90f0cbc..322bf13 100644
--- a/src/app/admin/utils/navbar-admin/navbar-admin.component.html
+++ b/src/app/admin/utils/navbar-admin/navbar-admin.component.html
@@ -23,7 +23,7 @@
-
diff --git a/src/app/admin/utils/navbar-admin/navbar-admin.component.ts b/src/app/admin/utils/navbar-admin/navbar-admin.component.ts
index f9c0f04..e23ae05 100644
--- a/src/app/admin/utils/navbar-admin/navbar-admin.component.ts
+++ b/src/app/admin/utils/navbar-admin/navbar-admin.component.ts
@@ -1,5 +1,7 @@
import {Component} from '@angular/core';
import {Router} from "@angular/router";
+import {ProfilService} from "../../../utils/services/profil/profil.service";
+import {MessageService} from "../../../utils/services/message/message.service";
@@ -19,9 +21,20 @@ export class NavbarAdminComponent
url = this.router.url;
- urlImage: string = "https://www.reference-gaming.com/assets/media/product/41195/figurine-pop-duck-tales-n-309-loulou.jpg?format=product-cover-large&k=1519639530" ;
+ constructor( private router: Router,
+ public profilService: ProfilService,
+ private messageService: MessageService ) { }
- constructor(private router: Router) { }
+ onDeconnexion(): void
+ {
+ this.messageService
+ .delete('user/logout', {})
+ .subscribe(retour => this.onDeconnexionCallback(retour), err => this.onDeconnexionCallback(err));
+ }
+
+ onDeconnexionCallback(retour: any): void
+ {
+ console.log(retour);
+ }
- onDeconnexion(): void {}
}
diff --git a/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.html b/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.html
index 1b16354..c1a8267 100644
--- a/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.html
+++ b/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.html
@@ -27,7 +27,7 @@
-
diff --git a/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.ts b/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.ts
index 0b9440d..a0e5181 100644
--- a/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.ts
+++ b/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.ts
@@ -1,5 +1,7 @@
import { Component } from '@angular/core';
import {Router} from "@angular/router";
+import {ProfilService} from "../../../utils/services/profil/profil.service";
+import {MessageService} from "../../../utils/services/message/message.service";
@@ -20,9 +22,20 @@ export class NavbarAdvertiserComponent
url = this.router.url;
- urlImage: string = "https://www.figurines-goodies.com/1188-large_default/dewey-duck-tales-disney-funko-pop.jpg" ;
+ constructor( private router: Router,
+ public profilService: ProfilService,
+ private messageService: MessageService ) { }
- constructor(private router: Router) { }
+ onDeconnexion(): void
+ {
+ this.messageService
+ .delete('user/logout', {})
+ .subscribe(retour => this.onDeconnexionCallback(retour), err => this.onDeconnexionCallback(err));
+ }
+
+ onDeconnexionCallback(retour: any): void
+ {
+ console.log(retour);
+ }
- onDeconnexion(): void {}
}
diff --git a/src/app/beforeConnexion/login/page-login/page-login.component.ts b/src/app/beforeConnexion/login/page-login/page-login.component.ts
index 8bbd022..d53bf46 100644
--- a/src/app/beforeConnexion/login/page-login/page-login.component.ts
+++ b/src/app/beforeConnexion/login/page-login/page-login.component.ts
@@ -5,6 +5,7 @@ import {ThemeService} from "../../../utils/services/theme/theme.service";
import {MatDialog} from "@angular/material/dialog";
import {PopupForgottenPasswordComponent} from "../popup-forgotten-password/popup-forgotten-password.component";
import {MatSnackBar} from "@angular/material/snack-bar";
+import {ProfilService} from "../../../utils/services/profil/profil.service";
@@ -25,7 +26,8 @@ export class PageLoginComponent implements OnInit
private router: Router,
public themeService: ThemeService,
public dialog: MatDialog,
- private snackBar: MatSnackBar ) { }
+ private snackBar: MatSnackBar,
+ private profilService: ProfilService) { }
ngOnInit(): void {}
@@ -50,12 +52,16 @@ export class PageLoginComponent implements OnInit
onSeConnecterCallback(retour): void
{
+ console.log(retour);
if(retour.status !== "success") {
this.errorMessage = retour.error.data.reason;
this.hasError = true;
}
else {
- this.router.navigateByUrl( '/user/search');
+ this.profilService.profileImageUrl = retour.data.profileImageUrl;
+ if(retour.data.role.name === "user") this.router.navigateByUrl( '/user/search');
+ else if(retour.data.role.name === "advertiser") this.router.navigateByUrl( '/advertiser/adList');
+ else if(retour.data.role.name === "admin") this.router.navigateByUrl( '/admin/userList');
}
}
diff --git a/src/app/beforeConnexion/login/popup-forgotten-password/popup-forgotten-password.component.html b/src/app/beforeConnexion/login/popup-forgotten-password/popup-forgotten-password.component.html
index 80a2fc9..c34b58e 100644
--- a/src/app/beforeConnexion/login/popup-forgotten-password/popup-forgotten-password.component.html
+++ b/src/app/beforeConnexion/login/popup-forgotten-password/popup-forgotten-password.component.html
@@ -1,4 +1,4 @@
-