aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_elements
diff options
context:
space:
mode:
authorSonja Galovic <galovicsonja@gmail.com>2022-03-24 00:42:57 +0100
committerSonja Galovic <galovicsonja@gmail.com>2022-03-24 00:42:57 +0100
commit6a4abae42f6a785f4e666b8fee23211e9e0ba543 (patch)
tree38df2d6dc04af39b077059ecbacffb1bedb2bbb7 /frontend/src/app/_elements
parent7c9c0653c68ecd5ad7e9c5b48922874fd6901fb1 (diff)
Uskladjena promena profilne slike sa slikom u navbaru.
Diffstat (limited to 'frontend/src/app/_elements')
-rw-r--r--frontend/src/app/_elements/navbar/navbar.component.html2
-rw-r--r--frontend/src/app/_elements/navbar/navbar.component.ts6
2 files changed, 6 insertions, 2 deletions
diff --git a/frontend/src/app/_elements/navbar/navbar.component.html b/frontend/src/app/_elements/navbar/navbar.component.html
index 52e26e6b..82a1ea07 100644
--- a/frontend/src/app/_elements/navbar/navbar.component.html
+++ b/frontend/src/app/_elements/navbar/navbar.component.html
@@ -18,7 +18,7 @@
<div *ngIf="shared.loggedIn" class="dropdown text-end">
<a href="#" class="d-block link-light text-decoration-none dropdown-toggle" id="dropdownUser1"
data-bs-toggle="dropdown" aria-expanded="false">
- <img src="https://github.com/mdo.png" alt="mdo" width="32" height="32" class="rounded-circle">
+ <img [src]="'/assets/profilePictures/'+ shared.photoId +'.png'" alt="mdo" width="32" height="32" class="rounded-circle">
</a>
<ul class="dropdown-menu text-small" aria-labelledby="dropdownUser1"
style="position: absolute; inset: 0px 0px auto auto; margin: 0px; transform: translate(0px, 34px);"
diff --git a/frontend/src/app/_elements/navbar/navbar.component.ts b/frontend/src/app/_elements/navbar/navbar.component.ts
index c16e3e9d..5fd98c8f 100644
--- a/frontend/src/app/_elements/navbar/navbar.component.ts
+++ b/frontend/src/app/_elements/navbar/navbar.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';
import { AuthService } from '../../_services/auth.service';
import shared from 'src/app/Shared';
+import { UserInfoService } from 'src/app/_services/user-info.service';
@Component({
selector: 'app-navbar',
@@ -13,7 +14,7 @@ export class NavbarComponent implements OnInit {
currentUrl: string;
shared = shared;
- constructor(public location: Location, private auth: AuthService) {
+ constructor(public location: Location, private auth: AuthService, private userInfoService: UserInfoService) {
this.currentUrl = this.location.path();
this.location.onUrlChange(() => {
this.currentUrl = this.location.path();
@@ -22,6 +23,9 @@ export class NavbarComponent implements OnInit {
ngOnInit(): void {
this.auth.updateUser();
+ this.userInfoService.getUserInfo().subscribe((response) => {
+ shared.photoId = response.photoId;
+ });
}
logOut() {