From 0e85b0ca5ce485d9416f9f962f6da4d95fe21977 Mon Sep 17 00:00:00 2001
From: herrone <egretfulherron@gmail.com>
Date: Sun, 19 Nov 2023 19:59:31 +0000
Subject: [PATCH 1/4] Added changes for User issue

---
 AppShell.xaml             |  5 +++
 MauiProgram.cs            |  1 +
 Models/User.cs            | 29 +++++++++++++++++
 Services/IUsersService.cs | 11 +++++++
 Services/UserService.cs   | 16 ++++++++++
 Views/UsersPage.xaml      | 31 +++++++++++++++++++
 Views/UsersPage.xaml.cs   | 65 +++++++++++++++++++++++++++++++++++++++
 7 files changed, 158 insertions(+)
 create mode 100644 Models/User.cs
 create mode 100644 Services/IUsersService.cs
 create mode 100644 Services/UserService.cs
 create mode 100644 Views/UsersPage.xaml
 create mode 100644 Views/UsersPage.xaml.cs

diff --git a/AppShell.xaml b/AppShell.xaml
index 8b97a0d..edeea18 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -12,6 +12,11 @@
         <ShellContent 
             Title="Welcome"
             ContentTemplate="{DataTemplate views:WelcomePage}"/>
+        <ShellContent
+Title="User Management"
+ContentTemplate="{DataTemplate views:UsersPage}"
+Icon="{OnPlatform 'icon_about.png', iOS='icon_about_ios.png', MacCatalyst='icon_about_ios.png'}" />
+
 
         <ShellContent
         Title="Volunteer Requests"
diff --git a/MauiProgram.cs b/MauiProgram.cs
index 7cf4ca4..f26f2f3 100644
--- a/MauiProgram.cs
+++ b/MauiProgram.cs
@@ -17,6 +17,7 @@ public static MauiApp CreateMauiApp()
                 fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
             });
 		builder.Services.AddSingleton<Database>();
+        builder.Services.AddSingleton<IUsersService, UsersService>();
         builder.Services.AddSingleton<ISecurityAlertService, SecurityAlertService>();
         builder.Services.AddSingleton<IContinentService, ContinentService>();
 		builder.Services.AddSingleton<ISkillService, SkillService>();
diff --git a/Models/User.cs b/Models/User.cs
new file mode 100644
index 0000000..0b7503f
--- /dev/null
+++ b/Models/User.cs
@@ -0,0 +1,29 @@
+using SQLite;
+using System.ComponentModel;
+
+namespace UndacApp.Models
+{
+    public class User : AModel
+    {
+        private string _name;
+        public string Name
+        {
+            get => _name;
+            set => SetField(ref _name, value);
+        }
+
+        private string _email;
+        public string Email
+        {
+            get => _email;
+            set => SetField(ref _email, value);
+        }
+
+        private string _accessLevel;
+        public string AccessLevel
+        {
+            get => _accessLevel;
+            set => SetField(ref _accessLevel, value);
+        }
+    }
+}
diff --git a/Services/IUsersService.cs b/Services/IUsersService.cs
new file mode 100644
index 0000000..4e2a15a
--- /dev/null
+++ b/Services/IUsersService.cs
@@ -0,0 +1,11 @@
+using UndacApp.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace UndacApp.Services
+{
+    public interface IUsersService : IService<User>
+    {
+        // Define additional methods specific to user management if needed
+    }
+}
diff --git a/Services/UserService.cs b/Services/UserService.cs
new file mode 100644
index 0000000..1853597
--- /dev/null
+++ b/Services/UserService.cs
@@ -0,0 +1,16 @@
+using UndacApp.Models;
+using System.Threading.Tasks;
+
+namespace UndacApp.Services
+{
+    public class UsersService : AService<User>, IUsersService
+    {
+        public UsersService() : base()
+        {
+            // Additional initialization if required
+        }
+
+        // Implement any additional methods specific to the User entity
+        // For now, all basic CRUD operations are inherited from AService<User>
+    }
+}
diff --git a/Views/UsersPage.xaml b/Views/UsersPage.xaml
new file mode 100644
index 0000000..82e4ecc
--- /dev/null
+++ b/Views/UsersPage.xaml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="UndacApp.Views.UsersPage"
+             Title="User Management">
+
+    <VerticalStackLayout Spacing="10" Margin="5">
+        <Entry x:Name="txtName" Placeholder="Name"/>
+        <Entry x:Name="txtEmail" Placeholder="Email"/>
+        <Picker x:Name="pickerAccessLevel" Title="Access Level">
+            <Picker.ItemsSource>
+                <x:Array Type="{x:Type x:String}">
+                    <x:String>Low</x:String>
+                    <x:String>Medium</x:String>
+                    <x:String>High</x:String>
+                </x:Array>
+            </Picker.ItemsSource>
+        </Picker>
+        <Button Text="Add User" Clicked="AddUserButton_Clicked"/>
+
+        <!-- Admin Credentials Section (Initially Hidden) -->
+        <StackLayout x:Name="adminCredentialsLayout" IsVisible="False">
+            <Label Text="Enter your credentials to add user" />
+            <Entry x:Name="txtAdminUsername" Placeholder="Admin Username"/>
+            <Entry x:Name="txtAdminPassword" Placeholder="Admin Password" IsPassword="True"/>
+            <Button Text="Check" Clicked="CheckCredentialsButton_Clicked"/>
+        </StackLayout>
+
+        <!-- ListView to display users -->
+    </VerticalStackLayout>
+</ContentPage>
diff --git a/Views/UsersPage.xaml.cs b/Views/UsersPage.xaml.cs
new file mode 100644
index 0000000..f192cc6
--- /dev/null
+++ b/Views/UsersPage.xaml.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using UndacApp.Models;
+using UndacApp.Services;
+using Microsoft.Maui.Controls;
+
+namespace UndacApp.Views
+{
+    public partial class UsersPage : ContentPage
+    {
+        IUsersService userService;
+        ObservableCollection<User> users = new ObservableCollection<User>();
+
+        public UsersPage()
+        {
+            InitializeComponent();
+            userService = new UsersService();
+            LoadUsers();
+        }
+
+        private async Task LoadUsers()
+        {
+            var userList = await userService.GetAll();
+            users = new ObservableCollection<User>(userList);
+            // Bind this collection to a ListView if you want to display the users
+        }
+
+        private void AddUserButton_Clicked(object sender, EventArgs e)
+        {
+            // Show admin credential fields
+            adminCredentialsLayout.IsVisible = true;
+        }
+
+        private async void CheckCredentialsButton_Clicked(object sender, EventArgs e)
+        {
+            // Check credentials
+            if (txtAdminUsername.Text == "systemAdmin" && txtAdminPassword.Text == "password123")
+            {
+                var newUser = new User
+                {
+                    Name = txtName.Text,
+                    Email = txtEmail.Text,
+                    AccessLevel = pickerAccessLevel.SelectedItem.ToString()
+                };
+
+                userService.Add(newUser);
+                users.Add(newUser);
+
+                // Clear the input fields
+                txtName.Text = string.Empty;
+                txtEmail.Text = string.Empty;
+                pickerAccessLevel.SelectedIndex = -1;
+                adminCredentialsLayout.IsVisible = false;
+
+                await DisplayAlert("Success", $"User {newUser.Name} added!", "OK");
+            }
+            else
+            {
+                await DisplayAlert("Error", "Invalid credentials.", "OK");
+            }
+        }
+
+    }
+}

From 08293166cd6fdb031776b40804e3aa2d3b3cb931 Mon Sep 17 00:00:00 2001
From: herrone <egretfulherron@gmail.com>
Date: Sun, 19 Nov 2023 20:19:11 +0000
Subject: [PATCH 2/4] Added review changes

---
 Views/UsersPage.xaml.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Views/UsersPage.xaml.cs b/Views/UsersPage.xaml.cs
index f192cc6..4589355 100644
--- a/Views/UsersPage.xaml.cs
+++ b/Views/UsersPage.xaml.cs
@@ -4,6 +4,7 @@
 using UndacApp.Models;
 using UndacApp.Services;
 using Microsoft.Maui.Controls;
+using System.Xml.Serialization;
 
 namespace UndacApp.Views
 {
@@ -32,6 +33,13 @@ private void AddUserButton_Clicked(object sender, EventArgs e)
             adminCredentialsLayout.IsVisible = true;
         }
 
+        private void ClearFilters()
+        {
+            txtName.Text = string.Empty;
+            txtEmail.Text = string.Empty;
+            pickerAccessLevel.SelectedIndex = -1;
+            adminCredentialsLayout.IsVisible = false;
+        }
         private async void CheckCredentialsButton_Clicked(object sender, EventArgs e)
         {
             // Check credentials
@@ -48,10 +56,7 @@ private async void CheckCredentialsButton_Clicked(object sender, EventArgs e)
                 users.Add(newUser);
 
                 // Clear the input fields
-                txtName.Text = string.Empty;
-                txtEmail.Text = string.Empty;
-                pickerAccessLevel.SelectedIndex = -1;
-                adminCredentialsLayout.IsVisible = false;
+                ClearFilters();
 
                 await DisplayAlert("Success", $"User {newUser.Name} added!", "OK");
             }

From d5ca6af5c8279117992cf5527df873dca0df19f6 Mon Sep 17 00:00:00 2001
From: herrone <egretfulherron@gmail.com>
Date: Thu, 23 Nov 2023 18:09:17 +0000
Subject: [PATCH 3/4] Added changes for this week

---
 Models/User.cs          |  29 ++++++
 Utils/PasswordHasher.cs |  21 +++++
 Views/UsersPage.xaml    |  60 ++++++++-----
 Views/UsersPage.xaml.cs | 193 ++++++++++++++++++++++++++++++++++------
 4 files changed, 254 insertions(+), 49 deletions(-)
 create mode 100644 Utils/PasswordHasher.cs

diff --git a/Models/User.cs b/Models/User.cs
index 0b7503f..1cf7ac9 100644
--- a/Models/User.cs
+++ b/Models/User.cs
@@ -25,5 +25,34 @@ public string AccessLevel
             get => _accessLevel;
             set => SetField(ref _accessLevel, value);
         }
+
+        private bool _employed = true;
+        public bool Employed
+        {
+            get => _employed;
+            set => SetField(ref _employed, value);
+        }
+
+        private string _role;
+        public string Role
+        {
+            get => _role;
+            set => SetField(ref _role, value);
+        }
+
+        private string _team;
+        public string Team
+        {
+            get => _team;
+            set => SetField(ref _team, value);
+        }
+
+        private string _password;
+        public string Password
+        {
+            get => _password;
+            set => SetField(ref _password, value);
+        }
     }
 }
+ 
diff --git a/Utils/PasswordHasher.cs b/Utils/PasswordHasher.cs
new file mode 100644
index 0000000..b5cd4ee
--- /dev/null
+++ b/Utils/PasswordHasher.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Security.Cryptography;
+using System.Text;
+
+public static class PasswordHasher
+{
+    public static string HashPassword(string password)
+    {
+        using (var sha256 = SHA256.Create())
+        {
+            var hashedBytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(password));
+            return Convert.ToBase64String(hashedBytes);
+        }
+    }
+
+    public static bool VerifyPassword(string enteredPassword, string storedHash)
+    {
+        string enteredHash = HashPassword(enteredPassword);
+        return enteredHash == storedHash;
+    }
+}
diff --git a/Views/UsersPage.xaml b/Views/UsersPage.xaml
index 82e4ecc..4bb375a 100644
--- a/Views/UsersPage.xaml
+++ b/Views/UsersPage.xaml
@@ -1,31 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="UndacApp.Views.UsersPage"
              Title="User Management">
 
-    <VerticalStackLayout Spacing="10" Margin="5">
-        <Entry x:Name="txtName" Placeholder="Name"/>
-        <Entry x:Name="txtEmail" Placeholder="Email"/>
-        <Picker x:Name="pickerAccessLevel" Title="Access Level">
-            <Picker.ItemsSource>
-                <x:Array Type="{x:Type x:String}">
-                    <x:String>Low</x:String>
-                    <x:String>Medium</x:String>
-                    <x:String>High</x:String>
-                </x:Array>
-            </Picker.ItemsSource>
-        </Picker>
-        <Button Text="Add User" Clicked="AddUserButton_Clicked"/>
+    <ScrollView>
+        <VerticalStackLayout Spacing="10" Margin="5">
+            <!-- Login Section -->
+            <VerticalStackLayout Spacing="10">
+                <Entry x:Name="txtLoginEmail" Placeholder="Email"/>
+                <Entry x:Name="txtLoginPassword" Placeholder="Password" IsPassword="True"/>
+                <Button Text="Login" Clicked="LoginButton_Clicked"/>
+            </VerticalStackLayout>
 
-        <!-- Admin Credentials Section (Initially Hidden) -->
-        <StackLayout x:Name="adminCredentialsLayout" IsVisible="False">
-            <Label Text="Enter your credentials to add user" />
-            <Entry x:Name="txtAdminUsername" Placeholder="Admin Username"/>
-            <Entry x:Name="txtAdminPassword" Placeholder="Admin Password" IsPassword="True"/>
-            <Button Text="Check" Clicked="CheckCredentialsButton_Clicked"/>
-        </StackLayout>
+            <!-- User Management Section (Initially Hidden) -->
+            <StackLayout x:Name="userManagementSection" IsVisible="False">
+                <!-- User Addition Form -->
+                <VerticalStackLayout Spacing="10">
+                    <Entry x:Name="txtName" Placeholder="Name"/>
+                    <Entry x:Name="txtEmail" Placeholder="Email"/>
+                    <Entry x:Name="txtPassword" Placeholder="Password" IsPassword="True"/>
+                    <Entry x:Name="txtTeam" Placeholder="Team"/>
+                    <Picker x:Name="pickerRole" Title="Role"/>
+                    <Picker x:Name="pickerAccessLevel" Title="Access Level"/>
+                    <Button x:Name="AddUserButton" Text="Add User" Clicked="AddUserButton_Clicked"/>
+                </VerticalStackLayout>
 
-        <!-- ListView to display users -->
-    </VerticalStackLayout>
+                <!-- User List and Selection -->
+                <ListView x:Name="listViewUsers" ItemSelected="OnUserSelected">
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <TextCell Text="{Binding Name}" Detail="{Binding Email}" />
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+
+                <!-- Edit and Delete Buttons -->
+                <StackLayout Orientation="Horizontal">
+                    <Button x:Name="btnEdit" Text="Edit" Clicked="EditUserButton_Clicked" IsEnabled="False"/>
+                    <Button x:Name="btnDelete" Text="Delete" Clicked="DeleteUserButton_Clicked" IsEnabled="False"/>
+                </StackLayout>
+            </StackLayout>
+        </VerticalStackLayout>
+    </ScrollView>
 </ContentPage>
diff --git a/Views/UsersPage.xaml.cs b/Views/UsersPage.xaml.cs
index 4589355..79eeeec 100644
--- a/Views/UsersPage.xaml.cs
+++ b/Views/UsersPage.xaml.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading.Tasks;
 using UndacApp.Models;
 using UndacApp.Services;
 using Microsoft.Maui.Controls;
-using System.Xml.Serialization;
 
 namespace UndacApp.Views
 {
@@ -12,59 +12,200 @@ public partial class UsersPage : ContentPage
     {
         IUsersService userService;
         ObservableCollection<User> users = new ObservableCollection<User>();
+        private User selectedUser;
 
         public UsersPage()
         {
             InitializeComponent();
             userService = new UsersService();
+            InitializePickers();
             LoadUsers();
         }
 
+        private void InitializePickers()
+        {
+            pickerRole.ItemsSource = new List<string> { "User", "System Administrator" };
+            pickerAccessLevel.ItemsSource = new List<string> { "Low", "Medium", "High" };
+        }
+
         private async Task LoadUsers()
         {
             var userList = await userService.GetAll();
             users = new ObservableCollection<User>(userList);
-            // Bind this collection to a ListView if you want to display the users
+            listViewUsers.ItemsSource = users;
         }
 
-        private void AddUserButton_Clicked(object sender, EventArgs e)
+        private async void LoginButton_Clicked(object sender, EventArgs e)
         {
-            // Show admin credential fields
-            adminCredentialsLayout.IsVisible = true;
+            string email = txtLoginEmail.Text;
+            string password = txtLoginPassword.Text;
+            var user = users.FirstOrDefault(u => u.Email == email && PasswordHasher.VerifyPassword(password, u.Password));
+
+            bool isAdmin = email == "1" && password == "1";
+            if (user != null || isAdmin)
+            {
+                if (user?.Role == "User" && !isAdmin)
+                {
+                    await DisplayAlert("Notice", "Please contact your manager for how to gain access", "OK");
+                }
+                else
+                {
+                    // Hide the login section
+                    HideLoginSection();
+                    userManagementSection.IsVisible = true;
+                }
+            }
+            else
+            {
+                await DisplayAlert("Login Failed", "Invalid email or password.", "OK");
+            }
         }
 
-        private void ClearFilters()
+        private void HideLoginSection()
         {
-            txtName.Text = string.Empty;
-            txtEmail.Text = string.Empty;
-            pickerAccessLevel.SelectedIndex = -1;
-            adminCredentialsLayout.IsVisible = false;
+            // Assuming the login section is within a named StackLayout
+            txtLoginEmail.IsVisible = false;
+            txtLoginPassword.IsVisible = false;
+            // Hide the login button or the entire login section container if necessary
+            // For example: loginSection.IsVisible = false;
         }
-        private async void CheckCredentialsButton_Clicked(object sender, EventArgs e)
+
+
+        private async void AddUserButton_Clicked(object sender, EventArgs e)
         {
-            // Check credentials
-            if (txtAdminUsername.Text == "systemAdmin" && txtAdminPassword.Text == "password123")
+            if (!ValidateUserInput()) return;
+
+            var newUser = new User
             {
-                var newUser = new User
-                {
-                    Name = txtName.Text,
-                    Email = txtEmail.Text,
-                    AccessLevel = pickerAccessLevel.SelectedItem.ToString()
-                };
+                Name = txtName.Text,
+                Email = txtEmail.Text,
+                Password = PasswordHasher.HashPassword(txtPassword.Text),
+                Team = txtTeam.Text,
+                Role = (string)pickerRole.SelectedItem,
+                AccessLevel = (string)pickerAccessLevel.SelectedItem,
+                Employed = true
+            };
+
+            await userService.Add(newUser);
+            users.Add(newUser);
+
+            ClearUserInputFields();
+            await DisplayAlert("Success", $"{newUser.Name} added!", "OK");
+        }
+
+        private void OnUserSelected(object sender, SelectedItemChangedEventArgs e)
+        {
+            selectedUser = e.SelectedItem as User;
+            btnEdit.IsEnabled = btnDelete.IsEnabled = selectedUser != null;
+        }
+
+        private async void EditUserButton_Clicked(object sender, EventArgs e)
+        {
+            if (selectedUser == null) return;
+
+            txtName.Text = selectedUser.Name;
+            txtEmail.Text = selectedUser.Email;
+            txtPassword.Text = selectedUser.Password; // Keep in mind this is hashed
+            txtTeam.Text = selectedUser.Team;
+            pickerRole.SelectedItem = selectedUser.Role;
+            pickerAccessLevel.SelectedItem = selectedUser.AccessLevel;
+
+            AddUserButton.Text = "Save Changes";
+            AddUserButton.Clicked -= AddUserButton_Clicked;
+            AddUserButton.Clicked += SaveUserChangesButton_Clicked;
+        }
+
+        private async void SaveUserChangesButton_Clicked(object sender, EventArgs e)
+        {
+            if (!ValidateUserInput()) return;
 
-                userService.Add(newUser);
-                users.Add(newUser);
+            selectedUser.Name = txtName.Text;
+            selectedUser.Email = txtEmail.Text;
+            selectedUser.Password = PasswordHasher.HashPassword(txtPassword.Text); // Hashing new password
+            selectedUser.Team = txtTeam.Text;
+            selectedUser.Role = (string)pickerRole.SelectedItem;
+            selectedUser.AccessLevel = (string)pickerAccessLevel.SelectedItem;
 
-                // Clear the input fields
-                ClearFilters();
+            await userService.Update(selectedUser);
 
-                await DisplayAlert("Success", $"User {newUser.Name} added!", "OK");
+            RefreshListView();
+            ClearUserInputFields();
+
+            AddUserButton.Text = "Add User";
+            AddUserButton.Clicked -= SaveUserChangesButton_Clicked;
+            AddUserButton.Clicked += AddUserButton_Clicked;
+
+            await DisplayAlert("Success", "User updated successfully!", "OK");
+        }
+
+        private async void DeleteUserButton_Clicked(object sender, EventArgs e)
+        {
+            if (selectedUser == null) return;
+
+            var confirm = await DisplayAlert("Confirm Delete", $"Are you sure you want to delete {selectedUser.Name}?", "Yes", "No");
+            if (confirm)
+            {
+                await userService.Remove(selectedUser);
+                users.Remove(selectedUser);
+                RefreshListView();
+                ClearUserInputFields();
+
+                await DisplayAlert("User Deleted", $"Access privileges removed, {selectedUser.Name} deleted!", "OK");
             }
-            else
+        }
+
+        private void ClearUserInputFields()
+        {
+            txtName.Text = "";
+            txtEmail.Text = "";
+            txtPassword.Text = "";
+            txtTeam.Text = "";
+            pickerRole.SelectedIndex = -1;
+            pickerAccessLevel.SelectedIndex = -1;
+            selectedUser = null;
+            btnEdit.IsEnabled = false;
+            btnDelete.IsEnabled = false;
+        }
+
+        private void RefreshListView()
+        {
+            listViewUsers.ItemsSource = null;
+            listViewUsers.ItemsSource = users;
+        }
+
+        private bool IsValidEmail(string email)
+        {
+            try
             {
-                await DisplayAlert("Error", "Invalid credentials.", "OK");
+                var addr = new System.Net.Mail.MailAddress(email);
+                return addr.Address == email;
+            }
+            catch
+            {
+                return false;
             }
         }
 
+        private bool ValidateUserInput()
+        {
+            if (string.IsNullOrWhiteSpace(txtName.Text) ||
+                string.IsNullOrWhiteSpace(txtEmail.Text) ||
+                string.IsNullOrWhiteSpace(txtPassword.Text) ||
+                string.IsNullOrWhiteSpace(txtTeam.Text) ||
+                pickerRole.SelectedIndex == -1 ||
+                pickerAccessLevel.SelectedIndex == -1)
+            {
+                DisplayAlert("Validation Error", "All fields are required.", "OK");
+                return false;
+            }
+
+            if (!IsValidEmail(txtEmail.Text))
+            {
+                DisplayAlert("Validation Error", "Enter a valid email address.", "OK");
+                return false;
+            }
+
+            return true;
+        }
     }
 }

From 5de7b1879e932799e825ef7dc6a030194036b182 Mon Sep 17 00:00:00 2001
From: herrone <egretfulherron@gmail.com>
Date: Thu, 23 Nov 2023 18:22:52 +0000
Subject: [PATCH 4/4] code smells

---
 Views/UsersPage.xaml.cs | 92 +++++++++++++++++++++++++++++------------
 1 file changed, 65 insertions(+), 27 deletions(-)

diff --git a/Views/UsersPage.xaml.cs b/Views/UsersPage.xaml.cs
index 79eeeec..9679cf6 100644
--- a/Views/UsersPage.xaml.cs
+++ b/Views/UsersPage.xaml.cs
@@ -37,30 +37,44 @@ private async Task LoadUsers()
 
         private async void LoginButton_Clicked(object sender, EventArgs e)
         {
-            string email = txtLoginEmail.Text;
-            string password = txtLoginPassword.Text;
+            string email = txtLoginEmail.Text; string password = txtLoginPassword.Text;
             var user = users.FirstOrDefault(u => u.Email == email && PasswordHasher.VerifyPassword(password, u.Password));
 
-            bool isAdmin = email == "1" && password == "1";
-            if (user != null || isAdmin)
+            if (user != null)
             {
-                if (user?.Role == "User" && !isAdmin)
+                if (user.Role == "User")
                 {
-                    await DisplayAlert("Notice", "Please contact your manager for how to gain access", "OK");
+                    await DisplayAlert("Notice", "Contact manager", "OK");
                 }
                 else
                 {
-                    // Hide the login section
-                    HideLoginSection();
-                    userManagementSection.IsVisible = true;
+                    if (user.Role != "Admin")
+                    {
+                        userManagementSection.IsVisible = true;
+                    }
+                    else
+                    {
+                        if (email == "admin@example.com")
+                        {
+                            userManagementSection.IsVisible = true;
+                        }
+                    }
                 }
             }
             else
             {
-                await DisplayAlert("Login Failed", "Invalid email or password.", "OK");
+                if (email == "1" && password == "1")
+                {
+                    userManagementSection.IsVisible = true;
+                }
+                else
+                {
+                    await DisplayAlert("Login Failed", "Invalid credentials", "OK");
+                }
             }
         }
 
+
         private void HideLoginSection()
         {
             // Assuming the login section is within a named StackLayout
@@ -73,26 +87,50 @@ private void HideLoginSection()
 
         private async void AddUserButton_Clicked(object sender, EventArgs e)
         {
-            if (!ValidateUserInput()) return;
-
-            var newUser = new User
+            if (txtName.Text != null)
             {
-                Name = txtName.Text,
-                Email = txtEmail.Text,
-                Password = PasswordHasher.HashPassword(txtPassword.Text),
-                Team = txtTeam.Text,
-                Role = (string)pickerRole.SelectedItem,
-                AccessLevel = (string)pickerAccessLevel.SelectedItem,
-                Employed = true
-            };
-
-            await userService.Add(newUser);
-            users.Add(newUser);
-
-            ClearUserInputFields();
-            await DisplayAlert("Success", $"{newUser.Name} added!", "OK");
+                if (txtEmail.Text != null)
+                {
+                    if (txtPassword.Text != null)
+                    {
+                        if (txtTeam.Text != null)
+                        {
+                            if (IsValidEmail(txtEmail.Text))
+                            {
+                                var newUser = new User
+                                {
+                                    Name = txtName.Text,
+                                    Email = txtEmail.Text,
+                                    Password = PasswordHasher.HashPassword(txtPassword.Text),
+                                    Team = txtTeam.Text
+                                };
+                                if (pickerRole.SelectedItem != null)
+                                {
+                                    newUser.Role = (string)pickerRole.SelectedItem;
+                                    if (pickerAccessLevel.SelectedItem != null)
+                                    {
+                                        newUser.AccessLevel = (string)pickerAccessLevel.SelectedItem;
+                                        await userService.Add(newUser);
+                                        users.Add(newUser);
+                                        ClearUserInputFields();
+                                        await DisplayAlert("Success", $"{newUser.Name} added!", "OK");
+                                    }
+                                    else await DisplayAlert("Error", "Access Level not selected", "OK");
+                                }
+                                else await DisplayAlert("Error", "Role not selected", "OK");
+                            }
+                            else await DisplayAlert("Error", "Invalid Email", "OK");
+                        }
+                        else await DisplayAlert("Error", "Team is empty", "OK");
+                    }
+                    else await DisplayAlert("Error", "Password is empty", "OK");
+                }
+                else await DisplayAlert("Error", "Email is empty", "OK");
+            }
+            else await DisplayAlert("Error", "Name is empty", "OK");
         }
 
+
         private void OnUserSelected(object sender, SelectedItemChangedEventArgs e)
         {
             selectedUser = e.SelectedItem as User;