Merge pull request #34 from melinda-schmitz/help_page

added logo

.firebase/hosting.Y2xpZW50XGJ1aWxk.cache

@@ -1,10 +1,10 @@
-asset-manifest.json,1537722543937,444958e1144c4a7250aba21cb82af4c90bf41c6786a5b57491a6d3e270fe97df
-index.html,1537722543934,e47134aa0538bb539df93f71b61096f1e321ae4e8867bbbb85acc37649c9c2ee
-favicon.ico,1537722526249,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
-manifest.json,1537722526251,65d4aa66cd0b8963e88196705111adfccad2e8b80725b6a7a82ca8a9a0de8889
-service-worker.js,1537722544092,7f9e52f46c148953ecbce2663166e5163c495c4b909b503f876d5e795c7eddf9
-static/css/main.92381bc7.css,1537722543988,d21a5eef18cc28a1c724e22f8b80a9d74a571abe410a0335ff2d698e9c63a6d7
-static/media/profilepic.f7f63b88.png,1537722543988,0a9d7a0037b51e9a5bc3d7d76fe4e36f0808f32960c0430fb86554a734f3b8a5
-static/css/main.92381bc7.css.map,1537722543990,b7f18cddbb3be51529ab58d7dac0c3903016c574a5cae8aadd4d1ce6452287d0
-static/js/main.9eccd006.js,1537722543990,bf4c640135f3bc3d2d5727adc7f727e80b245a301facac2b23435f653c8fbf00
-static/js/main.9eccd006.js.map,1537722543992,208917158d78d2370c428da106b6aecc108e9dbaccde2fe003d5cc87df229af4
+asset-manifest.json,1537732730536,612c78b65821425fd0a6104cdb20234ea30344ba1ecf4647734078f99b394983
+index.html,1537732730538,47538efa4037e4eb340bc19072628d2ebb453628d71a8c2bc84e9c61ad5f53b8
+manifest.json,1537732714142,65d4aa66cd0b8963e88196705111adfccad2e8b80725b6a7a82ca8a9a0de8889
+favicon.ico,1537732714140,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
+service-worker.js,1537732730703,3619f2eef63077ffb185885bf55a9781c49736ca10a3c9f38c9adc8024e8641b
+static/css/main.edf78ce3.css,1537732730584,7e0cc15dd432698defc16bdd9762cac15af47515351966550e414be4a3a3cccb
+static/media/profilepic.f7f63b88.png,1537732730559,0a9d7a0037b51e9a5bc3d7d76fe4e36f0808f32960c0430fb86554a734f3b8a5
+static/css/main.edf78ce3.css.map,1537732730585,839fc976419b66f5650c7807bf955cd4c7bc3b4a1705c38a8f0f2151e1e701b7
+static/js/main.3bbb433a.js,1537732730584,3b0c8bff785013954a60e493c6bb12f7d1be5ae376cc8508699f24c913f54e9e
+static/js/main.3bbb433a.js.map,1537732730598,71b5c8f54210ed4c0fd227650d66cd9e6c06b4ecc5466c8d63310f4d2a3daeb2

client/src/App.css

@@ -49,7 +49,7 @@ a {
 }
 
 .sub-title {
-	font-size: 30,
+	font-size: 20px;
 }
 
 /* Google */
@@ -88,4 +88,10 @@ a {
   left: 0;
   width: 34px;
   height: 100%;
+}
+
+.logo {
+	background-size: cover;
+	width: 450px;
+	height: 450px;
 }

client/src/App.js

@@ -14,6 +14,8 @@ import AddEvent from './containers/AddEvent';
 import Login from './containers/Login';
 // Import Landing page
 import Landing from './containers/Landing';
+// Import Help page
+import Help from './containers/Help';
 // Import Foooter component
 import Footer from './components/Footer';
 // import NavBar component
@@ -30,6 +32,8 @@ import Grid from '@material-ui/core/Grid';
 import Typography from '@material-ui/core/Typography';
 // import css styling for material ui components.
 import { withStyles } from '@material-ui/core/styles';
+// import Logo
+import logo from './images/edue_logo.png';
 
 const styles = {
 	card: {
@@ -118,6 +122,7 @@ class App extends Component {
 										<Route exact path="/profile" render={props => <Profile
 											{...props} name={user.displayName} email={user.email} photo={user.photoURL} uid={user.uid}></Profile>} />
 										<Route exact path="/add" component={AddEvent} />
+										<Route exact path="/help" component={Help} />
 										<Route exact path="/login" component={Login} />
 									</Switch>
 								</div>
@@ -126,6 +131,9 @@ class App extends Component {
 						: (
 							<div className="main-content-section">
 								<Grid container spacing={16} justify="center" className="login-page">
+									<Grid item xs={12} sm={12} md={6}>
+										<img src={logo} alt="team logo" className="logo"></img>
+									</Grid>
 									<Grid item xs={12} sm={12} md={6}>
 										<Typography variant="display1" className="app-title">
 											Welcome to EduVents

client/src/containers/Help/Help.js

@@ -0,0 +1,18 @@
+import React, { Component } from 'react'
+import Grid from '@material-ui/core/Grid';
+
+class Help extends Component {
+	render() {
+		return (
+			<div className="main-content-section">
+				<h1>Help</h1>
+				<Grid container spacing={16}>
+					<Grid item xs={12} sm={12} md={8}>
+					</Grid>
+				</Grid>
+			</div>
+		)
+	}
+}
+
+export default Help;

client/src/containers/Help/index.js

@@ -0,0 +1 @@
+export { default } from './Help';