Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
import { Control, useFieldArray } from 'react-hook-form';
<<<<<<< HEAD
import * as S from './CareersComponent.styled';
import CareerInput from './careersInputComponent/CareersComponentInput';
import { CAREER_INPUT } from '../../../constants/projectConstants';
import { ApplySchemeType } from '../../../models/joinProject';
=======
import { ApplySchemeType } from '../../../../pages/user/apply/Apply';
import * as S from './CareersComponent.styled';
import CareerInput from './careersInputComponent/CareersComponentInput';
import { CAREER_INPUT } from '../../../../constants/user/projectConstants';
>>>>>>> 4069f4a (chore: 디렉토리 변경에 따른 경로수정)

interface CareersComponentProps {
control: Control<ApplySchemeType>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import * as S from './PhoneComponent.styled';
<<<<<<< HEAD
=======
import { ApplySchemeType } from '../../../../pages/user/apply/Apply';
>>>>>>> 4069f4a (chore: 디렉토리 변경에 따른 경로수정)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

병합 충돌 마커가 남아있습니다.

코드에 병합 충돌 마커(<<<<<<< HEAD, =======, >>>>>>> 4069f4a)가 남아있습니다. 이로 인해 코드가 실행되지 않을 수 있습니다. 병합 충돌을 해결하고 적절한 import 경로를 선택해야 합니다.

다음과 같이 수정해주세요:

-<<<<<<< HEAD
-=======
-import { ApplySchemeType } from '../../../../pages/user/apply/Apply';
->>>>>>> 4069f4a (chore: 디렉토리 변경에 따른  경로수정)
+import { ApplySchemeType } from '../../../../pages/user/apply/Apply';
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<<<<<<< HEAD
=======
import { ApplySchemeType } from '../../../../pages/user/apply/Apply';
>>>>>>> 4069f4a (chore: 디렉토리 변경에 따른 경로수정)
import { ApplySchemeType } from '../../../../pages/user/apply/Apply';
🧰 Tools
🪛 Biome (1.9.4)

[error] 5-5: numbers cannot be followed by identifiers directly after

an identifier cannot appear here

(parse)

🤖 Prompt for AI Agents
In src/components/user/applyComponents/phoneComponent/PhoneComponent.tsx around
lines 2 to 5, there are leftover merge conflict markers (<<<<<<< HEAD, =======,
>>>>>>> 4069f4a) that must be removed. Resolve the conflict by deleting these
markers and keeping the correct import statement for ApplySchemeType from
'../../../../pages/user/apply/Apply'. Ensure the file contains only valid import
statements without any conflict markers.

import { Control, FieldErrors } from 'react-hook-form';
import PhoneInput from './phoneComponentInput/PhoneComponentInput';
import { ApplySchemeType } from '../../../models/joinProject';
Expand Down
4 changes: 2 additions & 2 deletions src/components/user/comment/CommentLayout.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/components/user/comment/DropDownItem.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
16 changes: 8 additions & 8 deletions src/components/user/comment/commentInput/CommentInput.tsx
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/components/user/comment/replyComponent/ReplyComponent.tsx
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/user/customerService/MoveInquiredLink.tsx
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/user/customerService/faq/FAQContent.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
10 changes: 5 additions & 5 deletions src/components/user/customerService/inquiry/Inquiry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/components/user/customerService/notice/NoticeList.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/components/user/evaluation/EvaluationContent.tsx
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/components/user/home/projectCardLists/ProjectCardLists.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/user/home/projectStats/ProjectStats.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/components/user/home/searchFiltering/search/Search.tsx
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/components/user/manageProjects/Card.tsx
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/user/manageProjects/CardList.tsx
Original file line number Diff line number Diff line change
@@ -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[];
Expand Down
4 changes: 2 additions & 2 deletions src/components/user/manageProjects/ProjectHeader.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/components/user/manageProjects/RecruitmentDate.tsx
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Loading
Loading