Skip to content

Commit 262768a

Browse files
committed
메인 페이지 행사 상세 업데이트
1 parent a3ef409 commit 262768a

File tree

6 files changed

+44
-9
lines changed

6 files changed

+44
-9
lines changed

frontend/components/service/Home/MainTalkList.tsx

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,50 @@
11
import React from 'react'
22
import { useTranslation } from 'react-i18next'
3-
import { Heading2, Paragraph } from '../../../assets/styles/typo'
3+
import { Heading2 } from '../../../assets/styles/typo'
44
import styled from 'styled-components'
5+
import Linkify from 'react-linkify'
6+
import Resources from "../../../data/constants/resources";
57

6-
const Content = styled(Paragraph)`
8+
const Content = styled.div`
79
margin-top: 1rem;
810
white-space: pre-line;
11+
a {
12+
color: ${props => props.theme.colors.blue0};
13+
}
914
`
1015

16+
const ProgramLink = styled.a`
17+
color: ${props => props.theme.colors.blue0};
18+
`
19+
20+
1121
const MainTalkList = () => {
1222
const { t } = useTranslation()
1323

1424
return (
1525
<div>
16-
<Heading2 useGradient={true}>{t('label:talk')}</Heading2>
17-
<Content></Content>
26+
<Heading2 useGradient={true}>{t('label:eventDetail')}</Heading2>
27+
<Content>
28+
{t('label:aboutEvent')}
29+
{''} 발표 및 시간표는 {''}
30+
<ProgramLink href={`/program/talks`}>
31+
프로그램 > 발표
32+
</ProgramLink>
33+
에서 확인하실 수 있습니다.
34+
</Content>
35+
<Content>
36+
<Linkify>
37+
파이썬 사용 사례와 지식을 공유하는 다양한 발표 세션이 열립니다.
38+
이외의 모든 공지사항은 {''}
39+
<ProgramLink href={Resources.pyconkrFacebook} target="_blank">
40+
공식 페이스북
41+
</ProgramLink>
42+
, {''}
43+
<ProgramLink href={Resources.pyconkrTwitter} target="_blank">
44+
트위터
45+
</ProgramLink>, 이곳을 통해 공지될 예정입니다.
46+
</Linkify>
47+
</Content>
1848
</div>
1949
)
2050
}

frontend/components/service/Program/CategoryList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const CategoryList = (props: { list: ITalkList }) => {
1515
const categoryList: { [key: string]: ICategoryListItem } = {}
1616

1717
props.list.list.forEach((talk) => {
18-
if (talk.category !== Resources.KEYNOTE_CATEGORY) {
18+
if (talk.category !== Resources.KEYNOTE_NAME) {
1919
if (!categoryList.hasOwnProperty(talk.category)) {
2020
categoryList[talk.category] = {
2121
name: talk.category,

frontend/data/constants/resources.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const Resources = {
2222
pyconkrFacebook: 'https://www.facebook.com/pyconkorea',
2323
pyconkrTwitter: 'https://twitter.com/PyConKR',
2424
KEYNOTE_CATEGORY: 13,
25+
KEYNOTE_NAME: '키노트 (Keynote)',
2526
FESTA_TICKET_LINK: 'https://festa.io/events/2605'
2627
}
2728

frontend/locales/en/label.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,6 @@ export default {
4848
offlineTicketInfo:
4949
'PyCon Korea 2022 merchandises and offline tickets are available at Festa (festa.io).\nOffline ticket has limited quantities are sold and may be sold out early, so please purchase as soon as possible.',
5050
buyTicket: 'Buy ticket',
51-
locationInfo: 'Simultaneous online-offline'
51+
locationInfo: 'Simultaneous online-offline',
52+
eventDetail: 'About Pycon Korea 2022'
5253
}

frontend/locales/ko/label.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,9 @@ export default {
5050
offlineTicketInfo:
5151
'파이콘 한국 2022 굿즈 및 오프라인 티켓은 페스타(festa.io)에서 구입할 수 있습니다.\n오프라인 티켓은 한정된 수량만 판매되어 조기 매진이 될 가능성이 있으니 서둘러 구매해주시기 바랍니다.',
5252
buyTicket: '티켓 구입하기',
53-
locationInfo: '온/오프라인 동시 진행'
53+
locationInfo: '온/오프라인 동시 진행',
54+
eventDetail: '행사 상세',
55+
aboutEvent:
56+
'파이콘 한국은 한국의 파이썬 개발자들이 지식을 공유하고 만남을 갖기 위한 장입니다.\n파이콘 한국 2022은 온라인과 오프라인 동시에 진행됩니다.',
57+
officialFacebook: '공식 페이스북(https://www.facebook.com)'
5458
}

frontend/pages/program/keynote.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import React from 'react'
22
import type { NextPage, GetServerSideProps } from 'next'
3-
import { useTranslation } from 'react-i18next'
43
import { PageName } from '../../data/enums/PageName'
54
import PageTitle from '../../components/core/PageTitle'
65
import { PageProps } from '../../interfaces/PageProps'
76
import { GetServerSidePropsContext } from 'next'
8-
import { getKeynoteList, getTalkList } from '../api/program'
7+
import { getKeynoteList } from '../api/program'
98
import { ITalkList } from '../../interfaces/IProgram'
109
import KeynoteListItem from '../../components/service/Program/KeynoteListItem'
1110

0 commit comments

Comments
 (0)