Merge branch 'add-staff', remote-tracking branch 'origin'

Author: constmoon

frontend/pages/program/talk-schedule.tsx

@@ -16,13 +16,6 @@ interface TalkTableProps extends PageProps {
     data: ITalkList
 }
 
-const LinkList = styled.li`
-    list-style: disc;
-    a {
-        color: ${(props) => props.theme.colors.blue0};
-    }
-`
-
 const ButtonWrap = styled.div`
     margin-top: 1.5rem;
 `
@@ -66,58 +59,9 @@ const TalkSchedule: NextPage = (props: TalkTableProps) => {
         isSameDay(new Date(item.video_open_at), new Date(2022, 9, 2))
     )
 
-    const trackLinkGroup = [
-        {
-            day: 'day1',
-            links: [
-                {
-                    track: '트랙1',
-                    link: `https://youtu.be/OrrquS5PFtw`
-                },
-                {
-                    track: '트랙2',
-                    link: `https://youtu.be/pJGRoe-jt9E`
-                }
-            ]
-        },
-        {
-            day: 'day2',
-            links: [
-                {
-                    track: '트랙3',
-                    link: `https://youtu.be/L6Lz793mzrU`
-                },
-                {
-                    track: '트랙4',
-                    link: `https://youtu.be/10qBldkS0wk`
-                }
-            ]
-        }
-    ]
-
     return (
         <div>
             <PageTitle title={pageName} />
-            <ul>
-                {trackLinkGroup
-                    .filter((item) => item.day === selectedDay)
-                    .map((item, index) => (
-                        <div key={`linkGroup-${index}`}>
-                            {item.links.map((linkItem, index) => (
-                                <LinkList key={`linkItem-${index}`}>
-                                    세션 {linkItem.track} 링크:{' '}
-                                    <a
-                                        href={linkItem.link}
-                                        target={'_blank'}
-                                        rel="noreferrer"
-                                    >
-                                        {linkItem.link}
-                                    </a>
-                                </LinkList>
-                            ))}
-                        </div>
-                    ))}
-            </ul>
             <ButtonWrap>
                 <TalkTableToggleButton handleClick={updateSelectedDay} />
             </ButtonWrap>

frontend/pages/program/talks/[id].tsx

@@ -1,7 +1,7 @@
 import { GetServerSideProps, GetServerSidePropsContext, NextPage } from 'next'
 import React from 'react'
 import { LocalePage } from '../../../interfaces/PageProps'
-import { ISpeaker, ITalkItem } from '../../../interfaces/IProgram'
+import { IPerson, ITalkItem } from '../../../interfaces/IProgram'
 import { getTalkById } from '../../api/program'
 import PageTitle from '../../../components/core/PageTitle'
 import { useTranslation } from 'react-i18next'
@@ -24,6 +24,9 @@ const DetailContainer = styled.div`
 const Description = styled.div`
     margin-top: 2rem;
     white-space: pre-line;
+    & + & {
+        margin-top: 4rem;
+    }
 `
 
 const SpeakerContainer = styled.div`
@@ -34,11 +37,12 @@ const TalkListDetail: NextPage = (props: TalkListDetailProps) => {
     const { t } = useTranslation()
 
     const item: ITalkItem = props[props.locale]
-    const speaker: ISpeaker = {
+    const speaker: IPerson = {
         image: item.speaker_profile_img ?? DEFAULT_PROFILE_PATH,
         name: item.user_name,
         introduction: item.introduction
     }
+    const videoUrl = item.video_url ?? ''
 
     return (
         <DetailContainer>
@@ -59,6 +63,12 @@ const TalkListDetail: NextPage = (props: TalkListDetailProps) => {
                 <Heading3 useGradient={true}>{t('label:description')}</Heading3>
                 <Linkify>{item.desc}</Linkify>
             </Description>
+            <Description>
+                <Heading3 useGradient={true}>{t('label:videoLink')}</Heading3>
+                <a href={videoUrl} target={'_blank'} rel="noreferrer">
+                    {videoUrl}
+                </a>
+            </Description>
             <SpeakerContainer>
                 <Heading3 useGradient={true}>
                     {t('label:speakerIntro')}