Merge pull request #61 from seionmoya/small-tweaks

Small tweaks
project-fika · Oct 2, 2024 · 95d9fd0 · 95d9fd0
2 parents d888318 + a51f162
commit 95d9fd0
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 20 deletions.
diff --git a/Fuyu.Backend.Core/Services/AccountValidationService.cs b/Fuyu.Backend.Core/Services/AccountValidationService.cs
@@ -20,7 +20,7 @@ public static partial class AccountValidationService
         // NOTE: regex has no length constraint as the validation method
         //       contains it instead.
         // -- seionmoya, 2024/09/08
-        [GeneratedRegex("^[a-zA-Z0-9]{0,}$")]
+        [GeneratedRegex("^[a-zA-Z0-9_-]{0,}$")]
         private static partial Regex UsernameRegex();
 
         // compile-time generated regex

diff --git a/Fuyu.Backend/Fuyu.Backend.csproj b/Fuyu.Backend/Fuyu.Backend.csproj
@@ -23,4 +23,8 @@
     <ProjectReference Include="../Fuyu.Backend.EFT/Fuyu.Backend.EFT.csproj" />
   </ItemGroup>
 
+  <Target Name="PostClean" AfterTargets="Clean">
+    <RemoveDir Directories="$(BaseOutputPath)" />
+  </Target>
+
 </Project>
diff --git a/Fuyu.Launcher/Pages/Login.razor b/Fuyu.Launcher/Pages/Login.razor
@@ -22,8 +22,8 @@
 
                 <MudPaper Class="pa-4" Elevation="4">
                     <MudForm @ref="_form" @bind-IsValid="@_success" @bind-Errors="@_errors" Spacing="4">
-                        <MudTextField @bind-Value="_username" Label="Username" Required="true" RequiredError="User name is required!" />
-                        <MudTextField @bind-Value="_password" Label="Password" Required="true" RequiredError="Password is required!" InputType="InputType.Password" />
+                        <MudTextField @bind-Value="_username" Label="Username" Required="true" RequiredError="Required" />
+                        <MudTextField @bind-Value="_password" Label="Password" Required="true" RequiredError="Required" InputType="InputType.Password" />
                         <div class="d-flex align-center justify-center mt-6">
                             <MudButton Variant="Variant.Filled" Color="Color.Tertiary" Disabled="@(!_success)" OnClick="Login_Clicked">Login</MudButton>
                         </div>
@@ -64,11 +64,11 @@
                 break;
 
             case ELoginStatus.AccountBanned:
-                Snackbar.Add("Account is banned!", Severity.Warning);
+                Snackbar.Add("Account is banned.", Severity.Warning);
                 break;
 
             case ELoginStatus.AccountNotFound:
-                Snackbar.Add("Account not found!", Severity.Warning);
+                Snackbar.Add("Account not found.", Severity.Warning);
                 break;
 
             case ELoginStatus.SessionAlreadyExists:

diff --git a/Fuyu.Launcher/Pages/Register.razor b/Fuyu.Launcher/Pages/Register.razor
@@ -15,16 +15,16 @@
             <MudStack Style="width: 400px;">
                 <MudPaper Class="pa-4" Elevation="4">
                     <MudText Typo="Typo.body1">Register</MudText>
-                    <MudText Typo="Typo.body2">Choose your username, password and game edition.</MudText>
+                    <MudText Typo="Typo.body2">Choose your account credentials.</MudText>
                 </MudPaper>
 
                 <MudPaper Class="pa-4" Elevation="4">
                     <MudForm @ref="_form" @bind-IsValid="@_success" @bind-Errors="@_errors">
-                        <MudTextField @bind-Value="_username" Label="Username" Required="true" RequiredError="User name is required!" />
-                        <MudTextField @bind-Value="_password" Label="Password" Required="true" RequiredError="Password is required!"
+                        <MudTextField @bind-Value="_username" Label="Username" Required="true" RequiredError="Required" />
+                        <MudTextField @bind-Value="_password" Label="Password" Required="true" RequiredError="Required"
                                         InputType="InputType.Password"
                                         HelperText="Choose a strong password" />
-                        <MudTextField T="string" Label="Repeat the Password" InputType="InputType.Password" Validation="@(new Func<string, string>(PasswordMatch))" />
+                        <MudTextField T="string" Label="Repeat the Password" Required="true" InputType="InputType.Password" Validation="@(new Func<string, string>(PasswordMatch))" />
                         <div class="d-flex align-center justify-center mt-6">
                             <MudButton Variant="Variant.Filled" Color="Color.Tertiary" Disabled="@(!_success)" OnClick="Register_Clicked">Register</MudButton>
                         </div>
@@ -61,43 +61,43 @@
         switch (status)
         {
             case ERegisterStatus.Success:
-                Snackbar.Add("Account registered successfully. You can now login!", Severity.Success);
+                Snackbar.Add("Account registered successfully. You can now login.", Severity.Success);
                 Navigation.NavigateTo("/login");
                 break;
 
             case ERegisterStatus.AlreadyExists:
-                Snackbar.Add("Account already exists!", Severity.Warning);
+                Snackbar.Add("Account already exists.", Severity.Warning);
                 break;
 
             case ERegisterStatus.PasswordInvalid:
-                Snackbar.Add("Password doesn't meet the requirements!", Severity.Warning);
+                Snackbar.Add("Password doesn't meet the requirements.", Severity.Warning);
                 break;
 
             case ERegisterStatus.PasswordTooLong:
-                Snackbar.Add("Password too long!", Severity.Warning);
+                Snackbar.Add("Password too long.", Severity.Warning);
                 break;
             case ERegisterStatus.PasswordTooShort:
-                Snackbar.Add("Password too short!", Severity.Warning);
+                Snackbar.Add("Password too short.", Severity.Warning);
                 break;
 
             case ERegisterStatus.PasswordEmpty:
-                Snackbar.Add("Didn't receive a password!", Severity.Warning);
+                Snackbar.Add("Didn't receive a password.", Severity.Warning);
                 break;
 
             case ERegisterStatus.UsernameInvalid:
-                Snackbar.Add("Username contains invalid characters!", Severity.Warning);
+                Snackbar.Add("Username contains invalid characters.", Severity.Warning);
                 break;
 
             case ERegisterStatus.UsernameTooLong:
-                Snackbar.Add("Username too long!", Severity.Warning);
+                Snackbar.Add("Username too long.", Severity.Warning);
                 break;
 
             case ERegisterStatus.UsernameTooShort:
-                Snackbar.Add("Username too short!", Severity.Warning);
+                Snackbar.Add("Username too short.", Severity.Warning);
                 break;
 
             case ERegisterStatus.UsernameEmpty:
-                Snackbar.Add("Didn't receive a username!", Severity.Warning);
+                Snackbar.Add("Didn't receive a username.", Severity.Warning);
                 break;
 
         }

diff --git a/Fuyu.Launcher/Store/GamesUseCase/Effects.cs b/Fuyu.Launcher/Store/GamesUseCase/Effects.cs
@@ -7,10 +7,11 @@ namespace Fuyu.Launcher.Store.GamesUseCase
     public class Effects
     {
         [EffectMethod]
-        public async Task HandleGetGamesAction(GetGamesAction action, IDispatcher dispatcher)
+        public Task HandleGetGamesAction(GetGamesAction action, IDispatcher dispatcher)
         {
             var games = RequestService.GetGames();
             dispatcher.Dispatch(new GetGamesResultAction(games));
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/Fuyu.Launcher/wwwroot/img/bg.png b/Fuyu.Launcher/wwwroot/img/bg.png
diff --git a/README.md b/README.md
@@ -51,4 +51,5 @@ SPTarkov.
 **Author** | **Reason**
 ---------- | ----------------------------------
 seionmoya  | Project creator, main author
+thesparta  | Most of the launcher code
 nexus      | Debugging issues inside EFT client