From 912e1b96bfa7d6c022d854fa744f719b49ca98d0 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Tue, 21 Jul 2020 15:33:37 +0200
Subject: Add first plotting attempts for portfolios

---
 frontend/src/pages/App.js | 57 +++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

(limited to 'frontend/src/pages/App.js')

diff --git a/frontend/src/pages/App.js b/frontend/src/pages/App.js
index 3ccae29d..078ad51a 100644
--- a/frontend/src/pages/App.js
+++ b/frontend/src/pages/App.js
@@ -22,6 +22,7 @@ import ProjectSidebarContainer from '../containers/app/sidebars/project/ProjectS
 import { openScenarioSucceeded } from '../actions/scenarios'
 import NewPortfolioModal from '../containers/modals/NewPortfolioModal'
 import NewScenarioModal from '../containers/modals/NewScenarioModal'
+import PortfolioResultsContainer from '../containers/app/results/PortfolioResultsContainer'
 
 const shortcutManager = new ShortcutManager(KeymapConfiguration)
 
@@ -55,28 +56,28 @@ class AppComponent extends React.Component {
     render() {
         const constructionElements = this.props.topologyIsLoading ? (
             <div className="full-height d-flex align-items-center justify-content-center">
-                <LoadingScreen/>
+                <LoadingScreen />
             </div>
         ) : (
             <div className="full-height">
-                <MapStage/>
-                <ScaleIndicatorContainer/>
-                <ToolPanelComponent/>
-                <ProjectSidebarContainer/>
-                <TopologySidebarContainer/>
+                <MapStage />
+                <ScaleIndicatorContainer />
+                <ToolPanelComponent />
+                <ProjectSidebarContainer />
+                <TopologySidebarContainer />
             </div>
         )
 
         const portfolioElements = (
-            <div className="full-height">
-                <ProjectSidebarContainer/>
-                <h2>Portfolio loading</h2>
+            <div className="full-height app-page-container">
+                <ProjectSidebarContainer />
+                <PortfolioResultsContainer/>
             </div>
         )
 
         const scenarioElements = (
-            <div className="full-height">
-                <ProjectSidebarContainer/>
+            <div className="full-height app-page-container">
+                <ProjectSidebarContainer />
                 <h2>Scenario loading</h2>
             </div>
         )
@@ -86,23 +87,20 @@ class AppComponent extends React.Component {
                 title={this.props.projectName ? this.props.projectName + ' - OpenDC' : 'Simulation - OpenDC'}
             >
                 <div className="page-container full-height">
-                    <AppNavbarContainer fullWidth={true}/>
-                    {this.props.scenarioId ? (
-                        scenarioElements
-                    ) : (this.props.portfolioId ? (
-                            portfolioElements
-                        ) : (
-                            constructionElements
-                        )
-                    )}
-                    <NewTopologyModal/>
-                    <NewPortfolioModal/>
-                    <NewScenarioModal/>
-                    <EditRoomNameModal/>
-                    <DeleteRoomModal/>
-                    <EditRackNameModal/>
-                    <DeleteRackModal/>
-                    <DeleteMachineModal/>
+                    <AppNavbarContainer fullWidth={true} />
+                    {this.props.scenarioId
+                        ? scenarioElements
+                        : this.props.portfolioId
+                        ? portfolioElements
+                        : constructionElements}
+                    <NewTopologyModal />
+                    <NewPortfolioModal />
+                    <NewScenarioModal />
+                    <EditRoomNameModal />
+                    <DeleteRoomModal />
+                    <EditRackNameModal />
+                    <DeleteRackModal />
+                    <DeleteMachineModal />
                 </div>
             </DocumentTitle>
         )
@@ -125,7 +123,8 @@ const mapDispatchToProps = (dispatch) => {
     return {
         openProjectSucceeded: (projectId) => dispatch(openProjectSucceeded(projectId)),
         openPortfolioSucceeded: (projectId, portfolioId) => dispatch(openPortfolioSucceeded(projectId, portfolioId)),
-        openScenarioSucceeded: (projectId, portfolioId, scenarioId) => dispatch(openScenarioSucceeded(projectId, portfolioId, scenarioId)),
+        openScenarioSucceeded: (projectId, portfolioId, scenarioId) =>
+            dispatch(openScenarioSucceeded(projectId, portfolioId, scenarioId)),
     }
 }
 
-- 
cgit v1.2.3


From 2ed4052162e2fcfa49f55cdd7f77cc2595526169 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Tue, 21 Jul 2020 15:50:20 +0200
Subject: Fix overflow and rearrange

---
 frontend/src/pages/App.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'frontend/src/pages/App.js')

diff --git a/frontend/src/pages/App.js b/frontend/src/pages/App.js
index 078ad51a..cbc805b8 100644
--- a/frontend/src/pages/App.js
+++ b/frontend/src/pages/App.js
@@ -71,14 +71,18 @@ class AppComponent extends React.Component {
         const portfolioElements = (
             <div className="full-height app-page-container">
                 <ProjectSidebarContainer />
-                <PortfolioResultsContainer/>
+                <div className="container-fluid full-height">
+                    <PortfolioResultsContainer />
+                </div>
             </div>
         )
 
         const scenarioElements = (
             <div className="full-height app-page-container">
                 <ProjectSidebarContainer />
-                <h2>Scenario loading</h2>
+                <div className="container-fluid full-height">
+                    <h2>Scenario loading</h2>
+                </div>
             </div>
         )
 
-- 
cgit v1.2.3