From 4364bb0a338310f2d1f278ac144d1a2fb1d5f136 Mon Sep 17 00:00:00 2001 From: Hannah Gooding <47333850+hannahgooding@users.noreply.github.com> Date: Wed, 27 May 2020 11:25:03 +0100 Subject: [PATCH] Add user page info Relates #13 Co-authored-by: Alexreid95 --- wip-app/src/pages/UserPage/UserPage.css | 0 wip-app/src/pages/UserPage/UserPage.js | 51 +++++++++++++------- wip-app/src/pages/UserPage/UserPage.style.js | 1 + wip-app/src/utils/get-fetch.js | 4 -- 4 files changed, 34 insertions(+), 22 deletions(-) delete mode 100644 wip-app/src/pages/UserPage/UserPage.css create mode 100644 wip-app/src/pages/UserPage/UserPage.style.js diff --git a/wip-app/src/pages/UserPage/UserPage.css b/wip-app/src/pages/UserPage/UserPage.css deleted file mode 100644 index e69de29..0000000 diff --git a/wip-app/src/pages/UserPage/UserPage.js b/wip-app/src/pages/UserPage/UserPage.js index df8195b..fd79b98 100644 --- a/wip-app/src/pages/UserPage/UserPage.js +++ b/wip-app/src/pages/UserPage/UserPage.js @@ -6,30 +6,45 @@ const UserPage = (props) => { React.useEffect(() => { getUser().then((userInfo) => { - console.log(userInfo); setUserInfo(userInfo); }); }, []); - // const renderProjects = (projects) => { - // return projects.map( - // ({ id, user_id, project_name, project_description, project_status }) => { - // // console.log(project); - // return ( - // - // ); - // } - // ); - // }; + // email: "JO@123.com" + // id: 2 + // user_bio: "I love colours they are so nice" + // user_link_1: "www.facebook.com" + // user_link_2: "www.instagram.com" + // user_link_3: "www.twitter.com" + // user_vocation: "professional animator" + // username: "Jacko" + + const { + username, + email, + user_bio, + user_vocation, + user_link_1, + user_link_2, + user_link_3, + } = userInfo; return ( -
-

Profile Page

-
+ <> + {userInfo !== [] ? ( + <> +

{username}'s Profile

+

{email}

+ Link 1 + Link 2 + Link 3 +

{user_bio}

+

{user_vocation}

+ + ) : ( +

Loading...

+ )} + ); }; diff --git a/wip-app/src/pages/UserPage/UserPage.style.js b/wip-app/src/pages/UserPage/UserPage.style.js new file mode 100644 index 0000000..0f6a10a --- /dev/null +++ b/wip-app/src/pages/UserPage/UserPage.style.js @@ -0,0 +1 @@ +import styled from "styled-components"; diff --git a/wip-app/src/utils/get-fetch.js b/wip-app/src/utils/get-fetch.js index 91a2e5f..61828ed 100644 --- a/wip-app/src/utils/get-fetch.js +++ b/wip-app/src/utils/get-fetch.js @@ -9,13 +9,10 @@ async function getFetch({ endpoint, error }) { }, }; - console.log(fetchObject); - const fetchURL = `https://wip-rest-api.herokuapp.com/${endpoint}`; return await fetch(fetchURL, fetchObject) .then((res) => { - console.log(res); if (!res.ok) { throw new Error(`${error}, status: ${res.status}`); } @@ -38,7 +35,6 @@ function getUser(token) { error: "Unable to get this page", }; return getFetch(options).then((res) => { - console.log("38", res); return res; }); }