Merge develop into main (#179)

* [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 --------- Co-authored-by: Taiga KIYOKAWA <[email protected]> Co-authored-by: sivchari <[email protected]> Co-authored-by: Shinji Nakamatsu <[email protected]>
GoCon · Apr 2, 2023 · 2459007 · 2459007
1 parent 34914bf
commit 2459007
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 46 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -2,7 +2,9 @@
   "extends": [
     "next/core-web-vitals",
     "prettier",
-    "plugin:storybook/recommended"
+    "plugin:storybook/recommended",
+    "eslint:recommended",
+    "plugin:react/jsx-runtime"
   ],
    "rules": {
     "@next/next/no-img-element": "off"

diff --git a/src/components/atoms/Button/index.tsx b/src/components/atoms/Button/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { ButtonBase, Typography } from '@mui/material'
 import { Colors } from 'src/styles/color'
 

diff --git a/src/components/atoms/IconTwitter/IconTwitter.stories.tsx b/src/components/atoms/IconTwitter/IconTwitter.stories.tsx
@@ -6,6 +6,6 @@ const meta: ComponentMeta<typeof IconTwitter> = {
 }
 export default meta
 
-const Template: ComponentStory<typeof IconTwitter> = args => <IconTwitter />
+const Template: ComponentStory<typeof IconTwitter> = () => <IconTwitter />
 
 export const Default = Template.bind({})
diff --git a/src/components/atoms/IconTwitter/index.tsx b/src/components/atoms/IconTwitter/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { SvgIcon } from '@mui/material'
 import { Colors } from 'src/styles/color'
 

diff --git a/src/components/atoms/Link/index.tsx b/src/components/atoms/Link/index.tsx
@@ -1,10 +1,11 @@
 import NextLink, { LinkProps as NextLinkProps } from 'next/link'
 import MuiLink from '@mui/material/Link'
+import { ReactNode } from 'react'
 
 export interface LinkProps {
   href: NextLinkProps['href']
   target?: string
-  children?: React.ReactNode
+  children?: ReactNode
 }
 
 export const Link = ({ href, target = '_self', children }: LinkProps) => {

diff --git a/src/components/atoms/Logo/index.tsx b/src/components/atoms/Logo/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { SvgIcon, SvgIconProps } from '@mui/material'
 
 export const Logo = (props: SvgIconProps) => {

diff --git a/src/components/commons/Layout/index.tsx b/src/components/commons/Layout/index.tsx
@@ -1,5 +1,5 @@
 import type { NextPage } from 'next'
-import { ReactNode } from 'react'
+import { ReactNode, ChangeEvent } from 'react'
 import Head from 'next/head'
 
 import { Header } from 'src/components/organisms'
@@ -17,7 +17,7 @@ export const Layout: NextPage<LayoutProps> = ({ children }) => {
   const config = require('../../../../next.config')
   const [authorized, setAuthorized] = useLocalStorageState('authorized', { defaultValue: false })
 
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
     if (toSha256(e.target.value) === process.env.NEXT_PUBLIC_AUTH_PASSWORD_HASH) setAuthorized(true)
   }
 

diff --git a/src/components/molecules/HeaderMenu/index.tsx b/src/components/molecules/HeaderMenu/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { Typography, Box } from '@mui/material'
 import { useRouter } from 'next/router'
 import { HeaderItemColor, HeaderMenuItem, HeaderItemBehaviorStyles } from 'src/components/organisms/Header'

diff --git a/src/components/organisms/Footer/FooterBottom.tsx b/src/components/organisms/Footer/FooterBottom.tsx
@@ -1,8 +1,9 @@
 import { Box } from '@mui/material'
 import { useSize } from 'src/modules/hooks'
+import { ReactNode } from 'react'
 
 interface FooterBottomProps {
-  children: React.ReactNode
+  children: ReactNode
 }
 
 export const FooterBottom = ({ children }: FooterBottomProps) => {

diff --git a/src/components/organisms/Header/index.tsx b/src/components/organisms/Header/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useMemo } from 'react'
+import { useState, useMemo } from 'react'
 import MenuRoundedIcon from '@mui/icons-material/MenuRounded'
 import { AppBar, Toolbar, Box, IconButton } from '@mui/material'
 import { Colors } from 'src/styles/color'

diff --git a/src/components/organisms/SpeakersSection/index.tsx b/src/components/organisms/SpeakersSection/index.tsx
@@ -3,20 +3,10 @@ import Link from 'next/link'
 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 { useSize } from 'src/modules/hooks'
-import { useReward } from 'react-rewards'
+import { Colors } from 'src/styles/color'
 
 export const SpeakersSection: FC = () => {
   const { t } = useTranslation()
-  const { isTabletOrOver } = useSize()
-  const { reward } = useReward('confettiGopherPopper', 'confetti', {
-    angle: 135,
-    colors: confettiColors,
-    position: 'absolute',
-    startVelocity: 20
-  })
-
   return (
     <Box
       bgcolor={Colors.background.primary}

diff --git a/src/components/pages/PagePartner/index.tsx b/src/components/pages/PagePartner/index.tsx
@@ -1,8 +1,6 @@
 import { Box, Typography } from '@mui/material'
-import { NextPage } from 'next'
 import Image from 'next/image'
 import { Layout } from 'src/components/commons'
-import { Header } from 'src/components/organisms'
 
 export type PartnerRank = 'platinum' | 'gold'
 

diff --git a/src/components/pages/PageTop/index.tsx b/src/components/pages/PageTop/index.tsx
@@ -1,12 +1,9 @@
 import type { NextPage } from 'next'
 import { Layout } from 'src/components/commons'
-import { useTranslation } from 'react-i18next'
 // import { useSessionize } from 'src/modules/sessionize/hooks'
-import { MainVisual, TopDescription, SponsorsSection, CommunityBoothSection } from 'src/components/organisms'
+import { MainVisual, TopDescription, SponsorsSection } from 'src/components/organisms'
 
 export const PageTop: NextPage = () => {
-  const { t } = useTranslation()
-
   // TODO(@maito1201): 取得したデータを基にセッションデータを表示する
   // const { data } = useSessionize()
   // console.log('session data', data)
@@ -16,7 +13,6 @@ export const PageTop: NextPage = () => {
       <MainVisual />
       <TopDescription />
       <SponsorsSection />
-      <CommunityBoothSection />
     </Layout>
   )
 }
diff --git a/src/pages/floor_guide.tsx b/src/pages/floor_guide.tsx
@@ -1,9 +1,6 @@
 import { PageTop } from 'src/components/pages'
 
-type InitialProps = {}
-type Props = {} & InitialProps
-
-const Index = (_: Props) => {
+const Index = () => {
   /* TODO: 各ページの実装 */
   return <PageTop />
 }

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,9 +1,6 @@
 import { PageTop } from 'src/components/pages'
 
-type InitialProps = {}
-type Props = {} & InitialProps
-
-const Index = (_: Props) => {
+const Index = () => {
   return <PageTop />
 }
 

diff --git a/src/pages/sessions.tsx b/src/pages/sessions.tsx
@@ -1,9 +1,6 @@
 import { PageTop } from 'src/components/pages'
 
-type InitialProps = {}
-type Props = {} & InitialProps
-
-const Index = (_: Props) => {
+const Index = () => {
   /* TODO: 各ページの実装 */
   return <PageTop />
 }

diff --git a/src/pages/timetable.tsx b/src/pages/timetable.tsx
@@ -1,9 +1,6 @@
 import { PageTop } from 'src/components/pages'
 
-type InitialProps = {}
-type Props = {} & InitialProps
-
-const Index = (_: Props) => {
+const Index = () => {
   /* TODO: 各ページの実装 */
   return <PageTop />
 }