From d4111df450bc76f9ca3b9a39847829011d580523 Mon Sep 17 00:00:00 2001 From: Eunji <129590633+bianbbc87@users.noreply.github.com> Date: Thu, 16 May 2024 06:52:22 +0900 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8FRefactor=20-=20=EC=98=A4?= =?UTF-8?q?=ED=94=88=EC=84=B8=EB=AF=B8=EB=82=98=20flag=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20notion=20db=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20#44?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../header/OpenSeminarDetailHeader.tsx | 2 +- src/constants/seminar/openSeminarData.ts | 20 ++++++------- src/hooks/seminar/notionDataRefactor.ts | 28 +++++++++---------- src/interfaces/seminar/openSeminar.ts | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/components/seminar/openSeminarDetail/header/OpenSeminarDetailHeader.tsx b/src/components/seminar/openSeminarDetail/header/OpenSeminarDetailHeader.tsx index a5b343a..f52c15e 100644 --- a/src/components/seminar/openSeminarDetail/header/OpenSeminarDetailHeader.tsx +++ b/src/components/seminar/openSeminarDetail/header/OpenSeminarDetailHeader.tsx @@ -15,7 +15,7 @@ import React, { useState } from 'react'; * @returns The rendered header component. */ const OpenSeminarDetailHeader = ({ openSeminar }: { openSeminar: OpenSeminar }) => { - const [categoryData, setCategoryData] = useState([openSeminar.type, `${openSeminar.flag}st`]); + const [categoryData, setCategoryData] = useState([openSeminar.type, openSeminar.flag]); return ( <> diff --git a/src/constants/seminar/openSeminarData.ts b/src/constants/seminar/openSeminarData.ts index b65b505..2bb37c3 100644 --- a/src/constants/seminar/openSeminarData.ts +++ b/src/constants/seminar/openSeminarData.ts @@ -7,7 +7,7 @@ export const OPEN_DETAIL_SEMINAR_DATA:SeminarThumbnail [] = [ { id: '1', flag: 1, - type: '๐ŸŒฒย Open Seminar', + type: 'Open Seminar', topic: '', date: '', location: '๋™๊ตญ๋Œ€ํ•™๊ต', @@ -21,7 +21,7 @@ export const OPEN_DETAIL_SEMINAR_DATA:SeminarThumbnail [] = [ { id: '2', flag: 1, - type: '๐ŸŒฒย Open Seminar', + type: 'Open Seminar', topic: '', date: '', location: '๋™๊ตญ๋Œ€ํ•™๊ต', @@ -35,7 +35,7 @@ export const OPEN_DETAIL_SEMINAR_DATA:SeminarThumbnail [] = [ { id: '3', flag: 1, - type: '๐ŸŒฒย Open Seminar', + type: 'Open Seminar', topic: '', date: '', location: '๋™๊ตญ๋Œ€ํ•™๊ต', @@ -49,7 +49,7 @@ export const OPEN_DETAIL_SEMINAR_DATA:SeminarThumbnail [] = [ { id: '4', flag: 1, - type: '๐ŸŒฒย Open Seminar', + type: 'Open Seminar', topic: '', date: '', location: '๋™๊ตญ๋Œ€ํ•™๊ต', @@ -65,8 +65,8 @@ export const OPEN_DETAIL_SEMINAR_DATA:SeminarThumbnail [] = [ export const OPEN_SEMINAR_DATA: OpenSeminar[] = [ { id: '', - flag: 1, - type: '๐ŸŒฒย Open Seminar', + flag: '1st', + type: 'Open Seminar', date: '', location: '๋™๊ตญ๋Œ€ํ•™๊ต', title: '', @@ -79,8 +79,8 @@ export const OPEN_SEMINAR_DATA: OpenSeminar[] = [ }, { id: '', - flag: 1, - type: '๐ŸŒฒย Open Seminar', + flag: '1st', + type: 'Open Seminar', date: '', location: '๋™๊ตญ๋Œ€ํ•™๊ต', title: '', @@ -93,8 +93,8 @@ export const OPEN_SEMINAR_DATA: OpenSeminar[] = [ }, { id: '', - flag: 1, - type: '๐ŸŒฒย Open Seminar', + flag: '1st', + type: 'Open Seminar', date: '', location: '๋™๊ตญ๋Œ€ํ•™๊ต', title: '', diff --git a/src/hooks/seminar/notionDataRefactor.ts b/src/hooks/seminar/notionDataRefactor.ts index 9123669..41bf9c6 100644 --- a/src/hooks/seminar/notionDataRefactor.ts +++ b/src/hooks/seminar/notionDataRefactor.ts @@ -11,11 +11,11 @@ export function refactorSeminarData(items: any[]): SeminarThumbnail[] { return items.map(item => ({ id: item.id ?? '', flag: 1, - type: item.properties.Tags?.multi_select[0]?.name ?? 'Unknown', - topic: item.properties.Topic?.select?.name ?? 'Unknown', - date: item.properties.Date?.date?.start ?? 'Unknown Date', + type: item.properties.Tags?.multi_select[0]?.name ?? '', + topic: item.properties.Topic?.select?.name ?? '', + date: item.properties.Date?.date?.start ?? '', location: item.properties.Location?.rich_text[0]?.plain_text ?? '๋™๊ตญ๋Œ€ํ•™๊ต', - title: item.properties.Name?.title[0]?.plain_text ?? 'Unknown Title', + title: item.properties.Name?.title[0]?.plain_text ?? '', description: item.properties.Description?.rich_text[0]?.plain_text ?? '', seminar_image_url: item.cover?.file?.url ?? SeminarThumbnailCardImg.src, pdf_url: item.properties['Files & media']?.files[0]?.file?.url ?? "", // ์ž„์‹œ pdf ๋ฐ์ดํ„ฐ @@ -26,11 +26,11 @@ export function refactorSeminarData(items: any[]): SeminarThumbnail[] { export function refactorOpenSeminarData(items: any[]): OpenSeminar[] { return items.map(item => ({ id: item.id ?? '', - flag: 1, - type: item.properties['๋‹ค์ค‘ ์„ ํƒ'].multi_select[0]?.name ?? 'Unknown', - date: item.properties.Date?.date?.start ?? 'Unknown Date', + flag: item.properties['๋‹ค์ค‘ ์„ ํƒ'].multi_select[1]?.name ?? '', + type: item.properties['๋‹ค์ค‘ ์„ ํƒ'].multi_select[0]?.name ?? '', + date: item.properties.Date?.date?.start ?? '', location: item.properties.Location?.rich_text[0]?.plain_text ?? '๋™๊ตญ๋Œ€ํ•™๊ต', // static value as per example - title: item.properties['์ด๋ฆ„']?.title[0]?.plain_text ?? 'Unknown Title', + title: item.properties['์ด๋ฆ„']?.title[0]?.plain_text ?? '', description: item.properties.Description?.rich_text[0]?.plain_text ?? '', image_url: item.cover?.file?.url ?? OpenSeminarThumbnailCardImg.src, status: (item.properties.status?.status?.name === "์ข…๋ฃŒ" ? false : true) ?? false, @@ -54,8 +54,8 @@ export function refactorOpenSeminarInformationData(items: any[]): SeminarThumbna return items.map(item => ({ id: item.id ?? '', seminar_id: item.properties.Seminar.relation[0]?.id ?? '', - author: item.properties.name?.title[0]?.plain_text ?? 'Unknown', - content: item.properties.Review.rich_text[0]?.plain_text ?? 'No Review' + author: item.properties.name?.title[0]?.plain_text ?? '', + content: item.properties.Review.rich_text[0]?.plain_text ?? '' })); } @@ -64,8 +64,8 @@ export function refactorOpenSeminarInformationData(items: any[]): SeminarThumbna return { id: item.id ?? 'Unknown', seminar_id: id ?? 'Unknown', - name: item.properties['์ด๋ฆ„']?.title[0]?.plain_text ?? 'Unknown', - role: item.properties.Part?.multi_select[0]?.name ?? 'Unknown', + name: item.properties['์ด๋ฆ„']?.title[0]?.plain_text ?? '', + role: item.properties.Part?.multi_select[0]?.name ?? '', profile_img: item.properties.ProfileImage?.url ?? PresenterProfileImg.src, }; } @@ -76,8 +76,8 @@ export function refactorOpenSeminarInformationData(items: any[]): SeminarThumbna id: seminar.id, seminar_id: seminar.id, member_id: member.id ?? '', - member_name: member.name ?? 'Unknown', - member_role: member.role ?? 'Unknown', + member_name: member.name ?? '', + member_role: member.role ?? '', member_profile_image: member.profileImage ?? PresenterProfileImg.src, seminar_title: seminar.title, }; diff --git a/src/interfaces/seminar/openSeminar.ts b/src/interfaces/seminar/openSeminar.ts index 3473a37..beaea00 100644 --- a/src/interfaces/seminar/openSeminar.ts +++ b/src/interfaces/seminar/openSeminar.ts @@ -2,7 +2,7 @@ import { SeminarThumbnail } from "./seminarThumbnail"; export interface OpenSeminar { id: string; - flag: number; + flag: string; type: string; date: string; location: string;