From a1d95b3685cffb6a9344d0d1e5505dd391193f16 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <g.andreadis@student.tudelft.nl>
Date: Fri, 15 Sep 2017 12:53:26 +0200
Subject: Implement experiment list and add

---
 src/pages/Experiments.js | 2 ++
 src/pages/Simulations.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/Experiments.js b/src/pages/Experiments.js
index d1d19d9f..71b9cfc9 100644
--- a/src/pages/Experiments.js
+++ b/src/pages/Experiments.js
@@ -5,6 +5,7 @@ import {fetchExperimentsOfSimulation} from "../actions/experiments";
 import {openSimulationSucceeded} from "../actions/simulations";
 import AppNavbar from "../components/navigation/AppNavbar";
 import ExperimentListContainer from "../containers/experiments/ExperimentListContainer";
+import NewExperimentButtonContainer from "../containers/experiments/NewExperimentButtonContainer";
 import NewExperimentModal from "../containers/modals/NewExperimentModal";
 
 class ExperimentsComponent extends React.Component {
@@ -23,6 +24,7 @@ class ExperimentsComponent extends React.Component {
                 <AppNavbar simulationId={this.props.simulationId} inSimulation={true}/>
                 <div className="container text-page-container full-height">
                     <ExperimentListContainer/>
+                    <NewExperimentButtonContainer/>
                 </div>
                 <NewExperimentModal/>
             </div>
diff --git a/src/pages/Simulations.js b/src/pages/Simulations.js
index 33e04a9d..d06fe43d 100644
--- a/src/pages/Simulations.js
+++ b/src/pages/Simulations.js
@@ -4,8 +4,8 @@ import {openNewSimulationModal} from "../actions/modals/simulations";
 import {fetchAuthorizationsOfCurrentUser} from "../actions/users";
 import AppNavbar from "../components/navigation/AppNavbar";
 import SimulationFilterPanel from "../components/simulations/FilterPanel";
-import NewSimulationButton from "../components/simulations/NewSimulationButton";
 import NewSimulationModal from "../containers/modals/NewSimulationModal";
+import NewSimulationButtonContainer from "../containers/simulations/NewSimulationButtonContainer";
 import VisibleSimulationList from "../containers/simulations/VisibleSimulationAuthList";
 
 class SimulationsContainer extends React.Component {
@@ -20,7 +20,7 @@ class SimulationsContainer extends React.Component {
                 <div className="container text-page-container full-height">
                     <SimulationFilterPanel/>
                     <VisibleSimulationList/>
-                    <NewSimulationButton onClick={() => {this.props.openNewSimulationModal()}}/>
+                    <NewSimulationButtonContainer/>
                 </div>
                 <NewSimulationModal/>
             </div>
-- 
cgit v1.2.3