From a71cb60e2a632616fadf2cd8453e9c1d9d140930 Mon Sep 17 00:00:00 2001 From: Taiga KIYOKAWA <40013676+taigakiyokawa@users.noreply.github.com> Date: Thu, 26 Jan 2023 16:19:41 +0900 Subject: [PATCH 01/15] [fix] Fix date for closing application from Sat to Tue (#65) --- src/components/organisms/SpeakersSection/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/organisms/SpeakersSection/index.tsx b/src/components/organisms/SpeakersSection/index.tsx index 1c336a05..e2a1b719 100644 --- a/src/components/organisms/SpeakersSection/index.tsx +++ b/src/components/organisms/SpeakersSection/index.tsx @@ -39,7 +39,7 @@ export const SpeakersSection: FC = () => { Call for Speakers! {t('application_started')}: 2022.12.01 Thu - {t('application_closed')}: 2023.01.31 Sat + {t('application_closed')}: 2023.01.31 Tue {isTabletOrOver && ( From 75636aaf9c20c7d23f6a5870dda147a40e56d919 Mon Sep 17 00:00:00 2001 From: sivchari Date: Wed, 1 Feb 2023 15:28:22 +0900 Subject: [PATCH 02/15] feat: add GitHub template (#68) --- .github/ISSUE_TEMPLATE | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE new file mode 100644 index 00000000..6033d9e5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE @@ -0,0 +1,43 @@ +name: Go Conference 2023 Proposal +description: Go Conference 2023のProposalです +title: "[Session title]: " +assignees: + - sivchari + - Hiroya3 +body: + - type: input + id: speaker + attributes: + label: Speaker + placeholder: Gopher + validations: + required: true + + - type: textarea + id: account + attributes: + label: SNS Accounts + placeholder: [Twitter](https://twitter.com/goconjp) + validations: + required: false + + - type: textarea + id: description + attributes: + label: Description + placeholder: What's new in Go1.20 ? + validations: + required: true + + - type: dropdown + id: type + attributes: + label: Session type + options: + - LT(5min) + - Short Talk(20min) + - Challenge Session(20min) + - Long Talk(40min) + validations: + required: true + From 0eeae8f3b1c35c6542daf36ecf5ba03f7df1f86b Mon Sep 17 00:00:00 2001 From: sivchari Date: Wed, 1 Feb 2023 15:48:34 +0900 Subject: [PATCH 03/15] fix: template (#69) --- .github/ISSUE_TEMPLATE | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE index 6033d9e5..bf2d466a 100644 --- a/.github/ISSUE_TEMPLATE +++ b/.github/ISSUE_TEMPLATE @@ -1,5 +1,5 @@ name: Go Conference 2023 Proposal -description: Go Conference 2023のProposalです +description: Go Conference 2023 Proposal title: "[Session title]: " assignees: - sivchari @@ -9,7 +9,7 @@ body: id: speaker attributes: label: Speaker - placeholder: Gopher + placeholder: "Gopher" validations: required: true @@ -17,7 +17,7 @@ body: id: account attributes: label: SNS Accounts - placeholder: [Twitter](https://twitter.com/goconjp) + placeholder: "[Twitter](https://twitter.com/goconjp)" validations: required: false @@ -25,7 +25,7 @@ body: id: description attributes: label: Description - placeholder: What's new in Go1.20 ? + placeholder: "What's new in Go1.20 ?" validations: required: true @@ -34,10 +34,10 @@ body: attributes: label: Session type options: - - LT(5min) - - Short Talk(20min) - - Challenge Session(20min) - - Long Talk(40min) + - LT (5min) + - Short Talk (20min) + - Challenge Session (20min) + - Long Talk (40min) validations: required: true From e4a898b92f519d0ba83e521945ff8b1d49cb2080 Mon Sep 17 00:00:00 2001 From: sivchari Date: Wed, 1 Feb 2023 15:51:23 +0900 Subject: [PATCH 04/15] fix: file structure (#70) --- .github/{ISSUE_TEMPLATE => ISSUE_TEMPLATE/proposal.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ISSUE_TEMPLATE => ISSUE_TEMPLATE/proposal.yml} (100%) diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE/proposal.yml similarity index 100% rename from .github/ISSUE_TEMPLATE rename to .github/ISSUE_TEMPLATE/proposal.yml From c705430e8abd096ceb69ff15d0e118c8f5963dcd Mon Sep 17 00:00:00 2001 From: maito1201 <49754654+maito1201@users.noreply.github.com> Date: Fri, 3 Feb 2023 23:32:02 +0900 Subject: [PATCH 05/15] 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 <40013676+taigakiyokawa@users.noreply.github.com> --- .../CommunityBoothSection.stories.tsx | 10 +++ .../organisms/CommunityBoothSection/index.tsx | 34 ++++++++++ src/components/organisms/Footer/index.tsx | 8 +++ .../organisms/SponsorsSection/index.tsx | 67 +++++++++++++++++-- src/components/organisms/index.ts | 1 + src/components/pages/PageTop/index.tsx | 4 +- src/i18n/en.json | 3 + src/i18n/ja.json | 3 + 8 files changed, 122 insertions(+), 8 deletions(-) create mode 100644 src/components/organisms/CommunityBoothSection/CommunityBoothSection.stories.tsx create mode 100644 src/components/organisms/CommunityBoothSection/index.tsx diff --git a/src/components/organisms/CommunityBoothSection/CommunityBoothSection.stories.tsx b/src/components/organisms/CommunityBoothSection/CommunityBoothSection.stories.tsx new file mode 100644 index 00000000..8dca829a --- /dev/null +++ b/src/components/organisms/CommunityBoothSection/CommunityBoothSection.stories.tsx @@ -0,0 +1,10 @@ +import type { ComponentMeta, ComponentStory } from '@storybook/react' +import { CommunityBoothSection } from '.' + +const meta: ComponentMeta = { + component: CommunityBoothSection +} +export default meta + +const Template: ComponentStory = args => +export const Default = Template.bind({}) diff --git a/src/components/organisms/CommunityBoothSection/index.tsx b/src/components/organisms/CommunityBoothSection/index.tsx new file mode 100644 index 00000000..cb411989 --- /dev/null +++ b/src/components/organisms/CommunityBoothSection/index.tsx @@ -0,0 +1,34 @@ +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 { Colors } from 'src/styles/color' + +export const CommunityBoothSection: FC = () => { + const { t } = useTranslation() + + return ( + + + Community Booth + + + {t('community_booth_description')} + + + +