관리자 페이지를 위한 사용자 페이지 경로 설정( issue #295)

src/components/common/header/Header.tsx

@@ -5,8 +5,6 @@ import DropDown from '../dropDown/DropDown';
 import Avatar from '../avatar/Avatar';
 import { useAuth } from '../../../hooks/useAuth';
 import useAuthStore from '../../../store/authStore';
-import { ROUTES } from '../../../constants/routes';
-import { useMyProfileInfo } from '../../../hooks/useMyInfo';
 import DefaultImg from '../../../assets/defaultImg.png';
 import { UserCircleIcon } from '@heroicons/react/24/outline';
 import loadingImg from '../../../assets/loadingImg.svg';
@@ -19,6 +17,8 @@ import bellLogined from '../../../assets/bellLogined.svg';
 import useNotification from '../../../hooks/useNotification';
 import { useEffect } from 'react';
 import { testLiveAlarm } from '../../../api/alarm.api';
+import { useMyProfileInfo } from '../../../hooks/user/useMyInfo';
+import { ROUTES } from '../../../constants/user/routes';
 
 function Header() {
   const location = useLocation();

src/components/common/header/Notification/Notification.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import * as S from './Notification.styled';
 import NotificationItem from './NotificationItem/NotificationItem';
-import useAlarmList from '../../../../hooks/useAlarmList';
 import LoadingSpinner from '../../loadingSpinner/LoadingSpinner';
+import useAlarmList from '../../../../hooks/user/useAlarmList';
 
 const Notification = () => {
   const { alarmListData: AlarmData, isLoading, isFetching } = useAlarmList();

src/components/user/applyComponents/careersComponent/CareersComponent.styled.ts

@@ -19,6 +19,8 @@ export const CareerContainer = styled.div`
 
 export const AddButton = styled(Button)`
   width: 50px;
+  height: 30px;
+  font-size: 13px;
   padding: 10px;
   cursor: pointer;
   border: 1px solid ${({ theme }) => theme.color.border};

src/components/user/applyComponents/careersComponent/CareersComponent.tsx

@@ -1,8 +1,8 @@
 import { Control, useFieldArray } from 'react-hook-form';
-import { ApplySchemeType } from '../../../pages/apply/Apply';
 import * as S from './CareersComponent.styled';
 import CareerInput from './careersInputComponent/CareersComponentInput';
 import { CAREER_INPUT } from '../../../constants/projectConstants';
+import { ApplySchemeType } from '../../../models/joinProject';
 
 interface CareersComponentProps {
   control: Control<ApplySchemeType>;

src/components/user/applyComponents/phoneComponent/PhoneComponent.tsx

@@ -1,7 +1,7 @@
 import * as S from './PhoneComponent.styled';
-import { ApplySchemeType } from '../../../pages/apply/Apply';
 import { Control, FieldErrors } from 'react-hook-form';
 import PhoneInput from './phoneComponentInput/PhoneComponentInput';
+import { ApplySchemeType } from '../../../models/joinProject';
 
 interface PhoneComponentProps {
   control: Control<ApplySchemeType>;

src/components/user/mypage/activityLog/ActivityLog.tsx

@@ -1,4 +1,4 @@
-import { ACTIVITY_FILTER } from '../../../constants/myPageFilter';
+import { ACTIVITY_FILTER } from '../../../../constants/user/myPageFilter';
 import ContentTab from '../ContentTab';
 
 export default function ActivityLog() {

src/components/user/mypage/activityLog/commentsActivity/CommentsActivity.tsx

@@ -1,9 +1,9 @@
 import { Fragment } from 'react/jsx-runtime';
-import { useGetMyComments } from '../../../../hooks/useGetMyComments';
-import NoContent from '../../../common/noContent/NoContent';
 import Spinner from '../../Spinner';
 import CommentActivity from './commentActivity/CommentActivity';
 import * as S from './CommentsActivity.styled';
+import NoContent from '../../../../common/noContent/NoContent';
+import { useGetMyComments } from '../../../../../hooks/user/useGetMyComments';
 
 export default function CommentsActivity() {
   const { myCommentsData, isLoading } = useGetMyComments();

src/components/user/mypage/activityLog/commentsActivity/commentActivity/CommentActivity.tsx

@@ -1,7 +1,7 @@
 import { Link } from 'react-router-dom';
-import type { MyComments } from '../../../../../models/activityLog';
 import * as S from './CommentActivity.styled';
-import { formatDate } from '../../../../../util/formatDate';
+import { formatDate } from '../../../../../../util/formatDate';
+import { MyComments } from '../../../../../../models/activityLog';
 
 interface CommentActivityProps {
   list: MyComments;

src/components/user/mypage/activityLog/inquiries/Inquiries.tsx

@@ -1,6 +1,6 @@
-import { useGetMyInquiries } from '../../../../hooks/useGetMyInquiries';
-import ContentBorder from '../../../common/contentBorder/ContentBorder';
-import NoContent from '../../../common/noContent/NoContent';
+import { useGetMyInquiries } from '../../../../../hooks/user/useGetMyInquiries';
+import ContentBorder from '../../../../common/contentBorder/ContentBorder';
+import NoContent from '../../../../common/noContent/NoContent';
 import Spinner from '../../Spinner';
 import * as S from './Inquiries.styled';
 import Inquiry from './inquiry/Inquiry';

src/components/user/mypage/joinedProject/MyJoinProjects.tsx

@@ -1,11 +1,11 @@
 import { Link } from 'react-router-dom';
-import { useMyJoinedProjectList } from '../../../hooks/useMyInfo';
 import * as S from './MyJoinProjects.styled';
 import Project from './Project';
-import { ROUTES } from '../../../constants/routes';
-import NoContent from '../../common/noContent/NoContent';
 import Spinner from '../Spinner';
 import ScrollWrapper from '../ScrollWrapper';
+import { useMyJoinedProjectList } from '../../../../hooks/user/useMyInfo';
+import { ROUTES } from '../../../../constants/user/routes';
+import NoContent from '../../../common/noContent/NoContent';
 
 const MyJoinProjects = () => {
   const { myJoinedProjectListData, isLoading } = useMyJoinedProjectList();

src/components/user/mypage/joinedProject/Project.tsx

@@ -1,7 +1,7 @@
-import type { JoinedProject } from '../../../models/userProject';
 import * as S from './Project.styled';
 import BeginnerIcon from '../../../assets/beginner.svg';
 import { EllipsisHorizontalIcon } from '@heroicons/react/24/outline';
+import { JoinedProject } from '../../../../models/userProject';
 
 interface ProjectProps {
   project: JoinedProject;

src/components/user/mypage/myProfile/MyProfile.tsx

@@ -1,14 +1,14 @@
 import * as S from './MyProfile.styled';
 import Spinner from '../Spinner';
-import { useMyProfileInfo } from '../../../hooks/useMyInfo';
 import NoMyInfo from './NoMyInfo';
-import Modal from '../../common/modal/Modal';
-import { useModal } from '../../../hooks/useModal';
 import { Outlet, useLocation } from 'react-router-dom';
-import { ROUTES } from '../../../constants/routes';
 import { PencilIcon } from '@heroicons/react/24/outline';
 import { useRef } from 'react';
 import ScrollWrapper from '../ScrollWrapper';
+import { useModal } from '../../../../hooks/useModal';
+import { useMyProfileInfo } from '../../../../hooks/user/useMyInfo';
+import { ROUTES } from '../../../../constants/user/routes';
+import Modal from '../../../common/modal/Modal';
 
 const MyProfile = () => {
   const { myData, isLoading } = useMyProfileInfo();

src/components/user/mypage/myProfile/editProfile/EditProfile.tsx

@@ -1,21 +1,21 @@
 import * as S from './editProfile.styled';
-import Button from '../../../common/Button/Button';
 import OptionBox from './../OptionBox';
 import { Controller, useFieldArray, useForm } from 'react-hook-form';
-import { useEditMyProfileInfo } from '../../../../hooks/useMyInfo';
-import { useSearchFilteringSkillTag } from '../../../../hooks/useSearchFilteringSkillTag';
 import { useEffect, useState } from 'react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import TextareaAutosize from 'react-textarea-autosize';
-import useNickNameVerification from '../../../../hooks/useNicknameVerification';
 import InputText from '../../../auth/InputText';
-import { ERROR_MESSAGES } from '../../../../constants/authConstants';
 import { z } from 'zod';
 import { SquaresPlusIcon, XMarkIcon } from '@heroicons/react/24/outline';
 import { useNavigate, useOutletContext } from 'react-router-dom';
-import { ROUTES } from '../../../../constants/routes';
-import { UserInfo } from '../../../../models/userInfo';
 import MyProfileWrapper from '../MyProfileWrapper';
+import { UserInfo } from '../../../../../models/userInfo';
+import { useSearchFilteringSkillTag } from '../../../../../hooks/user/useSearchFilteringSkillTag';
+import { useEditMyProfileInfo } from '../../../../../hooks/user/useMyInfo';
+import useNickNameVerification from '../../../../../hooks/user/useNicknameVerification';
+import { ROUTES } from '../../../../../constants/user/routes';
+import Button from '../../../../common/Button/Button';
+import { ERROR_MESSAGES } from '../../../../../constants/user/authConstants';
 
 type ProfileFormData = z.infer<typeof profileSchema>;
 

src/components/user/mypage/myProfile/profile/Profile.tsx

@@ -3,12 +3,12 @@ import BeginnerIcon from '../../../../assets/beginner.svg';
 import 'chart.js/auto';
 import { ChartOptions } from 'chart.js';
 import { Link, useOutletContext } from 'react-router-dom';
-import { ROUTES } from '../../../../constants/routes';
 import { Radar } from 'react-chartjs-2';
-import { UserInfo } from '../../../../models/userInfo';
 import { useEffect } from 'react';
 import MyProfileWrapper from '../MyProfileWrapper';
-import { PROFILE_DEFAULT_MESSAGE } from '../../../../constants/myPageProfile';
+import { UserInfo } from '../../../../../models/userInfo';
+import { PROFILE_DEFAULT_MESSAGE } from '../../../../../constants/user/myPageProfile';
+import { ROUTES } from '../../../../../constants/user/routes';
 
 export default function Profile() {
   const {

src/components/user/mypage/notifications/Notifications.tsx

@@ -1,4 +1,4 @@
-import { NOTIFICATION_FILTER } from '../../../constants/myPageFilter';
+import { NOTIFICATION_FILTER } from '../../../../constants/user/myPageFilter';
 import ContentTab from '../ContentTab';
 
 export default function Notifications() {

src/components/user/mypage/notifications/all/All.tsx

@@ -1,11 +1,11 @@
 import { Link, useOutletContext } from 'react-router-dom';
-import useAlarmList from '../../../../hooks/useAlarmList';
-import NoContent from '../../../common/noContent/NoContent';
 import * as S from './All.styled';
 import { XMarkIcon } from '@heroicons/react/24/outline';
-import { useAlarmDelete } from '../../../../hooks/useAlarmDelete';
-import { useAlarmPatch } from '../../../../hooks/useAlarmPatch';
 import Spinner from '../../Spinner';
+import { useAlarmDelete } from '../../../../../hooks/user/useAlarmDelete';
+import { useAlarmPatch } from '../../../../../hooks/user/useAlarmPatch';
+import useAlarmList from '../../../../../hooks/user/useAlarmList';
+import NoContent from '../../../../common/noContent/NoContent';
 
 export default function All() {
   const { alarmListData, isLoading } = useAlarmList();

src/components/user/mypage/notifications/appliedProjects/AppliedProjects.tsx

@@ -1,10 +1,10 @@
 import { Link } from 'react-router-dom';
-import { ROUTES } from '../../../../constants/routes';
-import { useMyAppliedStatusList } from '../../../../hooks/useMyInfo';
-import NoContent from '../../../common/noContent/NoContent';
 import * as S from './AppliedProjects.styled';
 import Spinner from '../../Spinner';
 import AppliedProjectsStatus from './appliedProjectsStatus/AppliedProjectsStatus';
+import NoContent from '../../../../common/noContent/NoContent';
+import { useMyAppliedStatusList } from '../../../../../hooks/user/useMyInfo';
+import { ROUTES } from '../../../../../constants/user/routes';
 
 export default function AppliedProjects() {
   const { myAppliedStatusListData, isLoading } = useMyAppliedStatusList();

src/components/user/mypage/notifications/appliedProjects/appliedProjectsStatus/AppliedProjectsStatus.tsx

@@ -1,5 +1,5 @@
-import { MY_STATUS } from '../../../../../constants/authConstants';
-import type { AppliedProject } from '../../../../../models/userProject';
+import { MY_STATUS } from '../../../../../../constants/user/authConstants';
+import { AppliedProject } from '../../../../../../models/userProject';
 import * as S from './AppliedProjectsStatus.styled';
 
 interface StatusProps {

src/components/user/projectFormComponents/projectInformationInput/ProjectInformationInput.tsx

@@ -2,12 +2,12 @@ import MozipCategoryComponent from './positionComponent/PositionComponent';
 import LanguageComponent from './languageComponent/LanguageComponent';
 import FieldCategoryComponent from './fieldCategoryComponent/FieldCategoryComponent';
 import { Control, FieldErrors, UseFormSetValue } from 'react-hook-form';
-import { PROJECT_DATA } from '../../../constants/projectConstants';
-import { CreateProjectFormValues } from '../../../models/createProject';
 import * as S from './ProjectInformationInput.styled';
-import { useSearchFilteringSkillTag } from '../../../hooks/useSearchFilteringSkillTag';
-import { ProjectDetailPlusExtended } from '../../../models/projectDetail';
 import Input from '../inputComponent/InputComponent';
+import { ProjectDetailPlusExtended } from '../../../../models/projectDetail';
+import { CreateProjectFormValues } from '../../../../models/createProject';
+import { useSearchFilteringSkillTag } from '../../../../hooks/user/useSearchFilteringSkillTag';
+import { PROJECT_DATA } from '../../../../constants/user/projectConstants';
 
 interface ProjectInformationProps {
   errors: FieldErrors;

src/components/user/projectFormComponents/projectInformationInput/fieldCategoryComponent/FieldCategoryComponent.tsx

@@ -1,8 +1,8 @@
+import useTagSelectors from '../../../../../hooks/user/ProjectHooks/useTagSelectors';
+import { CreateProjectFormValues } from '../../../../../models/createProject';
+import { MethodTag } from '../../../../../models/tags';
 import * as S from './FieldCategoryComponent.styled';
 import { FieldErrors, UseFormSetValue } from 'react-hook-form';
-import { CreateProjectFormValues } from '../../../../models/createProject';
-import { MethodTag } from '../../../../models/tags';
-import useTagSelectors from '../../../../hooks/ProjectHooks/useTagSelectors';
 
 interface FieldCategoryComponentProps {
   errors: FieldErrors;

src/components/user/projectFormComponents/projectInformationInput/languageComponent/LanguageComponent.tsx

@@ -1,9 +1,9 @@
+import useTagSelectors from '../../../../../hooks/user/ProjectHooks/useTagSelectors';
+import { CreateProjectFormValues } from '../../../../../models/createProject';
+import { SkillTag } from '../../../../../models/tags';
+import SkillTagBox from '../../../../common/skillTagBox/SkillTagBox';
 import * as S from './LanguageComponent.styled';
 import { FieldErrors, UseFormSetValue } from 'react-hook-form';
-import SkillTagBox from '../../../common/skillTagBox/SkillTagBox';
-import { CreateProjectFormValues } from '../../../../models/createProject';
-import useTagSelectors from '../../../../hooks/ProjectHooks/useTagSelectors';
-import { SkillTag } from '../../../../models/tags';
 
 interface LanguageComponentProps {
   errors: FieldErrors;

src/components/user/projectFormComponents/projectInformationInput/positionComponent/PositionComponent.tsx

@@ -1,8 +1,8 @@
+import useTagSelectors from '../../../../../hooks/user/ProjectHooks/useTagSelectors';
+import { CreateProjectFormValues } from '../../../../../models/createProject';
+import { PositionTag } from '../../../../../models/tags';
 import * as S from './PositionComponent.styled';
 import { FieldErrors, UseFormSetValue } from 'react-hook-form';
-import { PositionTag } from '../../../../models/tags';
-import useTagSelectors from '../../../../hooks/ProjectHooks/useTagSelectors';
-import { CreateProjectFormValues } from '../../../../models/createProject';
 
 interface MozipCategoryComponentProps {
   errors: FieldErrors;
@@ -31,7 +31,7 @@ const MozipCategoryComponent = ({
     <S.Container>
       <S.CategoryContainer>
         {positionTagsData.map((position, idx) => {
-          const isSelected = selectedTag.some((item) => item === idx + 1);
+          const isSelected = selectedTag.includes(idx + 1);
           return (
             <S.PositionButtonFeat
               position={position.name}

src/components/user/projectFormComponents/projectInformationText/ProjectInformation.tsx

@@ -1,11 +1,11 @@
-import * as S from './ProjectInformation.styled';
-import { PROJECT_DATA_GET } from '../../../constants/projectConstants';
-import beginner from '/src/assets/beginner.svg';
+import { PROJECT_DATA_GET } from '../../../../constants/user/projectConstants';
 import {
   ProjectDetailPlus,
   ProjectDetailPlusExtended,
-} from '../../../models/projectDetail';
-import { formatDate } from '../../../util/format';
+} from '../../../../models/projectDetail';
+import { formatDate } from '../../../../util/formatDate';
+import * as S from './ProjectInformation.styled';
+import beginner from '/src/assets/beginner.svg';
 
 interface ProjectInformationProps {
   data: ProjectDetailPlusExtended;

src/components/user/projectFormComponents/stepComponent/StepComponent.tsx

@@ -1,6 +1,6 @@
 import React, { Dispatch, SetStateAction } from 'react';
 import * as S from './StepComponent.styled';
-import { StepProp } from '../../../hooks/ProjectHooks/useMultiStepForm';
+import { StepProp } from '../../../../hooks/user/ProjectHooks/useMultiStepForm';
 
 type StepComponentProps = {
   steps: StepProp[];

src/components/user/reportComponent/ReportModal.tsx

@@ -1,10 +1,10 @@
+import { postReport } from '../../../api/report.api';
+import { reasons } from '../../../constants/user/reportConstants';
+import Avatar from '../../common/avatar/Avatar';
+import Button from '../../common/Button/Button';
+import ScrollPreventor from '../../common/modal/ScrollPreventor';
 import * as S from './ReportModal.styled';
-import Avatar from '../common/avatar/Avatar';
 import { useRef, useState } from 'react';
-import { postReport } from '../../api/report.api';
-import { reasons } from '../../constants/reportConstants';
-import Button from '../common/Button/Button';
-import ScrollPreventor from '../common/modal/ScrollPreventor';
 
 interface ReportModalProps {
   reportTitle: { userImg: string; userName: string } | string;

src/components/user/userPage/joinedProject/UserJoinProject.tsx

@@ -1,10 +1,10 @@
 import { Link, useParams } from 'react-router-dom';
-import { useUserJoinedProjectList } from '../../../hooks/useUserInfo';
 import * as S from '../../mypage/joinedProject/MyJoinProjects.styled';
 import Spinner from '../../mypage/Spinner';
-import { ROUTES } from '../../../constants/routes';
 import Project from '../../mypage/joinedProject/Project';
-import NoContent from '../../common/noContent/NoContent';
+import { useUserJoinedProjectList } from '../../../../hooks/user/useUserInfo';
+import { ROUTES } from '../../../../constants/user/routes';
+import NoContent from '../../../common/noContent/NoContent';
 
 const UserJoinProject = () => {
   const { userId } = useParams();

src/components/user/userPage/userProfile/UserProfile.tsx

@@ -1,8 +1,8 @@
-import Title from '../../common/title/Title';
-import * as S from '../../mypage/myProfile/MyProfile.styled';
+import * as S from '../../../mypage/myProfile/MyProfile.styled';
 import BeginnerIcon from '../../../assets/beginner.svg';
-import { useUserProfileInfo } from '../../../hooks/useUserInfo';
 import { useParams } from 'react-router-dom';
+import { useUserProfileInfo } from '../../../../hooks/user/useUserInfo';
+import Title from '../../../common/title/Title';
 
 const UserProfile = () => {
   const { userId } = useParams();