Merge pull request #107 from Ureca-Dangdang-salon/develop

알림 테스트 배포
Ureca-Dangdang-salon · Dec 11, 2024 · f062882 · f062882
2 parents e31959a + e7529b2
commit f062882
Show file tree

Hide file tree

Showing 28 changed files with 299 additions and 175 deletions.
diff --git a/public/_redirects b/public/_redirects
diff --git a/src/api/dogProfile.js b/src/api/dogProfile.js
@@ -5,7 +5,6 @@ export const dogProfile = async (id) => {
   try {
     const url = `${ProfileController.dogProfile}/${id}`;
     const { data } = await apiClient.get(url);
-    console.log(data);
     return data.response;
   } catch (e) {
     console.log(e);

diff --git a/src/api/socialProfile.js b/src/api/socialProfile.js
@@ -11,9 +11,10 @@ export const socialProfile = async () => {
   }
 };
 
-export const updateSocialProfile = async (district_id) => {
+export const updateSocialProfile = async (image_key, district_id) => {
   try {
     const { data } = await apiClient.put(ProfileController.socialProfile, {
+      imageKey: image_key,
       districtId: district_id,
     });
     if (data.response === '유저 정보가 변경되었습니다.') return true;

diff --git a/src/components/Features/ImageSelector.jsx b/src/components/Features/ImageSelector.jsx
@@ -2,16 +2,13 @@ import { useRef } from 'react';
 import { Box, IconButton } from '@mui/material';
 import AddRoundedIcon from '@mui/icons-material/AddRounded';
 import HighlightOffRoundedIcon from '@mui/icons-material/HighlightOffRounded';
-import toast from 'react-hot-toast';
 import SubTitle from '@components/NewRequest/atoms/SubTitle';
 import { uploadImage } from '@/api/image';
+import { maxImagesReached } from '@/utils/toastUtils';
 
 const ImageSelector = ({ maxImages, images, onChange }) => {
   const fileInputRef = useRef(null);
 
-  const maxImagesReached = () =>
-    toast.error(`최대 ${maxImages}장까지 업로드 할 수 있습니다`);
-
   const handleOpenFileInput = () => {
     if (fileInputRef.current) {
       fileInputRef.current.click();
@@ -24,7 +21,7 @@ const ImageSelector = ({ maxImages, images, onChange }) => {
       const fileArray = Array.from(files);
 
       if (images.length + fileArray.length > maxImages) {
-        maxImagesReached();
+        maxImagesReached(3);
         return;
       }
 

diff --git a/src/components/Features/ProfileSelector.jsx b/src/components/Features/ProfileSelector.jsx
@@ -35,16 +35,12 @@ const ProfileSelector = ({ defaultImage, image, onChange }) => {
           width="150px"
           height="150px"
           alt={selectedImage}
-          style={
-            image
-              ? {
-                  borderRadius: '50%',
-                  objectFit: 'cover',
-                  border: '2px solid',
-                  borderColor: '#9747FF',
-                }
-              : { borderRadius: '50%' }
-          }
+          style={{
+            borderRadius: '50%',
+            objectFit: 'cover',
+            border: '5px solid',
+            borderColor: '#FDD94E',
+          }}
         />
 
         <img

diff --git a/src/components/Survey/GroomerSteps/Step1.jsx b/src/components/Survey/GroomerSteps/Step1.jsx
@@ -1,19 +1,22 @@
 import SurveySection from '@/components/Survey/Common/SurveySection';
 import InputText from '@/components/Common/InputText/InputText';
 import useSurveyGroomerStore from '@/store/useSurveyGroomerStore';
+import { Box } from '@mui/material';
 
 const Step1 = () => {
   const { groomerInfo, setGroomerInfo } = useSurveyGroomerStore();
 
   return (
-    <SurveySection title="서비스 이름을 적어주세요">
-      <InputText
-        size="large"
-        placeholder="서비스 이름을 입력해주세요"
-        value={groomerInfo.name}
-        onChange={(e) => setGroomerInfo({ name: e.target.value })}
-      />
-    </SurveySection>
+    <Box mt={15} mb={15}>
+      <SurveySection title="서비스 이름을 적어주세요">
+        <InputText
+          size="large"
+          placeholder="서비스 이름을 입력해주세요"
+          value={groomerInfo.name}
+          onChange={(e) => setGroomerInfo({ name: e.target.value })}
+        />
+      </SurveySection>
+    </Box>
   );
 };
 

diff --git a/src/components/Survey/GroomerSteps/Step2.jsx b/src/components/Survey/GroomerSteps/Step2.jsx
@@ -8,7 +8,7 @@ const Step2 = () => {
 
   return (
     <SurveySection title="어떤 서비스를 제공하시나요?">
-      <Box sx={{ display: 'flex', flexDirection: 'column', gap: 1 }}>
+      <Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5 }}>
         {Object.entries(serviceList).map(([service, checked]) => (
           <RadioButton
             key={service}

diff --git a/src/components/Survey/GroomerSteps/Step3.jsx b/src/components/Survey/GroomerSteps/Step3.jsx
@@ -1,20 +1,22 @@
 import SurveySection from '@/components/Survey/Common/SurveySection';
 import InputText from '@/components/Common/InputText/InputText';
 import useSurveyGroomerStore from '@/store/useSurveyGroomerStore';
+import { Box } from '@mui/material';
 
 const Step3 = () => {
   const { groomerInfo, setGroomerInfo } = useSurveyGroomerStore();
 
   return (
-    <SurveySection title="전화번호를 입력해주세요">
-      <InputText
-        size="large"
-        placeholder="전화번호를 입력해주세요 ( - 포함)"
-        value={groomerInfo.phone}
-        onChange={(e) => setGroomerInfo({ phone: e.target.value })}
-        type="tel"
-      />
-    </SurveySection>
+    <Box mt={15} mb={15}>
+      <SurveySection title="전화번호를 입력해주세요">
+        <InputText
+          size="large"
+          placeholder="000-0000-0000 ( - 포함)"
+          value={groomerInfo.phone}
+          onChange={(e) => setGroomerInfo({ phone: e.target.value })}
+        />
+      </SurveySection>
+    </Box>
   );
 };
 

diff --git a/src/components/Survey/GroomerSteps/Step4.jsx b/src/components/Survey/GroomerSteps/Step4.jsx
@@ -1,18 +1,21 @@
 import SurveySection from '@/components/Survey/Common/SurveySection';
 import useSurveyGroomerStore from '@/store/useSurveyGroomerStore';
 import InputText from '@components/Common/InputText/InputText';
+import { Box } from '@mui/material';
 
 const Step4 = () => {
   const { groomerInfo, setGroomerInfo } = useSurveyGroomerStore();
 
   return (
-    <SurveySection title="연락 가능한 시간을 알려 주세요">
-      <InputText
-        placeholder="평일 오전 9시 ~ 오후 6시"
-        value={groomerInfo.contactHours}
-        onChange={(e) => setGroomerInfo({ contactHours: e.target.value })}
-      />
-    </SurveySection>
+    <Box mt={15} mb={15}>
+      <SurveySection title="연락 가능한 시간을 알려 주세요">
+        <InputText
+          placeholder="평일 오전 9시 ~ 오후 6시"
+          value={groomerInfo.contactHours}
+          onChange={(e) => setGroomerInfo({ contactHours: e.target.value })}
+        />
+      </SurveySection>
+    </Box>
   );
 };
 

diff --git a/src/components/Survey/GroomerSteps/Step5.jsx b/src/components/Survey/GroomerSteps/Step5.jsx
@@ -46,7 +46,7 @@ const Step5 = () => {
   return (
     <SurveySection title="서비스 지역을 알려주세요.">
       <Box>
-        <Box sx={{ display: 'flex', flexDirection: 'column', gap: 2, mb: 1 }}>
+        <Box sx={{ display: 'flex', flexDirection: 'column', gap: 2, mb: 2 }}>
           {serviceAreas.map((area, index) => (
             <Box
               key={index}

diff --git a/src/components/Survey/GroomerSteps/Step7.jsx b/src/components/Survey/GroomerSteps/Step7.jsx
@@ -41,7 +41,7 @@ const Step7 = () => {
           </Typography>
           <InputText
             size="large"
-            placeholder="사업자 번호를 입력해주세요"
+            placeholder="123-45-67890"
             value={businessInfo.businessNumber}
             onChange={(e) =>
               setBusinessInfo({ businessNumber: e.target.value })
@@ -55,7 +55,7 @@ const Step7 = () => {
           </Typography>
           <InputText
             size="large"
-            placeholder="가게 위치 정보를 입력해주세요"
+            placeholder="댕댕로 000-00"
             value={businessInfo.address}
             onChange={(e) => setBusinessInfo({ address: e.target.value })}
           />

diff --git a/src/components/Survey/UserSteps/Step1.jsx b/src/components/Survey/UserSteps/Step1.jsx
@@ -1,19 +1,22 @@
 import InputText from '@/components/Common/InputText/InputText';
 import SurveySection from '@/components/Survey/Common/SurveySection';
 import useSurveyUserStore from '@/store/useSurveyUserStore';
+import { Box } from '@mui/material';
 
 const Step1 = () => {
   const { petInfo, setPetInfo } = useSurveyUserStore();
 
   return (
-    <SurveySection title="반려견의 이름을 입력해주세요">
-      <InputText
-        size="large"
-        placeholder="이름을 입력해주세요"
-        value={petInfo.name}
-        onChange={(e) => setPetInfo({ name: e.target.value })}
-      />
-    </SurveySection>
+    <Box mt={15} mb={15}>
+      <SurveySection title="반려견의 이름을 입력해주세요">
+        <InputText
+          size="large"
+          placeholder="이름을 입력해주세요"
+          value={petInfo.name}
+          onChange={(e) => setPetInfo({ name: e.target.value })}
+        />
+      </SurveySection>
+    </Box>
   );
 };
 

diff --git a/src/components/Survey/UserSteps/Step2.jsx b/src/components/Survey/UserSteps/Step2.jsx
@@ -7,29 +7,31 @@ const Step2 = () => {
   const { petInfo, setPetInfo } = useSurveyUserStore();
 
   return (
-    <SurveySection title="반려견의 나이를 입력해주세요">
-      <Box
-        sx={{
-          display: 'flex',
-          gap: 2,
-          alignItems: 'center',
-          justifyContent: 'center',
-        }}
-      >
-        <NumberPicker
-          value={petInfo.ageYear}
-          onChange={(e) => setPetInfo({ ageYear: e })}
-          label="년"
-          max={20}
-        />
-        <NumberPicker
-          value={petInfo.ageMonth}
-          onChange={(e) => setPetInfo({ ageMonth: e })}
-          label="개월"
-          max={11}
-        />
-      </Box>
-    </SurveySection>
+    <Box mt={15} mb={15}>
+      <SurveySection title="반려견의 나이를 입력해주세요">
+        <Box
+          sx={{
+            display: 'flex',
+            gap: 2,
+            alignItems: 'center',
+            justifyContent: 'center',
+          }}
+        >
+          <NumberPicker
+            value={petInfo.ageYear}
+            onChange={(e) => setPetInfo({ ageYear: e })}
+            label="년"
+            max={20}
+          />
+          <NumberPicker
+            value={petInfo.ageMonth}
+            onChange={(e) => setPetInfo({ ageMonth: e })}
+            label="개월"
+            max={11}
+          />
+        </Box>
+      </SurveySection>
+    </Box>
   );
 };
 

diff --git a/src/components/Survey/UserSteps/Step3.jsx b/src/components/Survey/UserSteps/Step3.jsx
@@ -7,16 +7,18 @@ const Step3 = () => {
   const { petInfo, setPetInfo } = useSurveyUserStore();
 
   return (
-    <SurveySection title="반려견의 몸무게를 선택해주세요">
-      <Box sx={{ display: 'flex', justifyContent: 'center' }}>
-        <NumberPicker
-          value={petInfo.weight}
-          onChange={(value) => setPetInfo({ weight: value })}
-          label="kg"
-          max={100}
-        />
-      </Box>
-    </SurveySection>
+    <Box mt={15} mb={15}>
+      <SurveySection title="반려견의 몸무게를 선택해주세요">
+        <Box sx={{ display: 'flex', justifyContent: 'center' }}>
+          <NumberPicker
+            value={petInfo.weight}
+            onChange={(value) => setPetInfo({ weight: value })}
+            label="kg"
+            max={100}
+          />
+        </Box>
+      </SurveySection>
+    </Box>
   );
 };
 

diff --git a/src/components/Survey/UserSteps/Step4.jsx b/src/components/Survey/UserSteps/Step4.jsx
@@ -2,6 +2,7 @@ import SurveySection from '@/components/Survey/Common/SurveySection';
 import useSurveyUserStore from '@/store/useSurveyUserStore';
 import { Selector } from '@components/Common/Selector/Selector';
 import { breeds } from '@/constants/breeds';
+import { Box } from '@mui/material';
 
 const Step4 = () => {
   const { petInfo, setPetInfo } = useSurveyUserStore();
@@ -11,15 +12,17 @@ const Step4 = () => {
   };
 
   return (
-    <SurveySection title="반려견의 견종을 입력해주세요">
-      <Selector
-        label="견종을 선택해주세요"
-        value={petInfo.species}
-        choices={breeds}
-        onChange={handleChange}
-        field="species"
-      />
-    </SurveySection>
+    <Box mt={15} mb={15}>
+      <SurveySection title="반려견의 견종을 입력해주세요">
+        <Selector
+          label="견종을 선택해주세요"
+          value={petInfo.species}
+          choices={breeds}
+          onChange={handleChange}
+          field="species"
+        />
+      </SurveySection>
+    </Box>
   );
 };
 

diff --git a/src/constants/breeds.js b/src/constants/breeds.js
@@ -3,6 +3,7 @@ export const breeds = [
   '골든 리트리버',
   '저먼 셰퍼드',
   '비글',
+  '말티푸',
   '시베리안 허스키',
   '불독',
   '요크셔 테리어',

diff --git a/src/pages/NewReview.jsx b/src/pages/NewReview.jsx
@@ -56,7 +56,6 @@ const NewReview = () => {
 
   return (
     <Box>
-      <Toaster />
       <DetailHeader label="리뷰 작성" />
       <Box p={4}>
         <Box display="flex">

diff --git a/src/pages/Survey/Survey.jsx b/src/pages/Survey/Survey.jsx
@@ -68,12 +68,14 @@ function Survey() {
         >
           <Button
             size="large"
+            disabled={location ? false : true}
             backgroundColor={location ? 'primary' : 'n3'}
             onClick={handleHairstylistSignup}
             label="미용사로 가입하기"
           />
           <Button
             size="large"
+            disabled={location ? false : true}
             backgroundColor={location ? 'secondary' : 'n3'}
             onClick={handleUserSignup}
             label="사용자로 가입하기"