From da861719c6433a1fc9346da958f0907e52d578ce Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <g.andreadis@student.tudelft.nl>
Date: Thu, 21 Sep 2017 10:20:50 +0200
Subject: Show experiment and trace data on left-hand sidebar

---
 src/pages/App.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/App.js b/src/pages/App.js
index 87c139ec..26ded58c 100644
--- a/src/pages/App.js
+++ b/src/pages/App.js
@@ -7,7 +7,7 @@ import {openSimulationSucceeded} from "../actions/simulations";
 import {resetCurrentDatacenter} from "../actions/topology/building";
 import LoadingScreen from "../components/map/LoadingScreen";
 import AppNavbar from "../components/navigation/AppNavbar";
-import Timeline from "../components/timeline/Timeline";
+import SimulationSidebarComponent from "../components/sidebars/simulation/SimulationSidebarComponent";
 import MapStage from "../containers/map/MapStage";
 import DeleteMachineModal from "../containers/modals/DeleteMachineModal";
 import DeleteRackModal from "../containers/modals/DeleteRackModal";
@@ -15,6 +15,7 @@ import DeleteRoomModal from "../containers/modals/DeleteRoomModal";
 import EditRackNameModal from "../containers/modals/EditRackNameModal";
 import EditRoomNameModal from "../containers/modals/EditRoomNameModal";
 import TopologySidebar from "../containers/sidebars/topology/TopologySidebar";
+import TimelineContainer from "../containers/timeline/TimelineContainer";
 import KeymapConfiguration from "../shortcuts/keymap";
 
 const shortcutManager = new ShortcutManager(KeymapConfiguration);
@@ -56,7 +57,11 @@ class AppComponent extends React.Component {
                         <MapStage/>
                         <TopologySidebar/>
                         {this.props.inSimulation ?
-                            <Timeline/> :
+                            <TimelineContainer/> :
+                            undefined
+                        }
+                        {this.props.inSimulation ?
+                            <SimulationSidebarComponent/> :
                             undefined
                         }
                     </div>
-- 
cgit v1.2.3