diff --git a/ssh-web/public/assets/mascot_study.png b/ssh-web/public/assets/mascot_study.png new file mode 100644 index 0000000..ee6e3c6 Binary files /dev/null and b/ssh-web/public/assets/mascot_study.png differ diff --git a/ssh-web/src/components/molecules/ChangeChild/index.tsx b/ssh-web/src/components/molecules/ChangeChild/index.tsx index 5fdf94a..b792879 100644 --- a/ssh-web/src/components/molecules/ChangeChild/index.tsx +++ b/ssh-web/src/components/molecules/ChangeChild/index.tsx @@ -4,11 +4,13 @@ import { Button } from '../../atoms/Button'; import { FaArrowAltCircleLeft, FaArrowAltCircleRight } from 'react-icons/fa'; import { api } from '../../../apis/interceptors'; import { IChild } from '../../../interfaces/userInterface'; +import { getImgSrc } from '../../../utils/userUtil'; export const ChangeChild = () => { const [childrenList, setChildrenList] = useState([]); const [selectedChild, setSelectedChild] = useState(0); const [isloading, setIsLoading] = useState(false); + const [childImg, setChildImg] = useState(); useEffect(() => { setIsLoading(true); @@ -17,6 +19,11 @@ export const ChangeChild = () => { setIsLoading(false); }); }); + + useEffect(() => { + setChildImg(getImgSrc(childrenList[selectedChild]?.gender, 'CHILD')); + }, []); + return (
{selectedChild !== 0 && ( @@ -30,7 +37,7 @@ export const ChangeChild = () => { /> )} = ({
Mascot diff --git a/ssh-web/src/pages/Main.tsx b/ssh-web/src/pages/Main.tsx deleted file mode 100644 index f3dbd7e..0000000 --- a/ssh-web/src/pages/Main.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import React, { useEffect } from 'react'; -import { Modal } from '../components/molecules/Modal'; -import { useSetRecoilState } from 'recoil'; -import { isModalOpenState } from '../atoms/modal'; -import { Button } from '../components/atoms/Button'; - -const Home = () => { - const setIsModalOpen = useSetRecoilState(isModalOpenState); - - useEffect(() => { - // 모달을 열고, 모달 내용과 함께 상태를 설정합니다. - setIsModalOpen({ - isOpen: true, - content: ( -
-

모달 예시

-

모달임둥

-

모달임둥

-

모달임둥

-

모달임둥

-

모달임둥

-

모달임둥

-

모달임둥

- -
- ), - }); - }, [setIsModalOpen]); - - return ( -
- -
- ); -}; - -export default Home; diff --git a/ssh-web/src/pages/Mission/index.tsx b/ssh-web/src/pages/Mission/index.tsx index 3217a1e..69d66f1 100644 --- a/ssh-web/src/pages/Mission/index.tsx +++ b/ssh-web/src/pages/Mission/index.tsx @@ -111,22 +111,6 @@ export const MissionFetch: React.FC = () => { setIsModalOpen({ isOpen: true, content: }); }; - const handleNextPage = () => { - if (activeTab === 0) { - setActivePage((prev) => prev + 1); - } else { - setCompletedPage((prev) => prev + 1); - } - }; - - const handlePreviousPage = () => { - if (activeTab === 0) { - setActivePage((prev) => (prev > 0 ? prev - 1 : 0)); - } else { - setCompletedPage((prev) => (prev > 0 ? prev - 1 : 0)); - } - }; - return (
{sizeState === EResize.D && ( @@ -166,19 +150,9 @@ export const MissionFetch: React.FC = () => { )}
- {/*
- - -
*/} - {role === 'parent' && (