From c9019b6e0376cda7c08d94b7ce8368ed4aea5e56 Mon Sep 17 00:00:00 2001
From: djmil <andriy@djmil.dev>
Date: Fri, 1 Dec 2023 23:17:51 +0100
Subject: [PATCH 1/6] initial

---
 .../src/main/java/djmil/cordacheckers/ReactAppController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/djmil/cordacheckers/ReactAppController.java b/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
index d30b76d..ffd82bf 100644
--- a/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
+++ b/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
@@ -11,7 +11,7 @@ public class ReactAppController {
     // This controller simply redirects all UI related routes
     // to index.html, allowing react and react-router to work its magic
 
-    @GetMapping(value = { "", "/", "/games", "/games/new", "/games/proposal", "/games/active", "/games/archive", "/about","/leaderboard"  })
+    @GetMapping(value = { "", "/", "/games", "/games/*", "/about","/leaderboard"  })
     @PutMapping("/error")
     public String getIndex(HttpServletRequest inRequest) {
         return "/index.html";

From 04590e3be55a2b451541bbdf1ad3d58b54d8e635 Mon Sep 17 00:00:00 2001
From: djmil <andriy@djmil.dev>
Date: Fri, 1 Dec 2023 23:30:36 +0100
Subject: [PATCH 2/6] absolute path for /game/views

---
 .../main/java/djmil/cordacheckers/ReactAppController.java | 2 +-
 webapp/src/container/Games.jsx                            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/djmil/cordacheckers/ReactAppController.java b/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
index ffd82bf..5cfc464 100644
--- a/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
+++ b/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
@@ -11,7 +11,7 @@ public class ReactAppController {
     // This controller simply redirects all UI related routes
     // to index.html, allowing react and react-router to work its magic
 
-    @GetMapping(value = { "", "/", "/games", "/games/*", "/about","/leaderboard"  })
+    @GetMapping(value = { "", "/", "/games", "/games/*", "/about","/leaderboard" })
     @PutMapping("/error")
     public String getIndex(HttpServletRequest inRequest) {
         return "/index.html";
diff --git a/webapp/src/container/Games.jsx b/webapp/src/container/Games.jsx
index 8bcaae2..35c0679 100644
--- a/webapp/src/container/Games.jsx
+++ b/webapp/src/container/Games.jsx
@@ -48,10 +48,10 @@ function ViewSelector() {
   return (
     <nav className='ViewSelector' >
       <div className='Container' >
-        <NavLink to='new'>New</NavLink>
-        <NavLink to='proposal'>Proposal<Counter number={guide.awaiting.proposal} /></NavLink>
-        <NavLink to='active'  >Active<Counter number={guide.awaiting.active} /></NavLink>
-        <NavLink to='archive' >Archive</NavLink>
+        <NavLink to='/games/new'>New</NavLink>
+        <NavLink to='/games/proposal'>Proposal<Counter number={guide.awaiting.proposal} /></NavLink>
+        <NavLink to='/games/active'  >Active<Counter number={guide.awaiting.active} /></NavLink>
+        <NavLink to='/games/archive' >Archive</NavLink>
       </div>
     </nav>
   )

From 50a8d7d0f8967e7ce71f2d20ba3d7bdd9475a010 Mon Sep 17 00:00:00 2001
From: djmil <andriy@djmil.dev>
Date: Sat, 2 Dec 2023 00:49:36 +0100
Subject: [PATCH 3/6] link

---
 webapp/src/container/Games.jsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/webapp/src/container/Games.jsx b/webapp/src/container/Games.jsx
index 35c0679..f85761c 100644
--- a/webapp/src/container/Games.jsx
+++ b/webapp/src/container/Games.jsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect } from 'react';
 import { GamesStateContext, GamesGuideContext } from '../context/games';
-import { NavLink, Routes, Route } from 'react-router-dom';
+import { Routes, Route, Link } from 'react-router-dom';
 
 import NewGame from './games/NewGame';
 import { GameProposalSelector, ActiveGameSelector, GameArchiveSelector } from './games/GameSelector';
@@ -46,12 +46,14 @@ function ViewSelector() {
   const guide = useContext(GamesGuideContext);
 
   return (
-    <nav className='ViewSelector' >
-      <div className='Container' >
-        <NavLink to='/games/new'>New</NavLink>
-        <NavLink to='/games/proposal'>Proposal<Counter number={guide.awaiting.proposal} /></NavLink>
-        <NavLink to='/games/active'  >Active<Counter number={guide.awaiting.active} /></NavLink>
-        <NavLink to='/games/archive' >Archive</NavLink>
+    <nav>
+      <div className='ViewSelector'>
+        <div className='Container' >
+          <Link to='new'>New</Link>
+          <Link to='proposal'>Proposal<Counter number={guide.awaiting.proposal} /></Link>
+          <Link to='active'  >Active<Counter number={guide.awaiting.active} /></Link>
+          <Link to='archive' >Archive</Link>
+        </div>
       </div>
     </nav>
   )

From 49dcd38ab32bf51de78a0937e899d6d62f2a6d29 Mon Sep 17 00:00:00 2001
From: djmil <andriy@djmil.dev>
Date: Sat, 2 Dec 2023 01:24:19 +0100
Subject: [PATCH 4/6] different reactappcontroller mapping

---
 .../djmil/cordacheckers/ReactAppController.java    |  8 ++++----
 webapp/public/index.html                           |  2 +-
 webapp/src/container/Games.jsx                     | 14 ++++++--------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/djmil/cordacheckers/ReactAppController.java b/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
index 5cfc464..5d53593 100644
--- a/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
+++ b/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
@@ -1,8 +1,7 @@
 package djmil.cordacheckers;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -11,8 +10,9 @@ public class ReactAppController {
     // This controller simply redirects all UI related routes
     // to index.html, allowing react and react-router to work its magic
 
-    @GetMapping(value = { "", "/", "/games", "/games/*", "/about","/leaderboard" })
-    @PutMapping("/error")
+    // @GetMapping(value = { "", "/", "/games", "/games/*", "/about","/leaderboard" })
+    // @PutMapping("/error")
+    @RequestMapping(value = { "/", "/{x:[\\w\\-]+}", "/{x:^(?!api$).*$}/*/{y:[\\w\\-]+}","/error"  })
     public String getIndex(HttpServletRequest inRequest) {
         return "/index.html";
     }
diff --git a/webapp/public/index.html b/webapp/public/index.html
index ec6e3d2..4cb1350 100644
--- a/webapp/public/index.html
+++ b/webapp/public/index.html
@@ -9,7 +9,7 @@
       name="description"
       content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/webapp/src/container/Games.jsx b/webapp/src/container/Games.jsx
index f85761c..602265e 100644
--- a/webapp/src/container/Games.jsx
+++ b/webapp/src/container/Games.jsx
@@ -46,14 +46,12 @@ function ViewSelector() {
   const guide = useContext(GamesGuideContext);
 
   return (
-    <nav>
-      <div className='ViewSelector'>
-        <div className='Container' >
-          <Link to='new'>New</Link>
-          <Link to='proposal'>Proposal<Counter number={guide.awaiting.proposal} /></Link>
-          <Link to='active'  >Active<Counter number={guide.awaiting.active} /></Link>
-          <Link to='archive' >Archive</Link>
-        </div>
+    <nav className='ViewSelector'>
+      <div className='Container' >
+        <Link to='new'>New</Link>
+        <Link to='proposal'>Proposal<Counter number={guide.awaiting.proposal} /></Link>
+        <Link to='active'  >Active<Counter number={guide.awaiting.active} /></Link>
+        <Link to='archive' >Archive</Link>
       </div>
     </nav>
   )

From 7f51cf32c29a097072ff6c24b7e5343c6f2088ef Mon Sep 17 00:00:00 2001
From: djmil <andriy@djmil.dev>
Date: Sat, 2 Dec 2023 01:43:42 +0100
Subject: [PATCH 5/6] rectrouter version update

---
 .../main/java/djmil/cordacheckers/ReactAppController.java | 8 ++++----
 webapp/package.json                                       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/djmil/cordacheckers/ReactAppController.java b/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
index 5d53593..5cfc464 100644
--- a/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
+++ b/backend/src/main/java/djmil/cordacheckers/ReactAppController.java
@@ -1,7 +1,8 @@
 package djmil.cordacheckers;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -10,9 +11,8 @@ public class ReactAppController {
     // This controller simply redirects all UI related routes
     // to index.html, allowing react and react-router to work its magic
 
-    // @GetMapping(value = { "", "/", "/games", "/games/*", "/about","/leaderboard" })
-    // @PutMapping("/error")
-    @RequestMapping(value = { "/", "/{x:[\\w\\-]+}", "/{x:^(?!api$).*$}/*/{y:[\\w\\-]+}","/error"  })
+    @GetMapping(value = { "", "/", "/games", "/games/*", "/about","/leaderboard" })
+    @PutMapping("/error")
     public String getIndex(HttpServletRequest inRequest) {
         return "/index.html";
     }
diff --git a/webapp/package.json b/webapp/package.json
index 547219c..81c2f9a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -9,7 +9,7 @@
     "fsevents": "^2.3.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.16.0",
+    "react-router-dom": "^6.20.1",
     "react-scripts": "^5.0.1",
     "web-vitals": "^3.5.0"
   },

From 59e5ba0fd909763f351baeab20c087f34ea3f172 Mon Sep 17 00:00:00 2001
From: djmil <andriy@djmil.dev>
Date: Sat, 2 Dec 2023 01:48:28 +0100
Subject: [PATCH 6/6] package-lock.json

---
 webapp/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp/.gitignore b/webapp/.gitignore
index 4d29575..d3ff5fc 100644
--- a/webapp/.gitignore
+++ b/webapp/.gitignore
@@ -21,3 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+package-lock.json
\ No newline at end of file