merge/#61: develop 브랜치 merge

SolSolHigh · Aug 31, 2024 · f9da406 · f9da406
2 parents 9b559c5 + 4aa836b
commit f9da406
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 68 deletions.
diff --git a/ssh-web/public/assets/mascot_study.png b/ssh-web/public/assets/mascot_study.png
diff --git 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<IChild[]>([]);
   const [selectedChild, setSelectedChild] = useState<number>(0);
   const [isloading, setIsLoading] = useState<boolean>(false);
+  const [childImg, setChildImg] = useState<string>();
 
   useEffect(() => {
     setIsLoading(true);
@@ -17,6 +19,11 @@ export const ChangeChild = () => {
       setIsLoading(false);
     });
   });
+
+  useEffect(() => {
+    setChildImg(getImgSrc(childrenList[selectedChild]?.gender, 'CHILD'));
+  }, []);
+
   return (
     <div className="flex flex-row relative items-center mb-2 p-2 px-4 rounded-lg space-x-3">
       {selectedChild !== 0 && (
@@ -30,7 +37,7 @@ export const ChangeChild = () => {
         />
       )}
       <AvatarWithLabel
-        imageUrl="https://media1.tenor.com/m/o2nJ-w0v7lAAAAAC/teemo.gif"
+        imageUrl={childImg}
         altText="캐릭터"
         size="md"
         bgColor="blue"

diff --git a/ssh-web/src/components/organisms/QuizTab/index.tsx b/ssh-web/src/components/organisms/QuizTab/index.tsx
@@ -57,7 +57,7 @@ export const QuizTab: React.FC<QuizTabProps> = ({
         </div>
         <div className="col-span-1 border-l flex justify-center items-center">
           <img
-            src="https://media1.tenor.com/m/1fx68zKvE14AAAAC/thumbs-up-double-thumbs-up.gif"
+            src={`/assets/mascot_study.png`}
             alt="Mascot"
             className="w-24 h-24 border"
           />

diff --git a/ssh-web/src/pages/Main.tsx b/ssh-web/src/pages/Main.tsx
diff --git 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: <MissionCreate /> });
   };
 
-  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 (
     <div className={containerStyles()}>
       {sizeState === EResize.D && (
@@ -166,19 +150,9 @@ export const MissionFetch: React.FC = () => {
           )}
         </div>
 
-        {/* <div className="flex flex-row gap-3">
-          <Button
-            onClick={handlePreviousPage}
-            disabled={activeTab === 0 ? activePage === 0 : completedPage === 0}
-          >
-            이전
-          </Button>
-          <Button onClick={handleNextPage}>다음</Button>
-        </div> */}
-
         {role === 'parent' && (
           <Button
-            classNameStyles={bigButtonStyles()}
+            classNameStyles={`${bigButtonStyles()} absolute bottom-8`}
             onClick={onClickCreateModalOpen}
           >
             새 미션 등록하기