From ffab44bfc327482d4473589a5c67325633be0e48 Mon Sep 17 00:00:00 2001 From: Chneemann Date: Mon, 1 Apr 2024 10:47:30 +0200 Subject: [PATCH] display logged-in user --- .../components/summary/summary.component.html | 17 ++++++++++++-- .../components/summary/summary.component.scss | 2 +- .../components/summary/summary.component.ts | 22 +++++++++++++++++-- src/app/services/user.service.ts | 7 ++++++ .../components/header/header.component.html | 9 +++++++- .../components/header/header.component.ts | 3 +++ 6 files changed, 54 insertions(+), 6 deletions(-) diff --git a/src/app/components/summary/summary.component.html b/src/app/components/summary/summary.component.html index 326bc0d..6946c51 100644 --- a/src/app/components/summary/summary.component.html +++ b/src/app/components/summary/summary.component.html @@ -93,8 +93,21 @@
-

Good Morning,

- Guest +

{{ displayGreeting() }},

+ {{ + this.userService.getUserDetails( + userService.getCurrentUserId(), + "firstName" + ) + }}
+ {{ + this.userService.getUserDetails( + userService.getCurrentUserId(), + "lastName" + ) + }}
diff --git a/src/app/components/summary/summary.component.scss b/src/app/components/summary/summary.component.scss index d8806f7..86ebf14 100644 --- a/src/app/components/summary/summary.component.scss +++ b/src/app/components/summary/summary.component.scss @@ -163,7 +163,7 @@ section { /*------------- RESPONSIVE -------------*/ -@media screen and (max-width: 1250px) { +@media screen and (max-width: 1500px) { .right-container { display: none; } diff --git a/src/app/components/summary/summary.component.ts b/src/app/components/summary/summary.component.ts index e5d78d0..3c61693 100644 --- a/src/app/components/summary/summary.component.ts +++ b/src/app/components/summary/summary.component.ts @@ -1,7 +1,8 @@ import { Component } from '@angular/core'; import { RouterModule } from '@angular/router'; import { TaskService } from '../../services/task.service'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { UserService } from '../../services/user.service'; @Component({ selector: 'app-summary', @@ -11,7 +12,11 @@ import { TranslateModule } from '@ngx-translate/core'; styleUrl: './summary.component.scss', }) export class SummaryComponent { - constructor(private taskService: TaskService) {} + constructor( + private taskService: TaskService, + public userService: UserService, + private translateService: TranslateService + ) {} displayNumberOfAllTasks() { return this.taskService.getAllTasks().length; @@ -63,4 +68,17 @@ export class SummaryComponent { var time = month + ' ' + date + ', ' + year; return time; } + + displayGreeting() { + let currentTime = new Date(); + let localTime = new Date(currentTime.getTime() + 3600000); + let currentHour = localTime.getHours(); + if (currentHour >= 5 && currentHour < 12) { + return this.translateService.instant('summary.morning'); + } else if (currentHour >= 12 && currentHour < 18) { + return this.translateService.instant('summary.afternoon'); + } else { + return this.translateService.instant('summary.evening'); + } + } } diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts index 8882398..d736156 100644 --- a/src/app/services/user.service.ts +++ b/src/app/services/user.service.ts @@ -31,6 +31,13 @@ export class UserService implements OnDestroy { return this.allUsers; } + getCurrentUserId() { + let currentUser = localStorage.getItem('currentUser'); + if (currentUser !== null) { + return JSON.parse(currentUser)[0].id; + } + } + getUserDetails(userId: string, query: keyof User) { return this.getAllUsers() .filter((user) => user.id === userId) diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html index 21ebe1c..4209e2a 100644 --- a/src/app/shared/components/header/header.component.html +++ b/src/app/shared/components/header/header.component.html @@ -13,7 +13,14 @@
-
G
+
+ {{ + this.userService.getUserDetails( + userService.getCurrentUserId(), + "initials" + ) + }} +
diff --git a/src/app/shared/components/header/header.component.ts b/src/app/shared/components/header/header.component.ts index bf62bf9..a91b030 100644 --- a/src/app/shared/components/header/header.component.ts +++ b/src/app/shared/components/header/header.component.ts @@ -3,6 +3,7 @@ import { RouterModule } from '@angular/router'; import { NavbarComponent } from '../navbar/navbar.component'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; +import { UserService } from '../../../services/user.service'; @Component({ selector: 'app-header', @@ -15,6 +16,8 @@ export class HeaderComponent { navbarVisible: boolean = false; navbarLanguageVisible: boolean = false; + constructor(public userService: UserService) {} + toggleNavbar() { this.navbarVisible = !this.navbarVisible; }