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] 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>
   )