diff --git a/src/components/common/layout/Layout.tsx b/src/components/common/layout/Layout.tsx index f00921df..a268345d 100644 --- a/src/components/common/layout/Layout.tsx +++ b/src/components/common/layout/Layout.tsx @@ -1,6 +1,7 @@ import React from 'react'; import * as S from './Layout.styled'; import Header from '../header/Header'; +import { ScrollRestoration } from 'react-router-dom'; interface LayoutProps { children: React.ReactNode; @@ -8,6 +9,7 @@ interface LayoutProps { function Layout({ children }: LayoutProps) { return ( <> +
{children} diff --git a/src/components/common/skillTagBox/SkillTagBox.tsx b/src/components/common/skillTagBox/SkillTagBox.tsx index 10147a74..aae95985 100644 --- a/src/components/common/skillTagBox/SkillTagBox.tsx +++ b/src/components/common/skillTagBox/SkillTagBox.tsx @@ -30,7 +30,7 @@ export default function SkillTagBox({ {skillTagsData?.map((skillTagData) => ( {projectListsData && Boolean(projectListsData.projects.length) ? ( projectListsData.projects.map((list) => ( - + )) diff --git a/src/components/home/projectCardLists/cardList/CardList.tsx b/src/components/home/projectCardLists/cardList/CardList.tsx index 23041a4e..359d712d 100644 --- a/src/components/home/projectCardLists/cardList/CardList.tsx +++ b/src/components/home/projectCardLists/cardList/CardList.tsx @@ -24,7 +24,10 @@ export default function CardList({ list }: CardListProps) { {Boolean(list.positionTags.length) && listPositionTag.map((tag) => ( - + ))} {list.positionTags.length > listPositionTag.length && ( +{othersPosition} @@ -34,7 +37,7 @@ export default function CardList({ list }: CardListProps) { {Boolean(list.skillTags.length) && listSkillTag.map((tag) => ( - + ))} diff --git a/src/components/home/projectCardLists/pagination/Pagination.tsx b/src/components/home/projectCardLists/pagination/Pagination.tsx index 299dc52c..7c949020 100644 --- a/src/components/home/projectCardLists/pagination/Pagination.tsx +++ b/src/components/home/projectCardLists/pagination/Pagination.tsx @@ -64,7 +64,7 @@ export default function Pagination() { {pagination.map((pageIndex) => ( diff --git a/src/components/home/projectStats/ProjectStats.tsx b/src/components/home/projectStats/ProjectStats.tsx index c4335465..44e396d5 100644 --- a/src/components/home/projectStats/ProjectStats.tsx +++ b/src/components/home/projectStats/ProjectStats.tsx @@ -9,7 +9,11 @@ export default function ProjectStats() { {projectStatData.map((data) => ( - + ))} diff --git a/src/components/home/searchFiltering/filteringContents/filtering/Filtering.tsx b/src/components/home/searchFiltering/filteringContents/filtering/Filtering.tsx index 18319211..b364df3c 100644 --- a/src/components/home/searchFiltering/filteringContents/filtering/Filtering.tsx +++ b/src/components/home/searchFiltering/filteringContents/filtering/Filtering.tsx @@ -78,7 +78,7 @@ export default function Filtering({ selects, defaultValue }: FilteringProps) { {addAll.map((select) => ( handleValueClick(select.name, select.id)} > {select.name} diff --git a/src/components/manageProjects/CardList.tsx b/src/components/manageProjects/CardList.tsx index fd5e6922..fb69745c 100644 --- a/src/components/manageProjects/CardList.tsx +++ b/src/components/manageProjects/CardList.tsx @@ -21,7 +21,7 @@ function CardList({ projects }: CardListProps) { {projects?.map((data) => ( - + ))} diff --git a/src/components/mypage/appliedProject/MyApplyProject.tsx b/src/components/mypage/appliedProject/MyApplyProject.tsx index 99f88504..7c9fe33c 100644 --- a/src/components/mypage/appliedProject/MyApplyProject.tsx +++ b/src/components/mypage/appliedProject/MyApplyProject.tsx @@ -23,7 +23,7 @@ const MyApplyProject = () => { {myAppliedStatusListData?.map((status) => ( - + ))} diff --git a/src/components/mypage/myProfile/myProfile.tsx b/src/components/mypage/myProfile/myProfile.tsx index 832b3918..ade85e91 100644 --- a/src/components/mypage/myProfile/myProfile.tsx +++ b/src/components/mypage/myProfile/myProfile.tsx @@ -1,5 +1,5 @@ import { z } from 'zod'; -import * as S from './myProfile.styled'; +import * as S from './MyProfile.styled'; import { ERROR_MESSAGES } from '../../../constants/authConstants'; import { Controller, useFieldArray, useForm } from 'react-hook-form'; import { zodResolver } from '@hookform/resolvers/zod'; @@ -21,7 +21,7 @@ import { import { ROUTES } from '../../../constants/routes'; import { Link } from 'react-router-dom'; import BeginnerIcon from '../../../assets/beginner.svg'; -import OptionBox from './optionBox'; +import OptionBox from './OptionBox'; import TextareaAutosize from 'react-textarea-autosize'; import Modal from '../../common/modal/Modal'; import { useModal } from '../../../hooks/useModal'; diff --git a/src/components/mypage/myProfile/optionBox.tsx b/src/components/mypage/myProfile/optionBox.tsx index 84ef445a..8a723801 100644 --- a/src/components/mypage/myProfile/optionBox.tsx +++ b/src/components/mypage/myProfile/optionBox.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import * as S from './optionBox.styled'; +import * as S from './OptionBox.styled'; interface OptionBoxProps { id: number; diff --git a/src/components/userPage/userProfile/UserProfile.tsx b/src/components/userPage/userProfile/UserProfile.tsx index 31c20c04..9f921880 100644 --- a/src/components/userPage/userProfile/UserProfile.tsx +++ b/src/components/userPage/userProfile/UserProfile.tsx @@ -1,5 +1,5 @@ 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'; diff --git a/src/hooks/useProjectStatistic.ts b/src/hooks/useProjectStatistic.ts index fdc9d383..f38b797b 100644 --- a/src/hooks/useProjectStatistic.ts +++ b/src/hooks/useProjectStatistic.ts @@ -12,7 +12,6 @@ export const useProjectStatistic = () => { ProjectStatDataReset[] >([]); - // 실시간성 데이터가 필요할까? const { data } = useQuery({ queryKey: ['projectStat'], queryFn: async () => await getProjectStatistic(), diff --git a/src/pages/projectDetail/ProjectDetail.tsx b/src/pages/projectDetail/ProjectDetail.tsx index e09e8356..120e6712 100644 --- a/src/pages/projectDetail/ProjectDetail.tsx +++ b/src/pages/projectDetail/ProjectDetail.tsx @@ -1,4 +1,4 @@ -import { useNavigate, useParams } from 'react-router-dom'; +import { ScrollRestoration, useNavigate, useParams } from 'react-router-dom'; import ProjectInformation from '../../components/projectFormComponents/projectInformationText/ProjectInformation'; import useGetProjectData from '../../hooks/useJoinProject'; import * as S from './ProjectDetail.styled'; @@ -35,6 +35,7 @@ const ProjectDetail = () => { return ( + {data.title}