linting and cleanup

melinda-schmitz · Sep 29, 2018 · d3b385c · d3b385c
1 parent c2e3ef3
commit d3b385c
Show file tree

Hide file tree

Showing 28 changed files with 584 additions and 539 deletions.
diff --git a/.firebase/hosting.Y2xpZW50XGJ1aWxk.cache b/.firebase/hosting.Y2xpZW50XGJ1aWxk.cache
@@ -1,11 +1,11 @@
-asset-manifest.json,1537734275185,4d64c33c86321b808815d29f698a392fde0540b0acdb595983d23e7a857b50ff
-favicon.ico,1537734258789,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
-index.html,1537734275183,21b08efd5ad41b53211435fe727535ee988887bbf0cc5f965a673e4ce0007df3
-manifest.json,1537734258792,65d4aa66cd0b8963e88196705111adfccad2e8b80725b6a7a82ca8a9a0de8889
-service-worker.js,1537734275402,ef784fc76f45f03b5e7c8f4dd9c452d8abcb8ea4f915a7803db8c42d2b38f3ec
-static/css/main.ee878636.css,1537734275225,a481b4e5acd2cbda9e758ae381b5ea51f793ee895464a12315a16b6feab41244
-static/css/main.ee878636.css.map,1537734275227,f1aaaa5ad0bfae05182dfac256bf75183b4be5372622409c4cb0ae34eb611fef
-static/media/profilepic.f7f63b88.png,1537734275226,0a9d7a0037b51e9a5bc3d7d76fe4e36f0808f32960c0430fb86554a734f3b8a5
-static/media/edue_logo.d134030d.png,1537734275225,88e259cb56066267852af071a57debc5ebbed25787ae3620a662432c09bdbc96
-static/js/main.b8e8da95.js,1537734275225,498b131745128fb8429a09c7d24675f27e06414ab27eff3fcb7f4433fbbcc0ac
-static/js/main.b8e8da95.js.map,1537734275229,f58d446281199beabea7022ff3413201f73d73e4cda94e38c2825d5755ce956f
+favicon.ico,1537736130978,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
+asset-manifest.json,1537736147061,b7e1d8645553e6f610e5f29ecd9b270e110b5dae19a1ad655c007238b4470664
+index.html,1537736147061,42695b06af17b706bba6fbeedf16d89b0fbfd6dd8003ed417dba8005275a9459
+manifest.json,1537736130981,65d4aa66cd0b8963e88196705111adfccad2e8b80725b6a7a82ca8a9a0de8889
+service-worker.js,1537736147272,6f00c35904b3088e0ae5984f3f65dacbaf5513b2a8c94ba589a99d59e5b2ad63
+static/css/main.56aebd6d.css,1537736147104,9c79c57a0d226e178f98a8763d79208750d56e095b9c9b3bba77c143413f26a1
+static/media/profilepic.f7f63b88.png,1537736147103,0a9d7a0037b51e9a5bc3d7d76fe4e36f0808f32960c0430fb86554a734f3b8a5
+static/css/main.56aebd6d.css.map,1537736147105,e4623bc0d4360b70edd394f260709bccb3f573c912f1ee92d64f7274723c8fd2
+static/media/edue_logo.d134030d.png,1537736147104,88e259cb56066267852af071a57debc5ebbed25787ae3620a662432c09bdbc96
+static/js/main.2c2ab0ea.js,1537736147104,b1a9367a716a799f7799ddff6021ce1112413b96d0759320a7779e05b9d02456
+static/js/main.2c2ab0ea.js.map,1537736147132,31ff22180cc9dbecdd4e7149f7da36815e2c178e09fd4546df22d3544adfaadb
diff --git a/client/.eslintrc.json b/client/.eslintrc.json
@@ -2,6 +2,7 @@
 	"extends": "airbnb",
 	"parser": "babel-eslint",
 	"rules": {
-		"react/jsx-filename-extension": 0
+		"react/jsx-filename-extension": 0,
+		"implicit-arrow-linebreak": 0
 	}
 }
diff --git a/client/package.json b/client/package.json
@@ -6,6 +6,7 @@
     "@material-ui/core": "^3.1.0",
     "firebase": "^5.5.1",
     "primereact": "^2.0.0-beta.7",
+    "prop-types": "^15.6.2",
     "react": "^16.5.2",
     "react-day-picker": "^7.2.4",
     "react-dom": "^16.5.2",

diff --git a/client/public/index.html b/client/public/index.html
@@ -7,9 +7,11 @@
 	<meta name="theme-color" content="#000000">
 	<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
 	<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+
+	<!-- Font Awesome Icons -->
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU"
 	 crossorigin="anonymous">
-	<title>EduEvents</title>
+	<title>EduVents</title>
 </head>
 
 <body>

diff --git a/client/src/App.js b/client/src/App.js
@@ -2,8 +2,12 @@
 import React, { Component } from 'react';
 // Importing React Router to add page routes.
 import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
-// Import App css file
-import './App.css';
+// import Material UI components and styling
+import Card from '@material-ui/core/Card';
+import CardContent from '@material-ui/core/CardContent';
+import Grid from '@material-ui/core/Grid';
+import Typography from '@material-ui/core/Typography';
+import { withStyles } from '@material-ui/core/styles';
 // Import Events page
 import Events from './containers/Events';
 // Import Profile page
@@ -22,20 +26,12 @@ import Footer from './components/Footer';
 import EventDetails from './containers/EventDetails/EventDetails';
 // import NavBar component
 import NavBar from './components/NavBar';
-// import card components
-import Card from '@material-ui/core/Card';
-import CardActions from '@material-ui/core/CardActions';
-import CardContent from '@material-ui/core/CardContent';
 // import Firebase
 import { auth, provider } from './firebase-config';
-// import material ui grid layout
-import Grid from '@material-ui/core/Grid';
-// import typography
-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';
+// Import App css file
+import './App.css';
 
 const styles = {
 	card: {
@@ -109,20 +105,25 @@ class App extends Component {
 	render() {
 		const { user } = this.state;
 		const { classes } = this.props;
-		console.log(user);
+		// console.log(user);
 		return (<div className="App">
 			<Router>
 				<div className="entire-page">
 					{user
 						? (
 							<div>
-								<NavBar name={user.displayName || user.email} photo={user.photoURL} handleLogout={this.logout} />
+								<NavBar
+									name={user.displayName || user.email}
+									photo={user.photoURL}
+									handleLogout={this.logout}
+								/>
 								<div className="main-content-section">
 									<Switch>
 										<Route exact path="/" component={Landing} />
 										<Route exact path="/events" component={Events} />
 										<Route exact path="/profile" render={props => <Profile
-											{...props} name={user.displayName} email={user.email} photo={user.photoURL} uid={user.uid}></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} />
@@ -140,26 +141,27 @@ class App extends Component {
 									<Grid item xs={12} sm={12} md={6}>
 										<Typography variant="display1" className="app-title">
 											Welcome to EduVents
-            				</Typography>
+                    </Typography>
 										<Card className={classes.card}>
 											<CardContent>
 												<Typography variant="display1">
 													LOGIN
-            					</Typography>
-												<Typography variant="p" className="sub-title">
-													Log in to find fun, educational activities and events to do with your kids.
-            					</Typography>
+                        </Typography>
+												<Typography variant="body1" className="sub-title">
+													Log in to find fun, educational activities and
+                          events to do with your kids.
+                        </Typography>
 												<div className="login">
 													<p>Login with Google to continue to site.</p>
 													<button type="submit" className="loginBtn loginBtn--google" onClick={this.login}>
 														Login with Google
-                      </button>
+                          </button>
 												</div>
 											</CardContent>
 										</Card>
 									</Grid>
 								</Grid>
-							</div >
+							</div>
 						)}
 					<Footer />
 				</div>

diff --git a/client/src/components/Footer/Footer.js b/client/src/components/Footer/Footer.js
@@ -1,17 +1,18 @@
 // import React
-import React, { Component } from 'react';
+import React from 'react';
 // import Footer css
 import './Footer.css';
 
-class Footer extends Component {
-	render() {
-		return (
-			<footer id="main-footer">
-				EduVents <br />
-				Copyright &copy; 2018
-			</footer>
-		);
-	}
+// Footer component
+function Footer() {
+  return (
+    <footer id="main-footer">
+      EduVents
+      <br />
+      Copyright &copy; 2018
+    </footer>
+  );
 }
 
-export default Footer;
+// export Footer component
+export default Footer;
diff --git a/client/src/components/Footer/index.js b/client/src/components/Footer/index.js
@@ -1 +1 @@
-export { default } from './Footer';
+export { default } from './Footer';
diff --git a/client/src/components/Header/Header.js b/client/src/components/Header/Header.js
@@ -1,15 +1,15 @@
-import React, { Component } from 'react'
+// import React
+import React from 'react';
 // import css
 import './Header.css';
 
-class Header extends Component {
-	render() {
-		return (
-			<div className="header">
-				<h1 className="app-title">EDU Stuff To Do</h1>
-			</div>
-		)
-	}
+function Header() {
+  return (
+    <div className="header">
+      <h1 className="app-title">EduVents</h1>
+    </div>
+  );
 }
 
+// export Header component
 export default Header;
diff --git a/client/src/components/Header/index.js b/client/src/components/Header/index.js
@@ -1 +1 @@
-export { default } from './Header';
+export { default } from './Header';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { default } from './Footer';
		export { default } from './Footer';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { default } from './Header';
		export { default } from './Header';