From 3ac1eb2bd928c3d99ed5a91593a72a2884fe2158 Mon Sep 17 00:00:00 2001
From: Mazdak Gibran <141390141+mazdakgibran@users.noreply.github.com>
Date: Thu, 15 Jan 2026 15:58:19 +0500
Subject: [PATCH] show username in header

---
 .../components/header/header.component.html       | 10 +++++-----
 .../shared/components/header/header.component.ts  | 15 +++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html
index ba7379a..336b23f 100644
--- a/src/app/shared/components/header/header.component.html
+++ b/src/app/shared/components/header/header.component.html
@@ -44,14 +44,14 @@
       <div class="d-flex align-items-center">
 
         <div class="d-none d-lg-inline-block me-3">
-          <label class="text-muted fw-normal mb-0" 
+          <label class="text-muted fw-normal mb-0 " 
                  [title]="mismatchedDates" 
                  [style]="{'color': dateColor}" 
-                 style="font-size: 14px;">
+                 style="font-size: 14px;" >
             {{'date' | translate}}: {{date}}
           </label>
         </div>
-
+        
         <div class="dropdown d-inline-block profile-dropdown">
           <button type="button"
                   class="btn header-item waves-effect p-0 d-flex align-items-center"
@@ -60,10 +60,10 @@
                   aria-haspopup="true"
                   [attr.aria-expanded]="isDropdownVisible ? 'true' : 'false'">
             <img class="rounded-circle header-profile-user" src="assets/images/user-icon.png" alt="user-icon" />
-            <span class="d-none d-xl-inline-block ms-2 text-muted">{{username}}</span>
+            <span class="d-none d-xl-inline-block ms-2 fw-sm">{{username}}</span>
             <i class="mdi mdi-chevron-down text-muted d-xl-inline-block font-size-22"></i>
           </button>
-
+          
           <div class="dropdown-menu dropdown-menu-end" [ngClass]="{'show': isDropdownVisible}">
             <a class="dropdown-item text-danger" (click)="logout()">
               <i class="bx bx-power-off font-size-16 align-middle me-1 text-danger"></i> {{ 'logout' | translate }}
diff --git a/src/app/shared/components/header/header.component.ts b/src/app/shared/components/header/header.component.ts
index b6dd633..c8503ec 100644
--- a/src/app/shared/components/header/header.component.ts
+++ b/src/app/shared/components/header/header.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, Inject, PLATFORM_ID } from '@angular/core';
+import { Component, HostListener, Inject, OnInit, PLATFORM_ID } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { SidebarService } from '../../../services/sidebar.service';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
@@ -12,7 +12,7 @@ import { AuthenticationService } from '../../../services/authenticate.service';
   templateUrl: './header.component.html',
   styleUrl: './header.component.scss'
 })
-export class HeaderComponent {
+export class HeaderComponent implements OnInit{
   isDropdownVisible: boolean;
   isVacDropdownVisible: boolean;
   isNotificationsVisible: boolean;
@@ -25,9 +25,9 @@ export class HeaderComponent {
     },
   ];
   direction: string = 'ltr';
-  userString;
-  user;
-  username;
+  user: any;
+  userObj: any;
+  username : string = '';
   mismatchedDates: string = "";
   dateColor = "black";
   date: any;
@@ -42,9 +42,6 @@ export class HeaderComponent {
     this.isDropdownVisible = false;
     this.isVacDropdownVisible = false;
     this.isNotificationsVisible = false;
-    this.userString = this.storageService.getItem('user');
-    this.user = JSON.parse(this.userString as string);
-    this.username = this.user?.username;
     this.date = new Date().toISOString().split('T')[0];
   }
   ngOnInit(): void {
@@ -57,6 +54,8 @@ export class HeaderComponent {
         this.storageService.setItem('sidebarState', isCollapsed ? 'expanded' : 'collapsed');
       }
     }
+    this.userObj = JSON.parse(this.storageService.getItem('user') || '{}');
+    this.username = this.userObj?.user?.userFullname ?? '';
   }
 
   ngAfterViewInit(): void {