From 8b11e813829fa1bb25df9bb8de811e144eb13c0c Mon Sep 17 00:00:00 2001 From: Emily Shrestha Date: Tue, 10 Aug 2021 20:13:27 -0500 Subject: [PATCH 1/2] Create UI for Login screen --- mms-frontend/src/App.js | 2 ++ mms-frontend/src/css/Login.css | 27 +++++++++++++++++++++++++++ mms-frontend/src/pages/Login.js | 20 ++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 mms-frontend/src/css/Login.css create mode 100644 mms-frontend/src/pages/Login.js diff --git a/mms-frontend/src/App.js b/mms-frontend/src/App.js index 82858c6..b301f59 100644 --- a/mms-frontend/src/App.js +++ b/mms-frontend/src/App.js @@ -10,6 +10,7 @@ import Home from './pages/Home'; import UserSignup from './pages/UserSignup'; import Header from './components/Header'; import React from 'react'; +import Login from './pages/Login'; function App() { return ( @@ -21,6 +22,7 @@ function App() { + diff --git a/mms-frontend/src/css/Login.css b/mms-frontend/src/css/Login.css new file mode 100644 index 0000000..cfd7b16 --- /dev/null +++ b/mms-frontend/src/css/Login.css @@ -0,0 +1,27 @@ +*{ + box-sizing: border-box; + margin: 0; + padding: 0; +} +#MemeorTag { + background: lightcyan; + border: 2px solid #000; + border-radius: 50%; + font-size: 1.5rem; + padding: 1.5vw; +} +#LoginComponent { + background: #fff; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin: 5vh auto auto auto; + padding: 1vw; +} +input, button { + display: block; + padding: .5vw; + font-size: 1rem; + margin-bottom: .5vw; +} \ No newline at end of file diff --git a/mms-frontend/src/pages/Login.js b/mms-frontend/src/pages/Login.js new file mode 100644 index 0000000..d31a70d --- /dev/null +++ b/mms-frontend/src/pages/Login.js @@ -0,0 +1,20 @@ +import React, { Component } from 'react'; +import '../css/Login.css'; + +export class Login extends Component { + render() { + return ( +
+
memeor
+

Member Login

+ + + + Forgot password +

New User? Sign Up

+
+ ) + } +} + +export default Login; \ No newline at end of file From 95180b36bbc6dd9d0d08c4657f0734bb34ec204a Mon Sep 17 00:00:00 2001 From: Emily Shrestha Date: Tue, 10 Aug 2021 20:25:02 -0500 Subject: [PATCH 2/2] Add Log In link to header menu --- mms-frontend/src/components/Header.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mms-frontend/src/components/Header.js b/mms-frontend/src/components/Header.js index 38d3d3d..bbddd10 100644 --- a/mms-frontend/src/components/Header.js +++ b/mms-frontend/src/components/Header.js @@ -84,6 +84,11 @@ export default function Header() { history.push("/user-signup") } }>Sign Up + { + history.push("/Login") + } + }>Log In { history.push("/install")