From d034a2218ded1ec2ad76506a7f2bd3647b3070ed Mon Sep 17 00:00:00 2001
From: shiibe <82057235+shiibe@users.noreply.github.com>
Date: Sat, 9 Mar 2024 13:45:20 -0500
Subject: [PATCH] Login/Register clean up

---
 TaikoWebUI/Pages/Components/UserCard.razor |  3 +-
 TaikoWebUI/Pages/Login.razor               | 71 ++++++++++------------
 TaikoWebUI/Pages/Register.razor            | 14 ++++-
 TaikoWebUI/Services/LoginService.cs        |  6 ++
 TaikoWebUI/Shared/NavMenu.razor            |  2 +-
 5 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/TaikoWebUI/Pages/Components/UserCard.razor b/TaikoWebUI/Pages/Components/UserCard.razor
index 78fb9c5..daaff78 100644
--- a/TaikoWebUI/Pages/Components/UserCard.razor
+++ b/TaikoWebUI/Pages/Components/UserCard.razor
@@ -19,9 +19,10 @@
                     {
                         <MudSkeleton Width="35%" Height="32px" />
                     }
+
                     @if (user?.IsAdmin == true)
                     {
-                        <MudChip Color="Color.Secondary" Size="Size.Small">@Localizer["Admin"]</MudChip>
+                        <MudChip Variant="Variant.Outlined" Color="Color.Info" Size="Size.Small" Icon="@Icons.Material.TwoTone.AdminPanelSettings">@Localizer["Admin"]</MudChip>
                     }
                 </div>
                 <MudText Typo="Typo.caption">User ID: @user?.Baid</MudText>
diff --git a/TaikoWebUI/Pages/Login.razor b/TaikoWebUI/Pages/Login.razor
index 5d05855..8ce15b7 100644
--- a/TaikoWebUI/Pages/Login.razor
+++ b/TaikoWebUI/Pages/Login.razor
@@ -5,41 +5,36 @@
 
 @page "/Login"
 
-<MudGrid Class="my-8">
-                @if (!LoginService.IsLoggedIn) // Not logged in, show login form
-                {
-                    <MudContainer>
-                        <MudGrid Justify="Justify.Center">
-                            <MudItem xs="12" md="6" lg="4" class="mt-8">
-                                <MudCard Elevation="0" Outlined="true">
-                                    <MudCardContent>
-                                        <MudForm @ref="loginForm">
-                                            <MudText Typo="Typo.h5" Class="mb-4">Login</MudText>
-                                            <div style="display:flex;flex-direction:column;gap:15px;">
-                                                <MudTextField @bind-value="inputAccessCode" InputType="InputType.Text" T="string"
-                                                              FullWidth="true" Required="@true" RequiredError="Access code is required"
-                                                              Label="Access code" Variant="Variant.Outlined" Margin="Margin.Dense" />
-                                                <MudTextField @bind-Value="inputPassword" InputType="InputType.Password"
-                                                              T="string" FullWidth="true" Required="@true"
-                                                              RequiredError="Password is required"
-                                                              Label="Password" Variant="Variant.Outlined" Margin="Margin.Dense" />
-                                                <MudStack Row="true" Class="mt-2">
-                                                    <MudButton OnClick="OnLogin" FullWidth="true" StartIcon="@Icons.Material.Filled.Login" Color="Color.Primary" Variant="Variant.Filled">Login</MudButton>
-                                                    @if (!LoginService.OnlyAdmin)
-                                                    {
-                                                        <MudButton Href="@("/Register")" FullWidth="true" StartIcon="@Icons.Material.Filled.AddCard" Color="Color.Primary" Variant="Variant.Filled">Register</MudButton>
-                                                    }
-                                                </MudStack>
-                                            </div>
-                                        </MudForm>
-                                    </MudCardContent>
-                                </MudCard>
-                            </MudItem>
-                        </MudGrid>
-        </MudContainer>
-    } else
-    {
-        // Already logged in
-        NavigationManager.NavigateTo("/");
-    }
-</MudGrid>
\ No newline at end of file
+
+@if (!LoginService.IsLoggedIn) // Not logged in, show login form
+{
+    <MudContainer>
+        <MudGrid Justify="Justify.Center">
+            <MudItem xs="12" md="6" lg="4">
+                <MudCard Elevation="0" Outlined="true">
+                    <MudCardHeader>
+                        <MudText Typo="Typo.h5">@Localizer["Log In"]</MudText>
+                    </MudCardHeader>
+                    <MudCardContent>
+                        <MudForm @ref="loginForm">
+                            <div style="display:flex;flex-direction:column;gap:15px;">
+                                <MudTextField @bind-value="inputAccessCode" InputType="InputType.Text" T="string"
+                                                FullWidth="true" Required="@true" RequiredError="Access code is required"
+                                                Label="Access code" Variant="Variant.Outlined" Margin="Margin.Dense" />
+                                <MudTextField @bind-Value="inputPassword" InputType="InputType.Password"
+                                                T="string" FullWidth="true" Required="@true"
+                                                RequiredError="Password is required"
+                                                Label="Password" Variant="Variant.Outlined" Margin="Margin.Dense" />
+                                <MudButton OnClick="OnLogin" FullWidth="true" StartIcon="@Icons.Material.Filled.Login" Color="Color.Primary" Variant="Variant.Filled">@Localizer["Log In"]</MudButton>
+                            </div>
+                        </MudForm>
+                    </MudCardContent>
+                </MudCard>
+            </MudItem>
+        </MudGrid>
+    </MudContainer>
+} else
+{
+    // Already logged in
+    NavigationManager.NavigateTo("/");
+}
\ No newline at end of file
diff --git a/TaikoWebUI/Pages/Register.razor b/TaikoWebUI/Pages/Register.razor
index ba18224..3f63267 100644
--- a/TaikoWebUI/Pages/Register.razor
+++ b/TaikoWebUI/Pages/Register.razor
@@ -7,17 +7,25 @@
 
 @if (LoginService.OnlyAdmin || !LoginService.LoginRequired)
 {
-    <MudText Typo="Typo.body1">Registration is currently closed.</MudText>
+    Console.WriteLine("Registration is disabled. Redirecting to Dashboard...");
+    NavigationManager.NavigateTo("/");
+}
+else if (LoginService.IsLoggedIn)
+{
+	// User is already logged in. Redirect to dashboard.
+	NavigationManager.NavigateTo("/");
 }
 else
 {
     <MudContainer>
         <MudGrid Justify="Justify.Center">
-            <MudItem xs="12" md="6" lg="4" class="mt-8">
+            <MudItem xs="12" md="6" lg="4">
                 <MudCard Elevation="0" Outlined="true">
+                    <MudCardHeader>
+                        <MudText Typo="Typo.h5">Register</MudText>
+                    </MudCardHeader>
                     <MudCardContent>
                         <MudForm @ref="registerForm">
-                            <MudText Typo="Typo.h5" Class="mb-4">Register</MudText>
                             <div style="display:flex;flex-direction:column;gap:15px;">
                             <MudTextField @bind-value="accessCode" InputType="InputType.Text" T="string"
                                           FullWidth="true" Required="@true" RequiredError="Access Code is required"
diff --git a/TaikoWebUI/Services/LoginService.cs b/TaikoWebUI/Services/LoginService.cs
index 64d9179..b5691f2 100644
--- a/TaikoWebUI/Services/LoginService.cs
+++ b/TaikoWebUI/Services/LoginService.cs
@@ -40,6 +40,9 @@ public class LoginService
 
     public int Login(string inputCardNum, string inputPassword, DashboardResponse response)
     {
+        // strip spaces or dashes from card number
+        inputCardNum = inputCardNum.Replace(" ", "").Replace("-", "");
+
         foreach (var user in response.Users.Where(user => user.AccessCodes.Contains(inputCardNum)))
         {
             foreach (var userCredential in response.UserCredentials.Where(userCredential => userCredential.Baid == user.Baid))
@@ -64,6 +67,9 @@ public class LoginService
     {
         if (OnlyAdmin) return 0;
 
+        // strip spaces or dashes from card number
+        inputCardNum = inputCardNum.Replace(" ", "").Replace("-", "");
+
         foreach (var user in response.Users.Where(user => user.AccessCodes.Contains(inputCardNum)))
         {
             foreach (var userCredential in response.UserCredentials.Where(userCredential => userCredential.Baid == user.Baid))
diff --git a/TaikoWebUI/Shared/NavMenu.razor b/TaikoWebUI/Shared/NavMenu.razor
index 838491c..c76f5d7 100644
--- a/TaikoWebUI/Shared/NavMenu.razor
+++ b/TaikoWebUI/Shared/NavMenu.razor
@@ -16,7 +16,7 @@
 
 		if (LoginService.LoginRequired && !LoginService.OnlyAdmin && !LoginService.IsLoggedIn) {
             <MudDivider />
-            <MudNavLink Href="/Login" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Login">@Localizer["Login"]</MudNavLink>
+            <MudNavLink Href="/Login" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Login">@Localizer["Log In"]</MudNavLink>
 			<MudNavLink Href="/Register" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.AddCard">@Localizer["Register"]</MudNavLink>
 		}