From e0163353ef50994ff82c70478f8894a782e64d4c Mon Sep 17 00:00:00 2001
From: Adam <adam.g@virtualplanet.eu>
Date: Mon, 5 Aug 2024 10:07:55 +0200
Subject: [PATCH] restricting access to admin

---
 TIAMSharedUI/Pages/RenewPassword.razor        |  9 +++--
 TIAMSharedUI/Pages/User/Admin.razor           |  4 +-
 .../Pages/User/Drivers/DriverManageCars.razor |  2 +-
 .../User/Drivers/DriverManageTransfers.razor  |  6 +--
 .../Pages/User/Hotels/HotelAdmin.razor        |  7 ++--
 .../Pages/User/Hotels/HotelComponent.razor    | 10 ++---
 .../Pages/User/SysAdmins/ManageCars.razor     |  4 +-
 .../Pages/User/SysAdmins/ManageDrivers.razor  |  2 +-
 .../Pages/User/SysAdmins/ManageProducts.razor |  2 +-
 .../SysAdmins/ManageServiceProviders.razor    | 10 ++---
 .../ManageTransferDestinationToProducts.razor |  4 +-
 .../ManageTransferDestinations.razor          |  2 +-
 .../ManageTransferDestinations.razor.cs       |  2 +-
 .../User/SysAdmins/ManageTransfers.razor      | 14 +++----
 .../SysAdmins/ManageUserProductMappings.razor |  4 +-
 .../Pages/User/SysAdmins/ManageUsers.razor    | 25 ++++++------
 .../Pages/User/SysAdmins/SysAdmin.razor       |  2 +
 .../BaseComponents/UserBasePageComponent.cs   | 38 +++++++++++++++++++
 TIAMSharedUI/wwwroot/css/TourIAm.css          |  4 +-
 19 files changed, 90 insertions(+), 61 deletions(-)
 create mode 100644 TIAMSharedUI/Shared/Components/BaseComponents/UserBasePageComponent.cs

diff --git a/TIAMSharedUI/Pages/RenewPassword.razor b/TIAMSharedUI/Pages/RenewPassword.razor
index 2514f85b..398ae647 100644
--- a/TIAMSharedUI/Pages/RenewPassword.razor
+++ b/TIAMSharedUI/Pages/RenewPassword.razor
@@ -7,10 +7,10 @@
 @using TIAMSharedUI.Pages.Components;
 @using TIAMSharedUI.Pages.User.CardComponents
 
-<PageTitle>Login</PageTitle>
+<PageTitle>Forgot password</PageTitle>
 
 <div class="text-center m-5">
-    <h1>Login</h1>
+    <h1>Renew password</h1>
     <h2 style="font-size:small">Good to see you again!</h2>
 </div>
 
@@ -28,7 +28,7 @@
                         <div class="text-center mt-4 name">
                             @_localizer["LoginTitleText"]
                         </div>
-                            <UserCardComponent IsForgotten="true" />
+                            <UserCardComponent Context="user" IsForgotten="true" />
                         <div class="text-center fs-6">
                             No account yet? <a href="register">Sign up here!</a>
                         </div>
@@ -54,8 +54,9 @@
 @code {
 
     [Parameter] public string renewToken { get; set; }
+    [Parameter] public string emailAddress { get; set; }
 
-    private UserModelDto user;
+    private UserModelDtoDetail user;
     protected override Task OnInitializedAsync()
     {
         return base.OnInitializedAsync();
diff --git a/TIAMSharedUI/Pages/User/Admin.razor b/TIAMSharedUI/Pages/User/Admin.razor
index d1492032..ef8e7a93 100644
--- a/TIAMSharedUI/Pages/User/Admin.razor
+++ b/TIAMSharedUI/Pages/User/Admin.razor
@@ -3,12 +3,12 @@
 @using TIAMSharedUI.Shared
 @using TIAMWebApp.Shared.Application.Interfaces;
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
 @inject IPopulationStructureDataProvider DataProvider
 @inject ISupplierService SupplierService
 @inject IUserDataService UserDataService
-@attribute [Authorize]
+
 <PageTitle>Administration</PageTitle>
 
 <div class="text-center m-5">
diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor
index da4536cc..93fe5222 100644
--- a/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor
+++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor
@@ -13,7 +13,7 @@
 @using TIAMWebApp.Shared.Application.Utility
 @using AyCode.Services.Loggers
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject IStringLocalizer<TIAMResources> Localizer
diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
index 20083191..2f3131b8 100644
--- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
@@ -25,7 +25,7 @@
 @using DevExpress.Data.Filtering
 @using TIAM.Entities.Emails
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject IStringLocalizer<TIAMResources> localizer
@@ -71,7 +71,7 @@
     <div class="row">
         <div class=" col-12">
 
-            <div class="card">
+            
 
                 <DxTabs>
                     <DxTabPage Text="Upcoming">
@@ -162,7 +162,7 @@
                     </DxTabPage>
 
                 </DxTabs>
-            </div>
+            
         </div>
 
         <div class=" col-12 col-xl-6">
diff --git a/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor b/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor
index 07cc57ea..8c5fff0f 100644
--- a/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor
+++ b/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor
@@ -2,10 +2,9 @@
 @using TIAMSharedUI.Shared
 @using TIAMWebApp.Shared.Application.Interfaces;
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
 @inject IUserDataService UserDataService
-@inject ISessionService SessionService
 <PageTitle>HotelAdmin</PageTitle>
 
 <div class="text-center m-5">
@@ -33,11 +32,11 @@
     protected override void OnInitialized()
     {
         //check if Id matches with userproductmapping
-        if (!SessionService.IsAuthenticated)
+        if (!_sessionService.IsAuthenticated)
         {
             return;
         }
-        var check = SessionService.User.UserModelDto.UserProductMappings.Any(x => x.ProductId == id);
+        var check = _sessionService.User.UserModelDto.UserProductMappings.Any(x => x.ProductId == id);
         if (!check)
         {
             return;
diff --git a/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor b/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor
index fad159cf..30e83536 100644
--- a/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor
+++ b/TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor
@@ -15,7 +15,7 @@
 
     <div class=" col-12 col-xl-3">
         <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
-            <div class="card glass card-admin" style="border-radius: 16px;">
+            <div class="card card-admin" style="border-radius: 16px;">
                 <div class="card-header py-2 px-4">
                     <div class="d-flex justify-content-between align-items-center">
                         <div>
@@ -63,7 +63,7 @@
     </div>
     <div class=" col-12 col-xl-9">
         <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
-            <div class="card glass card-admin" style="border-radius: 16px;">
+            <div class="card card-admin" style="border-radius: 16px;">
                 <div class="card-header py-2 px-4">
                     <div class="d-flex justify-content-between align-items-center">
                         <div>
@@ -143,7 +143,7 @@
     </div>
     <div class=" col-12 col-xl-9">
         <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
-            <div class="card glass card-admin" style="border-radius: 16px;">
+            <div class="card card-admin" style="border-radius: 16px;">
                 <div class="card-header py-2 px-4">
                     <div class="d-flex justify-content-between align-items-center">
                         <div>
@@ -177,7 +177,7 @@
 
     <div class="col-12 col-lg-3" hidden="@accessDenied">
         <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
-            <div class="card glass card-admin" style="border-radius: 16px;">
+            <div class="card card-admin" style="border-radius: 16px;">
                 <div class="card-header py-2 px-4">
                     <div class="d-flex justify-content-between align-items-center">
                         <div>
@@ -245,7 +245,7 @@
     </div>
     <div class=" col-12">
         <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
-            <div class="card glass card-admin" style="border-radius: 16px;">
+            <div class="card card-admin" style="border-radius: 16px;">
                 <div class="card-header py-2 px-4">
                     <div class="d-flex justify-content-between align-items-center">
                         <div>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor
index a914693d..dc1e3b17 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor
@@ -13,11 +13,9 @@
 @using AyCode.Core.Helpers
 @using AyCode.Core.Consts
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
-
 @inject IStringLocalizer<TIAMResources> Localizer
-@inject ISessionService SessionService
 @inject IWizardProcessor WizardProcessor
 @inject IUserDataService UserDataService
 <PageTitle>Car list</PageTitle>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor
index d825a621..30e92d14 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor
@@ -15,7 +15,7 @@
 @inject IStringLocalizer<TIAMResources> Localizer
 @inject ISessionService SessionService
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 
 <PageTitle>User permissions</PageTitle>
 
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor
index 2f3b12aa..164a8e24 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor
@@ -9,7 +9,7 @@
 @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
 @using TIAMWebApp.Shared.Application.Utility
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
 @inject IStringLocalizer<TIAMResources> localizer
 @inject IServiceProviderDataService ServiceProviderDataService
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index 01feced7..86e2ca68 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -17,13 +17,11 @@
 @using TIAM.Entities.Users
 @using TIAM.Services
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
-@inject IStringLocalizer<TIAMResources> localizer
 @inject IWizardProcessor wizardProcessor
 @inject IServiceProviderDataService serviceProviderDataService
 @inject IUserDataService userDataService
-@inject ISessionService sessionService
 @inject AdminSignalRClient AdminSignalRClient;
 <PageTitle>Admin - Companies</PageTitle>
 
@@ -67,7 +65,7 @@
                      IgnoreReflection=@IgnoreList
                      TitleResourceString="NewMessage"
                      SubtitleResourceString="NewMessageSubtitle"
-                     SubmitButtonText="@localizer.GetString("ButtonSend")"></InputWizard>
+                     SubmitButtonText="@_localizer.GetString("ButtonSend")"></InputWizard>
     </BodyContentTemplate>
     <FooterContentTemplate Context="Context">
         <div class="popup-demo-events-footer">
@@ -143,10 +141,10 @@
                                 var transfer2 = (Company)EditFormContext.EditModel;
                             }
                             <DxFormLayout CssClass="w-100">
-                                <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.LastName) ColSpanMd="6" ColSpanLg="6" ColSpanSm="12">
+                                <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.LastName) ColSpanMd="6" ColSpanLg="6" ColSpanSm="12">
                                     @EditFormContext.GetEditor("Name")
                                 </DxFormLayoutItem>
-                                <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.LastName) ColSpanMd="6" ColSpanLg="6" ColSpanSm="12">
+                                <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.LastName) ColSpanMd="6" ColSpanLg="6" ColSpanSm="12">
                                     @EditFormContext.GetEditor("CommissionPercent")
                                 </DxFormLayoutItem>
                             </DxFormLayout>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor
index b679fd68..f8f27c88 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor
@@ -12,10 +12,8 @@
 @using AyCode.Core.Helpers
 @using AyCode.Core.Consts
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
-@inject IStringLocalizer<TIAMResources> Localizer
-@inject ISessionService SessionService
 @inject IWizardProcessor WizardProcessor
 @inject IUserDataService UserDataService
 <PageTitle>User permissions</PageTitle>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor
index 76ced070..f826f4e6 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor
@@ -5,7 +5,7 @@
 @using TIAMSharedUI.Shared
 @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
 
 @inject IStringLocalizer<TIAMResources> localizer
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor.cs
index 0a86cb09..262830b7 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor.cs
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor.cs
@@ -10,7 +10,7 @@ using TIAMSharedUI.Shared.Components.BaseComponents;
 
 namespace TIAMSharedUI.Pages.User.SysAdmins
 {
-    public partial class ManageTransferDestinations : BasePageComponent
+    public partial class ManageTransferDestinations : UserBasePageComponent
     {
 
         IGrid Grid { get; set; }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index 51c0975d..333d0071 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -21,12 +21,10 @@
 @using DevExpress.Data.Filtering
 @using TIAM.Entities.Emails
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
-@inject IStringLocalizer<TIAMResources> localizer
 @inject IWizardProcessor wizardProcessor
 @inject ITransferDataService transferDataService
-@inject ISessionService sessionService
 @inject AdminSignalRClient AdminSignalRClient;
 <PageTitle>Transfers</PageTitle>
 
@@ -51,7 +49,7 @@
                      IgnoreReflection=@IgnoreList
                      TitleResourceString="NewMessage"
                      SubtitleResourceString="NewMessageSubtitle"
-                     SubmitButtonText="@localizer.GetString("ButtonSend")"></InputWizard>
+                     SubmitButtonText="@_localizer.GetString("ButtonSend")"></InputWizard>
     </BodyContentTemplate>
     <FooterContentTemplate Context="Context">
         <div class="popup-demo-events-footer">
@@ -160,16 +158,16 @@
                                             var transfer2 = (Transfer)editFormContext.EditModel;
                                         }
                                         <DxFormLayout CssClass="w-100">
-                                            <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.FirstName) ColSpanMd="6">
+                                            <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.FirstName) ColSpanMd="6">
                                                 @editFormContext.GetEditor("FirstName")
                                             </DxFormLayoutItem>
-                                            <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.LastName) ColSpanMd="6">
+                                            <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.LastName) ColSpanMd="6">
                                                 @editFormContext.GetEditor("LastName")
                                             </DxFormLayoutItem>
-                                            <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.DestinationAddress) ColSpanMd="6">
+                                            <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.DestinationAddress) ColSpanMd="6">
                                                 @editFormContext.GetEditor("ToAddress")
                                             </DxFormLayoutItem>
-                                            <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.PickupAddress) ColSpanMd="6">
+                                            <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.PickupAddress) ColSpanMd="6">
                                                 @editFormContext.GetEditor("FromAddress")
                                             </DxFormLayoutItem>
                                             <DxFormLayoutItem Caption="Trip date:" ColSpanMd="6">
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor
index a499bde4..a5171d5b 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor
@@ -13,10 +13,8 @@
 @using AyCode.Core.Helpers
 @using AyCode.Core.Consts
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
-@inject IStringLocalizer<TIAMResources> Localizer
-@inject ISessionService SessionService
 @inject IWizardProcessor WizardProcessor
 @inject IUserDataService UserDataService
 <PageTitle>User permissions</PageTitle>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
index 716f06cb..f45c1e29 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
@@ -16,9 +16,8 @@
 @using AyCode.Core.Helpers
 @using TIAMWebApp.Shared.Application.Services
 @using TIAMSharedUI.Shared.Components.BaseComponents
-@inherits BasePageComponent
+@inherits UserBasePageComponent
 @layout AdminLayout
-@inject IStringLocalizer<TIAMResources> Localizer
 @inject IWizardProcessor WizardProcessor
 @inject IUserDataService UserDataService
 @inject AdminSignalRClient AdminSignalRClient;
@@ -85,12 +84,12 @@
                                 ShowFilterRow="true">
                             <Columns>
                                 <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left"/>
-                                <DxGridDataColumn Caption="@Localizer.GetString("Id")" FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/>
-                                <DxGridDataColumn Caption="@Localizer.GetString("FullName")" FieldName="ProfileDto.FullName"/>
-                                <DxGridDataColumn Caption="@Localizer.GetString("PhoneNumber")" FieldName="UserDto.PhoneNumber"/>
-                                <DxGridDataColumn Caption="@Localizer.GetString("RefferalId")" FieldName="UserDto.RefferalId" />
-                                <DxGridDataColumn Caption="@Localizer.GetString("EmailConfirmed")" FieldName="UserDto.EmailConfirmed" Width="120" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
-                                <DxGridDataColumn Caption="@Localizer.GetString("EmailAddress")" Width="240" FieldName="UserDto.EmailAddress" SortIndex="0" />
+                                <DxGridDataColumn Caption="@_localizer.GetString("Id")" FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/>
+                                <DxGridDataColumn Caption="@_localizer.GetString("FullName")" FieldName="ProfileDto.FullName"/>
+                                <DxGridDataColumn Caption="@_localizer.GetString("PhoneNumber")" FieldName="UserDto.PhoneNumber"/>
+                                <DxGridDataColumn Caption="@_localizer.GetString("RefferalId")" FieldName="UserDto.RefferalId" />
+                                <DxGridDataColumn Caption="@_localizer.GetString("EmailConfirmed")" FieldName="UserDto.EmailConfirmed" Width="120" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
+                                <DxGridDataColumn Caption="@_localizer.GetString("EmailAddress")" Width="240" FieldName="UserDto.EmailAddress" SortIndex="0" />
                                 <DxGridDataColumn Caption="Send email" Width="110" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center">
                                     <CellDisplayTemplate>
                                         @{
@@ -102,8 +101,8 @@
                                         }
                                     </CellDisplayTemplate>
                                 </DxGridDataColumn>
-                                <DxGridDataColumn Caption="@Localizer.GetString("Created")" FieldName="UserDto.Created" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
-                                <DxGridDataColumn Caption="@Localizer.GetString("Modified")" FieldName="UserDto.Modified" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
+                                <DxGridDataColumn Caption="@_localizer.GetString("Created")" FieldName="UserDto.Created" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
+                                <DxGridDataColumn Caption="@_localizer.GetString("Modified")" FieldName="UserDto.Modified" DisplayFormat="g" Width="140" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
                             </Columns>
                             <DetailRowTemplate>
                                 <DxTabs>
@@ -129,13 +128,13 @@
                                     var transfer2 = (UserModelDtoDetail)editFormContext.EditModel;
                                 }
                                 <DxFormLayout CssClass="w-100 form-control">
-                                    <DxFormLayoutItem Caption=@Localizer.GetString(ResourceKeys.EmailAddress) ColSpanMd="4">
+                                    <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.EmailAddress) ColSpanMd="4">
                                         @editFormContext.GetEditor("UserDto.EmailAddress")
                                     </DxFormLayoutItem>                                   
-                                    <DxFormLayoutItem Caption=@Localizer.GetString(ResourceKeys.ConfirmEmail) ColSpanMd="4">
+                                    <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.ConfirmEmail) ColSpanMd="4">
                                         @editFormContext.GetEditor("UserDto.EmailConfirmed")
                                     </DxFormLayoutItem>
-                                    <DxFormLayoutItem Caption=@Localizer.GetString(ResourceKeys.PhoneNumber) ColSpanMd="4">
+                                    <DxFormLayoutItem Caption=@_localizer.GetString(ResourceKeys.PhoneNumber) ColSpanMd="4">
                                         @editFormContext.GetEditor("UserDto.PhoneNumber")
                                     </DxFormLayoutItem>
                                     
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor b/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor
index 1f90bef0..aeeac7e9 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/SysAdmin.razor
@@ -1,6 +1,8 @@
 @page "/user/sysadmin"
 @using TIAMSharedUI.Shared
 @using TIAMWebApp.Shared.Application.Interfaces;
+@using TIAMSharedUI.Shared.Components.BaseComponents
+@inherits UserBasePageComponent
 @layout AdminLayout
 @inject IPopulationStructureDataProvider DataProvider
 @inject ISupplierService SupplierService
diff --git a/TIAMSharedUI/Shared/Components/BaseComponents/UserBasePageComponent.cs b/TIAMSharedUI/Shared/Components/BaseComponents/UserBasePageComponent.cs
new file mode 100644
index 00000000..d6e07503
--- /dev/null
+++ b/TIAMSharedUI/Shared/Components/BaseComponents/UserBasePageComponent.cs
@@ -0,0 +1,38 @@
+using AyCode.Services.Loggers;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TIAM.Resources;
+using TIAMSharedUI.Pages.User;
+using TIAMSharedUI.Resources;
+using TIAMWebApp.Shared.Application.Interfaces;
+using TIAMWebApp.Shared.Application.Utility;
+
+namespace TIAMSharedUI.Shared.Components.BaseComponents
+{
+    [Authorize]
+    public class UserBasePageComponent : BasePageComponent
+    {        
+
+        private LoggerClient<UserBasePageComponent> _logger = null!;
+        public UserBasePageComponent()
+        {
+            
+        }
+
+
+        protected override void OnInitialized()
+        {
+            base.OnInitialized();
+            _logger = new LoggerClient<UserBasePageComponent>(_logWriters.ToArray());
+            var currentUrl = _navManager.ToBaseRelativePath(_navManager.Uri);
+            _pageState.AddPageToHistory(currentUrl);
+            _logger.Debug(_pageState.GetGoBackPage());
+        }
+    }
+}
diff --git a/TIAMSharedUI/wwwroot/css/TourIAm.css b/TIAMSharedUI/wwwroot/css/TourIAm.css
index c94494f7..d582bf71 100644
--- a/TIAMSharedUI/wwwroot/css/TourIAm.css
+++ b/TIAMSharedUI/wwwroot/css/TourIAm.css
@@ -90,13 +90,13 @@ select {
 .card .card-footer {
     padding: 0px;
     margin:0px;
-    background-color:transparent;
+    background-color: transparent;
 }
 
 .card .card-header {
     padding: 0px;
     margin: 0px;
-    background-color: transparent;
+    background-color: aliceblue;
 }
 
 .bg-red {