Merge branch 'fix/homepage' into develop

4bujak-4bujak · Jun 13, 2024 · 656adc3 · 656adc3
2 parents caacc69 + 4f35930
commit 656adc3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/public/sign/phase.svg b/public/sign/phase.svg
diff --git a/src/components/home/MainHeader.tsx b/src/components/home/MainHeader.tsx
@@ -6,7 +6,7 @@ const MainHeader = () => {
   const router = useRouter();
   return (
     <header>
-      <div className="flex justify-between items-center py-2">
+      <div className="flex justify-between items-center py-6">
         <div className="w-[116px] h-8 cursor-pointer">
           <img src="/OffispaceLogo.png" alt="" className="w-full" />
         </div>

diff --git a/src/components/home/MainPageIndex.tsx b/src/components/home/MainPageIndex.tsx
@@ -16,7 +16,6 @@ const MainPageIndex = () => {
   return (
     <div className="mb-[100px]">
       <BgPurpleLayout>
-        <div className="h-6 w-full" /> {/* 핸드폰 기본 상단 레이아웃 자리 */}
         <MainHeader />
         <CurrentOffice />
         <OfficeNotice />

diff --git a/src/components/home/weekSchedule/WeekSchedule.tsx b/src/components/home/weekSchedule/WeekSchedule.tsx
@@ -39,7 +39,7 @@ const WeekSchedule = () => {
       <div className="flex gap-[11px] justify-center items-center bg-violet-50">
         {daysOfWeek.map((day, i) => (
           <div
-            className={`py-[13px] px-[11px] flex flex-col gap-[13px] cursor-pointer text-base font-medium 
+            className={`mt-3 mb-3 py-[13px] px-[11px] flex flex-col gap-[13px] cursor-pointer text-base font-medium 
             ${isSaturday(day) || isSunday(day) ? 'text-gray-400' : 'text-gray-600'} 
             ${selectedDate && isSameDay(day, selectedDate) ? 'bg-space-purple text-white rounded-[30px]' : ''}
             items-center justify-center`}

diff --git a/src/components/sign/signup/EmailVerification.tsx b/src/components/sign/signup/EmailVerification.tsx
@@ -158,9 +158,16 @@ const EmailVerification = ({ onNext }: EmailVerification) => {
               3 단계
             </span>
           </div>
-          <div className="w-[152.40px] h-[25.20px] bg-indigo-700 flex justify-center items-center">
-            <div className="text-center text-white text-sm font-medium font-pretendard">
-              한번 더 확인이 필요해요.
+          <div className="flex items-center relative">
+            <img
+              src="/sign/phase.svg"
+              alt="image"
+              className="absolute -left-[7px] z-50"
+            />
+            <div className=" w-[152.40px] h-[25.20px] bg-space-purple flex justify-center items-center">
+              <div className="text-center text-white text-sm font-medium font-pretendard">
+                한번 더 확인이 필요해요.
+              </div>
             </div>
           </div>
         </div>

diff --git a/src/components/sign/signup/PasswordVerification.tsx b/src/components/sign/signup/PasswordVerification.tsx
@@ -55,12 +55,12 @@ const PasswordVerification = ({ onNext, applyValues }: PasswordVerificationProps
   }, [selectedJob]);
 
   const handlePasswordChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setPasswordError(false);
     const newPassword = e.target.value;
     setPassword(newPassword);
+    checkValidPassword(newPassword);
   };
 
-  const checkValidPassword = () => {
+  const checkValidPassword = (password: string) => {
     const passwordRegex = /^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[@#$%^&+=!])(?=\S+$).{8,16}$/;
     if (!passwordRegex.test(password)) {
       setPasswordError(true);
@@ -99,9 +99,12 @@ const PasswordVerification = ({ onNext, applyValues }: PasswordVerificationProps
             3 단계
           </span>
         </div>
-        <div className="w-[152.40px] h-[25.20px] bg-indigo-700 flex justify-center items-center">
-          <div className="text-center text-white text-sm font-medium font-pretendard">
-            거의 다 완료되었어요!
+        <div className="flex items-center relative">
+          <img src="/sign/phase.svg" alt="image" className="absolute -left-[7px] z-50" />
+          <div className=" w-[152.40px] h-[25.20px] bg-space-purple flex justify-center items-center">
+            <div className="text-center text-white text-sm font-medium font-pretendard">
+              거의 다 완료되었어요!
+            </div>
           </div>
         </div>
       </div>
@@ -199,7 +202,6 @@ const PasswordVerification = ({ onNext, applyValues }: PasswordVerificationProps
               placeholder="비밀번호를 입력해주세요."
               value={password}
               onChange={handlePasswordChange}
-              onBlur={checkValidPassword}
             />
           </div>
         </div>