From 0867c902ee5c44d871a9a74a54bec2aa326cc715 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 4 Dec 2022 05:04:53 +0900 Subject: [PATCH 01/24] =?UTF-8?q?[chore]=20=EC=9C=88=EB=8F=84=EC=9A=B0?= =?UTF-8?q?=EC=97=90=EC=84=9C=20cr=20prettier=EC=99=80=20eslint=20?= =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index da936d4..b212656 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,7 +17,14 @@ module.exports = { ], plugins: ['@typescript-eslint', 'testing-library'], ignorePatterns: ['dist/', 'node_modules/'], - rules: {}, + rules: { + 'prettier/prettier': [ + 'error', + { + endOfLine: 'auto', + }, + ], + }, overrides: [ { files: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'], From d62b620c4eea24f32e562d281e8755746da79c4c Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 00:13:05 +0900 Subject: [PATCH 02/24] fix: fix window eslint error --- .eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc.js b/.eslintrc.js index b212656..1e582b8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -24,6 +24,7 @@ module.exports = { endOfLine: 'auto', }, ], + '@typescript-eslint/ban-ts-comment': 'off', }, overrides: [ { From 6e56aad46d3705285197d6160dca33cf50dffb42 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 00:20:10 +0900 Subject: [PATCH 03/24] feat: Add GlobalStyle --- src/styles/GlobalStyle.tsx | 176 +++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 src/styles/GlobalStyle.tsx diff --git a/src/styles/GlobalStyle.tsx b/src/styles/GlobalStyle.tsx new file mode 100644 index 0000000..d7e6559 --- /dev/null +++ b/src/styles/GlobalStyle.tsx @@ -0,0 +1,176 @@ +import { Global, css } from '@emotion/react'; + +import theme from './theme'; + +export const globalStyle = ( + +); From 8a54370c5f906c59f2ecac0db62a23e417e92038 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 00:20:25 +0900 Subject: [PATCH 04/24] feat: Add global theme --- src/styles/GlobalThemeProvider.tsx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/styles/GlobalThemeProvider.tsx diff --git a/src/styles/GlobalThemeProvider.tsx b/src/styles/GlobalThemeProvider.tsx new file mode 100644 index 0000000..dab65e8 --- /dev/null +++ b/src/styles/GlobalThemeProvider.tsx @@ -0,0 +1,16 @@ +import { ThemeProvider } from '@emotion/react'; +import React, { ReactNode } from 'react'; + +import { globalStyle } from './GlobalStyle'; +import Theme from './theme'; + +const GlobalThemeProvider: React.FC<{ theme: typeof Theme; children: ReactNode }> = ({ theme, children }) => { + return ( + <> + {globalStyle} + {children} + + ); +}; + +export default GlobalThemeProvider; From 5ac80e45bfa4b56750e4c9dbf4fa4553e832597d Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 00:20:53 +0900 Subject: [PATCH 05/24] feat: Add theme --- src/styles/theme.ts | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/styles/theme.ts diff --git a/src/styles/theme.ts b/src/styles/theme.ts new file mode 100644 index 0000000..ce39019 --- /dev/null +++ b/src/styles/theme.ts @@ -0,0 +1,47 @@ +const theme = { + color: { + bgPrimary: '#000000', + bgSecondary: '#00dd00', + txtPrimary: '#FFFFFF', + txtDanger: '#dd0d0d', + txtTertiary: '#999999', + borderPrimary: '#666666', + }, + fontWeight: { + light: 300, + regular: 400, + bold: 700, + }, + fontSize: { + small: '12px', + md: '14px', + lg: '16px', + }, + lineHeight: { + sm: '16px', + md: '20px', + lg: '24px', + }, + spacing: { + sm: '4px', + md: '8px', + lg: '16px', + }, + responsive: { + sm: '480px', + md: '768px', + lg: '1024px', + }, + borderRadius: { + sm: '4px', + md: '8px', + lg: '16px', + }, + shadow: { + sm: '0 1px 2px 0 rgba(0, 0, 0, 0.05)', + md: '0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06)', + lg: '0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)', + }, +} as const; + +export default theme; From cd77a79438756a0713d44a2c9ee9c4e0dd2fe55a Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 00:21:07 +0900 Subject: [PATCH 06/24] feat: Add Example Component --- src/components/Example/Example.stories.tsx | 16 ++++++++++++++++ src/components/Example/Example.style.tsx | 18 ++++++++++++++++++ src/components/Example/Example.tsx | 19 +++++++++++++++++++ src/components/Example/index.tsx | 1 + src/pages/_app.page.tsx | 2 ++ 5 files changed, 56 insertions(+) create mode 100644 src/components/Example/Example.stories.tsx create mode 100644 src/components/Example/Example.style.tsx create mode 100644 src/components/Example/Example.tsx create mode 100644 src/components/Example/index.tsx diff --git a/src/components/Example/Example.stories.tsx b/src/components/Example/Example.stories.tsx new file mode 100644 index 0000000..23e325e --- /dev/null +++ b/src/components/Example/Example.stories.tsx @@ -0,0 +1,16 @@ +import { ComponentStory } from '@storybook/react'; +import React from 'react'; + +import Example from '.'; + +export default { + component: Example, + title: 'Components/Example', +}; + +const Template: ComponentStory = (args) => ; + +export const Default = Template.bind({}); +Default.args = { + title: 'Example Word', +}; diff --git a/src/components/Example/Example.style.tsx b/src/components/Example/Example.style.tsx new file mode 100644 index 0000000..f37951a --- /dev/null +++ b/src/components/Example/Example.style.tsx @@ -0,0 +1,18 @@ +import styled from '@emotion/styled'; + +import theme from '../../styles/theme'; + +const StyledButton = styled.button` + background-color: ${theme.color.bgSecondary}; + color: ${theme.color.txtDanger}; + border: 1px solid ${theme.color.borderPrimary}; + border-radius: ${theme.borderRadius.sm}; + padding: 8px 16px; + font-size: ${theme.fontSize.md}; + font-weight: ${theme.fontWeight.bold}; + cursor: pointer; + transition: all 0.2s ease-in-out; + margin: 10px; +`; + +export default StyledButton; diff --git a/src/components/Example/Example.tsx b/src/components/Example/Example.tsx new file mode 100644 index 0000000..8d1b08a --- /dev/null +++ b/src/components/Example/Example.tsx @@ -0,0 +1,19 @@ +import Image from 'next/image'; +import React from 'react'; + +import StyledButton from './Example.style'; + +interface IMyButton { + title: string; +} + +const MyButton = ({ title, ...props }: IMyButton) => { + return ( +
+ {title} + {''} +
+ ); +}; + +export default MyButton; diff --git a/src/components/Example/index.tsx b/src/components/Example/index.tsx new file mode 100644 index 0000000..80c34b2 --- /dev/null +++ b/src/components/Example/index.tsx @@ -0,0 +1 @@ +export { default } from './Example'; diff --git a/src/pages/_app.page.tsx b/src/pages/_app.page.tsx index 8f76633..56ad1ba 100644 --- a/src/pages/_app.page.tsx +++ b/src/pages/_app.page.tsx @@ -3,12 +3,14 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import type { AppProps } from 'next/app'; import { RecoilRoot } from 'recoil'; +import Example from '../components/Example'; import queryClient from '../configs/queryClient'; import '../styles/reset.css'; function MyApp({ Component, pageProps }: AppProps) { return ( + From 69f185152a51d0ed3e104741fb3ebd1f803a229e Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 00:32:02 +0900 Subject: [PATCH 07/24] feat: Remove GlobalStyle --- src/styles/GlobalStyle.tsx | 176 ----------------------------- src/styles/GlobalThemeProvider.tsx | 16 --- 2 files changed, 192 deletions(-) delete mode 100644 src/styles/GlobalStyle.tsx delete mode 100644 src/styles/GlobalThemeProvider.tsx diff --git a/src/styles/GlobalStyle.tsx b/src/styles/GlobalStyle.tsx deleted file mode 100644 index d7e6559..0000000 --- a/src/styles/GlobalStyle.tsx +++ /dev/null @@ -1,176 +0,0 @@ -import { Global, css } from '@emotion/react'; - -import theme from './theme'; - -export const globalStyle = ( - -); diff --git a/src/styles/GlobalThemeProvider.tsx b/src/styles/GlobalThemeProvider.tsx deleted file mode 100644 index dab65e8..0000000 --- a/src/styles/GlobalThemeProvider.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { ThemeProvider } from '@emotion/react'; -import React, { ReactNode } from 'react'; - -import { globalStyle } from './GlobalStyle'; -import Theme from './theme'; - -const GlobalThemeProvider: React.FC<{ theme: typeof Theme; children: ReactNode }> = ({ theme, children }) => { - return ( - <> - {globalStyle} - {children} - - ); -}; - -export default GlobalThemeProvider; From eb91bd514a43bc6ab36c5d5cb72868189c02c080 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 19:02:36 +0900 Subject: [PATCH 08/24] =?UTF-8?q?fix:=20Image=20src=20missing=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Example/Example.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Example/Example.tsx b/src/components/Example/Example.tsx index 8d1b08a..34d4032 100644 --- a/src/components/Example/Example.tsx +++ b/src/components/Example/Example.tsx @@ -11,7 +11,6 @@ const MyButton = ({ title, ...props }: IMyButton) => { return (
{title} - {''}
); }; From 349542cfcb99400ce13c94f2cbbb653e8678d5f0 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 19:03:15 +0900 Subject: [PATCH 09/24] =?UTF-8?q?refactor:=20eslint=20ban-ts-comment=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 1 - 1 file changed, 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 1e582b8..b212656 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -24,7 +24,6 @@ module.exports = { endOfLine: 'auto', }, ], - '@typescript-eslint/ban-ts-comment': 'off', }, overrides: [ { From c6022b722ba54a6cc67bc84c8a29415052a39af6 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Tue, 6 Dec 2022 19:05:15 +0900 Subject: [PATCH 10/24] refactor: change theme fontsize small name into sm --- src/styles/theme.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/theme.ts b/src/styles/theme.ts index ce39019..bdd5c35 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -13,7 +13,7 @@ const theme = { bold: 700, }, fontSize: { - small: '12px', + sm: '12px', md: '14px', lg: '16px', }, From b7595e000381bc6b9d28fabf177bfd23e99d4520 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Wed, 7 Dec 2022 23:26:23 +0900 Subject: [PATCH 11/24] refactor: Remove Example from _app.page.tsx --- src/pages/_app.page.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/_app.page.tsx b/src/pages/_app.page.tsx index 56ad1ba..8f76633 100644 --- a/src/pages/_app.page.tsx +++ b/src/pages/_app.page.tsx @@ -3,14 +3,12 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import type { AppProps } from 'next/app'; import { RecoilRoot } from 'recoil'; -import Example from '../components/Example'; import queryClient from '../configs/queryClient'; import '../styles/reset.css'; function MyApp({ Component, pageProps }: AppProps) { return ( - From 5db0a66d9096934a69a90fd4f9d9981090607de7 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 25 Dec 2022 22:45:53 +0900 Subject: [PATCH 12/24] =?UTF-8?q?props=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Example/Example.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Example/Example.tsx b/src/components/Example/Example.tsx index 34d4032..c783c5f 100644 --- a/src/components/Example/Example.tsx +++ b/src/components/Example/Example.tsx @@ -7,7 +7,7 @@ interface IMyButton { title: string; } -const MyButton = ({ title, ...props }: IMyButton) => { +const MyButton = ({ title }: IMyButton) => { return (
{title} From e03dab38e069384ebc90159d492e7915bbaca093 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Mon, 26 Dec 2022 01:01:47 +0900 Subject: [PATCH 13/24] Example Style Update --- src/components/Example/Example.style.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/Example/Example.style.tsx b/src/components/Example/Example.style.tsx index f37951a..dca4232 100644 --- a/src/components/Example/Example.style.tsx +++ b/src/components/Example/Example.style.tsx @@ -4,15 +4,22 @@ import theme from '../../styles/theme'; const StyledButton = styled.button` background-color: ${theme.color.bgSecondary}; - color: ${theme.color.txtDanger}; + color: ${theme.color.primaryLight}; border: 1px solid ${theme.color.borderPrimary}; border-radius: ${theme.borderRadius.sm}; padding: 8px 16px; + line-height: ${theme.lineHeight.lg}; font-size: ${theme.fontSize.md}; font-weight: ${theme.fontWeight.bold}; + font-family: ${theme.fontFamily.mainTitle}; cursor: pointer; transition: all 0.2s ease-in-out; margin: 10px; + + &:hover { + background-color: ${theme.color.bgThird}; + color: ${theme.color.primaryDark}; + } `; export default StyledButton; From 8af1870f336c84f5d6a30cff17b4d22ee2933c98 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Mon, 26 Dec 2022 01:02:06 +0900 Subject: [PATCH 14/24] design system upgrade --- src/styles/reset.css | 26 +++++++++++++++++ src/styles/theme.ts | 66 ++++++++++++++++++++++++++++---------------- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/src/styles/reset.css b/src/styles/reset.css index d971da6..7f4833d 100644 --- a/src/styles/reset.css +++ b/src/styles/reset.css @@ -1,3 +1,10 @@ +@font-face { + font-family: 'Pretendard-Regular'; + src: url('https://cdn.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} + /* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) @@ -89,6 +96,7 @@ video { border: 0; font-size: 100%; font: inherit; + font-family: 'Pretendard-Regular', 'Noto Sans CJK KR', syne; vertical-align: baseline; } /* HTML5 display-role reset for older browsers */ @@ -107,6 +115,8 @@ section { } body { line-height: 1; + background-color: #101012; + color: #f1f3f5; } ol, ul { @@ -127,3 +137,19 @@ table { border-collapse: collapse; border-spacing: 0; } +h1 { + font-size: 20pt; + font-weight: bold; +} +h2 { + font-size: 18pt; + font-weight: medium; +} +h3 { + font-size: 16pt; + font-weight: regular; +} +p { + font-size: 14pt; + font-weight: regular; +} diff --git a/src/styles/theme.ts b/src/styles/theme.ts index bdd5c35..fcf0b27 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -1,11 +1,34 @@ const theme = { color: { - bgPrimary: '#000000', - bgSecondary: '#00dd00', - txtPrimary: '#FFFFFF', - txtDanger: '#dd0d0d', - txtTertiary: '#999999', - borderPrimary: '#666666', + // common color + dark0: '#c1c2c5', + dark1: '#a6a7ab', + dark2: '#909296', + dark3: '#5c5f66', + dark4: '#373a40', + dark5: '#2c2e33', + dark6: '#25262b', + dark7: '#1a1b1e', + dark8: '#141517', + dark9: '#101113', + primaryLight: '#d2fa64', + primaryDark: '#b2dd3c', + secondaryLight: '#ff3d60', + secondaryDark: '#e02d4d', + // specialized color + bgPrimary: '#101012', + bgSecondary: '#212529', + bgThird: '#2c2e33', + topicPrimary: '#ff7991', + topicSecondary: '#aef19d', + txtPrimary: '#f1f3f5', + txtSecondary: '#6E7178', + txtDanger: '#ff0000', + borderPrimary: '#f8f9fa', + }, + fontFamily: { + basic: 'Pretendard', + mainTitle: 'Syne', }, fontWeight: { light: 300, @@ -13,34 +36,29 @@ const theme = { bold: 700, }, fontSize: { - sm: '12px', - md: '14px', + xxsm: '8px', + xsm: '12px', + sm: '14px', + md: '15px', lg: '16px', + xlg: '18px', + xxlg: '20px', + xxxlg: '24px', }, lineHeight: { - sm: '16px', - md: '20px', - lg: '24px', - }, - spacing: { - sm: '4px', - md: '8px', - lg: '16px', + md: '130%', + lg: '150%', }, + // TODO: 반응형 도입시 재정의 필요. (임시로 기준값 설정한 상태) responsive: { sm: '480px', md: '768px', lg: '1024px', }, borderRadius: { - sm: '4px', - md: '8px', - lg: '16px', - }, - shadow: { - sm: '0 1px 2px 0 rgba(0, 0, 0, 0.05)', - md: '0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06)', - lg: '0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)', + sm: '10px', // card item + md: '20px', // card + lg: '16px', // hashtag }, } as const; From 68113ed60d7b518a2b60525e6fe4be26bc194d3d Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 06:53:34 +0900 Subject: [PATCH 15/24] =?UTF-8?q?common.css=EB=A1=9C=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .storybook/preview.js | 1 + src/pages/_app.page.tsx | 1 + src/styles/common.css | 46 ++++++++++++++++++++++++++++++++++++++++ src/styles/reset.css | 47 ----------------------------------------- 4 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 src/styles/common.css diff --git a/.storybook/preview.js b/.storybook/preview.js index a1c813e..f843929 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,6 +1,7 @@ import * as NextImage from 'next/image'; import '../src/styles/reset.css'; +import '../src/styles/common.css'; export const parameters = { actions: { argTypesRegex: '^on[A-Z].*' }, diff --git a/src/pages/_app.page.tsx b/src/pages/_app.page.tsx index 8f76633..c2072dd 100644 --- a/src/pages/_app.page.tsx +++ b/src/pages/_app.page.tsx @@ -4,6 +4,7 @@ import type { AppProps } from 'next/app'; import { RecoilRoot } from 'recoil'; import queryClient from '../configs/queryClient'; +import '../styles/common.css'; import '../styles/reset.css'; function MyApp({ Component, pageProps }: AppProps) { diff --git a/src/styles/common.css b/src/styles/common.css new file mode 100644 index 0000000..5b764cd --- /dev/null +++ b/src/styles/common.css @@ -0,0 +1,46 @@ +@font-face { + font-family: 'Pretendard-Regular'; + src: url('https://cdn.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} +body { + line-height: 1; + background-color: #101012; + color: #f1f3f5; +} +ol, +ul { + list-style: none; +} +blockquote, +q { + quotes: none; +} +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +h1 { + font-size: 20pt; + font-weight: bold; +} +h2 { + font-size: 18pt; + font-weight: medium; +} +h3 { + font-size: 16pt; + font-weight: regular; +} +p { + font-size: 14pt; + font-weight: regular; +} diff --git a/src/styles/reset.css b/src/styles/reset.css index 7f4833d..0827cf3 100644 --- a/src/styles/reset.css +++ b/src/styles/reset.css @@ -1,10 +1,3 @@ -@font-face { - font-family: 'Pretendard-Regular'; - src: url('https://cdn.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff'); - font-weight: 400; - font-style: normal; -} - /* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) @@ -113,43 +106,3 @@ nav, section { display: block; } -body { - line-height: 1; - background-color: #101012; - color: #f1f3f5; -} -ol, -ul { - list-style: none; -} -blockquote, -q { - quotes: none; -} -blockquote:before, -blockquote:after, -q:before, -q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} -h1 { - font-size: 20pt; - font-weight: bold; -} -h2 { - font-size: 18pt; - font-weight: medium; -} -h3 { - font-size: 16pt; - font-weight: regular; -} -p { - font-size: 14pt; - font-weight: regular; -} From 315e0930306d8f400024c85d64d0a8d43eb7c2c4 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 15:12:13 +0900 Subject: [PATCH 16/24] =?UTF-8?q?theme=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Example/Example.style.tsx | 12 ++--- src/styles/theme.ts | 57 +++++++++++------------- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/src/components/Example/Example.style.tsx b/src/components/Example/Example.style.tsx index dca4232..bb31092 100644 --- a/src/components/Example/Example.style.tsx +++ b/src/components/Example/Example.style.tsx @@ -3,13 +3,13 @@ import styled from '@emotion/styled'; import theme from '../../styles/theme'; const StyledButton = styled.button` - background-color: ${theme.color.bgSecondary}; - color: ${theme.color.primaryLight}; + background-color: ${theme.color.G8}; + color: ${theme.color.Primary1}; border: 1px solid ${theme.color.borderPrimary}; border-radius: ${theme.borderRadius.sm}; padding: 8px 16px; - line-height: ${theme.lineHeight.lg}; - font-size: ${theme.fontSize.md}; + line-height: ${theme.lineHeight.B}; + font-size: ${theme.textSize.B2}; font-weight: ${theme.fontWeight.bold}; font-family: ${theme.fontFamily.mainTitle}; cursor: pointer; @@ -17,8 +17,8 @@ const StyledButton = styled.button` margin: 10px; &:hover { - background-color: ${theme.color.bgThird}; - color: ${theme.color.primaryDark}; + background-color: ${theme.color.Primary2}; + color: ${theme.color.G8}; } `; diff --git a/src/styles/theme.ts b/src/styles/theme.ts index fcf0b27..c886702 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -1,24 +1,19 @@ const theme = { color: { // common color - dark0: '#c1c2c5', - dark1: '#a6a7ab', - dark2: '#909296', - dark3: '#5c5f66', - dark4: '#373a40', - dark5: '#2c2e33', - dark6: '#25262b', - dark7: '#1a1b1e', - dark8: '#141517', - dark9: '#101113', - primaryLight: '#d2fa64', - primaryDark: '#b2dd3c', - secondaryLight: '#ff3d60', - secondaryDark: '#e02d4d', + G8: '#F8F9FA', + G7: '#9C9EA7', + G6: '#6E7178', + G5: '#4E5259', + G4: '#373a40', + G3: '#1E1D23', + G2: '#141517', + G1: '#101012', + Primary1: '#D2FA64', + Primary2: '#b2dd3c', + Secondary1: '#ff3d60', + Secondary2: '#e02d4d', // specialized color - bgPrimary: '#101012', - bgSecondary: '#212529', - bgThird: '#2c2e33', topicPrimary: '#ff7991', topicSecondary: '#aef19d', txtPrimary: '#f1f3f5', @@ -35,19 +30,21 @@ const theme = { regular: 400, bold: 700, }, - fontSize: { - xxsm: '8px', - xsm: '12px', - sm: '14px', - md: '15px', - lg: '16px', - xlg: '18px', - xxlg: '20px', - xxxlg: '24px', + textSize: { + H1: '40px', + H2: '24px', + H3: '20px', + T1: '18px', + T2: '16px', // B1과 동일 + T3: '15px', + B2: '14px', + B3: '12px', + B4: '8px', + code: '16px', }, lineHeight: { - md: '130%', - lg: '150%', + H: '130%', + B: '150%', }, // TODO: 반응형 도입시 재정의 필요. (임시로 기준값 설정한 상태) responsive: { @@ -57,8 +54,8 @@ const theme = { }, borderRadius: { sm: '10px', // card item - md: '20px', // card - lg: '16px', // hashtag + md: '16px', // card + lg: '100px', // hashtag }, } as const; From eb988a4a10edeee52f913ad868bed74f732b959c Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 15:15:36 +0900 Subject: [PATCH 17/24] =?UTF-8?q?div=20=EB=8C=80=EC=8B=A0=20<>=20=EB=A5=BC?= =?UTF-8?q?=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Example/Example.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Example/Example.tsx b/src/components/Example/Example.tsx index c783c5f..34c08fa 100644 --- a/src/components/Example/Example.tsx +++ b/src/components/Example/Example.tsx @@ -9,9 +9,9 @@ interface IMyButton { const MyButton = ({ title }: IMyButton) => { return ( -
+ <> {title} -
+ ); }; From 30fcdf1fba31f59bb55e0b6f210f686c6d1ca375 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 15:18:36 +0900 Subject: [PATCH 18/24] =?UTF-8?q?inerface=20=EB=AA=85=20~~Props=20?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Example/Example.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/Example/Example.tsx b/src/components/Example/Example.tsx index 34c08fa..29c8dd2 100644 --- a/src/components/Example/Example.tsx +++ b/src/components/Example/Example.tsx @@ -1,13 +1,12 @@ -import Image from 'next/image'; import React from 'react'; import StyledButton from './Example.style'; -interface IMyButton { +interface MyButtonProps { title: string; } -const MyButton = ({ title }: IMyButton) => { +const MyButton = ({ title }: MyButtonProps) => { return ( <> {title} From 485d6ff8bde22a426f9d010a43c781cf2d2b5fa9 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 15:49:53 +0900 Subject: [PATCH 19/24] =?UTF-8?q?package-lock.json=20=EB=A8=B8=EC=A7=80=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 501 +++++++++------------------------------------- 1 file changed, 93 insertions(+), 408 deletions(-) diff --git a/package-lock.json b/package-lock.json index f45e18f..2882059 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,16 +49,9 @@ "eslint-plugin-testing-library": "^5.9.1", "jest": "^29.3.1", "jest-environment-jsdom": "^29.3.1", - << - << - << < HEAD === - === - = "msw": "^0.49.1", "msw-storybook-addon": "^1.6.3", - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "prettier": "^2.7.1", + "prettier": "^2.7.1", "start-server-and-test": "^1.14.0", "tsconfig-paths-webpack-plugin": "^4.0.0", "typescript": "4.8.4" @@ -3763,11 +3756,6 @@ "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/@mswjs/cookies": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/@mswjs/cookies/-/cookies-0.2.2.tgz", @@ -3800,9 +3788,7 @@ "node": ">=14" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/@next/env": { + "node_modules/@next/env": { "version": "13.0.4", "resolved": "https://registry.npmjs.org/@next/env/-/env-13.0.4.tgz", "integrity": "sha512-N5Z3bdxBzoxrC5bwykDFITzdWuwDteOdZ+7nxixY+I1XpRX8/iQYbw2wuXMdqdfBGm2NNUpAqg8YF2e4oAC2UQ==" @@ -4105,20 +4091,13 @@ "node": ">=10" } }, - << - << - << < HEAD === - === - = "node_modules/@open-draft/until": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-1.0.3.tgz", "integrity": "sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/@pkgr/utils": { + "node_modules/@pkgr/utils": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.3.1.tgz", "integrity": "sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==", @@ -11147,11 +11126,6 @@ "@babel/types": "^7.3.0" } }, - << - << - << < HEAD === - === - = "node_modules/@types/cookie": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", @@ -11167,9 +11141,7 @@ "@types/ms": "*" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/@types/eslint": { + "node_modules/@types/eslint": { "version": "8.4.10", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", @@ -11301,20 +11273,13 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/@types/js-levenshtein": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/js-levenshtein/-/js-levenshtein-1.1.1.tgz", "integrity": "sha512-qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/@types/jsdom": { + "node_modules/@types/jsdom": { "version": "20.0.1", "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", @@ -11358,20 +11323,13 @@ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/@types/ms": { "version": "0.7.31", "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz", "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/@types/node": { + "node_modules/@types/node": { "version": "18.11.9", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", @@ -11480,11 +11438,6 @@ "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/@types/set-cookie-parser": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/@types/set-cookie-parser/-/set-cookie-parser-2.4.2.tgz", @@ -11494,9 +11447,7 @@ "@types/node": "*" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/@types/sinonjs__fake-timers": { + "node_modules/@types/sinonjs__fake-timers": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz", "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==", @@ -12350,11 +12301,6 @@ "@xtuc/long": "4.2.2" } }, - << - << - << < HEAD === - === - = "node_modules/@xmldom/xmldom": { "version": "0.8.6", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.6.tgz", @@ -12364,9 +12310,7 @@ "node": ">=10.0.0" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/@xtuc/ieee754": { + "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", @@ -12378,11 +12322,6 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/@zxing/text-encoding": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz", @@ -12390,9 +12329,7 @@ "dev": true, "optional": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/abab": { + "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", @@ -12684,7 +12621,8 @@ "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz", "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==", "dev": true, - "funding": [{ + "funding": [ + { "type": "github", "url": "https://github.com/sponsors/feross" }, @@ -13541,7 +13479,8 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, - "funding": [{ + "funding": [ + { "type": "github", "url": "https://github.com/sponsors/feross" }, @@ -13630,11 +13569,6 @@ "file-uri-to-path": "1.0.0" } }, - << - << - << < HEAD === - === - = "node_modules/bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", @@ -13646,9 +13580,7 @@ "readable-stream": "^3.4.0" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/blob-util": { + "node_modules/blob-util": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz", "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==", @@ -13973,7 +13905,8 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", "dev": true, - "funding": [{ + "funding": [ + { "type": "opencollective", "url": "https://opencollective.com/browserslist" }, @@ -14009,7 +13942,8 @@ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, - "funding": [{ + "funding": [ + { "type": "github", "url": "https://github.com/sponsors/feross" }, @@ -14268,7 +14202,8 @@ "version": "1.0.30001434", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==", - "funding": [{ + "funding": [ + { "type": "opencollective", "url": "https://opencollective.com/browserslist" }, @@ -14375,20 +14310,13 @@ "url": "https://github.com/sponsors/wooorm" } }, - << - << - << < HEAD === - === - = "node_modules/chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/check-more-types": { + "node_modules/check-more-types": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==", @@ -14402,10 +14330,12 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, - "funding": [{ - "type": "individual", - "url": "https://paulmillr.com/funding/" - }], + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -14638,11 +14568,6 @@ "node": ">=8" } }, - << - << - << < HEAD === - === - = "node_modules/cli-spinners": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz", @@ -14655,9 +14580,7 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/cli-table3": { + "node_modules/cli-table3": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", @@ -14688,11 +14611,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - << - << - << < HEAD === - === - = "node_modules/cli-width": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", @@ -14702,9 +14620,7 @@ "node": ">= 10" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/client-only": { + "node_modules/client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==" @@ -14723,11 +14639,6 @@ "node": ">=12" } }, - << - << - << < HEAD === - === - = "node_modules/clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", @@ -14737,9 +14648,7 @@ "node": ">=0.8" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/clone-deep": { + "node_modules/clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", @@ -16102,11 +16011,6 @@ "node": ">=0.10.0" } }, - << - << - << < HEAD === - === - = "node_modules/defaults": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", @@ -16119,9 +16023,7 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/define-lazy-prop": { + "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", @@ -16359,10 +16261,12 @@ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true, - "funding": [{ - "type": "github", - "url": "https://github.com/sponsors/fb55" - }] + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] }, "node_modules/domexception": { "version": "4.0.0", @@ -17954,11 +17858,6 @@ "node": ">=0.10.0" } }, - << - << - << < HEAD === - === - = "node_modules/external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -17997,9 +17896,7 @@ "node": ">=0.6.0" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/extglob": { + "node_modules/extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", @@ -18547,10 +18444,12 @@ "version": "1.15.2", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "funding": [{ - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - }], + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], "engines": { "node": ">=4.0" }, @@ -19303,11 +19202,6 @@ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/graphql": { "version": "16.6.0", "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz", @@ -19317,9 +19211,7 @@ "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/hamt_plus": { + "node_modules/hamt_plus": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/hamt_plus/-/hamt_plus-1.0.2.tgz", "integrity": "sha512-t2JXKaehnMb9paaYA7J0BX8QQAY8lwfQ9Gjf4pg/mk4krt+cmwmU652HOoWonf+7+EQV97ARPMhhVgU1ra2GhA==" @@ -19662,20 +19554,13 @@ "he": "bin/he" } }, - << - << - << < HEAD === - === - = "node_modules/headers-polyfill": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-3.1.2.tgz", "integrity": "sha512-tWCK4biJ6hcLqTviLXVR9DTRfYGQMXEIUj3gwJ2rZ5wO/at3XtkI4g8mCvFdUF9l1KMBNCfmNAdnahm1cgavQA==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/hmac-drbg": { + "node_modules/hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", @@ -19928,7 +19813,8 @@ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true, - "funding": [{ + "funding": [ + { "type": "github", "url": "https://github.com/sponsors/feross" }, @@ -20046,11 +19932,6 @@ "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/inquirer": { "version": "8.2.5", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz", @@ -20147,9 +20028,7 @@ "node": ">=8" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/internal-slot": { + "node_modules/internal-slot": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", @@ -20298,7 +20177,8 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", "dev": true, - "funding": [{ + "funding": [ + { "type": "github", "url": "https://github.com/sponsors/feross" }, @@ -20484,11 +20364,6 @@ "node": ">=6" } }, - << - << - << < HEAD === - === - = "node_modules/is-generator-function": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", @@ -20504,9 +20379,7 @@ "url": "https://github.com/sponsors/ljharb" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/is-glob": { + "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", @@ -20544,11 +20417,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - << - << - << < HEAD === - === - = "node_modules/is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", @@ -20558,9 +20426,7 @@ "node": ">=8" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/is-map": { + "node_modules/is-map": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", @@ -20581,20 +20447,13 @@ "url": "https://github.com/sponsors/ljharb" } }, - << - << - << < HEAD === - === - = "node_modules/is-node-process": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.0.1.tgz", "integrity": "sha512-5IcdXuf++TTNt3oGl9EBdkvndXA8gmc4bz/Y+mdEpWh3Mcn/+kOw6hI7LD5CocqJWMzeb0I0ClndRVNdEPuJXQ==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/is-number": { + "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", @@ -22952,11 +22811,6 @@ "@sideway/pinpoint": "^2.0.0" } }, - << - << - << < HEAD === - === - = "node_modules/js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", @@ -22966,9 +22820,7 @@ "node": ">=0.10.0" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/js-sdsl": { + "node_modules/js-sdsl": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", @@ -24353,11 +24205,6 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/msw": { "version": "0.49.1", "resolved": "https://registry.npmjs.org/msw/-/msw-0.49.1.tgz", @@ -24520,9 +24367,7 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/nan": { + "node_modules/nan": { "version": "2.17.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", @@ -25246,11 +25091,6 @@ "node": ">= 0.8.0" } }, - << - << - << < HEAD === - === - = "node_modules/ora": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", @@ -25344,9 +25184,7 @@ "node": ">=8" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/os-browserify": { + "node_modules/os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", @@ -25362,11 +25200,6 @@ "node": ">=0.10.0" } }, - << - << - << < HEAD === - === - = "node_modules/os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -25376,28 +25209,19 @@ "node": ">=0.10.0" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/ospath": { + "node_modules/ospath": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz", "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==", "dev": true }, - << - << - << < HEAD === - === - = "node_modules/outvariant": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.3.0.tgz", "integrity": "sha512-yeWM9k6UPfG/nzxdaPlJkB2p08hCg4xP6Lx99F+vP8YF7xyZVfTmJjrrNalkmzudD4WFvNLVudQikqUmF8zhVQ==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "node_modules/p-all": { + "node_modules/p-all": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz", "integrity": "sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==", @@ -25954,7 +25778,8 @@ "version": "8.4.14", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", - "funding": [{ + "funding": [ + { "type": "opencollective", "url": "https://opencollective.com/postcss/" }, @@ -26468,7 +26293,8 @@ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, - "funding": [{ + "funding": [ + { "type": "github", "url": "https://github.com/sponsors/feross" }, @@ -27404,7 +27230,8 @@ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, - "funding": [{ + "funding": [ + { "type": "github", "url": "https://github.com/sponsors/feross" }, @@ -27450,7 +27277,8 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true, - "funding": [{ + "funding": [ + { "type": "github", "url": "https://github.com/sponsors/feross" }, @@ -27944,11 +27772,14 @@ "dev": true }, "node_modules/set-cookie-parser": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz", "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==", "dev": true }, "node_modules/set-value": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "dependencies": { @@ -30200,7 +30031,8 @@ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", "dev": true, - "funding": [{ + "funding": [ + { "type": "opencollective", "url": "https://opencollective.com/browserslist" }, @@ -42307,20 +42139,13 @@ "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", "dev": true }, - << - << - << < HEAD === - === - = "chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "check-more-types": { + "check-more-types": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==", @@ -42510,20 +42335,13 @@ "restore-cursor": "^3.1.0" } }, - << - << - << < HEAD === - === - = "cli-spinners": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz", "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "cli-table3": { + "cli-table3": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", @@ -42543,20 +42361,13 @@ "string-width": "^4.2.0" } }, - << - << - << < HEAD === - === - = "cli-width": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "client-only": { + "client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==" @@ -42572,20 +42383,13 @@ "wrap-ansi": "^7.0.0" } }, - << - << - << < HEAD === - === - = "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "clone-deep": { + "clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", @@ -43690,11 +43494,6 @@ } } }, - << - << - << < HEAD === - === - = "defaults": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", @@ -43704,9 +43503,7 @@ "clone": "^1.0.2" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "define-lazy-prop": { + "define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", @@ -45142,11 +44939,6 @@ "is-extendable": "^1.0.1" } }, - << - << - << < HEAD === - === - = "external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -45178,9 +44970,7 @@ } } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "extglob": { + "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", @@ -46206,20 +45996,13 @@ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", "dev": true }, - << - << - << < HEAD === - === - = "graphql": { "version": "16.6.0", "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz", "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "hamt_plus": { + "hamt_plus": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/hamt_plus/-/hamt_plus-1.0.2.tgz", "integrity": "sha512-t2JXKaehnMb9paaYA7J0BX8QQAY8lwfQ9Gjf4pg/mk4krt+cmwmU652HOoWonf+7+EQV97ARPMhhVgU1ra2GhA==" @@ -46486,20 +46269,13 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, - << - << - << < HEAD === - === - = "headers-polyfill": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-3.1.2.tgz", "integrity": "sha512-tWCK4biJ6hcLqTviLXVR9DTRfYGQMXEIUj3gwJ2rZ5wO/at3XtkI4g8mCvFdUF9l1KMBNCfmNAdnahm1cgavQA==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "hmac-drbg": { + "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", @@ -46768,11 +46544,6 @@ "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==", "dev": true }, - << - << - << < HEAD === - === - = "inquirer": { "version": "8.2.5", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz", @@ -46847,9 +46618,7 @@ } } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "internal-slot": { + "internal-slot": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", @@ -47072,11 +46841,6 @@ "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", "dev": true }, - << - << - << < HEAD === - === - = "is-generator-function": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", @@ -47086,9 +46850,7 @@ "has-tostringtag": "^1.0.0" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "is-glob": { + "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", @@ -47113,20 +46875,13 @@ "is-path-inside": "^3.0.2" } }, - << - << - << < HEAD === - === - = "is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "is-map": { + "is-map": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", @@ -47138,20 +46893,13 @@ "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true }, - << - << - << < HEAD === - === - = "is-node-process": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.0.1.tgz", "integrity": "sha512-5IcdXuf++TTNt3oGl9EBdkvndXA8gmc4bz/Y+mdEpWh3Mcn/+kOw6hI7LD5CocqJWMzeb0I0ClndRVNdEPuJXQ==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "is-number": { + "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", @@ -48901,20 +48649,13 @@ "@sideway/pinpoint": "^2.0.0" } }, - << - << - << < HEAD === - === - = "js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "js-sdsl": { + "js-sdsl": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", @@ -50000,11 +49741,6 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - << - << - << < HEAD === - === - = "msw": { "version": "0.49.1", "resolved": "https://registry.npmjs.org/msw/-/msw-0.49.1.tgz", @@ -50117,9 +49853,7 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "nan": { + "nan": { "version": "2.17.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", @@ -50693,11 +50427,6 @@ "word-wrap": "^1.2.3" } }, - << - << - << < HEAD === - === - = "ora": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", @@ -50766,9 +50495,7 @@ } } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "os-browserify": { + "os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", @@ -50781,39 +50508,25 @@ "dev": true, "optional": true }, - << - << - << < HEAD === - === - = "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "ospath": { + "ospath": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz", "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==", "dev": true }, - << - << - << < HEAD === - === - = "outvariant": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.3.0.tgz", "integrity": "sha512-yeWM9k6UPfG/nzxdaPlJkB2p08hCg4xP6Lx99F+vP8YF7xyZVfTmJjrrNalkmzudD4WFvNLVudQikqUmF8zhVQ==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "p-all": { + "p-all": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz", "integrity": "sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==", @@ -52323,20 +52036,13 @@ "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", "dev": true }, - << - << - << < HEAD === - === - = "run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "run-parallel": { + "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", @@ -52778,20 +52484,13 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "dev": true }, - << - << - << < HEAD === - === - = "set-cookie-parser": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz", "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==", "dev": true }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "set-value": { + "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", @@ -53528,11 +53227,6 @@ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", "dev": true }, - << - << - << < HEAD === - === - = "strict-event-emitter": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.2.8.tgz", @@ -53542,9 +53236,7 @@ "events": "^3.3.0" } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "string_decoder": { + "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", @@ -55115,11 +54807,6 @@ } } }, - << - << - << < HEAD === - === - = "wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", @@ -55154,9 +54841,7 @@ } } }, - >>> - >>> - > d0529ca614d185189185ee8c795f014b37ff7df2 "web-namespaces": { + "web-namespaces": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz", "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==", From 3b16da80b993c2118051ae00a3cb543ea0a97868 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 15:51:38 +0900 Subject: [PATCH 20/24] =?UTF-8?q?Example.tsx=20=EA=B4=84=ED=98=B8=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Example/Example.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/Example/Example.tsx b/src/components/Example/Example.tsx index 29c8dd2..5692b57 100644 --- a/src/components/Example/Example.tsx +++ b/src/components/Example/Example.tsx @@ -7,11 +7,7 @@ interface MyButtonProps { } const MyButton = ({ title }: MyButtonProps) => { - return ( - <> - {title} - - ); + return {title}; }; export default MyButton; From b3cb6aafc0c13ca2707abf5b9208d2334ba4c7aa Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 17:37:34 +0900 Subject: [PATCH 21/24] =?UTF-8?q?border-radius=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/theme.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/styles/theme.ts b/src/styles/theme.ts index c886702..9271fe4 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -52,11 +52,6 @@ const theme = { md: '768px', lg: '1024px', }, - borderRadius: { - sm: '10px', // card item - md: '16px', // card - lg: '100px', // hashtag - }, } as const; export default theme; From 928bb4a4a41e9d2978fcfbdd4f12f836f1df1fe4 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 17:38:09 +0900 Subject: [PATCH 22/24] =?UTF-8?q?app=5Fpage.tsx=20=EC=A0=9C=EA=B1=B0=20?= =?UTF-8?q?=EB=B0=8F=20style=20import=20=ED=94=BC=EB=93=9C=EB=B0=B1=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/_app.page.tsx | 21 --------------------- src/pages/_app.tsx | 3 ++- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 src/pages/_app.page.tsx diff --git a/src/pages/_app.page.tsx b/src/pages/_app.page.tsx deleted file mode 100644 index c2072dd..0000000 --- a/src/pages/_app.page.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { QueryClientProvider } from '@tanstack/react-query'; -import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; -import type { AppProps } from 'next/app'; -import { RecoilRoot } from 'recoil'; - -import queryClient from '../configs/queryClient'; -import '../styles/common.css'; -import '../styles/reset.css'; - -function MyApp({ Component, pageProps }: AppProps) { - return ( - - - - - - - ); -} - -export default MyApp; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index a1f0c69..190729b 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -1,10 +1,11 @@ +import '@/styles/common.css'; +import '@/styles/reset.css'; import { QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import type { AppProps } from 'next/app'; import { RecoilRoot } from 'recoil'; import queryClient from '../configs/queryClient'; -import '../styles/reset.css'; if (process.env.NODE_ENV === 'development') { if (typeof window === 'undefined') { From 11bc8a1eeecc305a749ef286a27a30b9585e64f7 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 20:24:08 +0900 Subject: [PATCH 23/24] =?UTF-8?q?=EC=A0=88=EB=8C=80=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=9B=84=20app.page.tsx=EB=A1=9C?= =?UTF-8?q?=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/_app.page.tsx | 18 ++++++++++++++++-- src/pages/_app.tsx | 34 ---------------------------------- 2 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 src/pages/_app.tsx diff --git a/src/pages/_app.page.tsx b/src/pages/_app.page.tsx index c2072dd..900bf1e 100644 --- a/src/pages/_app.page.tsx +++ b/src/pages/_app.page.tsx @@ -2,10 +2,24 @@ import { QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import type { AppProps } from 'next/app'; import { RecoilRoot } from 'recoil'; +import 'src/styles/common.css'; +import 'src/styles/reset.css'; import queryClient from '../configs/queryClient'; -import '../styles/common.css'; -import '../styles/reset.css'; + +if (process.env.NODE_ENV === 'development') { + if (typeof window === 'undefined') { + (async () => { + const { server } = await import('@mocks/apis/server'); + server.listen(); + })(); + } else { + (async () => { + const { worker } = await import('@mocks/apis/browser'); + await worker.start(); + })(); + } +} function MyApp({ Component, pageProps }: AppProps) { return ( diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx deleted file mode 100644 index a1f0c69..0000000 --- a/src/pages/_app.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { QueryClientProvider } from '@tanstack/react-query'; -import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; -import type { AppProps } from 'next/app'; -import { RecoilRoot } from 'recoil'; - -import queryClient from '../configs/queryClient'; -import '../styles/reset.css'; - -if (process.env.NODE_ENV === 'development') { - if (typeof window === 'undefined') { - (async () => { - const { server } = await import('@mocks/apis/server'); - server.listen(); - })(); - } else { - (async () => { - const { worker } = await import('@mocks/apis/browser'); - await worker.start(); - })(); - } -} - -function MyApp({ Component, pageProps }: AppProps) { - return ( - - - - - - - ); -} - -export default MyApp; From b501ae97555b5c9af1dcf64165645b39222a7589 Mon Sep 17 00:00:00 2001 From: sujk912 Date: Sun, 1 Jan 2023 23:22:58 +0900 Subject: [PATCH 24/24] =?UTF-8?q?reset=EC=9D=B4=20common=EB=B3=B4=EB=8B=A4?= =?UTF-8?q?=20=EB=A8=BC=EC=A0=80=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/_app.page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/_app.page.tsx b/src/pages/_app.page.tsx index 900bf1e..aab56c9 100644 --- a/src/pages/_app.page.tsx +++ b/src/pages/_app.page.tsx @@ -2,8 +2,8 @@ import { QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import type { AppProps } from 'next/app'; import { RecoilRoot } from 'recoil'; -import 'src/styles/common.css'; import 'src/styles/reset.css'; +import 'src/styles/common.css'; import queryClient from '../configs/queryClient';