Merge pull request #26 from SV-Winter-BootCamp-Team-C/fe/feat/#21

feat:제목 검색 기능, 경로 수정
SV-Winter-BootCamp-Team-C · Jan 19, 2024 · dbd6117 · dbd6117
2 parents 2918b5c + 4b73570
commit dbd6117
Show file tree

Hide file tree

Showing 45 changed files with 152 additions and 147 deletions.
diff --git a/frontend/src/api/deleteSurvey.ts b/frontend/src/api/deleteSurvey.ts
@@ -1,4 +1,4 @@
-import { restFetcher } from '@/queryClient';
+import { restFetcher } from '../queryClient';
 
 export const deleteSurveyAPI = async (surveyId: number, userId: number) => {
   const response = await restFetcher({

diff --git a/frontend/src/api/getForm.ts b/frontend/src/api/getForm.ts
@@ -1,4 +1,4 @@
-import { restFetcher } from '@/queryClient';
+import { restFetcher } from '../queryClient';
 
 const LIMIT = 9;
 
@@ -18,11 +18,13 @@ export const getAllSurveyAPI = async ({ userId, currentPage, title }: AllSurveyR
   return response;
 };
 
-export const getMySurveyAPI = async ({ userId, currentPage }: AllSurveyResponse) => {
+export const getMySurveyAPI = async ({ userId, currentPage, title }: AllSurveyResponse & { title?: string }) => {
+  const params: any = { page: currentPage, limit: LIMIT };
+  if (title) params.title = title;
   const response = await restFetcher({
     method: 'GET',
     path: `/surveys/${userId}/forms`,
-    params: { page: currentPage, limit: LIMIT },
+    params,
   });
   return response;
 };
@@ -33,7 +35,8 @@ export const getMyResponseAPI = async ({ userId, currentPage, title }: AllSurvey
   const response = await restFetcher({
     method: 'GET',
     path: `/surveys/${userId}/join`,
-    params: { page: currentPage, limit: LIMIT },
+    params,
   });
+  console.log(params);
   return response;
 };
diff --git a/frontend/src/api/getResult.ts b/frontend/src/api/getResult.ts
@@ -1,5 +1,5 @@
-import { restFetcher } from '@/queryClient';
 import axios from 'axios';
+import { restFetcher } from '../queryClient';
 
 export const getQuestionResultAPI = async (surveyId: number) => {
   const response = await restFetcher({

diff --git a/frontend/src/api/login.ts b/frontend/src/api/login.ts
@@ -1,5 +1,5 @@
-import { restFetcher } from '@/queryClient';
-import { LoginForm } from '@/types/auth';
+import { restFetcher } from '../queryClient';
+import { LoginForm } from '../types/auth';
 
 export const loginAPI = async (data: LoginForm) => {
   const response = await restFetcher({

diff --git a/frontend/src/api/myanswer.ts b/frontend/src/api/myanswer.ts
@@ -1,5 +1,5 @@
-import { restFetcher } from '@/queryClient';
-import { QuestionDataForm } from '@/types/questionData';
+import { restFetcher } from '../queryClient';
+import { QuestionDataForm } from '../types/questionData';
 
 export const myAnswerAPI = async (userId: number, surveyId: number): Promise<QuestionDataForm> => {
   const response = await restFetcher({

diff --git a/frontend/src/api/myprofile.ts b/frontend/src/api/myprofile.ts
@@ -1,4 +1,4 @@
-import { restFetcher } from '@/queryClient';
+import { restFetcher } from '../queryClient';
 
 export const getIdAPI = async (id: number) => {
   const response = await restFetcher({

diff --git a/frontend/src/api/responseform.ts b/frontend/src/api/responseform.ts
@@ -1,5 +1,5 @@
-import { restFetcher } from '@/queryClient';
-import { ResponseSubmit } from '@/types/questionData';
+import { restFetcher } from '../queryClient';
+import { ResponseSubmit } from '../types/questionData';
 
 export const responseformAPI = async (surveyId: number) => {
   const response = await restFetcher({

diff --git a/frontend/src/api/signup.ts b/frontend/src/api/signup.ts
@@ -1,5 +1,5 @@
-import { restFetcher } from '@/queryClient';
-import { SignupForm } from '@/types/auth';
+import { restFetcher } from '../queryClient';
+import { SignupForm } from '../types/auth';
 
 export const singupAPI = async (data: SignupForm) => {
   const response = await restFetcher({

diff --git a/frontend/src/api/survey.ts b/frontend/src/api/survey.ts
@@ -1,5 +1,6 @@
-import { restFetcher } from '@/queryClient';
-import { EditableSurvey } from '@/types/editableSurvey';
+import { restFetcher } from '../queryClient';
+import { EditableSurvey } from '../types/editableSurvey';
+
 
 export const createSurveyAPI = async (createSurveyData: EditableSurvey) => {
   const response = await restFetcher({

diff --git a/frontend/src/api/surveyMenu.ts b/frontend/src/api/surveyMenu.ts
@@ -1,4 +1,4 @@
-import { restFetcher } from '@/queryClient';
+import { restFetcher } from '../queryClient';
 
 export const shareSurveyAPI = async (surveyId: number, emails: string[]) => {
   const response = await restFetcher({

diff --git a/frontend/src/components/common/Alert.tsx b/frontend/src/components/common/Alert.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
-import close from '@/assets/closebtn.svg';
-import alertSuccess from '@/assets/alertSuccess.svg';
-import alertError from '@/assets/alertError.svg';
+import close from '../../assets/closebtn.svg';
+import alertSuccess from '../../assets/alertSuccess.svg';
+import alertError from '../../assets/alertError.svg';
 
 interface AlertProps {
   type?: 'success' | 'error';

diff --git a/frontend/src/components/common/Button.tsx b/frontend/src/components/common/Button.tsx
@@ -1,4 +1,4 @@
-import plus from '@/assets/plus.svg';
+import plus from '../../assets/plus.svg';
 
 interface ButtonProps {
   text: string;

diff --git a/frontend/src/components/common/MyProfileModal.tsx b/frontend/src/components/common/MyProfileModal.tsx
@@ -1,11 +1,11 @@
 import { useMutation, useQuery } from '@tanstack/react-query';
-import profile from '@/assets/profile.svg';
-import close from '@/assets/closebtn.svg';
-import pencil from '@/assets/pencil.svg';
-import { getIdAPI, patchPasswordAPI } from '@/api/myprofile';
-import { useAuthStore } from '@/store/AuthStore';
 import { useState } from 'react';
-import { getClient } from '@/queryClient';
+import profile from '../../assets/profile.svg';
+import close from '../../assets/closebtn.svg';
+import pencil from '../../assets/pencil.svg';
+import { getIdAPI, patchPasswordAPI } from '../../api/myprofile';
+import { useAuthStore } from '../../store/AuthStore';
+import { getClient } from '../../queryClient';
 import { TextButton } from './Button';
 import Alert from './Alert';
 

diff --git a/frontend/src/components/common/Navbar.tsx b/frontend/src/components/common/Navbar.tsx
@@ -1,12 +1,12 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { useNavbarStore } from '@/store/NavbarStore';
-import all from '@/assets/navAll.svg';
-import myform from '@/assets/navForm.svg';
-import myresponses from '@/assets/navRes.svg';
-import profile from '@/assets/profile.svg';
-import logout from '@/assets/logout.svg';
-import { useAuthStore } from '@/store/AuthStore';
+import { useNavbarStore } from '../../store/NavbarStore';
+import all from '../../assets/navAll.svg';
+import myform from '../../assets/navForm.svg';
+import myresponses from '../../assets/navRes.svg';
+import profile from '../../assets/profile.svg';
+import logout from '../../assets/logout.svg';
+import { useAuthStore } from '../../store/AuthStore';
 import MyProfileModal from './MyProfileModal';
 
 interface NavbarProps {

diff --git a/frontend/src/components/common/ShareMailModal.tsx b/frontend/src/components/common/ShareMailModal.tsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
-import close from '@/assets/closebtn.svg';
 import { Scrollbars } from 'react-custom-scrollbars-2';
 import { useMutation } from '@tanstack/react-query';
-import { shareSurveyAPI } from '@/api/surveyMenu';
 import { AxiosError } from 'axios';
-import { ApiResponseError } from '@/types/apiResponseError';
+import { shareSurveyAPI } from '../../api/surveyMenu';
+import close from '../../assets/closebtn.svg';
+import { ApiResponseError } from '../../types/apiResponseError';
 import { AddButton, TextButton } from './Button';
 import Alert from './Alert';
 import Loading from './Loading';

diff --git a/frontend/src/components/createSurvey/CreateQuestionMenu.tsx b/frontend/src/components/createSurvey/CreateQuestionMenu.tsx
@@ -1,7 +1,7 @@
-import createMultiple from '@/assets/createMultiple.svg';
-import createCheck from '@/assets/createCheck.svg';
-import createDrop from '@/assets/createDrop.svg';
-import createSubjective from '@/assets/createSubjective.svg';
+import createMultiple from '../../assets/createMultiple.svg';
+import createCheck from '../../assets/createCheck.svg';
+import createDrop from '../../assets/createDrop.svg';
+import createSubjective from '../../assets/createSubjective.svg';
 
 interface CreateQuestionMenuProps {
   onSelect: (type: 'MULTIPLE_CHOICE' | 'SUBJECTIVE_QUESTION' | 'CHECKBOX' | 'DROPDOWN') => void;

diff --git a/frontend/src/components/responsetype/ResponseCheckBox.tsx b/frontend/src/components/responsetype/ResponseCheckBox.tsx
@@ -1,8 +1,8 @@
 import { useState } from 'react';
-import typeIcon from '@/assets/type.svg';
-import checkIcon from '@/assets/check.svg';
-import { QuestionData } from '@/types/questionData';
-import { getRoundedClass } from '@/utils/getRoundedClass';
+import typeIcon from '../../assets/type.svg';
+import checkIcon from '../../assets/check.svg';
+import { QuestionData } from '../../types/questionData';
+import { getRoundedClass } from '../../utils/getRoundedClass';
 
 interface ResponseCheckBoxProps {
   question: QuestionData;

diff --git a/frontend/src/components/responsetype/ResponseDropDown.tsx b/frontend/src/components/responsetype/ResponseDropDown.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
-import typeIcon from '@/assets/type.svg';
-import { QuestionData } from '@/types/questionData';
+import typeIcon from '../../assets/type.svg';
+import { QuestionData } from '../../types/questionData';
 
 interface ResponseDropDownProps {
   question: QuestionData;

diff --git a/frontend/src/components/responsetype/ResponseMultipleChoice.tsx b/frontend/src/components/responsetype/ResponseMultipleChoice.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
-import typeIcon from '@/assets/type.svg';
-import { QuestionData } from '@/types/questionData';
-import { getRoundedClass } from '@/utils/getRoundedClass';
+import typeIcon from '../../assets/type.svg';
+import { QuestionData } from '../../types/questionData';
+import { getRoundedClass } from '../../utils/getRoundedClass';
 
 interface ResponseMultipleChoiceProps {
   question: QuestionData; // 수정된 QuestionData 타입 사용

diff --git a/frontend/src/components/responsetype/ResponseSubjective.tsx b/frontend/src/components/responsetype/ResponseSubjective.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
-import typeIcon from '@/assets/type.svg';
-import { QuestionData } from '@/types/questionData';
+import typeIcon from '../../assets/type.svg';
+import { QuestionData } from '../../types/questionData';
 
 interface ResponseSubjectiveProps {
   question: QuestionData;

diff --git a/frontend/src/components/staticresponse/StaticCheckBox.tsx b/frontend/src/components/staticresponse/StaticCheckBox.tsx
@@ -1,7 +1,7 @@
-import typeIcon from '@/assets/type.svg';
-import checkIcon from '@/assets/check.svg';
-import { ExtendedQuestionData } from '@/types/questionData';
-import { getRoundedClass } from '@/utils/getRoundedClass';
+import typeIcon from '../../assets/type.svg';
+import checkIcon from '../../assets/check.svg';
+import { ExtendedQuestionData } from '../../types/questionData';
+import { getRoundedClass } from '../../utils/getRoundedClass';
 
 interface StaticCheckBoxProps {
   question: ExtendedQuestionData;

diff --git a/frontend/src/components/staticresponse/StaticDropDown.tsx b/frontend/src/components/staticresponse/StaticDropDown.tsx
@@ -1,5 +1,5 @@
-import typeIcon from '@/assets/type.svg';
-import { ExtendedQuestionData } from '@/types/questionData';
+import typeIcon from '../../assets/type.svg';
+import { ExtendedQuestionData } from '../../types/questionData';
 
 interface StaticDropDownProps {
   question: ExtendedQuestionData;

diff --git a/frontend/src/components/staticresponse/StaticMultipleChoice.tsx b/frontend/src/components/staticresponse/StaticMultipleChoice.tsx
@@ -1,6 +1,6 @@
-import typeIcon from '@/assets/type.svg';
-import { ExtendedQuestionData } from '@/types/questionData';
-import { getRoundedClass } from '@/utils/getRoundedClass';
+import typeIcon from '../../assets/type.svg';
+import { ExtendedQuestionData } from '../../types/questionData';
+import { getRoundedClass } from '../../utils/getRoundedClass';
 
 interface StiticMultipleChoiceProps {
   question: ExtendedQuestionData;

diff --git a/frontend/src/components/staticresponse/StaticSubjective.tsx b/frontend/src/components/staticresponse/StaticSubjective.tsx
@@ -1,5 +1,5 @@
-import typeIcon from '@/assets/type.svg';
-import { ExtendedQuestionData } from '@/types/questionData';
+import typeIcon from '../../assets/type.svg';
+import { ExtendedQuestionData } from '../../types/questionData';
 
 interface StaticSubjectiveProps {
   question: ExtendedQuestionData;

diff --git a/frontend/src/components/survey/DeleteSurvey.tsx b/frontend/src/components/survey/DeleteSurvey.tsx
@@ -1,9 +1,9 @@
-import { deleteSurveyAPI } from '@/api/deleteSurvey';
 import { useMutation } from '@tanstack/react-query';
-import Alert from '@/components/common/Alert';
 import { AxiosError } from 'axios';
 import { useState } from 'react';
-import { getClient } from '@/queryClient';
+import Alert from '../common/Alert';
+import { deleteSurveyAPI } from '../../api/deleteSurvey';
+import { getClient } from '../../queryClient';
 
 interface DeleteSurveyProps {
   surveyId: number;

diff --git a/frontend/src/components/survey/SurveyCover.tsx b/frontend/src/components/survey/SurveyCover.tsx
@@ -1,12 +1,12 @@
-import participants from '@/assets/participants.svg';
-import { calculateRemainingDays } from '@/utils/calculateRemainingDays';
 import { useState } from 'react';
-import openIcon from '@/assets/open.svg';
-import privateIcon from '@/assets/private.svg';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { Survey } from '@/types/survey';
-import noImage from '@/assets/noImage.png';
-import { useAuthStore } from '@/store/AuthStore';
+import participants from '../../assets/participants.svg';
+import { calculateRemainingDays } from '../../utils/calculateRemainingDays';
+import openIcon from '../../assets/open.svg';
+import privateIcon from '../../assets/private.svg';
+import { Survey } from '../../types/survey';
+import noImage from '../../assets/noImage.png';
+import { useAuthStore } from '../../store/AuthStore';
 import SurveyCoverMenu from './SurveyCoverMenu';
 
 function SurveyCover({

diff --git a/frontend/src/components/survey/SurveyCoverMenu.tsx b/frontend/src/components/survey/SurveyCoverMenu.tsx
@@ -1,11 +1,11 @@
 import { useLocation, useNavigate } from 'react-router-dom';
 import { useState } from 'react';
-import menuSee from '@/assets/menuSee.svg';
-import menuLink from '@/assets/menuLink.svg';
-import menuAnalysis from '@/assets/menuAnalysis.svg';
-import menuEdit from '@/assets/menuEdit.svg';
-import menuDel from '@/assets/menuDel.svg';
-import { useAuthStore } from '@/store/AuthStore';
+import menuSee from '../../assets/menuSee.svg';
+import menuLink from '../../assets/menuLink.svg';
+import menuAnalysis from '../../assets/menuAnalysis.svg';
+import menuEdit from '../../assets/menuEdit.svg';
+import menuDel from '../../assets/menuDel.svg';
+import { useAuthStore } from '../../store/AuthStore';
 import ShareMailModal from '../common/ShareMailModal';
 import DeleteSurvey from './DeleteSurvey';
 

diff --git a/frontend/src/components/survey/SurveyForm.tsx b/frontend/src/components/survey/SurveyForm.tsx
@@ -1,8 +1,8 @@
-import { SurveyCoverType } from '@/types/survey';
-import search from '@/assets/search.svg';
-import { AddButton } from '@/components/common/Button';
 import { Pagination } from '@mui/material';
 import { useLocation } from 'react-router-dom';
+import { SurveyCoverType } from '../../types/survey';
+import search from '../../assets/search.svg';
+import { AddButton } from '../common/Button';
 import SurveyCover from './SurveyCover';
 
 interface SurvayFormProps {
@@ -25,7 +25,8 @@ function SurveyForm({
   const location = useLocation();
 
   console.log('전달된 surveyData:', surveyData);
-  console.log('검색 결과:', surveyData.surveys);
+  console.log('검색:', surveyData.surveys);
+
   return (
     <div className="flex flex-col items-center pt-6">
       <div className="flex justify-between w-[25rem] h-12 px-7 py-3 rounded-[1.875rem] border-2 border-gray border-solid gap-7 hover:border-darkGray transition duration-300 ease-in-out">

diff --git a/frontend/src/components/surveyResult/Question/PieChart.tsx b/frontend/src/components/surveyResult/Question/PieChart.tsx
@@ -1,6 +1,6 @@
-import typeIcon from '@/assets/type.svg';
-import { QuestionData } from '@/types/questionData';
 import Chart from 'react-apexcharts';
+import typeIcon from '../../../assets/type.svg';
+import { QuestionData } from '../../../types/questionData';
 
 interface PieChartProps {
   index: number;

diff --git a/frontend/src/components/surveyResult/Question/Question.tsx b/frontend/src/components/surveyResult/Question/Question.tsx
@@ -1,4 +1,4 @@
-import { QuestionData } from '@/types/questionData';
+import { QuestionData } from '../../../types/questionData';
 import PieChart from './PieChart';
 import SubjectQuestion from './SubjectQuestion';
 

diff --git a/frontend/src/components/surveyResult/Question/SubjectQuestion.tsx b/frontend/src/components/surveyResult/Question/SubjectQuestion.tsx
@@ -1,7 +1,7 @@
 import { Scrollbars } from 'react-custom-scrollbars-2';
-import typeIcon from '@/assets/type.svg';
-import { QuestionData } from '@/types/questionData';
-import t from '@/assets/t.svg';
+import typeIcon from '../../../assets/type.svg';
+import { QuestionData } from '../../../types/questionData';
+import t from '../../../assets/t.svg';
 
 interface SubjectQuestionProps {
   index: number;

diff --git a/frontend/src/components/surveyResult/Response/Response.tsx b/frontend/src/components/surveyResult/Response/Response.tsx
@@ -1,10 +1,10 @@
-import { getExcelDownloadAPI } from '@/api/getResult';
-import Alert from '@/components/common/Alert';
-import Loading from '@/components/common/Loading';
-import { ListData } from '@/types/answerData';
 import { DataGrid, GridColDef } from '@mui/x-data-grid';
 import { useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
+import { getExcelDownloadAPI } from '../../../api/getResult';
+import Alert from '../../common/Alert';
+import Loading from '../../common/Loading';
+import { ListData } from '../../../types/answerData';
 
 interface ResponseProps {
   title: string;

diff --git a/frontend/src/components/surveytype/CheckBox.tsx b/frontend/src/components/surveytype/CheckBox.tsx
@@ -5,7 +5,7 @@ import copyIcon from '../../assets/copy.svg';
 import deleteIcon from '../../assets/delete.svg';
 import imageaddIcon from '../../assets/imageadd.svg';
 import trashcanIcon from '../../assets/trashcan.svg';
-// import checkIcon from '../../assets/check.svg';
+import checkIcon from '../../assets/check.svg';
 import { EditableObjectiveQuestion } from '../../types/editableSurvey';
 import { uploadS3 } from '../../utils/s3ImgUpload';
 

diff --git a/frontend/src/components/surveytype/MultipleChoice.tsx b/frontend/src/components/surveytype/MultipleChoice.tsx
@@ -8,6 +8,7 @@ import trashcanIcon from '../../assets/trashcan.svg';
 import { EditableObjectiveQuestion } from '../../types/editableSurvey';
 import { uploadS3 } from '../../utils/s3ImgUpload';
 
+
 interface MultipleChoiceProps {
   index: number;
   data: EditableObjectiveQuestion;

diff --git a/frontend/src/components/surveytype/Subjective.tsx b/frontend/src/components/surveytype/Subjective.tsx
@@ -7,6 +7,7 @@ import trashcanIcon from '../../assets/trashcan.svg';
 import { EditableSubjectiveQuestion } from '../../types/editableSurvey';
 import { uploadS3 } from '../../utils/s3ImgUpload';
 
+
 interface SubjectiveProps {
   index: number;
   data: EditableSubjectiveQuestion;