Merge pull request #116 from blaybus-hackathon/feat/caregiver-matching

Feat/caregiver matching

Author: TakioN

src/App.jsx

@@ -21,7 +21,7 @@ const AccountPay = lazy(() => import('./pages/helper/AccountEdit/navigate/Accoun
 const AccountCareType = lazy(() => import('./pages/helper/AccountEdit/navigate/AccountCareType'));
 const DashBoard = lazy(() => import('./pages/center/Dashboard'));
 const Matching = lazy(() => import('./pages/center/Matching'));
-const RecriutDetail = lazy(() => import('./pages/center/RecriutDetail'));
+const RecruitDetail = lazy(() => import('./pages/center/RecruitDetail'));
 const ModifyRecruit = lazy(() => import('./pages/center/ModifyRecruit'));
 const CaregiverInfo = lazy(() => import('./pages/center/CaregiverInfo'));
 const CenterRegister = lazy(() => import('./pages/center/CenterRegister'));
@@ -59,7 +59,7 @@ function App() {
             <Route path='center/matching' element={<Matching />} />
             <Route path='center/matching-info' element={<MatchingInfo />} />
             <Route path='center/register/address' element={<ElderAddress />} />
-            <Route path='center/recruit/detail' element={<RecriutDetail />} />
+            <Route path='center/recruit/detail' element={<RecruitDetail />} />
             <Route path='center/recruit/modify' element={<ModifyRecruit />} />
             <Route path='center/care-info' element={<CaregiverInfo />} />
 

src/components/Center/RecruitInfo/ElderInfoCheck.jsx

@@ -80,7 +80,7 @@ export default function MatchingManage2({ handleMatchingPage }) {
         </p>
       </div>
 
-      <div className='mx-auto flex flex-col gap-5 max-w-2xl mb-40'>
+      <div className='mx-auto flex flex-col gap-5 max-w-2xl mb-3'>
         <div className='flex pb-5 border-b border-[var(--outline)]'>
           <div className='flex items-center justify-center mr-8'>
             <img
@@ -164,14 +164,6 @@ export default function MatchingManage2({ handleMatchingPage }) {
             </p>
           </div>
         </div>
-        {/* <div className='px-5'>
-          <div className='flex min-h-16'>
-            <p className='flex flex-1 text-start font-semibold text-xl items-center'>케어필요</p>
-            <p className='flex flex-1 text-start bg-[var(--button-inactive)] items-center rounded-md text-xl px-5'>
-              {}
-            </p>
-          </div>
-        </div> */}
         <div className='px-5'>
           <div className='flex min-h-16'>
             <p className='flex flex-1 text-start font-semibold text-xl items-center'>동거인 여부</p>
@@ -222,17 +214,9 @@ export default function MatchingManage2({ handleMatchingPage }) {
             </div>
           </div>
         </div>
-        {/* <div className='px-5'>
-          <div className='flex min-h-16'>
-            <p className='flex flex-1 text-start font-semibold text-xl items-center'>희망시급</p>
-            <p className='flex flex-1 text-start bg-[var(--button-inactive)] items-center rounded-md text-xl px-5'>
-              {recruitReq.wage || 10300}
-            </p>
-          </div>
-        </div> */}
 
         <Button
-          className='h-16 w-4/5 bg-[var(--company-primary)] text-xl hover:bg-[var(--company-primary)]/90 fixed bottom-[5rem] left-1/2 -translate-x-1/2 font-bold'
+          className='h-16 w-full bg-[var(--company-primary)] text-xl hover:bg-[var(--company-primary)]/90 font-bold'
           onClick={() => {
             window.scrollTo(0, 0);
             handleMatchingPage((prev) => {

src/components/Center/RecruitInfo/RecruitSetting.jsx

@@ -292,7 +292,7 @@ export default function MatchingManage3({ handleMatchingPage }) {
         </p>
       </div>
 
-      <div className='mx-auto flex flex-col gap-10 max-w-2xl mb-40'>
+      <div className='mx-auto flex flex-col gap-10 max-w-2xl mb-3'>
         <div className='flex flex-col items-start'>
           <label className='font-semibold text-xl mb-4'>근무 종류</label>
           <div className='grid grid-cols-2 w-full gap-4'>{renderWorkType()}</div>
@@ -420,7 +420,7 @@ export default function MatchingManage3({ handleMatchingPage }) {
           <div className='w-full grid grid-cols-2 gap-4'>{renderBenefit()}</div>
         </div>
         <Button
-          className='h-16 w-4/5 bg-[var(--company-primary)] text-xl hover:bg-[var(--company-primary)]/90 fixed bottom-[5rem] left-1/2 -translate-x-1/2 font-bold'
+          className='h-16 w-full bg-[var(--company-primary)] text-xl hover:bg-[var(--company-primary)]/90 font-bold'
           disabled={ptDateBit === 0 || wage === 0}
           onClick={() => {
             postRecruit();

src/pages/center/ModifyRecruit.jsx

@@ -174,7 +174,7 @@ export default function ModifyInfo() {
 
   return (
     <div>
-      <div className='max-w-2xl mx-auto px-6 mt-8 gap-10 flex flex-col mb-40'>
+      <div className='max-w-2xl mx-auto px-6 mt-8 gap-10 flex flex-col mb-3'>
         <div className='flex flex-col items-start'>
           <label className='font-semibold text-xl mb-5'>
             이름<span className='text-[var(--required-red)] text-sm ml-2'>필수</span>
@@ -342,7 +342,7 @@ export default function ModifyInfo() {
           <span className='absolute -bottom-6 right-3'>{`${guitar.length}/300`}</span>
         </div>
         <Button
-          className='h-16 w-4/5 bg-[var(--company-primary)] text-xl hover:bg-[var(--company-primary)]/90 fixed bottom-8 left-1/2 -translate-x-1/2 font-bold'
+          className='h-16 w-full bg-[var(--company-primary)] text-xl hover:bg-[var(--company-primary)]/90 font-bold'
           onClick={() => {
             modify();
           }}

src/pages/center/RecriutDetail.jsx src/pages/center/RecruitDetail.jsxsrc/pages/center/RecriutDetail.jsx renamed to src/pages/center/RecruitDetail.jsx

@@ -138,7 +138,7 @@ export default function PatientInfo() {
         </div>
       </div>
 
-      <div className='px-5 pt-8 flex flex-col gap-7.5 items-start mb-40'>
+      <div className='px-5 pt-8 flex flex-col gap-7.5 items-start mb-3'>
         <div className='w-full flex h-16'>
           <p className='flex flex-1 text-start font-semibold text-xl h-full items-center'>
             보유질병
@@ -181,7 +181,7 @@ export default function PatientInfo() {
         </div>
 
         <Button
-          className='h-16 w-4/5 bg-[var(--company-primary)] text-xl hover:bg-[var(--company-primary)]/90 fixed bottom-20 left-1/2 -translate-x-1/2 font-bold'
+          className='h-16 w-full bg-[var(--company-primary)] text-xl hover:bg-[var(--company-primary)]/90 font-bold'
           onClick={gotoModify}
         >
           수정하기