diff --git a/src/data/http/authApi.js b/src/data/http/authApi.js deleted file mode 100644 index ac4ba13..0000000 --- a/src/data/http/authApi.js +++ /dev/null @@ -1 +0,0 @@ -import API from "./axios/api"; diff --git a/src/data/http/requestProjectApi.js b/src/data/http/requestProjectApi.js deleted file mode 100644 index 1a4d6a6..0000000 --- a/src/data/http/requestProjectApi.js +++ /dev/null @@ -1,38 +0,0 @@ -import API from "./axios/api"; - -export default class requestProjectApiProvider { - async readRequestProjects() { - try { - const { data } = await API.get("/req-projects"); - return data; - } catch (err) { - console.log(err); - } - } - - async readContributeProjects() { - try { - const { data } = await API.get("/req-projects:{request_id}"); - return data; - } catch (err) { - console.log(err); - } - } - - async createContributeProject() { - try { - const { data } = await API.post("/req-projects/contributeproject"); - return data; - } catch (err) { - console.log(err); - } - } - async updateRequestProject() { - try { - const { data } = await API.put("/req-projects:{request_id}"); - return data; - } catch (err) { - console.log(err); - } - } -} diff --git a/src/presentation/App.js b/src/presentation/App.js index f5077c9..8b40179 100644 --- a/src/presentation/App.js +++ b/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() { - -
+ + - + diff --git a/src/presentation/page/detailProject/ProjectFieldItems.jsx b/src/presentation/page/detailProject/ProjectFieldItems.jsx index f64ec44..6d9e4ae 100644 --- a/src/presentation/page/detailProject/ProjectFieldItems.jsx +++ b/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
로딩중...
; diff --git a/src/presentation/page/detailProject/ProjectList.jsx b/src/presentation/page/detailProject/ProjectList.jsx index c37e35f..cb51c24 100644 --- a/src/presentation/page/detailProject/ProjectList.jsx +++ b/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); } diff --git a/src/presentation/page/detailProject/index.jsx b/src/presentation/page/detailProject/index.jsx index 1857a3d..52428d5 100644 --- a/src/presentation/page/detailProject/index.jsx +++ b/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 ( <> diff --git a/src/presentation/page/main/Project.jsx b/src/presentation/page/requestProject/Project.jsx similarity index 89% rename from src/presentation/page/main/Project.jsx rename to src/presentation/page/requestProject/Project.jsx index 115fb16..6068c9c 100644 --- a/src/presentation/page/main/Project.jsx +++ b/src/presentation/page/requestProject/Project.jsx @@ -12,18 +12,10 @@ 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); @@ -31,22 +23,20 @@ function Project() { 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
로딩중...
; @@ -60,7 +50,7 @@ function Project() {
{ - setHistory("/project/" + project.id); + setHistory("/requestprojects/" + project.id); }} > diff --git a/src/presentation/page/main/index.jsx b/src/presentation/page/requestProject/index.jsx similarity index 94% rename from src/presentation/page/main/index.jsx rename to src/presentation/page/requestProject/index.jsx index 5005df3..c703b68 100644 --- a/src/presentation/page/main/index.jsx +++ b/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; diff --git a/src/presentation/page/main/styled.js b/src/presentation/page/requestProject/styled.js similarity index 100% rename from src/presentation/page/main/styled.js rename to src/presentation/page/requestProject/styled.js