Merge branch 'fe-dev' of https://github.com/woowacourse-teams/2024-ha…

…eng-dong into feature/#780
woowacourse-teams · Oct 23, 2024 · 9855e3a · 9855e3a
2 parents fd049f0 + f98c0ea
commit 9855e3a
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 11 deletions.
diff --git a/client/.storybook/preview.tsx b/client/.storybook/preview.tsx
@@ -2,6 +2,7 @@
 
 import type {Preview} from '@storybook/react';
 import {HDesignProvider} from '../src/components/Design';
+import {css, Global} from '@emotion/react';
 
 const preview: Preview = {
   parameters: {
@@ -30,11 +31,23 @@ const preview: Preview = {
     },
   },
   decorators: [
-    Story => (
-      <HDesignProvider>
-        <Story />
-      </HDesignProvider>
-    ),
+    Story => {
+      return (
+        <div>
+          <Global
+            styles={css`
+              @import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css');
+              body {
+                font-family: 'Pretendard', sans-serif;
+              }
+            `}
+          />
+          <HDesignProvider>
+            <Story />
+          </HDesignProvider>
+        </div>
+      );
+    },
   ],
 };
 

diff --git a/client/index.html b/client/index.html
@@ -32,6 +32,9 @@
 
     <link rel="canonical" href="https://haengdong.pro/" />
     <link rel="icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="preconnect" href="https://cdn.jsdelivr.net" />
+    <link rel="dns-prefetch" href="https://cdn.jsdelivr.net" />
+    <link href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" rel="stylesheet" />
     <script
       src="https://t1.kakaocdn.net/kakao_js_sdk/2.7.2/kakao.min.js"
       integrity="sha384-TiCUE00h649CAMonG018J2ujOgDKW/kVWlChEuu4jK2vxfAAD0eZxzCKakxg55G4"

diff --git a/client/src/GlobalStyle.ts b/client/src/GlobalStyle.ts
@@ -2,8 +2,6 @@ import {css} from '@emotion/react';
 
 // reset css -> index css
 export const GlobalStyle = css`
-  @import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css');
-
   *:where(:not(html, iframe, canvas, img, svg, video, audio):not(svg *, symbol *)) {
     all: unset;
     display: revert;

diff --git a/client/src/components/Design/components/Carousel/Carousel.stories.tsx b/client/src/components/Design/components/Carousel/Carousel.stories.tsx
@@ -1,3 +1,4 @@
+/** @jsxImportSource @emotion/react */
 import type {Meta, StoryObj} from '@storybook/react';
 
 import Carousel from './Carousel';

diff --git a/client/src/components/Design/components/Carousel/CarouselDeleteButton.tsx b/client/src/components/Design/components/Carousel/CarouselDeleteButton.tsx
@@ -1,3 +1,4 @@
+/** @jsxImportSource @emotion/react */
 import Icon from '../Icon/Icon';
 
 import {deleteButtonStyle} from './Carousel.style';

diff --git a/client/src/components/Design/components/Carousel/CarouselIndicator.tsx b/client/src/components/Design/components/Carousel/CarouselIndicator.tsx
@@ -1,3 +1,4 @@
+/** @jsxImportSource @emotion/react */
 import {useTheme} from '@components/Design/theme/HDesignProvider';
 
 import {indicatorContainerStyle, indicatorStyle} from './Carousel.style';

diff --git a/...esign/components/Carousel/useCarousel.tsx → ...Design/components/Carousel/useCarousel.ts b/...esign/components/Carousel/useCarousel.tsx → ...Design/components/Carousel/useCarousel.ts
diff --git a/client/src/components/Design/theme/GlobalStyle.ts b/client/src/components/Design/theme/GlobalStyle.ts
@@ -2,8 +2,6 @@ import {css} from '@emotion/react';
 
 // reset css -> index css
 export const GlobalStyle = css`
-  @import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css');
-
   *:where(:not(html, iframe, canvas, img, svg, video, audio):not(svg *, symbol *)) {
     all: unset;
     display: revert;

diff --git a/client/src/components/Footer/Footer.tsx b/client/src/components/Footer/Footer.tsx
@@ -15,8 +15,9 @@ const Footer: React.FC<FooterProps> = () => {
         <a href="https://github.com/woowacourse-teams/2024-haeng-dong/wiki" target="_blank">
           행동대장 소개
         </a>
-        {/* TODO: (@soha) 문의 페이지 링크로 꼭!! 추후 수정 */}
-        <Link to={'/'}>문의하기</Link>
+        <a href="https://forms.gle/qtGXJ8WdPsWA3KURA" target="_blank">
+          문의하기
+        </a>
         <a href="mailto:[email protected]">이메일</a>
       </div>
       <Text size="tiny" textColor="gray">