Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Login UI Issue#14 #26

Merged
merged 2 commits into from
Jun 27, 2020
Merged

Feat: Login UI Issue#14 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7426086
Feat: Allow user to Login issue#14
mtreacy002 Jun 20, 2020
8e319f8
PR#26 Handle server error and refactor fetch
mtreacy002 Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 65 additions & 115 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions src/Login.jsx
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion src/Routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import React from "react";
import { BrowserRouter, Switch, Route } from "react-router-dom";
import Home from "./Home";
import Register from "./register/Register";
import Login from "./Login";
import Login from "./login/Login";
import MySpace from "./myspace/MySpace";
import { Navbar, Nav } from "react-bootstrap";


Expand All @@ -24,6 +25,7 @@ export default (
<Nav.Link href="/programs">Programs</Nav.Link>
<Nav.Link href="/organizations">Organizations</Nav.Link>
<Nav.Link href="/members">Members</Nav.Link>
<Nav.Link href="/my-space">My Space</Nav.Link>
<Nav.Link href="/register">Register</Nav.Link>
<Nav.Link href="/login">Login</Nav.Link>
</Nav>
Expand All @@ -33,6 +35,7 @@ export default (
<Route exact path="/" component={Home} />
<Route path="/register" component={Register} />
<Route path="/login" component={Login} />
<Route path="/my-space" component={MySpace} />
</Switch>
</div>
</BrowserRouter>
Expand Down
48 changes: 48 additions & 0 deletions src/login/Login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.container {
background: #f7f9fa;
height: auto;
width: 70%;
margin: 5em auto;
-webkit-box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.4);
-moz-box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.4);
box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.4);
}

label {
color: #24b9b6;
font-size: 1.2em;
font-weight: 400;
}

h1 {
color: #24b9b6;
padding-top: 0.5em;
}

.error {
color: red;
}
.error-message {
color: #ff6565;
padding: 0.5em 0.2em;
height: 1em;
position: absolute;
font-size: 0.8em;
}

.field {
border: 1px solid #1c6ea4;
width: 100%;
height: 2em;
}

.button-group {
width: 100%;
}

.login-form {
width: 80%;
text-align: left;
padding-top: 2em;
padding-bottom: 2em;
}
Loading