diff --git a/wip-app/src/pages/ProjectPage/ProjectPage.js b/wip-app/src/pages/ProjectPage/ProjectPage.js index 572f75f..80e4f88 100644 --- a/wip-app/src/pages/ProjectPage/ProjectPage.js +++ b/wip-app/src/pages/ProjectPage/ProjectPage.js @@ -1,22 +1,48 @@ import React from "react"; -// import { projectPage } from "../../utils/get-fetch"; +import { getProjectPage } from "../../utils/get-fetch"; const ProjectPage = () => { - // const [projectData, setProjectData] = React.useState([]); + const [projectData, setProjectData] = React.useState([]); + const [stepId, setStepId] = React.useState(null); + const [feedbackObject, setFeedbackObject] = React.useState([]); + + const projectId = 3; + + React.useEffect(() => { + getProjectPage(projectId).then((projectData) => { + setProjectData(projectData); + console.log(projectData); + setStepId(projectData.id); + }); + }, []); // React.useEffect(() => { - // projectPage().then(setProjectData); - // }, []); + // getFeedback().then(setFeedbackObject) + // }, [stepId]) - // const { - // id, - // user_id, - // project_name, - // project_description, - // project_status, - // } = projectData; + const { + id, + username, + step_link, + step_name, + project_name, + project_description, + project_status, + } = projectData; - return

Project Page

; + return ( +
+

{project_name}

+

By {username}

+

Project status: {project_status ? "Finished" : "In Progress"}

+

{project_description}

+

Project Steps

+
+

{step_name}

+ +
+
+ ); }; export default ProjectPage; diff --git a/wip-app/src/pages/UserPage/UserPage.js b/wip-app/src/pages/UserPage/UserPage.js index 7f53160..7244d61 100644 --- a/wip-app/src/pages/UserPage/UserPage.js +++ b/wip-app/src/pages/UserPage/UserPage.js @@ -15,7 +15,7 @@ const UserPage = (props) => { React.useEffect(() => { getUserPageProjects().then((userProjects) => { - setUserProjects(userProjects); + setUserProjects(userProjects.reverse()); }); }, []); diff --git a/wip-app/src/utils/get-fetch.js b/wip-app/src/utils/get-fetch.js index c71c44b..5d8e9cc 100644 --- a/wip-app/src/utils/get-fetch.js +++ b/wip-app/src/utils/get-fetch.js @@ -55,8 +55,7 @@ function getUserPageProjects() { return getFetch(options); } -function projectPage(projectid) { - projectid = 1; +function getProjectPage(projectid) { const options = { endpoint: `project/${projectid}`, errorMessage: "Project page error", @@ -64,4 +63,4 @@ function projectPage(projectid) { return getFetch(options); } -export { feedPage, getUser, explorePage, getUserPageProjects, projectPage }; +export { feedPage, getUser, explorePage, getUserPageProjects, getProjectPage };