Skip to content

Commit 2478f00

Browse files
authored
Merge pull request #86 from Duri-Salon/feat(salon)/statistics-page
[chore] SVG이미지 수정
2 parents b6fb4d7 + b2bd0d0 commit 2478f00

File tree

9 files changed

+191
-169
lines changed

9 files changed

+191
-169
lines changed

apps/duri/src/components/my/InputImageFile.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const InputImageFile = ({
3333
borderRadius={99}
3434
height={29}
3535
>
36-
<Pencil width={17} height={17} />
36+
<Pencil width={17} height={17} color={theme.palette.White} />
3737
</PencilWrapper>
3838
</ProfileImageWrapper>
3939
<FileInput type="file" accept="image/*" onChange={handleFileChange} />

apps/duri/src/components/my/UserInfo.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export const UserInfo = ({ name, phone, profileImg }: UserInfoProps) => {
5050
borderRadius={99}
5151
height={29}
5252
>
53-
<Pencil width={17} height={17} />
53+
<Pencil width={17} height={17} color={theme.palette.White}/>
5454
</PencilWrapper>
5555
</ProfileImageWrapper>
5656
</Flex>

apps/duri/src/components/quotation/SalonCard.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ export const SalonCard = ({
3232
{imageURL ? (
3333
<Image width={34} height={34} src={imageURL} borderRadius={34} />
3434
) : (
35-
<WidthFitFlex width={34} height={34}>
36-
<Store width={28} height={28} />
37-
</WidthFitFlex>
35+
<Flex width={34} height={34}>
36+
<Store width={34} height={24} />
37+
</Flex>
3838
)}
3939
<Flex height={34}>
4040
<Text typo={salonName.length > 5 ? 'Caption3' : 'Body4'}>

apps/duri/src/pages/Home/index.tsx

+5-17
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import CarouselHome from '@duri/components/home/Home';
55
import RecommendedShop from '@duri/components/home/RecommendedShop';
66
import SpeedQuotation from '@duri/components/home/SpeedQuotation';
77
import {
8-
AiStyleBanner,
8+
AiBanner,
99
Button,
1010
DuriNavbar,
1111
Flex,
@@ -23,7 +23,6 @@ import {
2323
useGetRegularShopList,
2424
useGetUpcomingReservation,
2525
} from '@duri-fe/utils';
26-
import styled from '@emotion/styled';
2726

2827
const Home = () => {
2928
const { coordinates } = useGeolocation();
@@ -145,15 +144,10 @@ const Home = () => {
145144
</Flex>
146145

147146
{/* AI 스타일링 배너 */}
148-
<StyleBannerWrapper
149-
borderRadius={12}
150-
widthPer={100}
151-
margin="26px 0 0 0"
152-
>
153-
<a href="/ai">
154-
<AiStyleBanner height={70} />
155-
</a>
156-
</StyleBannerWrapper>
147+
<a href="/ai">
148+
<AiBanner height={100} />
149+
</a>
150+
{/* </StyleBannerWrapper> */}
157151
</Flex>
158152
<Flex direction="column">
159153
{/* 추천 샵 */}
@@ -173,9 +167,3 @@ const Home = () => {
173167
};
174168

175169
export default Home;
176-
177-
const StyleBannerWrapper = styled(HeightFitFlex)`
178-
opacity: 0.9;
179-
box-shadow: 0px 0px 16px 0px rgba(195, 195, 195, 0.15);
180-
cursor: pointer;
181-
`;

apps/duri/src/pages/My/MyPetRegister.tsx

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { PetRegisterForm } from '@duri/components/my/register/PetRegisterForm';
55
import { BREEDS_MAPPING } from '@duri/constants';
66
import {
77
Button,
8+
Doori,
89
DuriNavbar,
910
Flex,
1011
Header,
@@ -63,13 +64,14 @@ const MyPetRegisterPage = () => {
6364
return (
6465
<MobileLayout backgroundColor={theme.palette.Gray_White}>
6566
<Header
66-
title="마이펫 정보 등록"
67+
title="마이펫 추가"
6768
titleAlign="start"
6869
backIcon
6970
onClickBack={() => navigate('/my/pet')}
7071
/>
71-
<Flex direction="column" margin="0 0 100px">
72-
<Flex direction="column" padding="0 20px" margin="0 0 30px 0">
72+
<Flex direction="column" margin="24px 0 100px">
73+
<Doori width={170} height={53}/>
74+
<Flex direction="column" padding="0 20px" margin="16px 0 30px 0">
7375
<PetRegisterForm
7476
control={control}
7577
getValues={getValues}

packages/ui/src/assets/AiBanner.tsx

+174
Large diffs are not rendered by default.

packages/ui/src/assets/AiStyleBanner.tsx

-142
This file was deleted.

packages/ui/src/assets/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export { default as Send } from './Send';
5757
export { default as Shopping } from './Shopping';
5858
export { default as Star } from './Star';
5959
export { default as Write } from './Write';
60-
export { default as AiStyleBanner } from './AiStyleBanner';
60+
export { default as AiBanner } from './AiBanner';
6161
export { default as AlertStar } from './AlertStar';
6262
export { default as NaverLogo } from './NaverLogo';
6363
export { default as SpeechBalloon } from './SpeechBalloon';

packages/ui/src/components/PetInfo/PetInfo.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export const PetInfo = ({
7676
height={29}
7777
imageSize={imageSize.width}
7878
>
79-
<Pencil width={17} height={17} />
79+
<Pencil width={17} height={17} color={theme.palette.White} />
8080
</PencilWrapper>
8181
</ProfileImageWrapper>
8282
) : (

0 commit comments

Comments
 (0)