Revert 65 feature/issue 53

src/presentation/App.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
 import "./App.css";
-import Main from "./page/main";
+import RequestProjects from "./page/requestProject";
 import Home from "./page/home";
 import NavBar from "./page/nav_bar";
 import DetailProject from "./page/detailProject";
@@ -18,10 +18,10 @@ function App() {
         <NavBar></NavBar>
       </Switch>
       <Switch>
-        <Route exact path="/main">
-          <Main></Main>
+        <Route exact path="/requestProjects">
+          <RequestProjects></RequestProjects>
         </Route>
-        <Route exact path="/project">
+        <Route exact path="/requestProjects/:id">
           <DetailProject></DetailProject>
         </Route>
         <Route exact path="/project/ContributeProject">

src/presentation/page/detailProject/ProjectFieldItems.jsx

@@ -1,29 +1,27 @@
 import React, { useState, useEffect } from "react";
-import axios from "axios";
+import API from "data/http/axios/api";
 import styled from "./styled";
 
-function ProjectFieldItems() {
+function ProjectFieldItems({ id }) {
   const [requestProject, setRequestProject] = useState(null);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
 
   useEffect(() => {
-    const fetchProjects = async () => {
+    const readContributeProjects = async () => {
       try {
         setError(null);
         setRequestProject(null);
         setLoading(true);
-        const response = await axios.get(
-          "https://jsonplaceholder.typicode.com/users"
-        );
-        setRequestProject(response.data);
+        const { data } = await API.get("/requestprojects/" + id);
+        setRequestProject(data);
       } catch (error) {
         setError(error);
       }
       setLoading(false);
     };
 
-    fetchProjects();
+    readContributeProjects();
   }, []);
 
   if (loading) return <div>로딩중...</div>;

src/presentation/page/detailProject/ProjectList.jsx

@@ -10,6 +10,7 @@ import selected from "assets/selected.png";
 import { Icon } from "@iconify/react";
 import playCircle from "@iconify-icons/mdi/play-circle";
 import pauseCircle from "@iconify-icons/mdi/pause-circle";
+import API from "data/http/axios/api";
 
 function ProjectList({ unselected }) {
   const [projects, setProjects] = useState(null);
@@ -22,10 +23,8 @@ function ProjectList({ unselected }) {
         setError(null);
         setProjects(null);
         setLoading(true);
-        const response = await axios.get(
-          "https://jsonplaceholder.typicode.com/users"
-        );
-        setProjects(response.data);
+        const { data } = await API.get("/requestprojects");
+        setProjects(data);
       } catch (error) {
         setError(error);
       }

src/presentation/page/detailProject/index.jsx

@@ -3,7 +3,7 @@ import styled from "./styled";
 import LeftBox from "./LeftBox";
 import RightBox from "./RightBox";
 
-function DetailProject() {
+function DetailProject({ id }) {
   return (
     <>
       <styled.Window>

src/presentation/page/main/Project.jsx → src/presentation/page/requestProject/Project.jsx

@@ -12,41 +12,31 @@ import { Icon } from "@iconify/react";
 import playCircle from "@iconify-icons/mdi/play-circle";
 import pauseCircle from "@iconify-icons/mdi/pause-circle";
 import useLastLocationHistory from "lib/history";
+import API from "data/http/axios/api";
 
 const text = "Preview Lrics,";
 
-// const readRequestProjects = async () => {
-//   try {
-//     const { data } = await API.get("/req-projects");
-//     return data;
-//   } catch (err) {
-//     console.log(err);
-//   }
-// };
-
 function Project() {
   const setHistory = useLastLocationHistory();
   const [projects, setProjects] = useState(null);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
 
   useEffect(() => {
-    const fetchProjects = async () => {
+    const readRequestProjects = async () => {
       try {
         setError(null);
         setProjects(null);
         setLoading(true);
-        const response = await axios.get(
-          "https://jsonplaceholder.typicode.com/users"
-        );
-        setProjects(response.data);
+        const { data } = await API.get("/requestprojects");
+        setProjects(data);
       } catch (error) {
         setError(error);
       }
       setLoading(false);
     };
 
-    fetchProjects();
+    readRequestProjects();
   }, []);
 
   if (loading) return <div>로딩중...</div>;
@@ -60,7 +50,7 @@ function Project() {
           <styled.Project>
             <div
               onClick={() => {
-                setHistory("/project/" + project.id);
+                setHistory("/requestprojects/" + project.id);
               }}
             >
               <styled.ProjectUserId key={project.id}>

src/presentation/page/main/index.jsx → src/presentation/page/requestProject/index.jsx

@@ -4,7 +4,7 @@ import Project from "./Project";
 import CreateButtonImage from "assets/createButton.svg";
 import useLastLocationHistory from "lib/history";
 
-function Main() {
+function RequestProjects() {
   const setHistory = useLastLocationHistory();
 
   const [isLong, setIsLong] = useState(false);
@@ -36,4 +36,4 @@ function Main() {
   );
 }
 
-export default Main;
+export default RequestProjects;