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

Duri-Salon · Dec 19, 2024 · f9ebeb2 · f9ebeb2
2 parents 2478f00 + 144aafb
commit f9ebeb2
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 28 deletions.
diff --git a/apps/admin/vite.config.ts.timestamp-1734531572622-60e0f4a382fa.mjs b/apps/admin/vite.config.ts.timestamp-1734531572622-60e0f4a382fa.mjs
diff --git a/apps/duri/src/assets/images/pngs/ShopDefaultImage.png b/apps/duri/src/assets/images/pngs/ShopDefaultImage.png
diff --git a/apps/duri/src/components/shop/ShopInfo.tsx b/apps/duri/src/components/shop/ShopInfo.tsx
@@ -1,6 +1,7 @@
 import { BottomSheet } from 'react-spring-bottom-sheet';
 import { useNavigate } from 'react-router-dom';
 
+import ShopDefaultImage from '@assets/images/pngs/ShopDefaultImage.png';
 import {
   BeforeArrow,
   Button,
@@ -125,7 +126,7 @@ export const ShopInfo = ({
           padding="0 20px 160px 20px"
           key={shopId}
         >
-          <MainImg src={shopImage} />
+          <MainImg src={shopImage ?? ShopDefaultImage} />
           {/**헤더 */}
           <HeightFitFlex direction="column" gap={8} margin="24px 0 0 0">
             <Flex gap={17} justify="flex-start" margin="0 0 9px 0">

diff --git a/apps/duri/src/components/shop/ShopLine.tsx b/apps/duri/src/components/shop/ShopLine.tsx
@@ -1,11 +1,12 @@
 import { BottomSheet } from 'react-spring-bottom-sheet';
 
+import ShopDefaultImage from '@assets/images/pngs/ShopDefaultImage.png';
 import {
   Button,
   Flex,
   HardText,
   HeightFitFlex,
-  ProfileImage,
+  Image,
   SalonTag,
   Send,
   Star,
@@ -68,7 +69,12 @@ export const ShopLine = ({
 
   return (
     <HeightFitFlex gap={20} key={id} onClick={openShopInfoSheet}>
-      <ProfileImage height={92} width={92} src={shopImg} borderRadius={8} />
+      <Image
+        height={92}
+        width={92}
+        src={shopImg ?? ShopDefaultImage}
+        borderRadius={8}
+      />
       <Flex direction="column" align="flex-start" gap={8}>
         <Flex gap={17} justify="flex-start">
           <Text typo="Body2">{title}</Text>

diff --git a/apps/duri/src/pages/Home/index.tsx b/apps/duri/src/pages/Home/index.tsx
@@ -69,6 +69,7 @@ const Home = () => {
               logoColor={theme.palette.Black}
               iconColor={theme.palette.Normal800}
               searchIcon
+              notificationIcon={false}
               onClickSearch={handleNavigate}
             />
           ) : (

diff --git a/apps/duri/src/pages/Shop/ShopDetail.tsx b/apps/duri/src/pages/Shop/ShopDetail.tsx
@@ -5,10 +5,10 @@ import { DuriNavbar, MobileLayout } from '@duri-fe/ui';
 
 const ShopDetail = () => {
   const { shopId } = useParams<{ shopId: string }>();
-  console.log(shopId);
+
 
   const shopIndex = shopId ? Number(shopId) : 0;
-  console.log(shopIndex);
+
 
   return (
     <MobileLayout>

diff --git a/apps/salon/src/pages/Home/index.tsx b/apps/salon/src/pages/Home/index.tsx
@@ -113,6 +113,7 @@ const Home = () => {
             <MainHeader
               logoColor={theme.palette.Black}
               iconColor={theme.palette.Normal800}
+              notificationIcon={false}
               badge
             />
 

diff --git a/apps/salon/src/pages/Quotation/ReplyPage.tsx b/apps/salon/src/pages/Quotation/ReplyPage.tsx
@@ -48,6 +48,7 @@ const ReplyPage = () => {
 
   const { userName, userPhone, pet } = request || {};
 
+
   const onNextStep = async () => {
     if (step === 1) {
       setStep(2);

diff --git a/packages/ui/src/components/Portfolio/GroomerPortfolio.tsx b/packages/ui/src/components/Portfolio/GroomerPortfolio.tsx
@@ -10,6 +10,7 @@ import {
 } from '@duri-fe/utils/src/apis/types/my';
 import styled from '@emotion/styled';
 
+import ShopDefaultImage from '../../assets/images/ShopDefaultImage.png';
 import { Flex, HeightFitFlex, WidthFitFlex } from '../FlexBox';
 import { Text } from '../Typo';
 
@@ -35,7 +36,10 @@ export const GroomerPortfolio = ({ groomerId }: { groomerId: number }) => {
   return (
     <>
       <HeaderBox>
-        <MainImg alt="shop-image" src={shopProfile?.imageURL} />
+        <MainImg
+          alt="shop-image"
+          src={shopProfile?.imageURL ?? ShopDefaultImage}
+        />
         <TextBox direction="column" gap={14}>
           <HeightFitFlex gap={10} justify="flex-start">
             <Text typo="Title4" colorCode={theme.palette.White}>