diff --git a/wip-app/src/components/LogInForm/LogInForm.js b/wip-app/src/components/LogInForm/LogInForm.js
index b7870f3..bac768b 100644
--- a/wip-app/src/components/LogInForm/LogInForm.js
+++ b/wip-app/src/components/LogInForm/LogInForm.js
@@ -3,7 +3,7 @@ import { Link } from "react-router-dom";
import { Container, Button, TextField } from "@material-ui/core";
import { makeStyles } from "@material-ui/core/styles";
import { useHistory } from "react-router-dom";
-import logInGet from "../../utils/fetch";
+import { logInGet } from "../../utils/fetch";
const useStyles = makeStyles({
form: {
@@ -44,7 +44,12 @@ const LogInForm = (props) => {
return (
Log In
-
);
diff --git a/wip-app/src/components/SignUpForm/SignUpForm.js b/wip-app/src/components/SignUpForm/SignUpForm.js
index bb093c3..329a2d6 100644
--- a/wip-app/src/components/SignUpForm/SignUpForm.js
+++ b/wip-app/src/components/SignUpForm/SignUpForm.js
@@ -3,7 +3,7 @@ import { Link } from "react-router-dom";
import { Container, Button, TextField } from "@material-ui/core";
import { makeStyles } from "@material-ui/core/styles";
import { useHistory } from "react-router-dom";
-import signUpPost from "../../utils/fetch";
+import { signUpPost } from "../../utils/fetch";
const useStyles = makeStyles({
form: {
@@ -34,9 +34,9 @@ const SignUpForm = (props) => {
const formData = new FormData(form);
signUpPost({
- username: formData.username,
- email: formData.email,
- password: formData.password,
+ username: formData.get("username"),
+ email: formData.get("email"),
+ password: formData.get("password"),
}).then(() => history.push("/feed"));
};
@@ -79,16 +79,16 @@ const SignUpForm = (props) => {
type="password"
autoComplete="password"
/>
-
-
-
+ {/* */}
+
+ {/* */}
);
diff --git a/wip-app/src/utils/fetch.js b/wip-app/src/utils/fetch.js
index 35091bf..bd33692 100644
--- a/wip-app/src/utils/fetch.js
+++ b/wip-app/src/utils/fetch.js
@@ -1,4 +1,4 @@
-function postFetch({ endpoint, body, error }) {
+async function postFetch({ endpoint, body, error }) {
// const headers = {
// 'content-type': 'application/JSON'
// };
@@ -14,7 +14,8 @@ function postFetch({ endpoint, body, error }) {
const fetchURL = `https://wip-rest-api.herokuapp.com/${endpoint}`;
- fetch(fetchURL, fetchObject).then((res) => {
+ return await fetch(fetchURL, fetchObject).then((res) => {
+ console.log(res);
if (!res.ok) {
throw new Error(`${error}, status: ${res.status}`);
}
@@ -27,14 +28,14 @@ function signUpPost(signUpFormData) {
const options = {
endpoint: "signUp",
body: {
- name: signUpFormData.name,
+ username: signUpFormData.username,
email: signUpFormData.email,
password: signUpFormData.password,
},
error: "Sorry, there was a problem signing you up",
};
- console.log(options);
return postFetch(options).then((res) => {
+ console.log("postFetch-> res", res);
localStorage.setItem("auth", JSON.stringify(res));
});
}
@@ -53,4 +54,4 @@ function logInGet(logInFormData) {
});
}
-export default { signUpPost, logInGet };
+export { signUpPost, logInGet };
diff --git a/wip-rest-api/src/server.js b/wip-rest-api/src/server.js
index 251255e..f278671 100644
--- a/wip-rest-api/src/server.js
+++ b/wip-rest-api/src/server.js
@@ -25,7 +25,7 @@ server.put("/user", checkAuth, users.put);
// server.delete("/user/:username", checkAuth, users.delete);
//Routes for projects
-server.get("/feed/:userId", checkAuth, project.get);
+// server.get("/feed/:userId", checkAuth, project.get);
// server.get("/project/:projectId", checkAuth, project.get);
// server.post('project', auth, project.post)
// server.put('/project/:projectId', auth, project.put)