diff --git a/package-lock.json b/package-lock.json index 3df45847..52ea8794 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15958,9 +15958,9 @@ } }, "node_modules/vite": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.3.tgz", - "integrity": "sha512-5nXH+QsELbFKhsEfWLkHrvgRpTdGJzqOZ+utSdmPTvwHmvU6ITTm3xx+mRusihkcI8GeC7lCDyn3kDtiki9scw==", + "version": "6.3.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", + "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", "dev": true, "license": "MIT", "dependencies": { @@ -16486,9 +16486,9 @@ } }, "node_modules/vite-node/node_modules/vite": { - "version": "5.4.18", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.18.tgz", - "integrity": "sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==", + "version": "5.4.19", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz", + "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==", "dev": true, "license": "MIT", "dependencies": { @@ -17152,9 +17152,9 @@ } }, "node_modules/vitest/node_modules/vite": { - "version": "5.4.18", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.18.tgz", - "integrity": "sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==", + "version": "5.4.19", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz", + "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/src/components/common/ProtectRoute.tsx b/src/components/common/ProtectRoute.tsx index 47199d48..2767d52e 100644 --- a/src/components/common/ProtectRoute.tsx +++ b/src/components/common/ProtectRoute.tsx @@ -3,7 +3,7 @@ import useAuthStore from '../../store/authStore'; import { Navigate } from 'react-router-dom'; import { useModal } from '../../hooks/useModal'; import Modal from './modal/Modal'; -import { MODAL_MESSAGE } from '../../constants/modalMessage'; +import { MODAL_MESSAGE } from '../../constants/user/modalMessage'; interface ProtectRouteProps extends PropsWithChildren { redirectUrl: string; } diff --git a/src/components/common/dropDown/DropDown.tsx b/src/components/common/dropDown/DropDown.tsx index f6dd2d4f..515f87a0 100644 --- a/src/components/common/dropDown/DropDown.tsx +++ b/src/components/common/dropDown/DropDown.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import * as S from './DropDown.styled'; -import { useOutsideClick } from '../../../hooks/useOutsideClick'; import { DropDownContext } from '../../../context/DropDownContext'; +import { useOutsideClick } from '../../../hooks/user/useOutsideClick'; interface DropDownProps { children: React.ReactNode; diff --git a/src/components/common/modal/Modal.tsx b/src/components/common/modal/Modal.tsx index 0cc35696..0a081d8a 100644 --- a/src/components/common/modal/Modal.tsx +++ b/src/components/common/modal/Modal.tsx @@ -2,7 +2,7 @@ import { PropsWithChildren, useState } from 'react'; import { createPortal } from 'react-dom'; import { CheckCircleIcon } from '@heroicons/react/24/outline'; import ScrollPreventor from './ScrollPreventor'; -import { useOutsideClick } from '../../../hooks/useOutsideClick'; +import { useOutsideClick } from '../../../hooks/user/useOutsideClick'; import { ModalWrapper } from './ModalWrapper'; interface ModalProps { diff --git a/src/components/common/sidebar/editMyProfileImg/EditMyProfileImg.tsx b/src/components/common/sidebar/editMyProfileImg/EditMyProfileImg.tsx index 32b129c0..11e19043 100644 --- a/src/components/common/sidebar/editMyProfileImg/EditMyProfileImg.tsx +++ b/src/components/common/sidebar/editMyProfileImg/EditMyProfileImg.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUploadProfileImg } from '../../../../hooks/useMyInfo'; +import { useUploadProfileImg } from '../../../../hooks/user/useMyInfo'; import * as S from './EditMyProfileImg.styled'; import { PhotoIcon } from '@heroicons/react/24/outline'; import { useModal } from '../../../../hooks/useModal'; diff --git a/src/components/common/skillTagBox/SkillTagBox.tsx b/src/components/common/skillTagBox/SkillTagBox.tsx index 5a769750..d59aa050 100644 --- a/src/components/common/skillTagBox/SkillTagBox.tsx +++ b/src/components/common/skillTagBox/SkillTagBox.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import { useSearchFilteringSkillTag } from '../../../hooks/useSearchFilteringSkillTag'; +import { useSearchFilteringSkillTag } from '../../../hooks/user/useSearchFilteringSkillTag'; import SkillTag from './skillTag/SkillTag'; import * as S from './SkillTagBox.styled'; import { ArrowUturnLeftIcon } from '@heroicons/react/24/outline'; -import { useSaveSearchFiltering } from '../../../hooks/useSaveSearchFiltering'; +import { useSaveSearchFiltering } from '../../../hooks/user/useSaveSearchFiltering'; export interface SkillTagBoxProps { width: string; diff --git a/src/components/user/applyComponents/careersComponent/CareersComponent.tsx b/src/components/user/applyComponents/careersComponent/CareersComponent.tsx index 4e9fb634..61511ee7 100644 --- a/src/components/user/applyComponents/careersComponent/CareersComponent.tsx +++ b/src/components/user/applyComponents/careersComponent/CareersComponent.tsx @@ -1,8 +1,8 @@ import { Control, useFieldArray } from 'react-hook-form'; import * as S from './CareersComponent.styled'; import CareerInput from './careersInputComponent/CareersComponentInput'; -import { CAREER_INPUT } from '../../../constants/projectConstants'; -import { ApplySchemeType } from '../../../models/joinProject'; +import { CAREER_INPUT } from '../../../../constants/user/projectConstants'; +import type { ApplySchemeType } from '../../../../models/joinProject'; interface CareersComponentProps { control: Control; diff --git a/src/components/user/applyComponents/phoneComponent/PhoneComponent.tsx b/src/components/user/applyComponents/phoneComponent/PhoneComponent.tsx index bdddc0ca..799fca87 100644 --- a/src/components/user/applyComponents/phoneComponent/PhoneComponent.tsx +++ b/src/components/user/applyComponents/phoneComponent/PhoneComponent.tsx @@ -1,7 +1,7 @@ import * as S from './PhoneComponent.styled'; import { Control, FieldErrors } from 'react-hook-form'; import PhoneInput from './phoneComponentInput/PhoneComponentInput'; -import { ApplySchemeType } from '../../../models/joinProject'; +import type { ApplySchemeType } from '../../../../models/joinProject'; interface PhoneComponentProps { control: Control; diff --git a/src/components/user/comment/CommentLayout.tsx b/src/components/user/comment/CommentLayout.tsx index 6140a2b8..055d3ec5 100644 --- a/src/components/user/comment/CommentLayout.tsx +++ b/src/components/user/comment/CommentLayout.tsx @@ -1,7 +1,7 @@ import * as S from './CommentLayout.styled'; import CommentInput from './commentInput/CommentInput'; -import LoadingSpinner from '../common/loadingSpinner/LoadingSpinner'; -import useGetComment from '../../hooks/CommentHooks/useGetComment'; +import LoadingSpinner from '../../common/loadingSpinner/LoadingSpinner'; +import useGetComment from '../../../hooks/user/CommentHooks/useGetComment'; import CommentComponentLayout from './commentComponent/CommentComponentLayout'; interface CommentLayoutProps { diff --git a/src/components/user/comment/DropDownItem.tsx b/src/components/user/comment/DropDownItem.tsx index 9fa01998..f6de9cf5 100644 --- a/src/components/user/comment/DropDownItem.tsx +++ b/src/components/user/comment/DropDownItem.tsx @@ -1,6 +1,6 @@ -import useDeleteComment from '../../hooks/CommentHooks/useDeleteComment'; -import useDeleteReply from '../../hooks/CommentHooks/useDeleteReply'; -import { useModal } from '../../hooks/useModal'; +import useDeleteComment from '../../../hooks/user/CommentHooks/useDeleteComment'; +import useDeleteReply from '../../../hooks/user/CommentHooks/useDeleteReply'; +import { useModal } from '../../../hooks/useModal'; import ReportModal from '../reportComponent/ReportModal'; import * as S from './DropDownItem.styled'; diff --git a/src/components/user/comment/commentComponent/CommentComponentLayout.tsx b/src/components/user/comment/commentComponent/CommentComponentLayout.tsx index 51a10dfe..1668babf 100644 --- a/src/components/user/comment/commentComponent/CommentComponentLayout.tsx +++ b/src/components/user/comment/commentComponent/CommentComponentLayout.tsx @@ -1,9 +1,9 @@ import * as S from './CommentComponentLayout.styled'; -import DropDown from '../../common/dropDown/DropDown'; +import DropDown from '../../../common/dropDown/DropDown'; import DropDownItem from '../DropDownItem'; -import { CommentType } from '../../../models/comment'; +import { CommentType } from '../../../../models/comment'; import dropdownButton from '../../../assets/dropdownButton.svg'; -import useComment from '../../../hooks/CommentHooks/useComment'; +import useComment from '../../../../hooks/user/CommentHooks/useComment'; import ReplyComponent from '../replyComponent/ReplyComponent'; import ArrowDown from '../../../assets/ArrowDown.svg'; import ArrowUp from '../../../assets/ArrowUp.svg'; diff --git a/src/components/user/comment/commentInput/CommentInput.tsx b/src/components/user/comment/commentInput/CommentInput.tsx index 87c782b1..068e5da9 100644 --- a/src/components/user/comment/commentInput/CommentInput.tsx +++ b/src/components/user/comment/commentInput/CommentInput.tsx @@ -1,15 +1,15 @@ import * as S from './CommentInput.styled'; import { Dispatch, SetStateAction, useEffect } from 'react'; -import { useMyProfileInfo } from '../../../hooks/useMyInfo'; -import { formatImgPath } from '../../../util/formatImgPath'; +import { useMyProfileInfo } from '../../../../hooks/user/useMyInfo'; +import { formatImgPath } from '../../../../util/formatImgPath'; import DefaultImg from '../../../assets/defaultImg.png'; -import Avatar from '../../common/avatar/Avatar'; +import Avatar from '../../../common/avatar/Avatar'; import { useForm } from 'react-hook-form'; -import useInputFocus from '../../../hooks/useInputFocus'; -import usePostReply from '../../../hooks/CommentHooks/usePostReply'; -import usePatchReply from '../../../hooks/CommentHooks/usePatchReply'; -import usePostComment from '../../../hooks/CommentHooks/usePostComment'; -import usePutComment from '../../../hooks/CommentHooks/usePutComment'; +import useInputFocus from '../../../../hooks/user/useInputFocus'; +import usePostReply from '../../../../hooks/user/CommentHooks/usePostReply'; +import usePatchReply from '../../../../hooks/user/CommentHooks/usePatchReply'; +import usePostComment from '../../../../hooks/user/CommentHooks/usePostComment'; +import usePutComment from '../../../../hooks/user/CommentHooks/usePutComment'; type FormValue = { commentInput: string; diff --git a/src/components/user/comment/replyComponent/ReplyComponent.tsx b/src/components/user/comment/replyComponent/ReplyComponent.tsx index cbc5599c..401bafba 100644 --- a/src/components/user/comment/replyComponent/ReplyComponent.tsx +++ b/src/components/user/comment/replyComponent/ReplyComponent.tsx @@ -1,15 +1,15 @@ -import Avatar from '../../common/avatar/Avatar'; +import Avatar from '../../../common/avatar/Avatar'; import * as S from './ReplyComponent.styled'; import DefaultImg from '../../../assets/defaultImg.png'; -import useComment from '../../../hooks/CommentHooks/useComment'; -import DropDown from '../../common/dropDown/DropDown'; +import useComment from '../../../../hooks/user/CommentHooks/useComment'; +import DropDown from '../../../common/dropDown/DropDown'; import DropDownItem from '../DropDownItem'; import dropdownButton from '../../../assets/dropdownButton.svg'; import CommentInput from '../commentInput/CommentInput'; -import useGetReply from '../../../hooks/CommentHooks/useGetReply'; -import LoadingSpinner from '../../common/loadingSpinner/LoadingSpinner'; +import useGetReply from '../../../../hooks/user/CommentHooks/useGetReply'; +import LoadingSpinner from '../../../common/loadingSpinner/LoadingSpinner'; import { Link } from 'react-router-dom'; -import { ROUTES } from '../../../constants/routes'; +import { ROUTES } from '../../../../constants/user/routes'; interface ReplyComponentProps { projectId: number; diff --git a/src/components/user/customerService/MoveInquiredLink.tsx b/src/components/user/customerService/MoveInquiredLink.tsx index 44b268c4..a3ada3b7 100644 --- a/src/components/user/customerService/MoveInquiredLink.tsx +++ b/src/components/user/customerService/MoveInquiredLink.tsx @@ -1,5 +1,5 @@ import { useLocation } from 'react-router-dom'; -import { ROUTES } from '../../constants/routes'; +import { ROUTES } from '../../../constants/user/routes'; import * as S from './MoveInquiredLink.styled'; export default function MovedInquiredLink() { diff --git a/src/components/user/customerService/faq/FAQContent.tsx b/src/components/user/customerService/faq/FAQContent.tsx index 785e7278..9df54089 100644 --- a/src/components/user/customerService/faq/FAQContent.tsx +++ b/src/components/user/customerService/faq/FAQContent.tsx @@ -1,5 +1,5 @@ import { ChevronRightIcon, PlusIcon } from '@heroicons/react/24/outline'; -import { FAQ } from '../../../models/customerService'; +import { FAQ } from '../../../../models/customerService'; import * as S from './FAQContent.styled'; import { useState } from 'react'; diff --git a/src/components/user/customerService/inquiry/Inquiry.tsx b/src/components/user/customerService/inquiry/Inquiry.tsx index 6b52699b..3ede44c3 100644 --- a/src/components/user/customerService/inquiry/Inquiry.tsx +++ b/src/components/user/customerService/inquiry/Inquiry.tsx @@ -3,15 +3,15 @@ import { INQUIRY_CATEGORY, INQUIRY_MESSAGE, My_INQUIRIES_MESSAGE, -} from '../../../constants/customerService'; +} from '../../../../constants/user/customerService'; import * as S from './Inquiry.styled'; import { ChevronDownIcon } from '@heroicons/react/24/outline'; import React, { useEffect, useState } from 'react'; -import type { InquiryFormData } from '../../../models/inquiry'; -import { usePostInquiry } from '../../../hooks/usePostInquiry'; +import type { InquiryFormData } from '../../../../models/inquiry'; +import { usePostInquiry } from '../../../../hooks/user/usePostInquiry'; import { useLocation } from 'react-router-dom'; -import { useModal } from '../../../hooks/useModal'; -import Modal from '../../../components/common/modal/Modal'; +import { useModal } from '../../../../hooks/useModal'; +import Modal from '../../../../components/common/modal/Modal'; interface FormStateType { category: string; diff --git a/src/components/user/customerService/notice/NoticeList.tsx b/src/components/user/customerService/notice/NoticeList.tsx index b61099da..cee63047 100644 --- a/src/components/user/customerService/notice/NoticeList.tsx +++ b/src/components/user/customerService/notice/NoticeList.tsx @@ -1,5 +1,5 @@ -import type { NoticeList as TNoticeList } from '../../../models/customerService'; -import { formatDate } from '../../../util/format'; +import type { NoticeList as TNoticeList } from '../../../../models/customerService'; +import { formatDate } from '../../../../util/format'; import * as S from './NoticeList.styled'; interface NoticeProps { diff --git a/src/components/user/customerService/noticeDetail/NoticeDetailBundle.tsx b/src/components/user/customerService/noticeDetail/NoticeDetailBundle.tsx index 05a8f594..e9bdcc44 100644 --- a/src/components/user/customerService/noticeDetail/NoticeDetailBundle.tsx +++ b/src/components/user/customerService/noticeDetail/NoticeDetailBundle.tsx @@ -1,5 +1,5 @@ import { useLocation, useParams } from 'react-router-dom'; -import { useGetNoticeDetail } from '../../../hooks/useGetNoticeDetail'; +import { useGetNoticeDetail } from '../../../../hooks/user/useGetNoticeDetail'; import * as S from './NoticeDetailBundle.styled'; import NoticeDetailBottom from './bottom/NoticeDetailBottom'; import NoticeDetailContent from './content/NoticeDetailContent'; diff --git a/src/components/user/customerService/noticeDetail/bottom/NoticeDetailBottom.tsx b/src/components/user/customerService/noticeDetail/bottom/NoticeDetailBottom.tsx index ff64ec7f..370bf5d3 100644 --- a/src/components/user/customerService/noticeDetail/bottom/NoticeDetailBottom.tsx +++ b/src/components/user/customerService/noticeDetail/bottom/NoticeDetailBottom.tsx @@ -1,5 +1,5 @@ -import type { OtherNotice } from '../../../../models/customerService'; -import ContentBorder from '../../../common/contentBorder/ContentBorder'; +import type { OtherNotice } from '../../../../../models/customerService'; +import ContentBorder from '../../../../common/contentBorder/ContentBorder'; import ListButton from './button/ListButton'; import OtherNoticeButton from './button/OtherNoticeButton'; import * as S from './NoticeDetailBottom.styled'; diff --git a/src/components/user/customerService/noticeDetail/bottom/button/ListButton.tsx b/src/components/user/customerService/noticeDetail/bottom/button/ListButton.tsx index 7fd83b7b..34a15300 100644 --- a/src/components/user/customerService/noticeDetail/bottom/button/ListButton.tsx +++ b/src/components/user/customerService/noticeDetail/bottom/button/ListButton.tsx @@ -1,5 +1,5 @@ -import { ROUTES } from '../../../../../constants/routes'; -import ContentBorder from '../../../../common/contentBorder/ContentBorder'; +import { ROUTES } from '../../../../../../constants/user/routes'; +import ContentBorder from '../../../../../common/contentBorder/ContentBorder'; import * as S from './ListButton.styled'; export default function ListButton() { diff --git a/src/components/user/customerService/noticeDetail/bottom/button/OtherNoticeButton.tsx b/src/components/user/customerService/noticeDetail/bottom/button/OtherNoticeButton.tsx index 76ce3255..6ac55ef8 100644 --- a/src/components/user/customerService/noticeDetail/bottom/button/OtherNoticeButton.tsx +++ b/src/components/user/customerService/noticeDetail/bottom/button/OtherNoticeButton.tsx @@ -1,6 +1,6 @@ -import { ROUTES } from '../../../../../constants/routes'; -import { OtherNotice } from '../../../../../models/customerService'; -import { formatDate } from '../../../../../util/format'; +import { ROUTES } from '../../../../../../constants/user/routes'; +import { OtherNotice } from '../../../../../../models/customerService'; +import { formatDate } from '../../../../../../util/format'; import * as S from './OtherNoticeButton.styled'; interface OtherNoticeButtonProps extends OtherNotice { diff --git a/src/components/user/customerService/noticeDetail/content/NoticeDetailContent.tsx b/src/components/user/customerService/noticeDetail/content/NoticeDetailContent.tsx index 5c2af2a5..45581300 100644 --- a/src/components/user/customerService/noticeDetail/content/NoticeDetailContent.tsx +++ b/src/components/user/customerService/noticeDetail/content/NoticeDetailContent.tsx @@ -1,8 +1,8 @@ import { EyeIcon } from '@heroicons/react/24/outline'; -import { formatDate } from '../../../../util/format'; +import { formatDate } from '../../../../../util/format'; import * as S from './NoticeDetailContent.styled'; import logo from '../../../../assets/mainlogo.svg'; -import ContentBorder from '../../../common/contentBorder/ContentBorder'; +import ContentBorder from '../../../../common/contentBorder/ContentBorder'; interface NoticeDetailContentProps { id: number; diff --git a/src/components/user/evaluation/EvaluationContent.tsx b/src/components/user/evaluation/EvaluationContent.tsx index e64be104..568628f5 100644 --- a/src/components/user/evaluation/EvaluationContent.tsx +++ b/src/components/user/evaluation/EvaluationContent.tsx @@ -1,8 +1,8 @@ import * as S from './EvaluationContent.styled'; -import ScrollPreventor from '../common/modal/ScrollPreventor'; -import useEvaluationStep from '../../hooks/evaluationHooks/useEvaluationStep'; -import { MemberList } from '../../models/evaluation'; -import { optionLabels, questions } from '../../constants/evaluation'; +import ScrollPreventor from '../../common/modal/ScrollPreventor'; +import useEvaluationStep from '../../../hooks/user/evaluationHooks/useEvaluationStep'; +import { MemberList } from '../../../models/evaluation'; +import { optionLabels, questions } from '../../../constants/user/evaluation'; interface EvaluationContentProps { projectId: number; projectName: string; diff --git a/src/components/user/home/projectCardLists/ProjectCardLists.tsx b/src/components/user/home/projectCardLists/ProjectCardLists.tsx index ba5d4020..06ee8194 100644 --- a/src/components/user/home/projectCardLists/ProjectCardLists.tsx +++ b/src/components/user/home/projectCardLists/ProjectCardLists.tsx @@ -1,13 +1,13 @@ import { useEffect, useState } from 'react'; -import { useProjectCardListData } from '../../../hooks/useProjectCardListData'; +import { useProjectCardListData } from '../../../../hooks/user/useProjectCardListData'; import CardList from './cardList/CardList'; import * as S from './ProjectCardLists.styled'; import { Link } from 'react-router-dom'; -import { ROUTES } from '../../../constants/routes'; -import EmptyLoading from '../../common/emptyLoading/EmptyLoading'; -import NoResult from '../../common/noResult/NoResult'; -import { useSaveSearchFiltering } from '../../../hooks/useSaveSearchFiltering'; -import Pagination from '../../common/pagination/Pagination'; +import { ROUTES } from '../../../../constants/user/routes'; +import EmptyLoading from '../../../common/emptyLoading/EmptyLoading'; +import NoResult from '../../../common/noResult/NoResult'; +import { useSaveSearchFiltering } from '../../../../hooks/user/useSaveSearchFiltering'; +import Pagination from '../../../common/pagination/Pagination'; export type Display = 'flex' | 'grid'; diff --git a/src/components/user/home/projectCardLists/cardList/CardList.tsx b/src/components/user/home/projectCardLists/cardList/CardList.tsx index 2b0cdc0e..c31912ce 100644 --- a/src/components/user/home/projectCardLists/cardList/CardList.tsx +++ b/src/components/user/home/projectCardLists/cardList/CardList.tsx @@ -1,10 +1,10 @@ -import PositionButton from '../../../common/positionButton/PositionButton'; +import PositionButton from '../../../../common/positionButton/PositionButton'; import * as S from './CardList.styled'; import beginner from '../../../../assets/beginner.svg'; -import Avatar from '../../../common/avatar/Avatar'; +import Avatar from '../../../../common/avatar/Avatar'; import { EyeIcon } from '@heroicons/react/24/outline'; -import type { ProjectList } from '../../../../models/mainProjectLists'; -import { formatDate } from '../../../../util/formatDate'; +import type { ProjectList } from '../../../../../models/mainProjectLists'; +import { formatDate } from '../../../../../util/formatDate'; interface CardListProps { list: ProjectList; diff --git a/src/components/user/home/projectStats/ProjectStats.tsx b/src/components/user/home/projectStats/ProjectStats.tsx index 44e396d5..ad0e7e99 100644 --- a/src/components/user/home/projectStats/ProjectStats.tsx +++ b/src/components/user/home/projectStats/ProjectStats.tsx @@ -1,4 +1,4 @@ -import { useProjectStatistic } from '../../../hooks/useProjectStatistic'; +import { useProjectStatistic } from '../../../../hooks/user/useProjectStatistic'; import ProjectStat from './projectStat/ProjectStat'; import * as S from './ProjectStats.styled'; diff --git a/src/components/user/home/searchFiltering/filteringContents/FilteringContents.tsx b/src/components/user/home/searchFiltering/filteringContents/FilteringContents.tsx index 827d19ae..30398fd2 100644 --- a/src/components/user/home/searchFiltering/filteringContents/FilteringContents.tsx +++ b/src/components/user/home/searchFiltering/filteringContents/FilteringContents.tsx @@ -2,12 +2,12 @@ import Filtering from './filtering/Filtering'; import * as S from './FilteringContents.styled'; import beginner from '../../../../assets/beginner.svg'; import { ChevronDownIcon } from '@heroicons/react/24/outline'; -import SkillTagBox from '../../../common/skillTagBox/SkillTagBox'; +import SkillTagBox from '../../../../common/skillTagBox/SkillTagBox'; import React, { useState } from 'react'; -import { useSearchFilteringSkillTag } from '../../../../hooks/useSearchFilteringSkillTag'; -import { useOutsideClick } from '../../../../hooks/useOutsideClick'; -import { useSaveSearchFiltering } from '../../../../hooks/useSaveSearchFiltering'; -import { SEARCH_FILTERING_DEFAULT_VALUE } from '../../../../constants/homeConstants'; +import { useSearchFilteringSkillTag } from '../../../../../hooks/user/useSearchFilteringSkillTag'; +import { useOutsideClick } from '../../../../../hooks/user/useOutsideClick'; +import { useSaveSearchFiltering } from '../../../../../hooks/user/useSaveSearchFiltering'; +import { SEARCH_FILTERING_DEFAULT_VALUE } from '../../../../../constants/user/homeConstants'; export default function FilteringContents() { const { positionTagsData, methodTagsData } = useSearchFilteringSkillTag(); diff --git a/src/components/user/home/searchFiltering/search/Search.tsx b/src/components/user/home/searchFiltering/search/Search.tsx index 71d1f4f0..5e7dc249 100644 --- a/src/components/user/home/searchFiltering/search/Search.tsx +++ b/src/components/user/home/searchFiltering/search/Search.tsx @@ -1,7 +1,7 @@ import { MagnifyingGlassIcon, XCircleIcon } from '@heroicons/react/24/outline'; import * as S from './Search.styled'; -import { useSaveSearchFiltering } from '../../../../hooks/useSaveSearchFiltering'; import React, { useState } from 'react'; +import { useSaveSearchFiltering } from '../../../../../hooks/user/useSaveSearchFiltering'; export default function Search() { const { searchFilters, handleUpdateFilters } = useSaveSearchFiltering(); diff --git a/src/components/user/manageProjects/Card.tsx b/src/components/user/manageProjects/Card.tsx index 701998ae..3800ea8e 100644 --- a/src/components/user/manageProjects/Card.tsx +++ b/src/components/user/manageProjects/Card.tsx @@ -1,7 +1,7 @@ import * as S from './Card.styled'; -import type { ManagedProject } from '../../models/manageMyProject'; -import AvatarList from '../common/avatar/AvatarList'; -import { formatDate } from '../../util/formatDate'; +import type { ManagedProject } from '../../../models/manageMyProject'; +import AvatarList from '../../common/avatar/AvatarList'; +import { formatDate } from '../../../util/formatDate'; interface CardProps { project: ManagedProject; } diff --git a/src/components/user/manageProjects/CardList.tsx b/src/components/user/manageProjects/CardList.tsx index 2f3936fc..a0976f6d 100644 --- a/src/components/user/manageProjects/CardList.tsx +++ b/src/components/user/manageProjects/CardList.tsx @@ -1,9 +1,9 @@ import * as S from './CardList.styled'; -import type { ManagedProject } from '../../models/manageMyProject'; +import type { ManagedProject } from '../../../models/manageMyProject'; import Card from './Card'; import CreateButton from '../../assets/createProjectButton.svg'; -import { ROUTES } from '../../constants/routes'; +import { ROUTES } from '../../../constants/user/routes'; interface CardListProps { projects: ManagedProject[]; diff --git a/src/components/user/manageProjects/ProjectHeader.tsx b/src/components/user/manageProjects/ProjectHeader.tsx index 8a025b51..b4817e1f 100644 --- a/src/components/user/manageProjects/ProjectHeader.tsx +++ b/src/components/user/manageProjects/ProjectHeader.tsx @@ -1,6 +1,6 @@ import * as S from './ProjectHeader.styled'; -import Title from '../common/title/Title'; -import { ProjectDetailPlusExtended } from '../../models/projectDetail'; +import Title from '../../common/title/Title'; +import { ProjectDetailPlusExtended } from '../../../models/projectDetail'; import RecruitmentDate from './RecruitmentDate'; import React from 'react'; interface ProjectHeaderProps { diff --git a/src/components/user/manageProjects/RecruitmentDate.tsx b/src/components/user/manageProjects/RecruitmentDate.tsx index 9344423d..c8b5fecf 100644 --- a/src/components/user/manageProjects/RecruitmentDate.tsx +++ b/src/components/user/manageProjects/RecruitmentDate.tsx @@ -1,5 +1,5 @@ -import { ProjectDetailPlus } from '../../models/projectDetail'; -import { formatDate } from '../../util/formatDate'; +import { ProjectDetailPlus } from '../../../models/projectDetail'; +import { formatDate } from '../../../util/formatDate'; import * as S from './RecruitmentDate.styled'; interface RecruitmentDateProps { ProjectData: ProjectDetailPlus; diff --git a/src/components/user/manageProjects/applicantInfo/ApplicantInfo.tsx b/src/components/user/manageProjects/applicantInfo/ApplicantInfo.tsx index b2e31b00..de693d47 100644 --- a/src/components/user/manageProjects/applicantInfo/ApplicantInfo.tsx +++ b/src/components/user/manageProjects/applicantInfo/ApplicantInfo.tsx @@ -1,8 +1,8 @@ import * as S from './ApplicantInfo.styled'; -import { ApplicantInfo as MApplicantInfo } from '../../../models/applicant'; -import AvatarList from '../../common/avatar/AvatarList'; +import { ApplicantInfo as MApplicantInfo } from '../../../../models/applicant'; +import AvatarList from '../../../common/avatar/AvatarList'; import { LabelWithContent } from './LabelWithContent'; -import { formatDate } from '../../../util/format'; +import { formatDate } from '../../../../util/format'; interface ApplicantInfoProps { applicantInfo: MApplicantInfo; } diff --git a/src/components/user/manageProjects/applicantList/ApplicantItem.tsx b/src/components/user/manageProjects/applicantList/ApplicantItem.tsx index 5a085eaf..4502599e 100644 --- a/src/components/user/manageProjects/applicantList/ApplicantItem.tsx +++ b/src/components/user/manageProjects/applicantList/ApplicantItem.tsx @@ -1,5 +1,5 @@ import { useEffect, useRef } from 'react'; -import { ApplicantInfo } from '../../../models/applicant'; +import { ApplicantInfo } from '../../../../models/applicant'; import * as S from './ApplicantItem.styled'; interface ApplicantItemProps { diff --git a/src/components/user/manageProjects/applicantList/ApplicantList.tsx b/src/components/user/manageProjects/applicantList/ApplicantList.tsx index 631e693e..d8edc662 100644 --- a/src/components/user/manageProjects/applicantList/ApplicantList.tsx +++ b/src/components/user/manageProjects/applicantList/ApplicantList.tsx @@ -1,5 +1,5 @@ import * as S from './ApplicantList.styled'; -import { ApplicantInfo } from '../../../models/applicant'; +import { ApplicantInfo } from '../../../../models/applicant'; import ApplicantItem from './ApplicantItem'; interface ApplicantListProps { selectedApplicant?: number; diff --git a/src/components/user/manageProjects/passNonPassList/PassNonPassItem.tsx b/src/components/user/manageProjects/passNonPassList/PassNonPassItem.tsx index f46f4603..78476d23 100644 --- a/src/components/user/manageProjects/passNonPassList/PassNonPassItem.tsx +++ b/src/components/user/manageProjects/passNonPassList/PassNonPassItem.tsx @@ -1,6 +1,6 @@ -import { useMutationParams } from '../../../hooks/usePassNonPassMutation'; -import { ApplicantInfo } from '../../../models/applicant'; -import { ProjectDetailPlusExtended } from '../../../models/projectDetail'; +import { useMutationParams } from '../../../../hooks/user/usePassNonPassMutation'; +import { ApplicantInfo } from '../../../../models/applicant'; +import { ProjectDetailPlusExtended } from '../../../../models/projectDetail'; import DeleteButton from './DeleteButton'; import * as S from './PassNonPassItem.styled'; diff --git a/src/components/user/manageProjects/passNonPassList/PassNonPassList.tsx b/src/components/user/manageProjects/passNonPassList/PassNonPassList.tsx index e1d65ed0..8571f160 100644 --- a/src/components/user/manageProjects/passNonPassList/PassNonPassList.tsx +++ b/src/components/user/manageProjects/passNonPassList/PassNonPassList.tsx @@ -1,7 +1,7 @@ import { useNavigate } from 'react-router-dom'; -import { useMutationParams } from '../../../hooks/usePassNonPassMutation'; -import { ApplicantInfo } from '../../../models/applicant'; -import { ProjectDetailPlusExtended } from '../../../models/projectDetail'; +import { useMutationParams } from '../../../../hooks/user/usePassNonPassMutation'; +import { ApplicantInfo } from '../../../../models/applicant'; +import { ProjectDetailPlusExtended } from '../../../../models/projectDetail'; import PassNonPassItem from './PassNonPassItem'; import * as S from './PassNonPassList.styled'; diff --git a/src/hooks/user/CommentHooks/useDeleteComment.ts b/src/hooks/user/CommentHooks/useDeleteComment.ts index 4724a2d3..5c9a4c22 100644 --- a/src/hooks/user/CommentHooks/useDeleteComment.ts +++ b/src/hooks/user/CommentHooks/useDeleteComment.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { ProjectCommentList } from '../../queries/user/keys'; -import { deleteComment } from '../../api/comment.api'; +import { deleteComment } from '../../../api/comment.api'; const useDeleteComment = (id: number) => { const queryClient = useQueryClient(); diff --git a/src/hooks/user/CommentHooks/useDeleteReply.ts b/src/hooks/user/CommentHooks/useDeleteReply.ts index 3d1ed85b..923911c2 100644 --- a/src/hooks/user/CommentHooks/useDeleteReply.ts +++ b/src/hooks/user/CommentHooks/useDeleteReply.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { ProjectReplyList } from '../../queries/user/keys'; -import { deleteReply } from '../../api/reply.api'; +import { deleteReply } from '../../../api/reply.api'; const useDeleteReply = (commentId: number, projectId: number) => { const queryClient = useQueryClient(); diff --git a/src/hooks/user/CommentHooks/useGetComment.ts b/src/hooks/user/CommentHooks/useGetComment.ts index 77e1e578..b36c6b5a 100644 --- a/src/hooks/user/CommentHooks/useGetComment.ts +++ b/src/hooks/user/CommentHooks/useGetComment.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { getComment } from '../../api/comment.api'; +import { getComment } from '../../../api/comment.api'; import { ProjectCommentList } from '../../queries/user/keys'; const useGetComment = (id: number) => { diff --git a/src/hooks/user/CommentHooks/useGetReply.ts b/src/hooks/user/CommentHooks/useGetReply.ts index 73f58b94..340a2ece 100644 --- a/src/hooks/user/CommentHooks/useGetReply.ts +++ b/src/hooks/user/CommentHooks/useGetReply.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; import { ProjectReplyList } from '../../queries/user/keys'; -import { getReply } from '../../api/reply.api'; +import { getReply } from '../../../api/reply.api'; const useGetReply = (projectId: number, commentId: number) => { const { data, isLoading, isFetching, isError } = useQuery({ diff --git a/src/hooks/user/CommentHooks/usePatchReply.ts b/src/hooks/user/CommentHooks/usePatchReply.ts index a3cd2747..86e2d4b9 100644 --- a/src/hooks/user/CommentHooks/usePatchReply.ts +++ b/src/hooks/user/CommentHooks/usePatchReply.ts @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { putReply } from '../../api/reply.api'; +import { putReply } from '../../../api/reply.api'; import { ProjectReplyList } from '../../queries/user/keys'; const usePatchReply = ( diff --git a/src/hooks/user/CommentHooks/usePostComment.ts b/src/hooks/user/CommentHooks/usePostComment.ts index 7e3db562..030de7e1 100644 --- a/src/hooks/user/CommentHooks/usePostComment.ts +++ b/src/hooks/user/CommentHooks/usePostComment.ts @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { postComment } from '../../api/comment.api'; +import { postComment } from '../../../api/comment.api'; import { ProjectCommentList } from '../../queries/user/keys'; const usePostComment = (id: number) => { diff --git a/src/hooks/user/CommentHooks/usePostReply.ts b/src/hooks/user/CommentHooks/usePostReply.ts index 2b6ee494..4115fe55 100644 --- a/src/hooks/user/CommentHooks/usePostReply.ts +++ b/src/hooks/user/CommentHooks/usePostReply.ts @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { postReply } from '../../api/reply.api'; +import { postReply } from '../../../api/reply.api'; import { ProjectReplyList } from '../../queries/user/keys'; const usePostReply = (projectId: number, commentId: number) => { diff --git a/src/hooks/user/CommentHooks/usePutComment.ts b/src/hooks/user/CommentHooks/usePutComment.ts index 785eefa1..4a372613 100644 --- a/src/hooks/user/CommentHooks/usePutComment.ts +++ b/src/hooks/user/CommentHooks/usePutComment.ts @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { patchComment } from '../../api/comment.api'; +import { patchComment } from '../../../api/comment.api'; import { ProjectCommentList } from '../../queries/user/keys'; const usePutComment = (id: number, commentId: number) => { const queryClient = useQueryClient(); diff --git a/src/hooks/user/ProjectHooks/useCreateProject.ts b/src/hooks/user/ProjectHooks/useCreateProject.ts index a1106d55..68ebd2bd 100644 --- a/src/hooks/user/ProjectHooks/useCreateProject.ts +++ b/src/hooks/user/ProjectHooks/useCreateProject.ts @@ -1,10 +1,11 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { useNavigate } from 'react-router-dom'; +import { postProject } from '../../../api/joinProject.api'; +import { MODAL_MESSAGE } from '../../../constants/user/modalMessage'; import { managedProjectKey } from '../../queries/user/keys'; import { ROUTES } from '../../../constants/user/routes'; -import { MODAL_MESSAGE } from '../../../constants/user/modalMessage'; -import { postProject } from '../../../api/joinProject.api'; import { FormData } from '../../../models/createProject'; + interface UseCreateProjectProps { handleModalOpen: (newMessage: string) => void; } diff --git a/src/hooks/user/ProjectHooks/useUpdateProject.ts b/src/hooks/user/ProjectHooks/useUpdateProject.ts index 43521895..33726f38 100644 --- a/src/hooks/user/ProjectHooks/useUpdateProject.ts +++ b/src/hooks/user/ProjectHooks/useUpdateProject.ts @@ -1,10 +1,11 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { useNavigate } from 'react-router-dom'; -import { managedProjectKey } from '../../queries/user/keys'; import { putProject } from '../../../api/joinProject.api'; -import { MODAL_MESSAGE } from '../../../constants/user/modalMessage'; +import { managedProjectKey } from '../../queries/user/keys'; import { FormData } from '../../../models/createProject'; +import { MODAL_MESSAGE } from '../../../constants/user/modalMessage'; import { ROUTES } from '../../../constants/user/routes'; + interface UseUpdateProjectProps { id: number; handleModalOpen: (newMessage: string) => void; diff --git a/src/hooks/user/evaluationHooks/useEvaluationStep.ts b/src/hooks/user/evaluationHooks/useEvaluationStep.ts index d4132e2f..45935f13 100644 --- a/src/hooks/user/evaluationHooks/useEvaluationStep.ts +++ b/src/hooks/user/evaluationHooks/useEvaluationStep.ts @@ -1,7 +1,7 @@ import { useEffect, useMemo, useState } from 'react'; -import { usePostEvaluation } from './usePostEvaluation'; import { MemberList } from '../../../models/evaluation'; import { questions } from '../../../constants/user/evaluation'; +import { usePostEvaluation } from './usePostEvaluation'; interface useEvaluationStepProps { projectId: number; diff --git a/src/hooks/user/evaluationHooks/useGetEvaluation.ts b/src/hooks/user/evaluationHooks/useGetEvaluation.ts index ac8f38e6..07fab730 100644 --- a/src/hooks/user/evaluationHooks/useGetEvaluation.ts +++ b/src/hooks/user/evaluationHooks/useGetEvaluation.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { ProjectMemberListEval } from '../../queries/user/keys'; import { getEvaluation } from '../../../api/evaluation.api'; +import { ProjectMemberListEval } from '../../queries/user/keys'; const useGetCompletedEvaluation = (id: number) => { const { data, isLoading, isFetching, isError } = useQuery({ diff --git a/src/hooks/user/evaluationHooks/usePostEvaluation.ts b/src/hooks/user/evaluationHooks/usePostEvaluation.ts index 082d8346..d436546c 100644 --- a/src/hooks/user/evaluationHooks/usePostEvaluation.ts +++ b/src/hooks/user/evaluationHooks/usePostEvaluation.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; +import { postEvaluation } from '../../../api/evaluation.api'; import { ProjectMemberListEval } from '../../queries/user/keys'; import { apiEvaluatedUser } from '../../../models/evaluation'; -import { postEvaluation } from '../../../api/evaluation.api'; export const usePostEvaluation = (projectId: number) => { const queryClient = useQueryClient(); diff --git a/src/hooks/user/useAlarmDelete.ts b/src/hooks/user/useAlarmDelete.ts index 663d0313..16f437f7 100644 --- a/src/hooks/user/useAlarmDelete.ts +++ b/src/hooks/user/useAlarmDelete.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { deleteAlarm } from '../api/alarm.api'; +import { deleteAlarm } from '../../api/alarm.api'; import { AlarmList } from '../queries/user/keys'; -import useAuthStore from '../store/authStore'; +import useAuthStore from '../../store/authStore'; export const useAlarmDelete = () => { const userId = useAuthStore((state) => state.userData?.id); diff --git a/src/hooks/user/useAlarmList.ts b/src/hooks/user/useAlarmList.ts index 899b3e8d..c0a5a33b 100644 --- a/src/hooks/user/useAlarmList.ts +++ b/src/hooks/user/useAlarmList.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { AlarmList } from '../queries/user/keys'; -import { getAlarmList } from '../api/alarm.api'; -import useAuthStore from '../store/authStore'; +import { getAlarmList } from '../../api/alarm.api'; +import useAuthStore from '../../store/authStore'; const useAlarmList = () => { const userId = useAuthStore((state) => state.userData?.id); diff --git a/src/hooks/user/useAlarmPatch.ts b/src/hooks/user/useAlarmPatch.ts index ab33418a..e7e5cafc 100644 --- a/src/hooks/user/useAlarmPatch.ts +++ b/src/hooks/user/useAlarmPatch.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { patchAlarm } from '../api/alarm.api'; +import { patchAlarm } from '../../api/alarm.api'; import { AlarmList } from '../queries/user/keys'; -import useAuthStore from '../store/authStore'; +import useAuthStore from '../../store/authStore'; export const useAlarmPatch = () => { const userId = useAuthStore((state) => state.userData?.id); diff --git a/src/hooks/user/useApllicantList.ts b/src/hooks/user/useApllicantList.ts index 085e8870..e4b02e20 100644 --- a/src/hooks/user/useApllicantList.ts +++ b/src/hooks/user/useApllicantList.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { applicantKey } from '../queries/user/keys'; -import { getApplicantList } from '../api/applicant.api'; -import { ApiApplicants } from '../models/applicant'; +import { getApplicantList } from '../../api/applicant.api'; +import { ApiApplicants } from '../../models/applicant'; export const useApllicantList = (projectId: number) => { const { data, isLoading } = useQuery({ diff --git a/src/hooks/user/useApplicantInfo.ts b/src/hooks/user/useApplicantInfo.ts index 53bdc8d7..57219af5 100644 --- a/src/hooks/user/useApplicantInfo.ts +++ b/src/hooks/user/useApplicantInfo.ts @@ -1,9 +1,9 @@ -import { getApplicantInfo } from '../api/applicant.api'; +import { getApplicantInfo } from '../../api/applicant.api'; import { useEffect, useState } from 'react'; import { useQuery } from '@tanstack/react-query'; import { applicantKey } from '../queries/user/keys'; import { useLocation } from 'react-router-dom'; -import { ApiApplicantInfo } from '../models/applicant'; +import { ApiApplicantInfo } from '../../models/applicant'; export const useApplicantInfo = (projectId: number) => { const [selectedApplicant, setSelectedUser] = useState(null); diff --git a/src/hooks/user/useChartData.ts b/src/hooks/user/useChartData.ts index 12a8b721..392476bf 100644 --- a/src/hooks/user/useChartData.ts +++ b/src/hooks/user/useChartData.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { getChartData } from '../api/chart.api'; +import { getChartData } from '../../api/chart.api'; import { ChartDataList } from '../queries/user/keys'; const useChartData = () => { diff --git a/src/hooks/user/useEmailVerification.ts b/src/hooks/user/useEmailVerification.ts index b282a53a..1ced21ab 100644 --- a/src/hooks/user/useEmailVerification.ts +++ b/src/hooks/user/useEmailVerification.ts @@ -1,5 +1,5 @@ import { useState } from 'react'; -import { postVerificationEmail, postVerifyEmailCode } from '../api/auth.api'; +import { postVerificationEmail, postVerifyEmailCode } from '../../api/auth.api'; import { AxiosError } from 'axios'; import { useMutation } from '@tanstack/react-query'; diff --git a/src/hooks/user/useGetFAQ.ts b/src/hooks/user/useGetFAQ.ts index c123e47d..3d9e55c7 100644 --- a/src/hooks/user/useGetFAQ.ts +++ b/src/hooks/user/useGetFAQ.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import { getFAQ } from '../api/customerService.api'; +import { getFAQ } from '../../api/customerService.api'; import { CustomerService } from '../queries/user/keys'; -import { SearchKeyword } from '../models/customerService'; +import { SearchKeyword } from '../../models/customerService'; export const useGetFAQ = (keyword: SearchKeyword) => { const { data: faqData, isLoading } = useQuery({ diff --git a/src/hooks/user/useGetMyComments.ts b/src/hooks/user/useGetMyComments.ts index 482fece1..59d8b83e 100644 --- a/src/hooks/user/useGetMyComments.ts +++ b/src/hooks/user/useGetMyComments.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { getMyComments } from '../api/activityLog.api'; -import useAuthStore from '../store/authStore'; +import { getMyComments } from '../../api/activityLog.api'; +import useAuthStore from '../../store/authStore'; import { ActivityLog } from '../queries/user/keys'; export const useGetMyComments = () => { diff --git a/src/hooks/user/useGetMyInquiries.ts b/src/hooks/user/useGetMyInquiries.ts index d4fd49d5..d7d0de9b 100644 --- a/src/hooks/user/useGetMyInquiries.ts +++ b/src/hooks/user/useGetMyInquiries.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { getMyInquiries } from '../api/activityLog.api'; -import useAuthStore from '../store/authStore'; +import { getMyInquiries } from '../../api/activityLog.api'; +import useAuthStore from '../../store/authStore'; import { ActivityLog } from '../queries/user/keys'; export const useGetMyInquiries = () => { diff --git a/src/hooks/user/useGetNotice.ts b/src/hooks/user/useGetNotice.ts index 0e9239d6..16cd3df3 100644 --- a/src/hooks/user/useGetNotice.ts +++ b/src/hooks/user/useGetNotice.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import type { NoticeSearch } from '../models/customerService'; -import { getNotice } from '../api/customerService.api'; +import type { NoticeSearch } from '../../models/customerService'; +import { getNotice } from '../../api/customerService.api'; import { CustomerService } from '../queries/user/keys'; export const useGetNotice = (searchProperty: NoticeSearch) => { diff --git a/src/hooks/user/useGetNoticeDetail.ts b/src/hooks/user/useGetNoticeDetail.ts index 33e2a77b..f355108b 100644 --- a/src/hooks/user/useGetNoticeDetail.ts +++ b/src/hooks/user/useGetNoticeDetail.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { getNoticeDetail } from '../api/customerService.api'; +import { getNoticeDetail } from '../../api/customerService.api'; import { CustomerService } from '../queries/user/keys'; export const useGetNoticeDetail = (id: string) => { diff --git a/src/hooks/user/useGetProjectData.ts b/src/hooks/user/useGetProjectData.ts index e77e6d32..e245e100 100644 --- a/src/hooks/user/useGetProjectData.ts +++ b/src/hooks/user/useGetProjectData.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; import { managedProjectKey } from '../queries/user/keys'; -import { getProjectData } from '../api/joinProject.api'; +import { getProjectData } from '../../api/joinProject.api'; const useGetProjectData = (projectId: number) => { const { data, isLoading, isFetching } = useQuery({ diff --git a/src/routes/AppRoutes.tsx b/src/routes/AppRoutes.tsx index 0916a1c3..f26e47b3 100644 --- a/src/routes/AppRoutes.tsx +++ b/src/routes/AppRoutes.tsx @@ -7,90 +7,98 @@ import { import { lazy, Suspense } from 'react'; import LoadingSpinner from '../components/common/loadingSpinner/LoadingSpinner'; -import { ROUTES } from '../constants/routes'; import useAuthStore from '../store/authStore'; import ProtectRoute from '../components/common/ProtectRoute'; import NotFoundPage from '../pages/notFoundPage/NotFoundPage'; import QueryErrorBoundary from '../components/common/error/QueryErrorBoundary'; import { ToastProvider } from '../components/common/Toast/ToastProvider'; +import { ROUTES } from '../constants/user/routes'; const Login = lazy(() => import('../pages/login/Login')); const LoginSuccess = lazy(() => import('../pages/login/LoginSuccess')); -const Register = lazy(() => import('../pages/register/Register')); +const Register = lazy(() => import('../pages/user/register/Register')); const ChangePassword = lazy( - () => import('../pages/changePassword/ChangePassword') + () => import('../pages/user/changePassword/ChangePassword') ); -const Main = lazy(() => import('../pages/main/Index')); +const Main = lazy(() => import('../pages/user/main/Index')); const Layout = lazy(() => import('../components/common/layout/Layout')); -const Home = lazy(() => import('../pages/home/Home')); -const FAQ = lazy(() => import('../pages/customerService/faq/FAQ')); -const Notice = lazy(() => import('../pages/customerService/notice/Notice')); +const Home = lazy(() => import('../pages/user/home/Home')); +const FAQ = lazy(() => import('../pages/user/customerService/faq/FAQ')); +const Notice = lazy( + () => import('../pages/user/customerService/notice/Notice') +); const NoticeDetail = lazy( - () => import('../pages/customerService/noticeDetail/NoticeDetail') + () => import('../pages/user/customerService/noticeDetail/NoticeDetail') ); const Inquiry = lazy( - () => import('../components/customerService/inquiry/Inquiry') + () => import('../components/user/customerService/inquiry/Inquiry') ); -const MyPage = lazy(() => import('../pages/mypage/MyPage')); -const UserPage = lazy(() => import('../pages/userpage/UserPage')); -const Apply = lazy(() => import('../pages/apply/ApplyStep')); +const MyPage = lazy(() => import('../pages/user/mypage/MyPage')); +const UserPage = lazy(() => import('../pages/user/userpage/UserPage')); +const Apply = lazy(() => import('../pages/user/apply/ApplyStep')); const CreateProject = lazy( - () => import('../pages/createProject/CreateProject') + () => import('../pages/user/createProject/CreateProject') ); const ProjectDetail = lazy( - () => import('../pages/projectDetail/ProjectDetail') + () => import('../pages/user/projectDetail/ProjectDetail') ); const MyProjectList = lazy( - () => import('../pages/manage/myProjectList/MyProjectList') + () => import('../pages/user/manage/myProjectList/MyProjectList') ); const MyProfile = lazy( - () => import('../components/mypage/myProfile/MyProfile') + () => import('../components/user/mypage/myProfile/MyProfile') ); const Profile = lazy( - () => import('../components/mypage/myProfile/profile/Profile') + () => import('../components/user/mypage/myProfile/profile/Profile') ); const ProfileEdit = lazy( - () => import('../components/mypage/myProfile/editProfile/EditProfile') + () => import('../components/user/mypage/myProfile/editProfile/EditProfile') ); const MyProjectVolunteer = lazy( - () => import('../pages/manage/myProjectVolunteer/MyProjectVolunteer') + () => import('../pages/user/manage/myProjectVolunteer/MyProjectVolunteer') ); const MyProjectVolunteersPass = lazy( () => - import('../pages/manage/myProjectParticipantsPass/MyProjectVolunteersPass') + import( + '../pages/user/manage/myProjectParticipantsPass/MyProjectVolunteersPass' + ) ); const MyJoinProjects = lazy( - () => import('../components/mypage/joinedProject/MyJoinProjects') + () => import('../components/user/mypage/joinedProject/MyJoinProjects') ); const MyNotifications = lazy( - () => import('../components/mypage/notifications/Notifications') + () => import('../components/user/mypage/notifications/Notifications') ); const NotificationsAll = lazy( - () => import('../components/mypage/notifications/all/All') + () => import('../components/user/mypage/notifications/all/All') ); const NotificationsAppliedProjects = lazy( () => - import('../components/mypage/notifications/appliedProjects/AppliedProjects') + import( + '../components/user/mypage/notifications/appliedProjects/AppliedProjects' + ) ); const MyActivityLog = lazy( - () => import('../components/mypage/activityLog/ActivityLog') + () => import('../components/user/mypage/activityLog/ActivityLog') ); const ActivityLogComments = lazy( () => - import('../components/mypage/activityLog/commentsActivity/CommentsActivity') + import( + '../components/user/mypage/activityLog/commentsActivity/CommentsActivity' + ) ); const ActivityLogInquiries = lazy( - () => import('../components/mypage/activityLog/inquiries/Inquiries') + () => import('../components/user/mypage/activityLog/inquiries/Inquiries') ); const UserProfile = lazy( - () => import('../components/userPage/userProfile/UserProfile') + () => import('../components/user/userPage/userProfile/UserProfile') ); const UserJoinProject = lazy( - () => import('../components/userPage/joinedProject/UserJoinProject') + () => import('../components/user/userPage/joinedProject/UserJoinProject') ); const ModifyProject = lazy( - () => import('../pages/modifyProject/ModifyProject') + () => import('../pages/user/modifyProject/ModifyProject') ); -const Evaluation = lazy(() => import('../pages/evaluation/Evaluation')); +const Evaluation = lazy(() => import('../pages/user/evaluation/Evaluation')); const AppRoutes = () => { const isLoggedIn = useAuthStore((state) => state.isLoggedIn);