From c5490ec33205aa71c6f6e7bd42d5a471245f1c49 Mon Sep 17 00:00:00 2001
From: martin <me@martials.no>
Date: Sun, 27 Aug 2023 12:01:30 +0200
Subject: [PATCH] Fixed redirect not working, added autoComplete attribute to
 login form and hidden lobby button when not logged in

---
 pac-man-board-game/ClientApp/src/App.tsx                | 2 +-
 pac-man-board-game/ClientApp/src/components/input.tsx   | 2 ++
 pac-man-board-game/ClientApp/src/components/navMenu.tsx | 6 ++++--
 pac-man-board-game/ClientApp/src/pages/login.tsx        | 5 +++--
 pac-man-board-game/ClientApp/src/types/props.d.ts       | 9 +++++----
 pac-man-board-game/Services/ActionService.cs            | 1 -
 pac-man-board-game/Services/Game.cs                     | 6 +++---
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pac-man-board-game/ClientApp/src/App.tsx b/pac-man-board-game/ClientApp/src/App.tsx
index 7c8175b..9b53acd 100644
--- a/pac-man-board-game/ClientApp/src/App.tsx
+++ b/pac-man-board-game/ClientApp/src/App.tsx
@@ -32,7 +32,7 @@ const Secured: FC<{ secured: boolean } & ChildProps> = ({children, secured}) =>
     if (redirect) {
       navigate("/login");
     }
-  }, []);
+  });
 
   if (!redirect) {
     return (
diff --git a/pac-man-board-game/ClientApp/src/components/input.tsx b/pac-man-board-game/ClientApp/src/components/input.tsx
index 00a44af..551298e 100644
--- a/pac-man-board-game/ClientApp/src/components/input.tsx
+++ b/pac-man-board-game/ClientApp/src/components/input.tsx
@@ -8,8 +8,10 @@ const Input: FRComponent<InputProps, HTMLInputElement> = forwardRef((
     placeholder,
     required = false,
     name,
+    autoComplete = "off",
   }, ref) => (
   <input type={type}
+         autoComplete={autoComplete}
          ref={ref}
          id={id}
          name={name}
diff --git a/pac-man-board-game/ClientApp/src/components/navMenu.tsx b/pac-man-board-game/ClientApp/src/components/navMenu.tsx
index 9cea4c4..86e50a8 100644
--- a/pac-man-board-game/ClientApp/src/components/navMenu.tsx
+++ b/pac-man-board-game/ClientApp/src/components/navMenu.tsx
@@ -15,12 +15,14 @@ const NavMenu: FC = () => {
 
         <ul className="inline-flex gap-2 items-center mr-5 relative">
           <NavItem to="/">Home</NavItem>
-          <NavItem to={"/lobby"}>Lobby</NavItem>
           {
             player === undefined ?
               <NavItem className={"mx-2"} to={"/login"}>Login</NavItem>
               :
-              <ProfileDropdown className={"mx-2"}/>
+              <>
+                <NavItem to={"/lobby"}>Lobby</NavItem>
+                <ProfileDropdown className={"mx-2"}/>
+              </>
           }
         </ul>
       </nav>
diff --git a/pac-man-board-game/ClientApp/src/pages/login.tsx b/pac-man-board-game/ClientApp/src/pages/login.tsx
index 78bb5ef..2e799aa 100644
--- a/pac-man-board-game/ClientApp/src/pages/login.tsx
+++ b/pac-man-board-game/ClientApp/src/pages/login.tsx
@@ -49,9 +49,10 @@ const LoginPage: FC = () => {
       <h1 className={"my-5"}>Login</h1>
       {error && <p className={"text-red-500"}>{error}</p>}
       <label htmlFor={username}>Username:</label>
-      <Input id={username} name={username} placeholder={"Username"} required/>
+      <Input id={username} name={username} placeholder={"Username"} autoComplete={"username"} required/>
       <label htmlFor={password}>Password:</label>
-      <Input id={password} name={password} type={"password"} placeholder={"Password"} required/>
+      <Input id={password} name={password} type={"password"} placeholder={"Password"}
+             autoComplete={"current-password"} required/>
       <Button type={"submit"}>Login</Button>
     </form>
   );
diff --git a/pac-man-board-game/ClientApp/src/types/props.d.ts b/pac-man-board-game/ClientApp/src/types/props.d.ts
index 0904e11..a903022 100644
--- a/pac-man-board-game/ClientApp/src/types/props.d.ts
+++ b/pac-man-board-game/ClientApp/src/types/props.d.ts
@@ -23,10 +23,11 @@ interface ButtonProps extends ChildProps {
 }
 
 interface InputProps extends ComponentProps {
-  type?: string,
-  placeholder?: string,
-  required?: boolean,
-  name?: string,
+  type?: string
+  placeholder?: string
+  required?: boolean
+  name?: string
+  autoComplete?: string
 }
 
 interface CharacterProps {
diff --git a/pac-man-board-game/Services/ActionService.cs b/pac-man-board-game/Services/ActionService.cs
index 225deac..e33ff1f 100644
--- a/pac-man-board-game/Services/ActionService.cs
+++ b/pac-man-board-game/Services/ActionService.cs
@@ -78,7 +78,6 @@ public class ActionService : IActionService
 
     public List<Player> FindGame(JsonElement? jsonElement)
     {
-        // TODO Receive Username and GameId
         var data = jsonElement?.Deserialize<JoinGameData>() ?? throw new NullReferenceException("Data is null");
 
         var game = _gameService.Games.FirstOrDefault(game => game.Id == data.GameId) ??
diff --git a/pac-man-board-game/Services/Game.cs b/pac-man-board-game/Services/Game.cs
index 9a9a49d..0cc5186 100644
--- a/pac-man-board-game/Services/Game.cs
+++ b/pac-man-board-game/Services/Game.cs
@@ -5,7 +5,7 @@ using pacMan.GameStuff.Items;
 
 namespace pacMan.Services;
 
-public class Game // TODO handle disconnects and reconnects
+public class Game
 {
     private readonly Random _random = new();
     private int _currentPlayerIndex;
@@ -29,11 +29,11 @@ public class Game // TODO handle disconnects and reconnects
             }).ToList();
     }
 
-    [JsonIgnore] public List<Character> Ghosts { get; set; } = new();
+    [JsonIgnore] public List<Character> Ghosts { get; set; } = new(); // TODO include
 
     [JsonIgnore] private Queue<DirectionalPosition> Spawns { get; }
 
-    [JsonIgnore] public DiceCup DiceCup { get; } = new();
+    [JsonIgnore] public DiceCup DiceCup { get; } = new(); // TODO include
 
     [JsonInclude] public int Count => Players.Count;