summaryrefslogtreecommitdiff
path: root/src/pages
diff options
context:
space:
mode:
Diffstat (limited to 'src/pages')
-rw-r--r--src/pages/App.js4
-rw-r--r--src/pages/Home.js11
-rw-r--r--src/pages/Home.sass4
-rw-r--r--src/pages/Profile.js6
-rw-r--r--src/pages/Profile.sass2
-rw-r--r--src/pages/Simulations.js5
-rw-r--r--src/pages/Simulations.sass2
7 files changed, 14 insertions, 20 deletions
diff --git a/src/pages/App.js b/src/pages/App.js
index f34c03cd..ce6556fb 100644
--- a/src/pages/App.js
+++ b/src/pages/App.js
@@ -5,7 +5,6 @@ import {openSimulationSucceeded} from "../actions/simulations";
import {fetchLatestDatacenter} from "../actions/topology";
import MapStage from "../components/map/MapStage";
import Navbar from "../components/navigation/Navbar";
-import Login from "../containers/auth/Login";
class AppContainer extends React.Component {
static propTypes = {
@@ -19,12 +18,11 @@ class AppContainer extends React.Component {
render() {
return (
- <div className="full-height">
+ <div className="page-container full-height">
<Navbar/>
<div className="full-height">
<MapStage/>
</div>
- <Login visible={false}/>
</div>
);
}
diff --git a/src/pages/Home.js b/src/pages/Home.js
index bd32d0d9..dd5fd492 100644
--- a/src/pages/Home.js
+++ b/src/pages/Home.js
@@ -1,8 +1,11 @@
import React from 'react';
-import Login from "../containers/auth/Login";
+import Navbar from "../components/navigation/Navbar";
+import "./Home.css";
-const Index = () => (
- <Login visible={true}/>
+const Home = () => (
+ <div className="body-wrapper">
+ <Navbar/>
+ </div>
);
-export default Index;
+export default Home;
diff --git a/src/pages/Home.sass b/src/pages/Home.sass
new file mode 100644
index 00000000..58fbf6b2
--- /dev/null
+++ b/src/pages/Home.sass
@@ -0,0 +1,4 @@
+// Fix for the white space appearing otherwise on the right of the page, on mobile
+.body-wrapper
+ overflow-x: hidden
+ overflow-y: hidden
diff --git a/src/pages/Profile.js b/src/pages/Profile.js
index 3c3b0899..d4594c9e 100644
--- a/src/pages/Profile.js
+++ b/src/pages/Profile.js
@@ -2,15 +2,12 @@ import React from 'react';
import {connect} from "react-redux";
import {openDeleteProfileModal} from "../actions/profile";
import Navbar from "../components/navigation/Navbar";
-import Login from "../containers/auth/Login";
import DeleteProfileModal from "../containers/profile/DeleteProfileModal";
-import "./Profile.css";
const ProfileContainer = ({onDelete}) => (
<div className="full-height">
<Navbar/>
- <div className="container profile-page-container full-height">
- <h2>Profile Settings</h2>
+ <div className="container text-page-container full-height">
<button className="btn btn-danger" onClick={onDelete}>Delete my account on OpenDC</button>
<p>
This does not delete your Google account, it simply disconnects it from the OpenDC app and deletes any
@@ -19,7 +16,6 @@ const ProfileContainer = ({onDelete}) => (
</p>
</div>
<DeleteProfileModal/>
- <Login visible={false}/>
</div>
);
diff --git a/src/pages/Profile.sass b/src/pages/Profile.sass
deleted file mode 100644
index 9bb0a7e4..00000000
--- a/src/pages/Profile.sass
+++ /dev/null
@@ -1,2 +0,0 @@
-.profile-page-container
- padding-top: 2rem
diff --git a/src/pages/Simulations.js b/src/pages/Simulations.js
index 8218b1a4..6c40516d 100644
--- a/src/pages/Simulations.js
+++ b/src/pages/Simulations.js
@@ -5,10 +5,8 @@ import {fetchAuthorizationsOfCurrentUser} from "../actions/users";
import Navbar from "../components/navigation/Navbar";
import SimulationFilterPanel from "../components/simulations/FilterPanel";
import NewSimulationButton from "../components/simulations/NewSimulationButton";
-import Login from "../containers/auth/Login";
import NewSimulationModal from "../containers/simulations/NewSimulationModal";
import VisibleSimulationList from "../containers/simulations/VisibleSimulationAuthList";
-import "./Simulations.css";
class SimulationsContainer extends React.Component {
componentDidMount() {
@@ -19,13 +17,12 @@ class SimulationsContainer extends React.Component {
return (
<div className="full-height">
<Navbar/>
- <div className="container simulation-page-container full-height">
+ <div className="container text-page-container full-height">
<SimulationFilterPanel/>
<VisibleSimulationList/>
<NewSimulationButton onClick={() => {this.props.openNewSimulationModal()}}/>
</div>
<NewSimulationModal/>
- <Login visible={false}/>
</div>
);
}
diff --git a/src/pages/Simulations.sass b/src/pages/Simulations.sass
deleted file mode 100644
index d639ba83..00000000
--- a/src/pages/Simulations.sass
+++ /dev/null
@@ -1,2 +0,0 @@
-.simulation-page-container
- padding-top: 2rem