From 872f97bc7922f97e5bde58ab84ee80cc75a09cac Mon Sep 17 00:00:00 2001 From: Chris Ohk Date: Wed, 2 Aug 2023 15:13:43 +0900 Subject: [PATCH 001/170] fix: Correct minor typo - Conatiner -> Container --- apps/admin/src/components/ApproveModal/index.tsx | 4 ++-- apps/admin/src/components/ApproveModal/style.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/admin/src/components/ApproveModal/index.tsx b/apps/admin/src/components/ApproveModal/index.tsx index 055e20ff4..5f089c83f 100644 --- a/apps/admin/src/components/ApproveModal/index.tsx +++ b/apps/admin/src/components/ApproveModal/index.tsx @@ -13,7 +13,7 @@ const ApproveModal: React.FC = ({ close }) => { const { data: unApproveList, refetch } = useGetUnapproveList(); return ( - e.stopPropagation()}> + e.stopPropagation()}> 🀝 κ°€μž… μš”μ²­
@@ -29,7 +29,7 @@ const ApproveModal: React.FC = ({ close }) => { /> ))} - + ); }; diff --git a/apps/admin/src/components/ApproveModal/style.ts b/apps/admin/src/components/ApproveModal/style.ts index 6a05985ca..e7391993c 100644 --- a/apps/admin/src/components/ApproveModal/style.ts +++ b/apps/admin/src/components/ApproveModal/style.ts @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -export const ModalConatiner = styled.div` +export const ModalContainer = styled.div` display: flex; flex-direction: column; position: absolute; From 21e381fe3f5cd1c856e215781340be41072a632a Mon Sep 17 00:00:00 2001 From: Chris Ohk Date: Wed, 2 Aug 2023 15:13:59 +0900 Subject: [PATCH 002/170] fix: Correct minor typo - Cancle -> Cancel --- apps/admin/src/components/DeleteModal/index.tsx | 2 +- apps/admin/src/components/DeleteModal/style.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/admin/src/components/DeleteModal/index.tsx b/apps/admin/src/components/DeleteModal/index.tsx index 03d968427..209d15216 100644 --- a/apps/admin/src/components/DeleteModal/index.tsx +++ b/apps/admin/src/components/DeleteModal/index.tsx @@ -9,7 +9,7 @@ const DeleteModal: React.FC = ({ onClick }) => ( κ²Œμ‹œλ¬Ό μ‚­μ œ 정말 κ²Œμ‹œλ¬Όμ„ μ‚­μ œν•˜μ‹€κ±΄κ°€μš”? - μ·¨μ†Œν•˜κΈ° + μ·¨μ†Œν•˜κΈ° μ‚­μ œν•˜κΈ° diff --git a/apps/admin/src/components/DeleteModal/style.ts b/apps/admin/src/components/DeleteModal/style.ts index bdcd89ff1..bffffba79 100644 --- a/apps/admin/src/components/DeleteModal/style.ts +++ b/apps/admin/src/components/DeleteModal/style.ts @@ -40,7 +40,7 @@ export const Button = styled.button` cursor: pointer; `; -export const CancleButton = styled(Button)` +export const CancelButton = styled(Button)` background: ${({ theme }) => theme.color.gray['040']}; color: ${({ theme }) => theme.color.gray['080']}; `; From afa3f6d00ff00d81184acb950070f8456ec86fe2 Mon Sep 17 00:00:00 2001 From: Chris Ohk Date: Wed, 2 Aug 2023 15:14:17 +0900 Subject: [PATCH 003/170] fix: Correct minor typo - extentions -> extensions --- packages/common/src/utils/filterImages.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/common/src/utils/filterImages.ts b/packages/common/src/utils/filterImages.ts index f98206c10..ceb9bd638 100644 --- a/packages/common/src/utils/filterImages.ts +++ b/packages/common/src/utils/filterImages.ts @@ -1,10 +1,10 @@ import { FileInfoType } from 'types'; -const extentions = ['JPG', 'PNG', 'HEIC', 'JPEG', 'WEBP']; +const extensions = ['JPG', 'PNG', 'HEIC', 'JPEG', 'WEBP']; const filterImages = (fileInfo?: FileInfoType[]): FileInfoType[] => { return ( - fileInfo?.filter((file) => extentions.includes(file.fileExtension)) ?? [] + fileInfo?.filter((file) => extensions.includes(file.fileExtension)) ?? [] ); }; From 0cb0ee45dd0d9b8234e6f5ebc0b855ba5b728397 Mon Sep 17 00:00:00 2001 From: Chris Ohk Date: Wed, 2 Aug 2023 15:14:48 +0900 Subject: [PATCH 004/170] fix: Correct minor typo - Gallary -> Gallery --- .../components/MainPage/GalleryList/index.stories.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/client/src/components/MainPage/GalleryList/index.stories.tsx b/apps/client/src/components/MainPage/GalleryList/index.stories.tsx index 3273ad3e1..eb88aaa55 100644 --- a/apps/client/src/components/MainPage/GalleryList/index.stories.tsx +++ b/apps/client/src/components/MainPage/GalleryList/index.stories.tsx @@ -1,14 +1,14 @@ -import GallaryList from '.'; +import GalleryList from '.'; import type { Meta, StoryObj } from '@storybook/react'; export default { - title: 'client/MainPage/GallaryList', - component: GallaryList, + title: 'client/MainPage/GalleryList', + component: GalleryList, parameters: {}, -} as Meta; +} as Meta; -type Story = StoryObj; +type Story = StoryObj; export const Primary: Story = { args: {}, From 48777a7b6854d0f43764b419d6a6ca303bef6f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A0=95=EC=9A=B0?= <103944346+handsomejeongwoo@users.noreply.github.com> Date: Thu, 3 Aug 2023 00:01:35 +0900 Subject: [PATCH 005/170] Update add footer link --- apps/client/src/components/Footer/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/client/src/components/Footer/index.tsx b/apps/client/src/components/Footer/index.tsx index 932e66104..125846f0e 100644 --- a/apps/client/src/components/Footer/index.tsx +++ b/apps/client/src/components/Footer/index.tsx @@ -26,6 +26,7 @@ const Footer = () => { μ˜μƒμ •λ³΄μ²˜λ¦¬κΈ°κΈ°μš΄μ˜Β·κ΄€λ¦¬λ°©μΉ¨ μ €μž‘κΆŒμ‹ κ³  및 λ³΄ν˜Έκ·œμ • μ°Ύμ•„μ˜€μ‹œλŠ” κΈΈ + κ΄€λ¦¬μž From f24b94b38ccabaf51913ca106d70b9d81fab80c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A0=95=EC=9A=B0?= <103944346+handsomejeongwoo@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:17:43 +0900 Subject: [PATCH 006/170] Update linking --- apps/client/src/components/Footer/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/client/src/components/Footer/index.tsx b/apps/client/src/components/Footer/index.tsx index 125846f0e..665cb2b10 100644 --- a/apps/client/src/components/Footer/index.tsx +++ b/apps/client/src/components/Footer/index.tsx @@ -26,7 +26,7 @@ const Footer = () => { μ˜μƒμ •λ³΄μ²˜λ¦¬κΈ°κΈ°μš΄μ˜Β·κ΄€λ¦¬λ°©μΉ¨ μ €μž‘κΆŒμ‹ κ³  및 λ³΄ν˜Έκ·œμ • μ°Ύμ•„μ˜€μ‹œλŠ” κΈΈ - κ΄€λ¦¬μž + κ΄€λ¦¬μž From 94714c8a9d074529f8bf7977c780cd87879682e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A0=95=EC=9A=B0?= <103944346+handsomejeongwoo@users.noreply.github.com> Date: Fri, 4 Aug 2023 12:34:30 +0900 Subject: [PATCH 007/170] Update edit linking --- apps/client/src/components/Footer/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/client/src/components/Footer/index.tsx b/apps/client/src/components/Footer/index.tsx index 665cb2b10..cb0f58dee 100644 --- a/apps/client/src/components/Footer/index.tsx +++ b/apps/client/src/components/Footer/index.tsx @@ -26,7 +26,7 @@ const Footer = () => { μ˜μƒμ •λ³΄μ²˜λ¦¬κΈ°κΈ°μš΄μ˜Β·κ΄€λ¦¬λ°©μΉ¨ μ €μž‘κΆŒμ‹ κ³  및 λ³΄ν˜Έκ·œμ • μ°Ύμ•„μ˜€μ‹œλŠ” κΈΈ - κ΄€λ¦¬μž + κ΄€λ¦¬μž From f658dd8a74c71a2fe7a4bea534c2995efee818e7 Mon Sep 17 00:00:00 2001 From: Lee-Seungje Date: Fri, 4 Aug 2023 16:22:29 +0900 Subject: [PATCH 008/170] Update newsletterCard date color --- apps/client/src/components/MainPage/NewsletterList/style.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/client/src/components/MainPage/NewsletterList/style.ts b/apps/client/src/components/MainPage/NewsletterList/style.ts index 529d814f2..00f2920f8 100644 --- a/apps/client/src/components/MainPage/NewsletterList/style.ts +++ b/apps/client/src/components/MainPage/NewsletterList/style.ts @@ -26,6 +26,9 @@ export const NewsletterList = styled.div` background-color: ${({ theme: { color } }) => color.primary.lime}; color: #73962b; } + p { + color: #73962b; + } } @media ${({ theme }) => theme.breakPoint['1440']} { From e4cbb1db5b3478a98935f6c9a078f02639275807 Mon Sep 17 00:00:00 2001 From: Lee-Seungje Date: Fri, 4 Aug 2023 22:27:19 +0900 Subject: [PATCH 009/170] Add subGreen --- apps/client/src/components/MainPage/NewsletterList/style.ts | 4 ++-- packages/common/src/styles/theme.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/client/src/components/MainPage/NewsletterList/style.ts b/apps/client/src/components/MainPage/NewsletterList/style.ts index 00f2920f8..8ba2ee049 100644 --- a/apps/client/src/components/MainPage/NewsletterList/style.ts +++ b/apps/client/src/components/MainPage/NewsletterList/style.ts @@ -24,10 +24,10 @@ export const NewsletterList = styled.div` background: rgba(178, 228, 73, 0.1); .dateCircle { background-color: ${({ theme: { color } }) => color.primary.lime}; - color: #73962b; + color: ${({ theme }) => theme.color.sub.green}; } p { - color: #73962b; + color: ${({ theme }) => theme.color.sub.green}; } } diff --git a/packages/common/src/styles/theme.ts b/packages/common/src/styles/theme.ts index 6c28441e2..7444b0f58 100644 --- a/packages/common/src/styles/theme.ts +++ b/packages/common/src/styles/theme.ts @@ -11,6 +11,7 @@ const color = { orange: '#FF9877', yellow: '#F8FADB', gray: '#CDD5E2', + green: '#73962B', }, gray: { '010': '#FCFCFC', From 4d2864d8a0aba9b86fb17650e3e988e637b8dee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=98=88=EB=B9=88?= Date: Tue, 8 Aug 2023 13:50:17 +0900 Subject: [PATCH 010/170] Add page --- .../src/app/about/searchLocation/page.tsx | 25 +++++++++++++++++++ .../components/About/SearchLocation/index.tsx | 11 ++++++++ .../components/About/SearchLocation/style.ts | 11 ++++++++ apps/client/src/components/index.ts | 1 + 4 files changed, 48 insertions(+) create mode 100644 apps/client/src/app/about/searchLocation/page.tsx create mode 100644 apps/client/src/components/About/SearchLocation/index.tsx create mode 100644 apps/client/src/components/About/SearchLocation/style.ts diff --git a/apps/client/src/app/about/searchLocation/page.tsx b/apps/client/src/app/about/searchLocation/page.tsx new file mode 100644 index 000000000..98785c5da --- /dev/null +++ b/apps/client/src/app/about/searchLocation/page.tsx @@ -0,0 +1,25 @@ +import { SearchLocation, Header, Footer } from 'client/components'; + +import type { Metadata } from 'next'; + +export const metadata: Metadata = { + description: + 'κ΄‘μ£Όμ†Œν”„νŠΈμ›¨μ–΄λ§ˆμ΄μŠ€ν„°κ³ λ“±ν•™κ΅ 곡식 ν™ˆνŽ˜μ΄μ§€ 학ꡐ μ†Œκ°œ νŽ˜μ΄μ§€μž…λ‹ˆλ‹€.', + title: { absolute: '학ꡐ μ†Œκ°œ' }, + openGraph: { + title: '학ꡐ μ†Œκ°œ', + description: + 'κ΄‘μ£Όμ†Œν”„νŠΈμ›¨μ–΄λ§ˆμ΄μŠ€ν„°κ³ λ“±ν•™κ΅ 곡식 ν™ˆνŽ˜μ΄μ§€ 학ꡐ μ†Œκ°œ νŽ˜μ΄μ§€μž…λ‹ˆλ‹€.', + url: 'https://official.hellogsm.kr/about', + }, +}; + +export default function SearchLocationPage() { + return ( + <> +
+ +