Merge pull request #225 from RyoTa0222/develop

Develop
ryota0222 · Jun 21, 2022 · fc389d9 · fc389d9 · vercel · Jun 21, 2022
2 parents 9966d9e + f369e3d
commit fc389d9
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 16 deletions.
diff --git a/src/components/atoms/HamburgerMenu/HamburgerMenu.tsx b/src/components/atoms/HamburgerMenu/HamburgerMenu.tsx
@@ -13,6 +13,7 @@ export const HamburgerMenu: React.FC<Props> = memo(({ isOpen }) => {
       h="20px"
       className={clsx(isOpen && 'active')}
       cursor="pointer"
+      role="button"
     >
       <Box as="span" bgColor={TEXT_COLOR}></Box>
       <Box as="span" bgColor={TEXT_COLOR}></Box>

diff --git a/src/components/features/blogs/Gist.tsx b/src/components/features/blogs/Gist.tsx
@@ -57,6 +57,7 @@ const Gist: React.FC<Props> = ({ id, file }) => {
   return (
     <iframe
       ref={ref}
+      title="gist"
       width="100%"
       frameBorder={0}
       id={file ? `gist-${id}-${file}` : `gist-${id}`}

diff --git a/src/components/features/top/Creative.tsx b/src/components/features/top/Creative.tsx
@@ -81,7 +81,10 @@ const Creative = memo(() => {
                 transition={'all 0.2s'}
                 _hover={{ transform: 'scale(1.1)' }}
               >
-                <CreativeItem image={line_stamp.image} />
+                <CreativeItem
+                  image={line_stamp.image}
+                  title={line_stamp.link}
+                />
               </Box>
             </Link>
           </React.Fragment>

diff --git a/src/components/features/top/Slide.tsx b/src/components/features/top/Slide.tsx
@@ -11,6 +11,7 @@ const Slide = memo(() => {
         }}
         width={'100%'}
         height={400}
+        title={'slide'}
         src={SLIDE_LIST[0].link}
         allowFullScreen
       ></iframe>

diff --git a/src/components/molecules/CreativeItem/CreativeItem.tsx b/src/components/molecules/CreativeItem/CreativeItem.tsx
@@ -19,7 +19,13 @@ export const CreativeItem: React.FC<Props> = memo((props) => {
     githubIconSize,
   } = useCreativeItem(props)
   return (
-    <Flex bgColor={bgColor} borderRadius="xl" padding={2} d="inline-flex">
+    <Flex
+      bgColor={bgColor}
+      borderRadius="xl"
+      padding={2}
+      d="inline-flex"
+      aria-label={title || ''}
+    >
       <Box
         width={imageSize}
         height={imageSize}
@@ -28,15 +34,15 @@ export const CreativeItem: React.FC<Props> = memo((props) => {
       >
         <img
           src={image}
-          alt={title}
+          alt={title || ''}
           width={imageSize || 0}
           height={imageSize || 0}
         />
       </Box>
       {!isImageOnly && (
         <Flex flexDirection={'column'} ml={2} width={'120px'}>
           <Text fontWeight={'bold'} fontSize={titleFontSize}>
-            {title}
+            {title || ''}
           </Text>
           <Text
             noOfLines={descriptionNoOfLines}

diff --git a/src/components/organisms/Footer/Footer.tsx b/src/components/organisms/Footer/Footer.tsx
@@ -24,11 +24,11 @@ export const AppFooter = memo(() => {
       <Spacer />
       {/* github */}
       <Link href={'https://github.com/RyoTa0222'} isExternal mr="4">
-        <FaGithub color={color} size="20px" />
+        <FaGithub color={color} size="20px" aria-label="github" />
       </Link>
       {/* twitter */}
       <Link href={'https://twitter.com/RyoTa___0222'} isExternal>
-        <FaTwitter color={color} size="20px" />
+        <FaTwitter color={color} size="20px" aria-label="twitter" />
       </Link>
     </Flex>
   )

diff --git a/src/components/templates/Slides.tsx b/src/components/templates/Slides.tsx
@@ -54,6 +54,7 @@ const Slides: React.FC<Props> = memo(({ data }) => {
                 width={'100%'}
                 height={400}
                 src={slide.link}
+                title={slide.title}
                 allowFullScreen
               ></SlideIframe>
             </Box>

diff --git a/src/consts/top.ts b/src/consts/top.ts
@@ -33,7 +33,7 @@ export const SLIDE_LIST: Slide[] = [
   },
   {
     page: 6,
-    link: 'https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com%2Fproto%2FYMVaY2koGrP1fugOirBLe3%2F%25E3%2581%25A4%25E3%2581%25AA%25E3%2581%258C%25E3%2582%258B%25E5%258B%2589%25E5%25BC%25B7%25E4%25BC%259A%3Fpage-id%3D201%253A1102%26node-id%3D201%253A1103%26viewport%3D2473%252C74%252C0.26%26scaling%3Dmin-zoom%26starting-point-node-id%3D201%253A1103',
+    link: 'https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com%2Fproto%2FYMVaY2koGrP1fugOirBLe3%2F%25E3%2581%25A4%25E3%2581%25AA%25E3%2581%258C%25E3%2582%258B%25E5%258B%2589%25E5%25BC%25B7%25E4%25BC%259A%3Fpage-id%3D201%253A1102%26node-id%3D201%253A1103%26viewport%3D2473%252C74%252C0.26%26scaling%3Dscale-down%26starting-point-node-id%3D201%253A1103',
     title: 'Figmaがエンジニアに最適だと思う話',
     date: '2022-11-27',
   },

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -1,3 +1,4 @@
+import { useMemo } from 'react'
 import { Box } from '@chakra-ui/react'
 import * as Sentry from '@sentry/react'
 import { Integrations } from '@sentry/tracing'
@@ -11,7 +12,6 @@ import useFontSizeEffect from '@/hooks/useFontSizeEffect'
 import usePageView from '@/hooks/usePageView'
 import { Container } from '@/styles/global.css'
 import '@/styles/globals.css'
-import { useMemo } from 'react'
 
 Sentry.init({
   dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,

diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
@@ -5,6 +5,7 @@ import Document, {
   NextScript,
   DocumentContext,
 } from 'next/document'
+import Script from 'next/script'
 import { existsGaId, GA_ID } from '@/plugins/gtag'
 
 const htmlPrefix = 'og: http://ogp.me/ns#'
@@ -14,10 +15,10 @@ class MyDocument extends Document<{ prefix: string | null }> {
     const initialProps = await Document.getInitialProps(ctx)
     // 404 ページには prefix を設定しない
     const prefix = ctx.pathname.startsWith('/404') ? null : htmlPrefix
-    return { ...initialProps, prefix }
+    return { ...initialProps, prefix, locale: ctx?.locale || 'ja' }
   }
   render() {
-    const { locale } = this.props.__NEXT_DATA__
+    const locale = this.props.locale
     const dir = locale === 'ar' ? 'rtl' : 'ltr'
     const prefix = this.props.prefix
     return (
@@ -26,11 +27,11 @@ class MyDocument extends Document<{ prefix: string | null }> {
           {/* Google Analytics */}
           {existsGaId && (
             <>
-              <script
+              <Script
                 async
                 src={`https://www.googletagmanager.com/gtag/js?id=${GA_ID}`}
               />
-              <script
+              <Script
                 dangerouslySetInnerHTML={{
                   __html: `
                   window.dataLayer = window.dataLayer || [];
@@ -78,14 +79,14 @@ class MyDocument extends Document<{ prefix: string | null }> {
             content="/favicons/browserconfig.xml"
           />
           <meta name="theme-color" content="#444444" />
-          <script
+          {/* <Script
             async
             src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-7852298720384342"
             crossOrigin="anonymous"
-          ></script>
+          ></Script> */}
         </Head>
         <body>
-          <script> </script>
+          <Script />
           <Main />
           <NextScript />
         </body>

diff --git a/src/styles/globals.css b/src/styles/globals.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: 'bananaslipplus';
-  src: url(/fonts/bananaslipplus.otf);
+  src: url('/fonts/bananaslipplus.otf') format('opentype');
 }
 
 html,