Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Merge develop into main #182

Merged
merged 16 commits into from
Apr 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 14 additions & 39 deletions src/components/organisms/SponsorsSection/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import type { FC } from 'react'
import Link from 'next/link'
import { Box, Typography } from '@mui/material'
import { Button } from 'src/components/atoms'
import { useTranslation } from 'react-i18next'
import { Trans, useTranslation } from 'react-i18next'
import { Colors, confettiColors } from 'src/styles/color'
import {
GopherConductor,
Expand Down Expand Up @@ -40,9 +38,11 @@ export const SponsorsSection: FC = () => {
<Typography variant="h2" textAlign={'center'}>
Sponsors
</Typography>
{/* TODO: This description will be changed as soon as the official wording is fixed. */}
<Typography variant="body1" mb={{ md: 5, xs: 2 }}>
{t('sponsors_description')}
<Typography
variant="body1"
sx={{ mb: { md: 5, xs: 2 }, textAlign: 'center', wordBreak: 'keep-all', overflowWrap: 'break-word' }}
>
<Trans t={t} i18nKey="sponsors_application_closed" />
</Typography>
{/* NOTE: Hide SponsorsCard until the top level sponsors has fixed.
<Box gap={3} mb={5} display={'flex'} flexDirection={'column'} width={'100%'} alignItems={'center'}>
Expand All @@ -51,47 +51,22 @@ export const SponsorsSection: FC = () => {
<SponsorsCard planType="silver" logoImages={[]}/>
<SponsorsCard planType="bronze" logoImages={[]}/>
</Box> */}
<Box display="grid" gridTemplateColumns={isTabletOrOver ? '1fr 1fr 1fr' : '1fr'} gap={2}>
<Box display="flex" alignItems="flex-end" justifyContent="flex-end" gap={0.5}>
<Image src={GopherConductor} alt="gopher conductor" />
<Image src={GopherDrummer} alt="gopher drummer" />
<Image src={GopherTrumpeter} alt="gopher trumpeter" />
<Image src={GopherPomPom} alt="gopher pom pom" />
<Image src={GopherFlowerBlue} alt="gopher flower blue" />
{isTabletOrOver && (
<Box display="flex" alignItems="flex-end" justifyContent="flex-end" gap={0.5}>
<Image src={GopherConductor} alt="gopher conductor" />
<Image src={GopherDrummer} alt="gopher drummer" />
<Image src={GopherTrumpeter} alt="gopher trumpeter" />
<Image src={GopherPomPom} alt="gopher pom pom" />
</Box>
)}
<Link href="https://drive.google.com/file/d/1wwFeJk0rT0SydwDi2wx4wVVAD6psDUrL/view?usp=share_link">
<a target="_blank">
<Button text={t('consider_a_sponsor')} />
</a>
</Link>
{isTabletOrOver && (
<Box display="flex" alignItems="flex-end" gap={0.5}>
<Image src={GopherFlowerBlue} alt="gopher flower blue" />
<>
<Image src={GopherFlowerPink} alt="gopher flower pink" />
<Box onClick={reward} sx={{ '&:hover': { cursor: 'pointer' } }}>
<span id="confettiGopherPopper" />
<Image src={GopherPartyPopper} alt="gopher party popper" />
</Box>
</Box>
</>
)}
</Box>
{!isTabletOrOver && (
<Box
sx={{
position: 'absolute',
zIndex: 0,
top: '56px',
right: 0,
display: 'flex',
alignItems: 'flex-end',
opacity: 0.7
}}
>
<Image src={GopherConductor} alt="gopher conductor" width="56px" objectFit="contain" />
<Image src={GopherDrummer} alt="gopher drummer" width="52px" objectFit="contain" />
</Box>
)}
</Box>
)
}
3 changes: 2 additions & 1 deletion src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"host": "organizer",
"gophers_japan": "Institute Gophers Japan",
"act_on_specified_commercial_transactions": "Act on Specified Commercial Transactions",
"sponsors_description": "We are looking for sponsors!"
"sponsors_description": "We are looking for sponsors!",
"sponsors_application_closed": "Sponsors application has been closed. We will reflect the information on our website in due course."
}
3 changes: 2 additions & 1 deletion src/i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"host": "主催",
"gophers_japan": "一般社団法人Gophers Japan",
"act_on_specified_commercial_transactions": "特定商取引法に基づく表記",
"sponsors_description": "スポンサー募集中です!"
"sponsors_description": "スポンサー募集中です!",
"sponsors_application_closed": "スポンサーの募集は<wbr/>終了いたしました。<wbr/>ホームページへの反映は<wbr/>順次行って参ります。"
}