Skip to content

Commit c705430

Browse files
merge main into develop (#72)
* [fix] Fix date for closing application from Sat to Tue (#65) (#66) * feat: community booth section (#67) * feat: specified commercial transaction (#71) * feat: specified commercial transaction * fix typo * fix: i18n locale * fix: english explanation --------- Co-authored-by: Taiga KIYOKAWA <[email protected]>
1 parent e4a898b commit c705430

File tree

8 files changed

+122
-8
lines changed

8 files changed

+122
-8
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import type { ComponentMeta, ComponentStory } from '@storybook/react'
2+
import { CommunityBoothSection } from '.'
3+
4+
const meta: ComponentMeta<typeof CommunityBoothSection> = {
5+
component: CommunityBoothSection
6+
}
7+
export default meta
8+
9+
const Template: ComponentStory<typeof CommunityBoothSection> = args => <CommunityBoothSection {...args} />
10+
export const Default = Template.bind({})
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import type { FC } from 'react'
2+
import Link from 'next/link'
3+
import { Box, Typography } from '@mui/material'
4+
import { Button } from 'src/components/atoms'
5+
import { useTranslation } from 'react-i18next'
6+
import { Colors } from 'src/styles/color'
7+
8+
export const CommunityBoothSection: FC = () => {
9+
const { t } = useTranslation()
10+
11+
return (
12+
<Box
13+
bgcolor={Colors.background.primary}
14+
display={'flex'}
15+
flexDirection={'column'}
16+
alignItems={'center'}
17+
mb={{ md: 12.5, xs: 7.5 }}
18+
px={{ xs: 2 }}
19+
py={{ md: 10, xs: 4 }}
20+
>
21+
<Typography variant="h2" textAlign={'center'}>
22+
Community Booth
23+
</Typography>
24+
<Typography variant="body1" mb={{ md: 5, xs: 2 }}>
25+
{t('community_booth_description')}
26+
</Typography>
27+
<Link href="https://drive.google.com/file/d/1QUr1BWF7Mu1vU40UieBcvkMf5B-tAf91/view?usp=share_link">
28+
<a target="_blank">
29+
<Button text={t('consider_a_community_booth')} />
30+
</a>
31+
</Link>
32+
</Box>
33+
)
34+
}

src/components/organisms/Footer/index.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ export const Footer = () => {
6464
6565
</Typography>
6666
</Link>
67+
<Link
68+
href="https://drive.google.com/file/d/1Xon1uyLT-810sxnkLMngmL67z68K3XJG/view?usp=share_link"
69+
target="_blank"
70+
>
71+
<Typography variant="body2" sx={{ color: Colors.text.default }}>
72+
{t('act_on_specified_commercial_transactions')}
73+
</Typography>
74+
</Link>
6775
</Box>
6876
</Box>
6977
<Box

src/components/organisms/SponsorsSection/index.tsx

Lines changed: 61 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,29 @@ import Link from 'next/link'
33
import { Box, Typography } from '@mui/material'
44
import { Button } from 'src/components/atoms'
55
import { useTranslation } from 'react-i18next'
6-
import { Colors } from 'src/styles/color'
6+
import { Colors, confettiColors } from 'src/styles/color'
7+
import {
8+
GopherConductor,
9+
GopherDrummer,
10+
GopherFlowerBlue,
11+
GopherFlowerPink,
12+
GopherPartyPopper,
13+
GopherPomPom,
14+
GopherTrumpeter
15+
} from 'src/images/gopher'
16+
import Image from 'next/image'
17+
import { useSize } from 'src/modules/hooks'
18+
import { useReward } from 'react-rewards'
719

820
export const SponsorsSection: FC = () => {
921
const { t } = useTranslation()
22+
const { isTabletOrOver } = useSize()
23+
const { reward } = useReward('confettiGopherPopper', 'confetti', {
24+
angle: 135,
25+
colors: confettiColors,
26+
position: 'absolute',
27+
startVelocity: 20
28+
})
1029

1130
return (
1231
<Box
@@ -32,11 +51,47 @@ export const SponsorsSection: FC = () => {
3251
<SponsorsCard planType="silver" logoImages={[]}/>
3352
<SponsorsCard planType="bronze" logoImages={[]}/>
3453
</Box> */}
35-
<Link href="https://drive.google.com/file/d/1wwFeJk0rT0SydwDi2wx4wVVAD6psDUrL/view?usp=share_link">
36-
<a target="_blank">
37-
<Button text={t('consider_a_sponsor')} />
38-
</a>
39-
</Link>
54+
<Box display="grid" gridTemplateColumns={isTabletOrOver ? '1fr 1fr 1fr' : '1fr'} gap={2}>
55+
{isTabletOrOver && (
56+
<Box display="flex" alignItems="flex-end" justifyContent="flex-end" gap={0.5}>
57+
<Image src={GopherConductor} alt="gopher conductor" />
58+
<Image src={GopherDrummer} alt="gopher drummer" />
59+
<Image src={GopherTrumpeter} alt="gopher trumpeter" />
60+
<Image src={GopherPomPom} alt="gopher pom pom" />
61+
</Box>
62+
)}
63+
<Link href="https://drive.google.com/file/d/1wwFeJk0rT0SydwDi2wx4wVVAD6psDUrL/view?usp=share_link">
64+
<a target="_blank">
65+
<Button text={t('consider_a_sponsor')} />
66+
</a>
67+
</Link>
68+
{isTabletOrOver && (
69+
<Box display="flex" alignItems="flex-end" gap={0.5}>
70+
<Image src={GopherFlowerBlue} alt="gopher flower blue" />
71+
<Image src={GopherFlowerPink} alt="gopher flower pink" />
72+
<Box onClick={reward} sx={{ '&:hover': { cursor: 'pointer' } }}>
73+
<span id="confettiGopherPopper" />
74+
<Image src={GopherPartyPopper} alt="gopher party popper" />
75+
</Box>
76+
</Box>
77+
)}
78+
</Box>
79+
{!isTabletOrOver && (
80+
<Box
81+
sx={{
82+
position: 'absolute',
83+
zIndex: 0,
84+
top: '56px',
85+
right: 0,
86+
display: 'flex',
87+
alignItems: 'flex-end',
88+
opacity: 0.7
89+
}}
90+
>
91+
<Image src={GopherConductor} alt="gopher conductor" width="56px" objectFit="contain" />
92+
<Image src={GopherDrummer} alt="gopher drummer" width="52px" objectFit="contain" />
93+
</Box>
94+
)}
4095
</Box>
4196
)
4297
}

src/components/organisms/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ export * from './MainVisual'
44
export * from './SpeakersSection'
55
export * from './SponsorsSection'
66
export * from './TopDescription'
7+
export * from './CommunityBoothSection'
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { NextPage } from 'next'
22
import { Layout } from 'src/components/commons'
33
import { useTranslation } from 'react-i18next'
4-
import { MainVisual, TopDescription, SpeakersSection, SponsorsSection } from 'src/components/organisms'
4+
import { MainVisual, TopDescription, SponsorsSection, CommunityBoothSection } from 'src/components/organisms'
55

66
export const PageTop: NextPage = () => {
77
const { t } = useTranslation()
@@ -10,8 +10,8 @@ export const PageTop: NextPage = () => {
1010
<Layout>
1111
<MainVisual />
1212
<TopDescription />
13-
<SpeakersSection />
1413
<SponsorsSection />
14+
<CommunityBoothSection />
1515
</Layout>
1616
)
1717
}

src/i18n/en.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
"application_started": "Application started",
66
"application_closed": "Application closed",
77
"consider_a_sponsor": "Consider sponsoring",
8+
"consider_a_community_booth": "Consider applying for a community booth",
9+
"community_booth_description": "We are looking for Community Booth!",
810
"about": "Go Conference is a conference for Go programming language users. It's the 10th anniversary!",
911
"session": "session",
1012
"session_num": "30 or more sessions(Open call for paper at 2022/12)",
1113
"target": "target",
1214
"target_info": "gopher, aspiring engineer, interested in Go",
1315
"host": "organizer",
1416
"gophers_japan": "Institute Gophers Japan",
17+
"act_on_specified_commercial_transactions": "Act on Specified Commercial Transactions",
1518
"sponsors_description": "We are looking for sponsors!"
1619
}

src/i18n/ja.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
"application_started": "応募開始",
66
"application_closed": "応募締切",
77
"consider_a_sponsor": "スポンサーを検討する",
8+
"consider_a_community_booth": "コミュニティブースを検討する",
9+
"community_booth_description": "コミュニティブース募集中です!",
810
"about": "Go Conference は<wbr/>プログラミング言語Goユーザーの<wbr/>ための<wbr/>カンファレンスです。<wbr/>今年で10周年!",
911
"session": "セッション",
1012
"session_num": "30セッション程度(2022年12月公募開始)",
1113
"target": "対象者",
1214
"target_info": "Goエンジニア、エンジニア志望の方、Goに興味のある方",
1315
"host": "主催",
1416
"gophers_japan": "一般社団法人Gophers Japan",
17+
"act_on_specified_commercial_transactions": "特定商取引法に基づく表記",
1518
"sponsors_description": "スポンサー募集中です!"
1619
}

0 commit comments

Comments
 (0)