Merge remote-tracking branch 'origin/develop' into fix/#330/image-qa-…

…issue
BCSDLab · May 10, 2024 · 866036e · 866036e
2 parents 0b9e4c2 + a247cb5
commit 866036e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/src/component/common/Auth/PreviousStep/index.tsx b/src/component/common/Auth/PreviousStep/index.tsx
@@ -7,6 +7,18 @@ interface PreviousStepProps {
 }
 
 export default function PreviousStep({ step, clickEvent }: PreviousStepProps) {
+  // 이후에 가게 등록 첫 페이지에서 로그아웃 시 생기는 오류 해결 시 사용 예정
+  // const navigate = useNavigate();
+  // const handlePrevious = () => {
+  //   if (clickEvent) {
+  //     if (step === 0) {
+  //       clickEvent();
+  //       navigate('/login');
+  //     } else {
+  //       clickEvent();
+  //     }
+  //   }
+  // };
   return (
     <div className={styles.previous}>
       <button type="button" className={styles.previous__button} disabled={step === 0} onClick={clickEvent}>

diff --git a/src/page/Auth/Signup/component/ErrorMessage/ErrorMessage.module.scss b/src/page/Auth/Signup/component/ErrorMessage/ErrorMessage.module.scss
@@ -2,8 +2,7 @@
   display: flex;
   align-items: center;
   gap: 7px;
-  height: 32px;
-  margin-top: 10px;
+  margin-top: 3px;
 
   &--phrase {
     display: block;

diff --git a/src/page/Auth/Signup/view/TermsOfServicePage/TermsOfService.module.scss b/src/page/Auth/Signup/view/TermsOfServicePage/TermsOfService.module.scss
@@ -51,9 +51,10 @@
 
 .buttons {
   width: 100%;
+  background-color: white;
 
   @include media.media-breakpoint-down(mobile) {
-    position: absolute;
+    position: sticky;
     bottom: 0;
     width: 100%;
     background-color: #ffffff;

diff --git a/src/page/ShopRegistration/view/Mobile/ShopEntry/ShopEntry.module.scss b/src/page/ShopRegistration/view/Mobile/ShopEntry/ShopEntry.module.scss
@@ -4,6 +4,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  margin-top: 87px;
 
   &__icon {
     width: 55px;

diff --git a/src/page/ShopRegistration/view/Mobile/index.tsx b/src/page/ShopRegistration/view/Mobile/index.tsx
@@ -14,10 +14,10 @@ import styles from './ShopRegistrationMobile.module.scss';
 
 export default function ShopRegistrationMobile() {
   const { TOTAL_STEP, step, decreaseStep } = useStepStore();
-
+  // 임시로 step 0 일때 뒤로가기 버튼 삭제
   return (
     <div>
-      <PreviousStep step={step} clickEvent={decreaseStep} />
+      {step !== 0 && <PreviousStep step={step} clickEvent={decreaseStep} />}
       <div className={styles.content}>
         {step === 0 && <ShopEntry />}
         {step === 1 && (

diff --git a/src/utils/constant/menu.ts b/src/utils/constant/menu.ts
@@ -11,14 +11,15 @@ const MENU_CATEGORY = [
   },
   {
     id: 3,
-    name: '사이드 메뉴',
-    img: 'https://static.koreatech.in/assets/img/side-menu.png',
+    name: '세트 메뉴',
+    img: 'https://static.koreatech.in/assets/img/set-menu.png',
   },
   {
     id: 4,
-    name: '세트 메뉴',
-    img: 'https://static.koreatech.in/assets/img/set-menu.png',
+    name: '사이드 메뉴',
+    img: 'https://static.koreatech.in/assets/img/side-menu.png',
   },
+
 ];
 
 export default MENU_CATEGORY;