blaybus-hackathon · TakioN · Sep 6, 2025 · Sep 6, 2025 · Sep 6, 2025 · Sep 6, 2025
diff --git a/src/App.jsx b/src/App.jsx
@@ -82,6 +82,8 @@ function App() {
               <Route path='center/signup' element={<CenterSignUp />} />
               <Route path='helper/signup' element={<HelperSignUp />} />
 
+              <Route path='helper/address' element={<HelperAddress />} />
+
               {/* Center */}
               <Route
                 path='center/*'
@@ -124,7 +126,6 @@ function App() {
                       <Route path='account/pay' element={<AccountPay />} />
                       <Route path='account/care-type' element={<AccountCareType />} />
                       <Route path='location' element={<HelperLocation />} />
-                      <Route path='address' element={<HelperAddress />} />
                       <Route path='*' element={<Navigate to='/404' replace />} />
                     </Routes>
                   </RequireAuth>

diff --git a/src/components/Auth/SignUp/helper/EmailAuth.jsx b/src/components/Auth/SignUp/helper/EmailAuth.jsx
@@ -8,7 +8,7 @@ import SignUpButton from '@/components/Auth/SignUp/helper/SignUpButton';
 
 export default function EmailAuth() {
   const emailCodeRef = useRef(null);
-  const { signUpForm, setEmailAuthField } = useSignUpStore();
+  const { signUpForm, setEmailAuthField, isEmailFirstCheck } = useSignUpStore();
   const { sendEmail, verifyEmail, sendEmailStatus, verifyEmailStatus } = useEmailAuthMutation();
   const { email, emailCode, isVerified, mailSeq, password, passwordConfirm } = signUpForm.emailAuth;
 
@@ -28,7 +28,7 @@ export default function EmailAuth() {
 
   return (
     <div className='flex flex-col mb-[0.56rem]'>
-      <FormField label='이메일 입력' required>
+      <FormField label='이메일 입력' required className='mb-5'>
         <div className='flex justify-between items-center gap-2'>
           <Input
             placeholder='이메일을 입력해주세요.'
@@ -64,19 +64,30 @@ export default function EmailAuth() {
             {verifyEmailStatus.isPending ? '인증중...' : isVerified ? '인증완료' : '인증하기'}
           </Button>
         </div>
+
+        {!isEmailFirstCheck && !email && (
+          <p className='text-start text-sm text-[var(--required-red)] font-medium'>
+            이메일을 입력해주세요
+          </p>
+        )}
       </FormField>
 
-      <FormField label='비밀번호 입력' required>
+      <FormField label='비밀번호 입력' required className='mb-5'>
         <Input
           placeholder='비밀번호를 입력해주세요.'
           type='password'
           value={password}
           onChange={(e) => setEmailAuthField('password', e.target.value)}
           className='rounded-lg h-[4.0625rem] text-base font-normal text-[var(--button-black)] border border-[var(--outline)] placeholder:text-[var(--placeholder-gray)] w-[100%]'
         />
+        {!isEmailFirstCheck && !password && (
+          <p className='text-start text-sm text-[var(--required-red)] font-medium'>
+            비밀번호를 입력해주세요
+          </p>
+        )}
       </FormField>
 
-      <FormField label='비밀번호 확인' required>
+      <FormField label='비밀번호 확인' required className='mb-5'>
         <Input
           placeholder='비밀번호를 다시 한 번 입력해주세요.'
           type='password'
@@ -85,6 +96,12 @@ export default function EmailAuth() {
           onBlur={() => setEmailAuthField('passwordCheck', true)}
           className='rounded-lg h-[4.0625rem] text-base font-normal text-[var(--button-black)] border border-[var(--outline)] placeholder:text-[var(--placeholder-gray)] w-[100%]'
         />
+
+        {!isEmailFirstCheck && !passwordConfirm && (
+          <p className='text-start text-sm text-[var(--required-red)] font-medium'>
+            비밀번호를 확인해주세요
+          </p>
+        )}
       </FormField>
 
       <SignUpButton />

diff --git a/src/components/Auth/SignUp/helper/HelperInfo.jsx b/src/components/Auth/SignUp/helper/HelperInfo.jsx
@@ -16,6 +16,12 @@ export default function HelperInfo() {
     setHelperInfoField('profilePic', value);
   };
 
+  const handleBirthday = (e) => {
+    let str = e.target.value.replace(/\D/g, '');
+    if (str.length > 8) str = str.slice(0, 8);
+    setHelperInfoField('birthday', str);
+  };
+
   return (
     <div>
       <h1 className='text-[var(--text)] text-[1.44rem] font-semibold leading-normal text-start mb-5'>
@@ -25,13 +31,12 @@ export default function HelperInfo() {
       </h1>
 
       <FormField label='이름' required className='mb-5'>
-        {console.log(isFirstCheck)}
         <Input
           placeholder='예) 홍길동'
           value={name}
           maxLength={10}
           onChange={(e) => setHelperInfoField('name', e.target.value)}
-          className={`rounded-lg h-[4.0625rem] text-base font-normal text-[var(--button-black)] border  placeholder:text-[var(--placeholder-gray)] w-[100%] ${
+          className={`rounded-lg h-[4.0625rem] text-base font-normal text-[var(--button-black)] border placeholder:text-[var(--placeholder-gray)] w-[100%] ${
             !isFirstCheck && !name ? 'border-[var(--required-red)]' : 'border-[var(--outline)]'
           }`}
         />
@@ -72,7 +77,7 @@ export default function HelperInfo() {
             여성
           </RadioItem>
         </Radio>
-        {!isFirstCheck && !gender && (
+        {!isFirstCheck && gender === null && (
           <p className='text-start text-sm text-[var(--required-red)] font-medium'>
             성별을 입력해주세요
           </p>
@@ -85,7 +90,8 @@ export default function HelperInfo() {
           inputMode='numeric'
           maxLength={8}
           value={birthday}
-          onChange={(e) => setHelperInfoField('birthday', e.target.value)}
+          // onChange={(e) => setHelperInfoField('birthday', e.target.value)}
+          onChange={handleBirthday}
           className={`rounded-lg h-[4.0625rem] text-base font-normal text-[var(--button-black)] border placeholder:text-[var(--placeholder-gray)] w-[100%] ${
             !isFirstCheck && !birthday ? 'border-[var(--required-red)]' : 'border-[var(--outline)]'
           }`}
@@ -128,7 +134,7 @@ export default function HelperInfo() {
             아니오
           </RadioItem>
         </Radio>
-        {!isFirstCheck && !carOwnYn && (
+        {!isFirstCheck && carOwnYn === null && (
           <p className='text-start text-sm text-[var(--required-red)] font-medium'>
             차량소유여부를 입력해주세요
           </p>
@@ -144,7 +150,7 @@ export default function HelperInfo() {
             아니오
           </RadioItem>
         </Radio>
-        {!isFirstCheck && !eduYn && (
+        {!isFirstCheck && eduYn === null && (
           <p className='text-start text-sm text-[var(--required-red)] font-medium'>
             치매교육 이수 여부를 입력해주세요
           </p>

diff --git a/src/components/Auth/SignUp/helper/SignUpButton.jsx b/src/components/Auth/SignUp/helper/SignUpButton.jsx
@@ -20,10 +20,15 @@ export default function SignUpButton() {
 
   const signUpForm = useSignUpStore((state) => state.signUpForm);
   const submitSignUp = useSignUpStore((state) => state.submitHelper);
-  const { setIsFirstCheck } = useSignUpStore();
+  const setIsFirstCheck = useSignUpStore((state) => state.setIsFirstCheck);
+  const setIsEmailFirstCheck = useSignUpStore((state) => state.setIsEmailFirstCheck);
+  // const { setIsFirstCheck, setIsEmailFirstCheck } = useSignUpStore();
 
   const handleNext = async () => {
-    setIsFirstCheck(false);
+    if (currentStep === 0) {
+      setIsEmailFirstCheck(false);
+    } else if (currentStep === 1) setIsFirstCheck(false);
+
     if (currentStep === 2) {
       // 만약 선택된 자격증이 있다면, 그 항목 하위의 모든 필드가 입력되었는지 체크
       const incomplete = Object.entries(signUpForm.licenseInfo).find(([key, certData]) => {

diff --git a/src/components/Auth/SignUp/helper/SignUpComplete.jsx b/src/components/Auth/SignUp/helper/SignUpComplete.jsx
@@ -9,8 +9,8 @@ export default function SignUpComplete() {
     navigate('/signin');
   };
 
-  const handleInfo = () => {
-    navigate('/helper/account');
+  const handleHome = () => {
+    navigate('/');
   };
 
   return (
@@ -33,8 +33,8 @@ export default function SignUpComplete() {
           <Button onClick={handleLogin} className='w-full'>
             로그인하기
           </Button>
-          <Button onClick={handleInfo} variant='white' className='w-full'>
-            내 정보 설정하기
+          <Button onClick={handleHome} variant='white' className='w-full'>
+            홈으로 이동
           </Button>
         </div>
       </div>

diff --git a/src/components/helper/Matching/CompleteDetail.jsx b/src/components/helper/Matching/CompleteDetail.jsx
@@ -33,6 +33,8 @@ export default function CompleteDetail({ patientLogSeq, returnPath }) {
   );
 
   useEffect(() => {
+    window.scrollTo(0, 0);
+
     setHeaderProps({
       type: 'back',
       title: '어르신 상세정보',
@@ -111,7 +113,10 @@ export default function CompleteDetail({ patientLogSeq, returnPath }) {
           <InfoField label='몸무게' text={data.weight ? `${data.weight}kg` : '정보 없음'} />
           <InfoField label='근무종류' text={data.careChoiceFormatted?.workType || '정보 없음'} />
           <InfoField label='주소지' text={data.fullAddress || '주소 정보 없음'} />
-          <InfoField label='희망요일/시간' text={data.formattedTimeList || '시간 정보 없음'} />
+          <InfoField
+            label='희망요일/시간'
+            text={data.formattedTimeList.join('\n') || '시간 정보 없음'}
+          />
           <InfoField label='보유질병' text={data.diseases || '정보 없음'} />
           <InfoField
             label='장기요양등급'

diff --git a/src/components/helper/Matching/RequestDetail.jsx b/src/components/helper/Matching/RequestDetail.jsx
@@ -42,6 +42,7 @@ export default function RequestDetail({ patientLogSeq, returnPath }) {
   const getHelperSeq = useAuthStore((state) => state.getHelperSeq);
 
   useEffect(() => {
+    window.scrollTo(0, 0);
     setHeaderProps({
       type: 'back',
       title: '어르신 상세정보',
@@ -163,7 +164,10 @@ export default function RequestDetail({ patientLogSeq, returnPath }) {
         <section className='grid gap-y-5 px-0'>
           <InfoField label='근무종류' text={data.careChoiceFormatted?.workType || '정보 없음'} />
           <InfoField label='주소지' text={data.fullAddress || '주소 정보 없음'} />
-          <InfoField label='희망요일/시간' text={data.formattedTimeList || '시간 정보 없음'} />
+          <InfoField
+            label='희망요일/시간'
+            text={data.formattedTimeList.join('\n') || '시간 정보 없음'}
+          />
           <InfoField label='보유질병' text={data.diseases || '정보 없음'} />
           <InfoField label='돌봄필요' text={getCareNeedItems(data.careChoice)} />
           <InfoField label='희망시급' text={data.formattedWage || '시급 정보 없음'} />

diff --git a/src/pages/helper/AccountEdit/AccountEdit.jsx b/src/pages/helper/AccountEdit/AccountEdit.jsx
@@ -36,7 +36,7 @@ export default function AccountEdit() {
   const { helper } = useHelperAccountStore();
 
   useEffect(() => {
-    setHeaderProps({ type: 'back', title: '나의 계정' });
+    setHeaderProps({ type: 'back', title: '나의 계정', onBack: () => navigate('/helper/account') });
     return () => {
       clearHeaderProps();
     };
@@ -48,18 +48,6 @@ export default function AccountEdit() {
 
   const handleSave = async () => {
     try {
-      // 모든 Store의 현재 상태로 새 프로필 생성
-      const newProfile = {
-        // ...editedProfile,
-        // pay: {
-        //   amount: selectedPay,
-        //   type: payType,
-        // },
-        // careTypes: selectedTypes,
-        // locations: selectedDistricts,
-        // schedules: schedules,
-      };
-
       await request('put', '/helper/complete-profile', {
         introduce: helper.introduce,
         careExperience: helper.careExperience,

diff --git a/src/pages/helper/AccountEdit/CareerSection.jsx b/src/pages/helper/AccountEdit/CareerSection.jsx
@@ -17,10 +17,18 @@ const CareExperienceSelector = () => {
         className='flex items-center gap-8'
         value={helper.careExperience} // Zustand에서 직접 가져옴
       >
-        <RadioItem className='hover:cursor-pointer' value={false}>
+        <RadioItem
+          className='hover:cursor-pointer'
+          value={false}
+          checked={helper.careExperience === false}
+        >
           신입
         </RadioItem>
-        <RadioItem className='hover:cursor-pointer' value={true}>
+        <RadioItem
+          className='hover:cursor-pointer'
+          value={true}
+          checked={helper.careExperience === true}
+        >
           경력
         </RadioItem>
       </Radio>

diff --git a/src/pages/helper/HelperAddress.jsx b/src/pages/helper/HelperAddress.jsx
@@ -6,7 +6,7 @@ export default function HelperAddress() {
 
   return (
     <AddressRegister
-      backPath='helper/signup'
+      backPath='/helper/signup'
       title='나의 주소지를 등록해 주세요!'
       description='요양보호사 등록을 위해 주소지를 등록해 주세요.'
       onComplete={({ addressLabel }) => {

diff --git a/src/store/auth/helper/useSignUpStore.js b/src/store/auth/helper/useSignUpStore.js
@@ -1,6 +1,7 @@
 import { create } from 'zustand';
 import { omit } from '@/utils/omit';
 import { signUpHelper, uploadHelperImg } from '@/services/signUpService';
+import { devtools } from 'zustand/middleware';
 
 // 선택 해제 시 key 삭제
 function removeLicenseField(licenseInfo, key) {
@@ -61,6 +62,7 @@ const createHelperDataSlice = (set) => ({
     kakaoUser: null,
   },
   isFirstCheck: true,
+  isEmailFirstCheck: true,
 
   setEmailAuth: (data) =>
     set((state) => ({
@@ -138,6 +140,8 @@ const createHelperDataSlice = (set) => ({
     })),
 
   setIsFirstCheck: (newBool) => set({ isFirstCheck: newBool }),
+  setIsEmailFirstCheck: (newBool) => set({ isEmailFirstCheck: newBool }),
+
   reset: () =>
     set({
       signUpForm: {
@@ -258,9 +262,11 @@ const createHelperSubmissionSlice = (set, get) => ({
   },
 });
 
-export const useSignUpStore = create((set, get) => ({
-  ...createHelperDataSlice(set),
-  ...createHelperSubmissionSlice(set, get),
-}));
+export const useSignUpStore = create(
+  devtools((set, get) => ({
+    ...createHelperDataSlice(set),
+    ...createHelperSubmissionSlice(set, get),
+  })),
+);
 
 export default useSignUpStore;