Skip to content

Commit 680bc53

Browse files
committed
Merge branch 'add-program' into devdev
2 parents ac3e645 + 2615e9b commit 680bc53

File tree

5 files changed

+47
-22
lines changed

5 files changed

+47
-22
lines changed

frontend/components/service/Program/CategoryListItem.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const SpeakerProfile = styled.div`
4040
height: 6rem;
4141
background-image: url(${(props) => props.image});
4242
background-size: cover;
43+
background-position: center;
4344
border-radius: 50%;
4445
`
4546

frontend/components/service/Program/Speaker.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ const SpeakerName = styled.div`
3333
const SpeakerIntro = styled.p`
3434
margin-top: 0.8rem;
3535
white-space: pre-wrap;
36-
a {
37-
color: ${(props) => props.theme.colors.blue0};
38-
}
3936
`
4037

4138
const Speaker = (props: { item: ISpeaker }) => {

frontend/components/service/Sponsor/SponsorList.tsx

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,28 @@ import { ISponsorLevelItem, ISponsorList } from '../../../interfaces/ISponsor'
55
import { useTranslation } from 'react-i18next'
66
import { Heading3 } from '../../../assets/styles/typo'
77
import { DEFAULT_PROFILE_PATH } from '../../../data/constants/config'
8+
import { media } from '../../../assets/styles/mixin'
89

910
const SponsorLevel = styled.div`
1011
margin-bottom: 6rem;
1112
`
1213
const SponsorGroup = styled.ul`
1314
display: flex;
1415
align-items: center;
15-
margin: 0;
16-
padding: 0;
17-
margin-top: 3rem;
18-
@media (max-width: 768px) {
16+
flex-wrap: wrap;
17+
flex: auto;
18+
gap: 2rem;
19+
${media.mobile(`
1920
flex-direction: column;
20-
}
21+
`)}
2122
`
2223

2324
const SponsorItem = styled.li`
24-
min-height: 100px;
2525
max-width: 200px;
26-
margin: 0;
27-
padding: 0;
26+
height: 200px;
2827
list-style: none;
29-
display: flex;
28+
display: inline-flex;
3029
align-items: center;
31-
& + & {
32-
margin-left: 1.6rem;
33-
@media (max-width: 768px) {
34-
margin-left: 0;
35-
margin-top: 2rem;
36-
}
37-
}
3830
`
3931

4032
const SponsorImage = styled.img`
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import React from 'react'
2+
import type { NextPage, GetServerSideProps } from 'next'
3+
import { useTranslation } from 'react-i18next'
4+
import { PageName } from '../../data/enums/PageName'
5+
import PageTitle from '../../components/core/PageTitle'
6+
import { PageProps } from '../../interfaces/PageProps'
7+
8+
const TalkSchedule: NextPage = (props: PageProps) => {
9+
const { t } = useTranslation()
10+
11+
return (
12+
<div>
13+
<PageTitle title={props.pageName} />
14+
{t('label:preparing')}
15+
</div>
16+
)
17+
}
18+
19+
export const getServerSideProps: GetServerSideProps = async () => {
20+
return {
21+
props: {
22+
title: PageName.TalkSchedule
23+
}
24+
}
25+
}
26+
27+
export default TalkSchedule

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,21 @@ import Speaker from '../../../components/service/Program/Speaker'
99
import { DEFAULT_PROFILE_PATH } from '../../../data/constants/config'
1010
import styled from 'styled-components'
1111
import { Heading3 } from '../../../assets/styles/typo'
12+
import Linkify from 'react-linkify'
1213

1314
interface TalkListDetailProps extends LocalePage<ITalkItem> {
1415
locale: string
1516
}
1617

18+
const DetailContainer = styled.div`
19+
a {
20+
color: ${(props) => props.theme.colors.blue0};
21+
}
22+
`
23+
1724
const Description = styled.div`
1825
margin-top: 2rem;
26+
white-space: pre-line;
1927
`
2028

2129
const SpeakerContainer = styled.div`
@@ -33,7 +41,7 @@ const TalkListDetail: NextPage = (props: TalkListDetailProps) => {
3341
}
3442

3543
return (
36-
<>
44+
<DetailContainer>
3745
<PageTitle title={item.title} />
3846
<div>
3947
{t('label:category')}: {item.category}
@@ -49,15 +57,15 @@ const TalkListDetail: NextPage = (props: TalkListDetailProps) => {
4957
</div>
5058
<Description>
5159
<Heading3 useGradient={true}>{t('label:description')}</Heading3>
52-
{item.desc}
60+
<Linkify>{item.desc}</Linkify>
5361
</Description>
5462
<SpeakerContainer>
5563
<Heading3 useGradient={true}>
5664
{t('label:speakerIntro')}
5765
</Heading3>
5866
<Speaker item={speaker} />
5967
</SpeakerContainer>
60-
</>
68+
</DetailContainer>
6169
)
6270
}
6371

0 commit comments

Comments
 (0)