Merge branch 'develop'

PICK-PLE · Jul 19, 2024 · eda9f07 · eda9f07
2 parents fe1d962 + 7e0205c
commit eda9f07
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -13,7 +13,9 @@
     <meta
       property="og:description"
       content="내가 PICK!한 사람과 함께 하는 클래스 모임을 통해 원하는 가치를 나누어 보세요." />
-    <meta property="og:image" content="/image/thumbnail/pick_ple_thumbnail.png" />
+    <meta
+      property="og:image"
+      content="https://pickple-bucket.s3.ap-northeast-2.amazonaws.com/%E1%84%91%E1%85%B5%E1%86%A8%E1%84%91%E1%85%B3%E1%86%AF%E1%84%8B%E1%85%B5%E1%84%86%E1%85%B5%E1%84%8C%E1%85%B5.png" />
     <meta property="og:image:width" content="1200" />
     <meta property="og:image:height" content="630" />
 

diff --git a/public/svg/ic_offline.svg b/public/svg/ic_offline.svg
diff --git a/src/assets/svg/IcOffline.tsx b/src/assets/svg/IcOffline.tsx
@@ -1,17 +1,17 @@
 import type { SVGProps } from 'react';
 const SvgIcOffline = (props: SVGProps<SVGSVGElement>) => (
-  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 25" {...props}>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
     <g clipPath="url(#ic_offline_svg__a)">
       <path
         stroke="#3E3F45"
         strokeLinejoin="round"
         strokeWidth={1.5}
-        d="M18.029 6.03a.25.25 0 0 1 .322.322l-5.307 14.196a.23.23 0 0 1-.098.128.26.26 0 0 1-.152.034.26.26 0 0 1-.147-.053.24.24 0 0 1-.08-.14L11.17 14.52a1.75 1.75 0 0 0-1.308-1.308l-5.998-1.396a.24.24 0 0 1-.14-.081.26.26 0 0 1-.053-.147.26.26 0 0 1 .034-.152.23.23 0 0 1 .128-.098L18.029 6.03l-.263-.702z"
+        d="M18.652 4.714a.25.25 0 0 1 .322.322l-5.307 14.196a.23.23 0 0 1-.098.128.26.26 0 0 1-.152.034.26.26 0 0 1-.147-.054.24.24 0 0 1-.08-.14l-1.397-5.998a1.75 1.75 0 0 0-1.307-1.307l-6-1.397a.24.24 0 0 1-.139-.08.26.26 0 0 1-.053-.147.26.26 0 0 1 .034-.152.23.23 0 0 1 .128-.098l14.196-5.307-.263-.703z"
       />
     </g>
     <defs>
       <clipPath id="ic_offline_svg__a">
-        <path fill="#fff" d="M0 .5h24v24H0z" />
+        <path fill="#fff" d="M0 0h24v24H0z" />
       </clipPath>
     </defs>
   </svg>

diff --git a/src/pages/categories/page/Categories/Categories.style.ts b/src/pages/categories/page/Categories/Categories.style.ts
@@ -18,6 +18,7 @@ export const categoriesContainer = (theme: Theme) => css`
 
 export const categoryWrapper = css`
   ${flexGenerator('column', 'flex-start')};
+  gap: 0.5rem;
 
   cursor: pointer;
 `;

diff --git a/src/pages/class/components/HostInfoCard/HostInfoCard.tsx b/src/pages/class/components/HostInfoCard/HostInfoCard.tsx
@@ -1,5 +1,5 @@
 import { Image, Label } from '@components';
-import { CATEGORY_NAME, CATEGORY_SMALL_ICON } from '@constants';
+import { CATEGORY_NAME, CATEGORY_SMALL_ICON, images } from '@constants';
 
 import {
   hostInfoCardContainer,
@@ -24,7 +24,12 @@ const HostInfoCard = ({ hostId }: HostInfoCardProps) => {
 
   return (
     <div css={hostInfoCardContainer}>
-      <Image variant="round" width="6.1rem" src={hostImageUrl ?? ''} customStyle={imageStyle} />
+      <Image
+        variant="round"
+        width="6.1rem"
+        src={images.HostProfileImage || hostImageUrl}
+        customStyle={imageStyle}
+      />
 
       <div css={hostInfoCardWrapper}>
         <div>

diff --git a/src/pages/class/components/StepFour/StepFour.style.ts b/src/pages/class/components/StepFour/StepFour.style.ts
@@ -3,7 +3,7 @@ import { flexGenerator } from '@styles/generator';
 
 export const layoutStyle = css`
   ${flexGenerator('column')};
-  padding: 3.1rem 2rem 2.7rem ;
+  padding: 3.1rem 2rem 2.7rem;
   //header + progressbar 높이 = 6.6rem
   min-height: calc(100dvh - 6.6rem);
 `;
@@ -21,6 +21,7 @@ export const titleStyle = (theme: Theme) => css`
 export const subTitleStyle = (theme: Theme) => css`
   color: ${theme.color.black};
   ${theme.font['head01-b-22']};
+  margin-bottom: 0.7rem;
 `;
 
 export const headerSpanStyle = (theme: Theme) => css`

diff --git a/src/pages/guest/components/GuestMyClassEmptyView/GuestMyClassEmptyView.style.ts b/src/pages/guest/components/GuestMyClassEmptyView/GuestMyClassEmptyView.style.ts
@@ -2,9 +2,9 @@ import { Theme, css } from '@emotion/react';
 import { flexGenerator } from '@styles/generator';
 
 export const completedTabContainer = (theme: Theme) => css`
-  ${flexGenerator('column')}
+  ${flexGenerator('column')};
   height: calc(100dvh - 15rem);
-  padding: 0 9.3rem;
+  padding: 0 auto;
   width: 100%;
 
   background-color: ${theme.color.background};

diff --git a/src/pages/host/components/StepThree/StepThree.style.ts b/src/pages/host/components/StepThree/StepThree.style.ts
@@ -22,6 +22,7 @@ export const titleStyle = (theme: Theme) => css`
 export const subTitleStyle = (theme: Theme) => css`
   color: ${theme.color.black};
   ${theme.font['head01-b-22']};
+  margin-bottom: 0.7rem;
 `;
 
 export const headerSpanStyle = (theme: Theme) => css`