diff --git a/package.json b/package.json
index 60b6859..f2c052e 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
- "eject": "react-scripts eject"
+ "eject": "react-scripts eject",
+ "dev": "npm run start && nodemon index.js"
},
"eslintConfig": {
"extends": [
diff --git a/src/components/HomePage.js b/src/components/HomePage.js
index 5a0d3c6..82da2aa 100644
--- a/src/components/HomePage.js
+++ b/src/components/HomePage.js
@@ -106,11 +106,12 @@ export default function HomePage() {
Adapt to a new place easy peasy.
+
-
+
diff --git a/src/components/Login.js b/src/components/Login.js
index 0f09a05..00b2da4 100644
--- a/src/components/Login.js
+++ b/src/components/Login.js
@@ -28,7 +28,6 @@ const Login = () => {
user: loginRes.data.user,
});
localStorage.setItem("auth-token", loginRes.data.token);
- console.log(userData);
history.push("/");
} catch (err) {
err.response.data.msg && setError(err.response.data.msg);
diff --git a/src/components/NavBar.js b/src/components/NavBar.js
index 09089f8..fbb89f6 100644
--- a/src/components/NavBar.js
+++ b/src/components/NavBar.js
@@ -96,28 +96,6 @@ export default function NavBar() {
{userData.user ? (
{userData.user.username}
-
-
-
-
-
-
-
-
diff --git a/src/components/Register.js b/src/components/Register.js
index 3f7272a..89fdc9c 100644
--- a/src/components/Register.js
+++ b/src/components/Register.js
@@ -1,5 +1,5 @@
import React, { useState, useContext } from "react";
-import { useHistory } from "react-router-dom";
+import { useHistory, withRouter } from "react-router-dom";
import UserContext from "../context/UserContext";
import Axios from "axios";
import { Link } from "react-router-dom";
@@ -30,7 +30,7 @@ import ErrorNotice from "./ErrorNotice";
user: loginRes.data.user,
});
localStorage.setItem("auth-token", loginRes.data.token);
- history.push("/home");
+ history.push("/");
} catch (err) {
return err.response.data.msg && setError(err.response.data.msg);
}
@@ -87,7 +87,7 @@ import ErrorNotice from "./ErrorNotice";
@@ -99,4 +99,4 @@ import ErrorNotice from "./ErrorNotice";
);
}
-export default Register;
+export default withRouter( Register );
diff --git a/src/login_reg.css b/src/login_reg.css
index 7524c50..e1d1341 100644
--- a/src/login_reg.css
+++ b/src/login_reg.css
@@ -1,7 +1,7 @@
.Apper {
display: flex;
color: white;
- height:100%;
+ height:100vh;
}
.Apper__Aside {
@@ -32,13 +32,14 @@
font-family: "Ubuntu";
font-size: 5rem;
font-weight: bold;
- color: rgb(24, 14, 14);
+ color: #ffffff;
text-decoration: none;
text-transform: lowercase;
}
.Apper_logo img{
width:100px;
display:flex;
+ margin-bottom: 50px;
align-content: flex-start;
justify-content: flex-start;
@@ -46,6 +47,7 @@
.Apper__Aside__text {
text-align: center;
+ margin-bottom: 25%;
}
.Apper_quote{
@@ -53,9 +55,10 @@
font-size: 1.25em;
font-style:italic;
}
-.Apper__Aside_image{
+.Apper__Aside_image img{
margin-top: 600px;
- max-width: 100%;
+ width: 900px;
+
}
@@ -124,7 +127,6 @@
font-size: 1.25em;
color: #4C5D72;
text-align: start;
- margin-left:45px;
}
.FormField__Input {