Skip to content

Commit a0c184e

Browse files
taigakiyokawasivcharimaito1201snaka
authored
chore: Merge develop into main (#182)
* [fix] Fix date for closing application from Sat to Tue (#65) * feat: add GitHub template (#68) * fix: template (#69) * fix: file structure (#70) * 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]> * Merge main into develop (#169) * [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 * feat: add information about CfP result (#165) --------- Co-authored-by: Taiga KIYOKAWA <[email protected]> * feat: useSessionize (#171) * feat: useSettionize * add EOL * スポンサー(パートナー)ページの実装 (#170) * feat: partner page * SAMPLE json / images * fix: `desc` to `description` * fix: simplify prop type name * fix: `desc` to `description` * fix: extract params from context * feat: header with link (#172) * chore: Remove CommunityBoothSection from PageTop (#174) * chore: Temporarily change links of Header to the links to HTML pages build by Sessionize (#173) * chore: Remove `next/link` temporary for forwarding to HTML pages build by Sessionize * chore: Temporarily change links of Header to the links to HTML pages build by Sessionize * fix(HeaderMenu): Use `next/link` when href is `/` * Proposal feat: hide home label from header (#175) * feat: hide home label from header * fix header menu * comment out unused import * fix: remove community booth section (#177) * feat: community booth section (#67) * fix: remove community booth section * chore: add eslint rule (#178) * feat: community booth section (#67) * fix: remove community booth section * chore: add eslint rules * chore: Close sponsors application (#180) * chore: Remove the button for application to sponsors due to be already closed * chore: Fix arrangement of Gophers due to remove the button * chore: Change description to "Sponsors application has been closed.~" --------- Co-authored-by: sivchari <[email protected]> Co-authored-by: maito1201 <[email protected]> Co-authored-by: Shinji Nakamatsu <[email protected]>
1 parent 2459007 commit a0c184e

File tree

3 files changed

+18
-41
lines changed

3 files changed

+18
-41
lines changed
Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import type { FC } from 'react'
2-
import Link from 'next/link'
32
import { Box, Typography } from '@mui/material'
4-
import { Button } from 'src/components/atoms'
5-
import { useTranslation } from 'react-i18next'
3+
import { Trans, useTranslation } from 'react-i18next'
64
import { Colors, confettiColors } from 'src/styles/color'
75
import {
86
GopherConductor,
@@ -40,9 +38,11 @@ export const SponsorsSection: FC = () => {
4038
<Typography variant="h2" textAlign={'center'}>
4139
Sponsors
4240
</Typography>
43-
{/* TODO: This description will be changed as soon as the official wording is fixed. */}
44-
<Typography variant="body1" mb={{ md: 5, xs: 2 }}>
45-
{t('sponsors_description')}
41+
<Typography
42+
variant="body1"
43+
sx={{ mb: { md: 5, xs: 2 }, textAlign: 'center', wordBreak: 'keep-all', overflowWrap: 'break-word' }}
44+
>
45+
<Trans t={t} i18nKey="sponsors_application_closed" />
4646
</Typography>
4747
{/* NOTE: Hide SponsorsCard until the top level sponsors has fixed.
4848
<Box gap={3} mb={5} display={'flex'} flexDirection={'column'} width={'100%'} alignItems={'center'}>
@@ -51,47 +51,22 @@ export const SponsorsSection: FC = () => {
5151
<SponsorsCard planType="silver" logoImages={[]}/>
5252
<SponsorsCard planType="bronze" logoImages={[]}/>
5353
</Box> */}
54-
<Box display="grid" gridTemplateColumns={isTabletOrOver ? '1fr 1fr 1fr' : '1fr'} gap={2}>
54+
<Box display="flex" alignItems="flex-end" justifyContent="flex-end" gap={0.5}>
55+
<Image src={GopherConductor} alt="gopher conductor" />
56+
<Image src={GopherDrummer} alt="gopher drummer" />
57+
<Image src={GopherTrumpeter} alt="gopher trumpeter" />
58+
<Image src={GopherPomPom} alt="gopher pom pom" />
59+
<Image src={GopherFlowerBlue} alt="gopher flower blue" />
5560
{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" />
61+
<>
7162
<Image src={GopherFlowerPink} alt="gopher flower pink" />
7263
<Box onClick={reward} sx={{ '&:hover': { cursor: 'pointer' } }}>
7364
<span id="confettiGopherPopper" />
7465
<Image src={GopherPartyPopper} alt="gopher party popper" />
7566
</Box>
76-
</Box>
67+
</>
7768
)}
7869
</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-
)}
9570
</Box>
9671
)
9772
}

src/i18n/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
"host": "organizer",
1818
"gophers_japan": "Institute Gophers Japan",
1919
"act_on_specified_commercial_transactions": "Act on Specified Commercial Transactions",
20-
"sponsors_description": "We are looking for sponsors!"
20+
"sponsors_description": "We are looking for sponsors!",
21+
"sponsors_application_closed": "Sponsors application has been closed. We will reflect the information on our website in due course."
2122
}

src/i18n/ja.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
"host": "主催",
1818
"gophers_japan": "一般社団法人Gophers Japan",
1919
"act_on_specified_commercial_transactions": "特定商取引法に基づく表記",
20-
"sponsors_description": "スポンサー募集中です!"
20+
"sponsors_description": "スポンサー募集中です!",
21+
"sponsors_application_closed": "スポンサーの募集は<wbr/>終了いたしました。<wbr/>ホームページへの反映は<wbr/>順次行って参ります。"
2122
}

0 commit comments

Comments
 (0)