From 56bf5183942b0e9f3690ec4c79dd7a206f5fe58f Mon Sep 17 00:00:00 2001
From: Soyeon Choe <77609591+soi-ha@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:10:53 +0900
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EB=AC=B8=EC=9D=98=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B5=AC=ED=98=84=20?=
 =?UTF-8?q?(#772)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 문의하기 구글 forms 페이지 링크 연결

* fix: chromatic 에러 해결
---
 .../Design/components/Carousel/Carousel.stories.tsx          | 1 +
 .../Design/components/Carousel/CarouselDeleteButton.tsx      | 1 +
 .../Design/components/Carousel/CarouselIndicator.tsx         | 1 +
 .../components/Carousel/{useCarousel.tsx => useCarousel.ts}  | 0
 client/src/components/Footer/Footer.tsx                      | 5 +++--
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename client/src/components/Design/components/Carousel/{useCarousel.tsx => useCarousel.ts} (100%)

diff --git a/client/src/components/Design/components/Carousel/Carousel.stories.tsx b/client/src/components/Design/components/Carousel/Carousel.stories.tsx
index 0a8b19930..235fc7f04 100644
--- 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
index 9f7154395..828195095 100644
--- 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
index 971fa7d3e..ea96b1043 100644
--- 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/client/src/components/Design/components/Carousel/useCarousel.tsx b/client/src/components/Design/components/Carousel/useCarousel.ts
similarity index 100%
rename from client/src/components/Design/components/Carousel/useCarousel.tsx
rename to client/src/components/Design/components/Carousel/useCarousel.ts
diff --git a/client/src/components/Footer/Footer.tsx b/client/src/components/Footer/Footer.tsx
index b75be7ed9..fb22c0b4a 100644
--- 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:haengdongdj@gmail.com">이메일</a>
       </div>
       <Text size="tiny" textColor="gray">

From f98c0eacbd748dd163666e4fdfe947308b65e3f4 Mon Sep 17 00:00:00 2001
From: Soyeon Choe <77609591+soi-ha@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:26:04 +0900
Subject: [PATCH 2/2] =?UTF-8?q?refactor=20=EC=84=B1=EB=8A=A5=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0=20:=20Preconnect=20to=20requered=20origins=20(#771)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 성능개선 Preconnect to requered origins (font)

* fix: storybook에서 pretendard 폰트가 적용되도록 스토리북 preview.tsx 수정
---
 client/.storybook/preview.tsx                 | 23 +++++++++++++++----
 client/index.html                             |  3 +++
 client/src/GlobalStyle.ts                     |  2 --
 .../components/Design/theme/GlobalStyle.ts    |  2 --
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/client/.storybook/preview.tsx b/client/.storybook/preview.tsx
index a3c83803f..7492d7b9d 100644
--- 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
index 7f96b23c5..610cb08a1 100644
--- 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
index 22c43decc..460d50ca2 100644
--- 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/theme/GlobalStyle.ts b/client/src/components/Design/theme/GlobalStyle.ts
index b25bb94d1..afaebfc89 100644
--- 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;