From 3d3ff1f3e7a06e08bd675c54efd7bea18416db32 Mon Sep 17 00:00:00 2001
From: maito1201 <49754654+maito1201@users.noreply.github.com>
Date: Thu, 23 Feb 2023 12:28:06 +0900
Subject: [PATCH] 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 <40013676+taigakiyokawa@users.noreply.github.com>
---
 .../organisms/SpeakersSection/index.tsx       | 59 ++-----------------
 src/components/pages/PageTop/index.tsx        |  9 ++-
 src/i18n/en.json                              |  2 +
 src/i18n/ja.json                              |  2 +
 4 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/src/components/organisms/SpeakersSection/index.tsx b/src/components/organisms/SpeakersSection/index.tsx
index e2a1b719..a9652ad3 100644
--- a/src/components/organisms/SpeakersSection/index.tsx
+++ b/src/components/organisms/SpeakersSection/index.tsx
@@ -4,16 +4,6 @@ import { Box, Typography } from '@mui/material'
 import { Button } from 'src/components/atoms'
 import { useTranslation } from 'react-i18next'
 import { Colors, confettiColors } from 'src/styles/color'
-import {
-  GopherConductor,
-  GopherDrummer,
-  GopherFlowerBlue,
-  GopherFlowerPink,
-  GopherPartyPopper,
-  GopherPomPom,
-  GopherTrumpeter
-} from 'src/images/gopher'
-import Image from 'next/image'
 import { useSize } from 'src/modules/hooks'
 import { useReward } from 'react-rewards'
 
@@ -38,50 +28,13 @@ export const SpeakersSection: FC = () => {
     >
       <Typography variant="h2">Call for Speakers!</Typography>
       <Box mb={1}>
-        <Typography variant="body2">{t('application_started')}: 2022.12.01 Thu</Typography>
-        <Typography variant="body2">{t('application_closed')}: 2023.01.31 Tue</Typography>
+        <Typography variant="body2">{t('application_result_will_be_noticed')}</Typography>
       </Box>
-      <Box display="grid" gridTemplateColumns={isTabletOrOver ? '1fr 1fr 1fr' : '1fr'} gap={2}>
-        {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://sessionize.com/go-conference-2023-online/">
-          <a target="_blank">
-            <Button text={t('apply_for_speaker')} />
-          </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>
-      )}
+      <Link href="https://sessionize.com/go-conference-2023-online/">
+        <a target="_blank">
+          <Button text={t('check_cfp')} />
+        </a>
+      </Link>
     </Box>
   )
 }
diff --git a/src/components/pages/PageTop/index.tsx b/src/components/pages/PageTop/index.tsx
index c8ed36f5..24e2b315 100644
--- a/src/components/pages/PageTop/index.tsx
+++ b/src/components/pages/PageTop/index.tsx
@@ -1,7 +1,13 @@
 import type { NextPage } from 'next'
 import { Layout } from 'src/components/commons'
 import { useTranslation } from 'react-i18next'
-import { MainVisual, TopDescription, SponsorsSection, CommunityBoothSection } from 'src/components/organisms'
+import {
+  MainVisual,
+  TopDescription,
+  SponsorsSection,
+  CommunityBoothSection,
+  SpeakersSection
+} from 'src/components/organisms'
 
 export const PageTop: NextPage = () => {
   const { t } = useTranslation()
@@ -10,6 +16,7 @@ export const PageTop: NextPage = () => {
     <Layout>
       <MainVisual />
       <TopDescription />
+      <SpeakersSection />
       <SponsorsSection />
       <CommunityBoothSection />
     </Layout>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index fe1fa93e..12018fdd 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -4,10 +4,12 @@
   "apply_for_speaker": "Call for Speakers",
   "application_started": "Application started",
   "application_closed": "Application closed",
+  "application_result_will_be_noticed": "CfP results will be sent to the email registered on sessionize on March 9, 2023",
   "consider_a_sponsor": "Consider sponsoring",
   "consider_a_community_booth": "Consider applying for a community booth",
   "community_booth_description": "We are looking for Community Booth!",
   "about": "Go Conference is a conference for Go programming language users. It's the 10th anniversary!",
+  "check_cfp": "check CfP",
   "session": "session",
   "session_num": "30 or more sessions(Open call for paper at 2022/12)",
   "target": "target",
diff --git a/src/i18n/ja.json b/src/i18n/ja.json
index 9ad6c11b..42386bf2 100644
--- a/src/i18n/ja.json
+++ b/src/i18n/ja.json
@@ -4,9 +4,11 @@
   "apply_for_speaker": "スピーカーに応募する",
   "application_started": "応募開始",
   "application_closed": "応募締切",
+  "application_result_will_be_noticed": "CfPの結果は2023年3月9日に、sessionizeに登録されたメールにお送りする予定です",
   "consider_a_sponsor": "スポンサーを検討する",
   "consider_a_community_booth": "コミュニティブースを検討する",
   "community_booth_description": "コミュニティブース募集中です!",
+  "check_cfp": "CfPを確認する",
   "about": "Go Conference は<wbr/>プログラミング言語Goユーザーの<wbr/>ための<wbr/>カンファレンスです。<wbr/>今年で10周年!",
   "session": "セッション",
   "session_num": "30セッション程度(2022年12月公募開始)",