Fixed routing

jensborch · Oct 20, 2022 · 097f7b0 · 097f7b0
1 parent 15d3084
commit 097f7b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/client/.env b/client/.env
@@ -1,2 +1 @@
-PUBLIC_URL=http://localhost:8080/client/
-BASENAME=/client
+PUBLIC_URL=http://localhost:8080/client
diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -26,7 +26,7 @@ function App({ basename }: AppProps) {
             <Theming>
               <BrowserRouter basename={basename}>
                 <Routes>
-                  <Route path="/" element={<Index />} />
+                  <Route index element={<Index />} />
                   <Route path="/tournament/:id" element={<Tournament />} />
                 </Routes>
               </BrowserRouter>

diff --git a/client/src/components/Tournaments.tsx b/client/src/components/Tournaments.tsx
@@ -75,11 +75,13 @@ const Tournaments = () => {
   }
   return (
     <DefaultGrid container direction="row">
-      {data?.map((tournament) => (
-        <Grid item key={tournament.id}>
-          <Tournament {...tournament} />
-        </Grid>
-      ))}
+      {data &&
+        Array.isArray(data) &&
+        data.map((tournament) => (
+          <Grid item key={tournament.id}>
+            <Tournament {...tournament} />
+          </Grid>
+        ))}
     </DefaultGrid>
   );
 };