Merge branch 'master' into edit-profile-frontend

twistter-frontend/src/pages/Home.js

@@ -0,0 +1,37 @@
+import React, { Component } from 'react';
+import '../App.css';
+
+import logo from '../images/twistter-logo.png';
+
+
+class Home extends Component {
+  render() {
+    return (
+      <div>
+        <div>
+          <img src={logo} className="app-logo" alt="logo" />
+          <br/><br/>
+          <b>Welcome to Twistter!</b> 
+          <br/><br/>
+          <b>See the most interesting topics people are following right now.</b> 
+        </div>
+
+        <br/><br/><br/><br/>
+
+        <div>                    
+          <b>Join today or sign in if you already have an account.</b> 
+          <br/><br/>
+          <form action="./register">
+            <button className="authButtons register">Sign up</button> 
+          </form>
+          <br/>
+          <form action="./login">
+            <button className="authButtons login">Sign in</button>
+          </form>
+        </div>
+      </div>
+    );
+    }
+  }
+
+export default Home;

twistter-frontend/src/pages/Login.js

@@ -0,0 +1,26 @@
+/* eslint-disable */
+import React, { Component } from 'react';
+import '../App.css';
+
+import logo from '../images/twistter-logo.png';
+import TextField from '@material-ui/core/TextField';
+
+class Login extends Component {
+  render() {
+    return (
+      <div>
+        <img src={logo} className="app-logo" alt="logo" />
+        <br/><br/>
+        <b>Log in to Twistter</b>
+        <br/><br/>
+        <TextField className="authInput" id="email" name="email" label="Email" />
+        <br/><br/>
+        <TextField className="authInput" id="password" name="password" label="Password" />
+        <br/><br/>
+        <button className="authButtons register" type="submit">Sign in</button>
+      </div>
+    );
+  };
+}
+
+export default Login;

twistter-frontend/src/pages/Register.js

@@ -0,0 +1,29 @@
+import React, { Component } from 'react';
+import '../App.css';
+
+import logo from '../images/twistter-logo.png';
+import TextField from '@material-ui/core/TextField';
+
+class Register extends Component {
+  render() {
+    return (
+      <div>
+        <img src={logo} className="app-logo" alt="logo" />
+        <br/><br/>
+        <b>Create your account</b>
+        <br/><br/>
+        <TextField className="authInput" id="email" name="email" label="Email" />
+        <br/><br/>
+        <TextField className="authInput" id="username" name="username" label="Username" />
+        <br/><br/>
+        <TextField className="authInput" id="password" name="password" label="Password" />
+        <br/><br/>
+        <TextField className="authInput" id="confirmPassword" name="confirmPassword" label="Confirm Password" />
+        <br/><br/>
+        <button class="authButtons register" id="submit">Sign up</button>
+      </div>
+    );
+  }
+}
+
+export default Register;