From afc3fbf1c75afd2fd3ae89deeb29e9ac962db43d Mon Sep 17 00:00:00 2001 From: Kuesung Park Date: Sat, 23 Dec 2023 13:36:40 +0900 Subject: [PATCH 01/55] =?UTF-8?q?feat=20:=20text=20=EA=B0=80=EC=9A=B4?= =?UTF-8?q?=EB=8D=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/[lng]/(main)/meeting/components/NoMeeting.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/[lng]/(main)/meeting/components/NoMeeting.tsx b/src/app/[lng]/(main)/meeting/components/NoMeeting.tsx index f9f14221c..f686221ac 100644 --- a/src/app/[lng]/(main)/meeting/components/NoMeeting.tsx +++ b/src/app/[lng]/(main)/meeting/components/NoMeeting.tsx @@ -7,7 +7,7 @@ interface NoMeetingProps { } export default function NoMeeting({ message }: NoMeetingProps) { return ( - +

{message}

From 7efb17c24b584e6c02c70f429fe29d9c0e48ca80 Mon Sep 17 00:00:00 2001 From: Kuesung Park Date: Sat, 23 Dec 2023 13:37:38 +0900 Subject: [PATCH 02/55] =?UTF-8?q?feat=20:=20=EA=B7=B8=EB=A3=B9=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=ED=99=94=EB=A9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grouping/components/GroupingCardList.client.tsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/[lng]/(main)/grouping/components/GroupingCardList.client.tsx b/src/app/[lng]/(main)/grouping/components/GroupingCardList.client.tsx index e7f239216..3e825bf02 100644 --- a/src/app/[lng]/(main)/grouping/components/GroupingCardList.client.tsx +++ b/src/app/[lng]/(main)/grouping/components/GroupingCardList.client.tsx @@ -1,5 +1,7 @@ 'use client'; +import NoMeeting from '../../meeting/components/NoMeeting'; import { useGetGroups } from '@/apis/groups'; +import { useTranslation } from '@/app/i18n/client'; import { GroupingCard } from '@/components/Card'; import { ItemList } from '@/components/List'; import { useBlockStore } from '@/store/useBlockStore'; @@ -8,7 +10,8 @@ import { useInView } from 'react-intersection-observer'; export default function GroupingCardList() { const { blockGroupIds } = useBlockStore(); - const { data, fetchNextPage } = useGetGroups(); + const { data: groupList, fetchNextPage } = useGetGroups(); + const { t } = useTranslation('grouping'); const { ref, inView } = useInView(); @@ -19,10 +22,11 @@ export default function GroupingCardList() { return ( <> - !blockGroupIds.includes(grouping.groupId) && + data={groupList} + renderItem={(group) => + !blockGroupIds.includes(group.groupId) && } + renderEmpty={() => } />
From 08b7f8729a8e70de0d0c02b27f2e356468e18b07 Mon Sep 17 00:00:00 2001 From: Kuesung Park Date: Sat, 23 Dec 2023 13:38:15 +0900 Subject: [PATCH 03/55] =?UTF-8?q?feat=20:=20=EB=A7=A4=EC=B9=AD=20-=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EC=97=86=EC=9D=84=20=EB=95=8C=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/i18n/locales/en/grouping.json | 3 ++- src/app/i18n/locales/ko/grouping.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/i18n/locales/en/grouping.json b/src/app/i18n/locales/en/grouping.json index 4943a2f73..52c561280 100644 --- a/src/app/i18n/locales/en/grouping.json +++ b/src/app/i18n/locales/en/grouping.json @@ -41,5 +41,6 @@ "ok": "Yes", "cancel": "No" } - } + }, + "noGroup": "No groups found." } diff --git a/src/app/i18n/locales/ko/grouping.json b/src/app/i18n/locales/ko/grouping.json index 30dbb83bd..67143acdf 100644 --- a/src/app/i18n/locales/ko/grouping.json +++ b/src/app/i18n/locales/ko/grouping.json @@ -41,5 +41,6 @@ "ok": "네", "cancel": "아니오" } - } + }, + "noGroup": "만들어진 모임이 없습니다. \n모임을 만들어보세요!" } From 3f721cf1dd918d52ad3c3c6ca423958107a892b5 Mon Sep 17 00:00:00 2001 From: Kuesung Park Date: Sat, 23 Dec 2023 13:51:01 +0900 Subject: [PATCH 04/55] =?UTF-8?q?refactor=20:=20issue=20labeler=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 --- .github/workflows/auto-issue-labeler.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/auto-issue-labeler.yml diff --git a/.github/workflows/auto-issue-labeler.yml b/.github/workflows/auto-issue-labeler.yml deleted file mode 100644 index 45525b07d..000000000 --- a/.github/workflows/auto-issue-labeler.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: 'Issue Labeler' -on: - issues: - types: [opened, edited] - -permissions: - issues: write - contents: read - -jobs: - triage: - runs-on: ubuntu-latest - steps: - - uses: github/issue-labeler@v3.1 #May not be the latest version - with: - configuration-path: .github/labeler.yml - enable-versioned-regex: 0 - repo-token: ${{ github.token }} From eef482b0bf331238c23cedc0238ad4245f6bc258 Mon Sep 17 00:00:00 2001 From: Kuesung Park Date: Sat, 23 Dec 2023 13:55:08 +0900 Subject: [PATCH 05/55] =?UTF-8?q?refactor=20:=20=EC=A3=BC=EC=84=9D=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 --- src/app/[lng]/layout.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/app/[lng]/layout.tsx b/src/app/[lng]/layout.tsx index 989606d9e..090d84c08 100644 --- a/src/app/[lng]/layout.tsx +++ b/src/app/[lng]/layout.tsx @@ -1,7 +1,5 @@ import './globals.css'; -// import { readFileSync } from 'fs'; - import { languages } from '../i18n/settings'; import { GoogleAnalytics } from '@/components/Analytics'; import { InitMap } from '@/components/Map'; @@ -81,14 +79,8 @@ interface LayoutProps { } function Layout({ lng, children }: StrictPropsWithChildren) { - // const filePath = `src/style/tailwindSSR.css`; - // const styleSheetContent = readFileSync(filePath, 'utf8'); - return ( - {/* -