From d645964266cf95f80634903f72357dcf16aa6003 Mon Sep 17 00:00:00 2001
From: Mateusz Tylka <mattyl@st.amu.edu.pl>
Date: Fri, 30 Jun 2023 14:05:14 +0200
Subject: [PATCH] correct popUpMessenge in MyEntries

---
 src/App/App.js                                |  9 ++--
 src/App/components/RoutingManager.js          | 54 ++++++++++++++++---
 .../generic/Table/styles/TableStyle.js        |  1 +
 src/pages/MyEntries/MyEntries.js              |  1 +
 4 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/src/App/App.js b/src/App/App.js
index 1bf3790..0e59bba 100644
--- a/src/App/App.js
+++ b/src/App/App.js
@@ -16,14 +16,13 @@ const App = () => {
   const renderApp = React.useCallback(() => {
     return (
       <ThemeProvider theme={theme}>
-          <BrowserRouter>
-        <PopUpMessageManager>
-
+        <BrowserRouter>
+          <PopUpMessageManager>
             <NavigationManager>
               <RoutingManager />
             </NavigationManager>
-            </PopUpMessageManager>
-          </BrowserRouter>
+          </PopUpMessageManager>
+        </BrowserRouter>
       </ThemeProvider>
     );
   }, []);
diff --git a/src/App/components/RoutingManager.js b/src/App/components/RoutingManager.js
index 8d65b44..dae6680 100644
--- a/src/App/components/RoutingManager.js
+++ b/src/App/components/RoutingManager.js
@@ -16,15 +16,30 @@ const RoutingManager = (props) => {
     <Routes>
       <Route
         path={`${CHALLENGE_PAGE}/:challengeId`}
-        element={<Challenge section={CHALLENGE_SECTIONS.LEADERBOARD} />}
+        element={
+          <Challenge
+            section={CHALLENGE_SECTIONS.LEADERBOARD}
+            popUpMessageHandler={props.popUpMessageHandler}
+          />
+        }
       />
       <Route
         path={`${CHALLENGE_PAGE}/:challengeId/leaderboard`}
-        element={<Challenge section={CHALLENGE_SECTIONS.LEADERBOARD} />}
+        element={
+          <Challenge
+            section={CHALLENGE_SECTIONS.LEADERBOARD}
+            popUpMessageHandler={props.popUpMessageHandler}
+          />
+        }
       />
       <Route
         path={`${CHALLENGE_PAGE}/:challengeId/allentries`}
-        element={<Challenge section={CHALLENGE_SECTIONS.ALL_ENTRIES} popUpMessageHandler={props.popUpMessageHandler} />}
+        element={
+          <Challenge
+            section={CHALLENGE_SECTIONS.ALL_ENTRIES}
+            popUpMessageHandler={props.popUpMessageHandler}
+          />
+        }
       />
       <Route
         path={`${CHALLENGE_PAGE}/:challengeId/readme`}
@@ -41,13 +56,26 @@ const RoutingManager = (props) => {
       />
       <Route
         path={`${CHALLENGE_PAGE}/:challengeId/myentries`}
-        element={<Challenge section={CHALLENGE_SECTIONS.MY_ENTRIES} popUpMessageHandler={props.popUpMessageHandler} />}
+        element={
+          <Challenge
+            section={CHALLENGE_SECTIONS.MY_ENTRIES}
+            popUpMessageHandler={props.popUpMessageHandler}
+          />
+        }
       />
       <Route
         path={`${CHALLENGE_PAGE}/:challengeId/submit`}
-        element={<Challenge section={CHALLENGE_SECTIONS.SUBMIT} />}
+        element={
+          <Challenge
+            section={CHALLENGE_SECTIONS.SUBMIT}
+            popUpMessageHandler={props.popUpMessageHandler}
+          />
+        }
+      />
+      <Route
+        path={CHALLENGES_PAGE}
+        element={<Challenges popUpMessageHandler={props.popUpMessageHandler} />}
       />
-      <Route path={CHALLENGES_PAGE} element={<Challenges popUpMessageHandler={props.popUpMessageHandler} />} />
       <Route
         path={POLICY_PRIVACY_PAGE}
         element={
@@ -74,8 +102,18 @@ const RoutingManager = (props) => {
       />
       {KeyCloakService.isLoggedIn() ? (
         <>
-          <Route exact path="/" element={<Challenges popUpMessageHandler={props.popUpMessageHandler} />} />
-          <Route element={<Challenges popUpMessageHandler={props.popUpMessageHandler} />} />
+          <Route
+            exact
+            path="/"
+            element={
+              <Challenges popUpMessageHandler={props.popUpMessageHandler} />
+            }
+          />
+          <Route
+            element={
+              <Challenges popUpMessageHandler={props.popUpMessageHandler} />
+            }
+          />
         </>
       ) : (
         <>
diff --git a/src/components/generic/Table/styles/TableStyle.js b/src/components/generic/Table/styles/TableStyle.js
index c4a3425..707faf9 100644
--- a/src/components/generic/Table/styles/TableStyle.js
+++ b/src/components/generic/Table/styles/TableStyle.js
@@ -2,6 +2,7 @@ import styled from 'styled-components';
 
 const TableStyle = styled.table`
   border-collapse: separate;
+  border-spacing: 12px 0;
   width: 100%;
 
   .TableStyle__th {
diff --git a/src/pages/MyEntries/MyEntries.js b/src/pages/MyEntries/MyEntries.js
index db76109..7071fcc 100644
--- a/src/pages/MyEntries/MyEntries.js
+++ b/src/pages/MyEntries/MyEntries.js
@@ -112,6 +112,7 @@ const MyEntries = (props) => {
                 items={elements}
                 orderedKeys={orderKeys(myEntries[0])}
                 sortByUpdate={sortByUpdate}
+                popUpMessageHandler={props.popUpMessageHandler}
               />
             </div>
           )}