Feat: 베타용 최종

Author: lsy1307

package-lock.json

@@ -22,6 +22,7 @@
     "antd": "^5.21.2",
     "axios": "^1.7.7",
     "bootstrap": "^5.3.3",
+    "chart.js": "^4.4.6",
     "date-fns": "^4.1.0",
     "fs": "^0.0.1-security",
     "install": "^0.13.0",
@@ -31,6 +32,7 @@
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",
     "react-bootstrap": "^2.10.5",
+    "react-chartjs-2": "^5.2.0",
     "react-datepicker": "^7.4.0",
     "react-dom": "^18.3.1",
     "react-geocode": "^1.0.0-alpha.1",

package.json

@@ -9,8 +9,9 @@ import QnaDetail from './pages/Qna/QnaDetail';
 import RegistProject from './pages/Request/RegistProject';
 import RequestHome from './pages/Request/RequestHome';
 import RequestDetail from './pages/Request/RequestDetail';
+// import ProjectSupport
 import Callback from './auth/Callback';
-import useStore from './zustand/Store';
+import { useStore } from './zustand/Store';
 
 function App() {
   return (
@@ -28,6 +29,7 @@ function App() {
           <Route path="project" element={<RequestHome />} />
           <Route path="project/:requestId" element={<RequestDetail />} />
           <Route path="project/regist" element={<RegistProject />} />
+          {/* <Route path="project/support" element={<ProjectSupport />} /> */}
         </Route>
         {/* User Regist */}
         <Route path="/regist" element={<Regist />} />

src/App.jsx

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { GetAxiosInstance, PostAxiosInstance } from '../axios/AxiosMethod';
 import { uploadFiles } from './file';
-import useStore from '../zustand/Store';
+import { useStore } from '../zustand/Store';
 
 const baseURL = import.meta.env.VITE_BASE_URL;
 const url = `${import.meta.env.VITE_LOGIN_URL}${import.meta.env.VITE_CLIENT_ID}&redirect_uri=${import.meta.env.VITE_REDIRECT_URL}&response_type=code&scope=basic_profile&scope=friends_list&scope=presence`;

src/api/oauth.js

@@ -1,6 +1,8 @@
 import axios from 'axios';
 import { GetAxiosInstance, PostAxiosInstance } from '../axios/AxiosMethod';
 
+const baseURL = import.meta.env.VITE_BASE_URL;
+
 export const registRequestInfo = async (projectInfo) => {
   try {
     const res = await PostAxiosInstance('/api/project', projectInfo);
@@ -12,7 +14,7 @@ export const registRequestInfo = async (projectInfo) => {
 
 export const getRequestDetail = async (projectId) => {
   try {
-    const res = await GetAxiosInstance(`/api/project/${projectId}`);
+    const res = await GetAxiosInstance(`/api/project/detail/${projectId}`);
     return res;
   } catch (e) {
     console.error(e);
@@ -21,9 +23,7 @@ export const getRequestDetail = async (projectId) => {
 
 export const getAllRequests = async (page) => {
   try {
-    const res = await GetAxiosInstance(
-      `/api/project/summary/pagination?page=${page}`,
-    );
+    const res = await axios.get(`${baseURL}/api/project/summary/${page}`);
     return res;
   } catch (e) {
     console.error(e);
@@ -32,8 +32,26 @@ export const getAllRequests = async (page) => {
 
 export const getHomeRequests = async () => {
   try {
-    const res = await axios.get(
-      `${import.meta.env.VITE_BASE_URL}/api/project/summary/home`,
+    const res = await axios.get(`${baseURL}/api/project/summary/home`);
+    return res;
+  } catch (e) {
+    console.error(e);
+  }
+};
+
+export const getTeamData = async (projectId) => {
+  try {
+    const res = await GetAxiosInstance(`/api/team/${projectId}/support/list`);
+    return res;
+  } catch (e) {
+    console.error(e);
+  }
+};
+
+export const acceptTeam = async (projectId, teamId) => {
+  try {
+    const res = await PostAxiosInstance(
+      `/api/project/accept/epic/${projectId}/${teamId}`,
     );
     return res;
   } catch (e) {

src/api/request.js

@@ -1,10 +1,10 @@
 import React, { useEffect } from 'react';
 import { checkIsRegisted, getToken } from '../api/oauth';
 import { useNavigate } from 'react-router-dom';
-import useStore from '../zustand/Store';
+import { useStore, usePersistentStore } from '../zustand/Store';
 const Callback = () => {
   const navigate = useNavigate();
-  const { setIsLogin } = useStore();
+  const { setIsLogin } = usePersistentStore();
   useEffect(() => {
     const getAccessToken = async () => {
       await getToken();

src/auth/Callback.jsx

@@ -6,31 +6,26 @@ const axiosInstance = axios.create({ baseURL: import.meta.env.VITE_BASE_URL });
 axiosInstance.interceptors.request.use(
   async (config) => {
     const accessToken = localStorage.getItem('accessToken');
-
     if (!accessToken) {
       localStorage.clear();
       alert('로그인 해주세요');
       window.location.href = '/home';
       throw new Error('토큰 없음');
     }
-
     config.headers['Authorization'] = `Bearer ${accessToken}`;
-
     return config;
   },
   (error) => {
     return Promise.reject(error);
   },
 );
 
-// 토큰 관련 에러 처리
 axiosInstance.interceptors.response.use(
   async (response) => {
     return response;
   },
 
   async (error) => {
-    // 토큰 만료나 잘못된 토큰일 때 로그아웃 처리
     if (error.response?.data?.status === '449') {
       console.log('잘못된 토큰');
       const originalConfig = error.config;
@@ -46,7 +41,6 @@ axiosInstance.interceptors.response.use(
         alert('토큰이 만료되었습니다. 다시 로그인 해주세요.');
       }
     }
-
     return Promise.reject(error);
   },
 );

src/axios/AxiosInstance.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import useStore from '../../../../zustand/Store';
+import { useStore } from '../../../../zustand/Store';
 import {
   Container,
   SortButtonContainer,

src/components/common/Filter/Buttons/FilterButtons.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { InputContainer, TextArea } from './style';
-import useStore from '../../../zustand/Store';
+import { useStore } from '../../../zustand/Store';
 
 const InputText = (props) => {
   const { projectInfo, setProjectInfo } = useStore();

src/components/common/InputText/InputText.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button } from './style';
-import useStore from '../../../../zustand/Store';
+import { useStore } from '../../../../zustand/Store';
 const NextPrevButton = ({ isNext }) => {
   const { setDetailPage } = useStore();
   const handleNextButtonClick = () => {