Merge pull request #86 from Duri-Salon/feat(salon)/statistics-page

[chore] SVG이미지 수정
Duri-Salon · Dec 19, 2024 · 2478f00 · 2478f00
2 parents b6fb4d7 + b2bd0d0
commit 2478f00
Show file tree

Hide file tree

Showing 9 changed files with 191 additions and 169 deletions.
diff --git a/apps/duri/src/components/my/InputImageFile.tsx b/apps/duri/src/components/my/InputImageFile.tsx
@@ -33,7 +33,7 @@ export const InputImageFile = ({
           borderRadius={99}
           height={29}
         >
-          <Pencil width={17} height={17} />
+          <Pencil width={17} height={17} color={theme.palette.White} />
         </PencilWrapper>
       </ProfileImageWrapper>
       <FileInput type="file" accept="image/*" onChange={handleFileChange} />

diff --git a/apps/duri/src/components/my/UserInfo.tsx b/apps/duri/src/components/my/UserInfo.tsx
@@ -50,7 +50,7 @@ export const UserInfo = ({ name, phone, profileImg }: UserInfoProps) => {
             borderRadius={99}
             height={29}
           >
-            <Pencil width={17} height={17} />
+            <Pencil width={17} height={17} color={theme.palette.White}/>
           </PencilWrapper>
         </ProfileImageWrapper>
       </Flex>

diff --git a/apps/duri/src/components/quotation/SalonCard.tsx b/apps/duri/src/components/quotation/SalonCard.tsx
@@ -32,9 +32,9 @@ export const SalonCard = ({
           {imageURL ? (
             <Image width={34} height={34} src={imageURL} borderRadius={34} />
           ) : (
-            <WidthFitFlex width={34} height={34}>
-              <Store width={28} height={28} />
-            </WidthFitFlex>
+            <Flex width={34} height={34}>
+              <Store width={34} height={24} />
+            </Flex>
           )}
           <Flex height={34}>
             <Text typo={salonName.length > 5 ? 'Caption3' : 'Body4'}>

diff --git a/apps/duri/src/pages/Home/index.tsx b/apps/duri/src/pages/Home/index.tsx
@@ -5,7 +5,7 @@ import CarouselHome from '@duri/components/home/Home';
 import RecommendedShop from '@duri/components/home/RecommendedShop';
 import SpeedQuotation from '@duri/components/home/SpeedQuotation';
 import {
-  AiStyleBanner,
+  AiBanner,
   Button,
   DuriNavbar,
   Flex,
@@ -23,7 +23,6 @@ import {
   useGetRegularShopList,
   useGetUpcomingReservation,
 } from '@duri-fe/utils';
-import styled from '@emotion/styled';
 
 const Home = () => {
   const { coordinates } = useGeolocation();
@@ -145,15 +144,10 @@ const Home = () => {
           </Flex>
 
           {/* AI 스타일링 배너 */}
-          <StyleBannerWrapper
-            borderRadius={12}
-            widthPer={100}
-            margin="26px 0 0 0"
-          >
-            <a href="/ai">
-              <AiStyleBanner height={70} />
-            </a>
-          </StyleBannerWrapper>
+          <a href="/ai">
+            <AiBanner height={100} />
+          </a>
+          {/* </StyleBannerWrapper> */}
         </Flex>
         <Flex direction="column">
           {/* 추천 샵 */}
@@ -173,9 +167,3 @@ const Home = () => {
 };
 
 export default Home;
-
-const StyleBannerWrapper = styled(HeightFitFlex)`
-  opacity: 0.9;
-  box-shadow: 0px 0px 16px 0px rgba(195, 195, 195, 0.15);
-  cursor: pointer;
-`;
diff --git a/apps/duri/src/pages/My/MyPetRegister.tsx b/apps/duri/src/pages/My/MyPetRegister.tsx
@@ -5,6 +5,7 @@ import { PetRegisterForm } from '@duri/components/my/register/PetRegisterForm';
 import { BREEDS_MAPPING } from '@duri/constants';
 import {
   Button,
+  Doori,
   DuriNavbar,
   Flex,
   Header,
@@ -63,13 +64,14 @@ const MyPetRegisterPage = () => {
   return (
     <MobileLayout backgroundColor={theme.palette.Gray_White}>
       <Header
-        title="마이펫 정보 등록"
+        title="마이펫 추가"
         titleAlign="start"
         backIcon
         onClickBack={() => navigate('/my/pet')}
       />
-      <Flex direction="column" margin="0 0 100px">
-        <Flex direction="column" padding="0 20px" margin="0 0 30px 0">
+      <Flex direction="column" margin="24px 0 100px">
+        <Doori width={170} height={53}/>
+        <Flex direction="column" padding="0 20px" margin="16px 0 30px 0">
           <PetRegisterForm
             control={control}
             getValues={getValues}

diff --git a/packages/ui/src/assets/AiBanner.tsx b/packages/ui/src/assets/AiBanner.tsx
diff --git a/packages/ui/src/assets/AiStyleBanner.tsx b/packages/ui/src/assets/AiStyleBanner.tsx
diff --git a/packages/ui/src/assets/index.tsx b/packages/ui/src/assets/index.tsx
@@ -57,7 +57,7 @@ export { default as Send } from './Send';
 export { default as Shopping } from './Shopping';
 export { default as Star } from './Star';
 export { default as Write } from './Write';
-export { default as AiStyleBanner } from './AiStyleBanner';
+export { default as AiBanner } from './AiBanner';
 export { default as AlertStar } from './AlertStar';
 export { default as NaverLogo } from './NaverLogo';
 export { default as SpeechBalloon } from './SpeechBalloon';

diff --git a/packages/ui/src/components/PetInfo/PetInfo.tsx b/packages/ui/src/components/PetInfo/PetInfo.tsx
@@ -76,7 +76,7 @@ export const PetInfo = ({
               height={29}
               imageSize={imageSize.width}
             >
-              <Pencil width={17} height={17} />
+              <Pencil width={17} height={17} color={theme.palette.White} />
             </PencilWrapper>
           </ProfileImageWrapper>
         ) : (