From f119fc78dda4d1e828dde04f378a63a93e3a0a7e Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Thu, 2 Jul 2020 18:39:28 +0200
Subject: Add current progress on frontend port

---
 frontend/src/routes/index.js | 49 +++++++++++---------------------------------
 1 file changed, 12 insertions(+), 37 deletions(-)

(limited to 'frontend/src/routes')

diff --git a/frontend/src/routes/index.js b/frontend/src/routes/index.js
index 119cdb54..ea703567 100644
--- a/frontend/src/routes/index.js
+++ b/frontend/src/routes/index.js
@@ -8,55 +8,30 @@ import NotFound from '../pages/NotFound'
 import Profile from '../pages/Profile'
 import Simulations from '../pages/Simulations'
 
-const ProtectedComponent = component => () =>
-    userIsLoggedIn() ? component : <Redirect to="/"/>
+const ProtectedComponent = (component) => () => (userIsLoggedIn() ? component : <Redirect to="/" />)
 const AppComponent = ({ match }) =>
-    userIsLoggedIn() ? (
-        <App simulationId={parseInt(match.params.simulationId, 10)}/>
-    ) : (
-        <Redirect to="/"/>
-    )
+    userIsLoggedIn() ? <App simulationId={match.params.simulationId} /> : <Redirect to="/" />
 
 const ExperimentsComponent = ({ match }) =>
-    userIsLoggedIn() ? (
-        <Experiments simulationId={parseInt(match.params.simulationId, 10)}/>
-    ) : (
-        <Redirect to="/"/>
-    )
+    userIsLoggedIn() ? <Experiments simulationId={match.params.simulationId} /> : <Redirect to="/" />
 
 const SimulationComponent = ({ match }) =>
     userIsLoggedIn() ? (
-        <App
-            simulationId={parseInt(match.params.simulationId, 10)}
-            inSimulation={true}
-            experimentId={parseInt(match.params.experimentId, 10)}
-        />
+        <App simulationId={match.params.simulationId} inSimulation={true} experimentId={match.params.experimentId} />
     ) : (
-        <Redirect to="/"/>
+        <Redirect to="/" />
     )
 
 const Routes = () => (
     <BrowserRouter>
         <Switch>
-            <Route exact path="/" component={Home}/>
-            <Route
-                exact
-                path="/simulations"
-                render={ProtectedComponent(<Simulations/>)}
-            />
-            <Route exact path="/simulations/:simulationId" component={AppComponent}/>
-            <Route
-                exact
-                path="/simulations/:simulationId/experiments"
-                component={ExperimentsComponent}
-            />
-            <Route
-                exact
-                path="/simulations/:simulationId/experiments/:experimentId"
-                component={SimulationComponent}
-            />
-            <Route exact path="/profile" render={ProtectedComponent(<Profile/>)}/>
-            <Route path="/*" component={NotFound}/>
+            <Route exact path="/" component={Home} />
+            <Route exact path="/simulations" render={ProtectedComponent(<Simulations />)} />
+            <Route exact path="/simulations/:simulationId" component={AppComponent} />
+            <Route exact path="/simulations/:simulationId/experiments" component={ExperimentsComponent} />
+            <Route exact path="/simulations/:simulationId/experiments/:experimentId" component={SimulationComponent} />
+            <Route exact path="/profile" render={ProtectedComponent(<Profile />)} />
+            <Route path="/*" component={NotFound} />
         </Switch>
     </BrowserRouter>
 )
-- 
cgit v1.2.3