diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-15 12:53:26 +0200 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-23 10:06:03 +0200 |
| commit | a1d95b3685cffb6a9344d0d1e5505dd391193f16 (patch) | |
| tree | 42851ec0726881dd9f82a3ea12a7987324a68ef8 /src/pages | |
| parent | f604406453f95c82c3e5e4294a51245661868bbe (diff) | |
Implement experiment list and add
Diffstat (limited to 'src/pages')
| -rw-r--r-- | src/pages/Experiments.js | 2 | ||||
| -rw-r--r-- | src/pages/Simulations.js | 4 |
2 files changed, 4 insertions, 2 deletions
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> |