From f7ceb720bd178f4a10009679972eb8da761d527a Mon Sep 17 00:00:00 2001 From: kyw0716 Date: Wed, 19 Jul 2023 16:45:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=EC=9B=B9=ED=8C=A9=20=EB=B9=8C?= =?UTF-8?q?=EB=93=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - styled-components의 createGlobalStyle 내부에 @import 삭제 [#135] --- frontend/src/style/GlobalStyle.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/frontend/src/style/GlobalStyle.ts b/frontend/src/style/GlobalStyle.ts index f15c887bd..da46eaa22 100644 --- a/frontend/src/style/GlobalStyle.ts +++ b/frontend/src/style/GlobalStyle.ts @@ -3,13 +3,7 @@ import { createGlobalStyle } from 'styled-components'; import { reset } from './reset'; export const GlobalStyle = createGlobalStyle` - @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap"); - ${reset} - - * { - font-family: "Noto Sans KR", sans-serif !important; - } /********** hidden scroll **********/ html, From 09d706d63174784445c09de72f2925eceab0fe5c Mon Sep 17 00:00:00 2001 From: kyw0716 Date: Wed, 19 Jul 2023 16:45:42 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EA=B0=9C=EB=B0=9C=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=97=90=EC=84=9C=EB=A7=8C=20msw=EA=B0=80=20=EB=8F=99?= =?UTF-8?q?=EC=9E=91=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B6=84=EA=B8=B0?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=ED=95=9C=20=EB=B6=80=EB=B6=84=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 백엔드와 연결 성공 시 다시 분기 처리할 것 [#135] --- frontend/src/index.tsx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index 8c84139ae..8278f0a2b 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -12,14 +12,12 @@ import { GlobalStyle } from 'style/GlobalStyle'; const queryClient = new QueryClient(); const main = async () => { - if (process.env.NODE_ENV === 'development') { - await worker.start({ - serviceWorker: { - url: '/mockServiceWorker.js', - }, - onUnhandledRequest: 'bypass', - }); - } + await worker.start({ + serviceWorker: { + url: '/mockServiceWorker.js', + }, + onUnhandledRequest: 'bypass', + }); const domNode = document.getElementById('root'); const root = createRoot(domNode);