diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/app/map/MapStageComponent.js | 4 | ||||
| -rw-r--r-- | src/components/home/ContentSection.sass | 2 | ||||
| -rw-r--r-- | src/components/home/TeamSection.js | 13 | ||||
| -rw-r--r-- | src/containers/auth/Login.js | 8 | ||||
| -rw-r--r-- | src/store/configure-store.js | 5 |
5 files changed, 18 insertions, 14 deletions
diff --git a/src/components/app/map/MapStageComponent.js b/src/components/app/map/MapStageComponent.js index 4e4972f4..67b3349c 100644 --- a/src/components/app/map/MapStageComponent.js +++ b/src/components/app/map/MapStageComponent.js @@ -7,8 +7,8 @@ import RoomHoverLayer from "../../../containers/app/map/layers/RoomHoverLayer"; import jQuery from "../../../util/jquery"; import { NAVBAR_HEIGHT } from "../../navigation/Navbar"; import { MAP_MOVE_PIXELS_PER_EVENT } from "./MapConstants"; -import {Provider} from "react-redux"; -import {store} from "../../../store/configure-store"; +import { Provider } from "react-redux"; +import { store } from "../../../store/configure-store"; class MapStageComponent extends React.Component { state = { diff --git a/src/components/home/ContentSection.sass b/src/components/home/ContentSection.sass index 31062aa7..67541179 100644 --- a/src/components/home/ContentSection.sass +++ b/src/components/home/ContentSection.sass @@ -2,7 +2,7 @@ .content-section padding-top: 50px - padding-bottom: 150px + padding-bottom: 100px text-align: center h1 diff --git a/src/components/home/TeamSection.js b/src/components/home/TeamSection.js index f29003f7..b86655b4 100644 --- a/src/components/home/TeamSection.js +++ b/src/components/home/TeamSection.js @@ -24,21 +24,20 @@ const TeamSection = () => ( description="Project Lead" /> <TeamMember - photoId="loverweel" - name="Leon Overweel" - description="Product Lead and Software Engineer responsible for the web server, database, and - API specification" - /> - <TeamMember photoId="gandreadis" name="Georgios Andreadis" - description="Software Engineer responsible for the frontend web application" + description="Technology Lead and Software Engineer responsible for the frontend web application" /> <TeamMember photoId="fmastenbroek" name="Fabian Mastenbroek" description="Software Engineer responsible for the datacenter simulator" /> + <TeamMember + photoId="loverweel" + name="Leon Overweel" + description="Software Engineer responsible for the web server, database, and API specification" + /> </div> <div className="text-center lead mt-3"> See{" "} diff --git a/src/containers/auth/Login.js b/src/containers/auth/Login.js index 3f2039a3..15af8e62 100644 --- a/src/containers/auth/Login.js +++ b/src/containers/auth/Login.js @@ -40,8 +40,7 @@ class LoginContainer extends React.Component { <span className="fa fa-google" /> Login with Google </span> )} - > - </GoogleLogin> + /> ); } } @@ -58,6 +57,9 @@ const mapDispatchToProps = dispatch => { }; }; -const Login = connect(mapStateToProps, mapDispatchToProps)(LoginContainer); +const Login = connect( + mapStateToProps, + mapDispatchToProps +)(LoginContainer); export default Login; diff --git a/src/store/configure-store.js b/src/store/configure-store.js index 02faf073..29af25ab 100644 --- a/src/store/configure-store.js +++ b/src/store/configure-store.js @@ -29,7 +29,10 @@ export let store = undefined; export default function configureStore() { const configuredStore = createStore( rootReducer, - compose(persistState("auth"), applyMiddleware(...middlewares)) + compose( + persistState("auth"), + applyMiddleware(...middlewares) + ) ); sagaMiddleware.run(rootSaga); store = configuredStore; |
