Merge branch 'development' into feat/add_unite-attacks-list_page

Author: nikukyugamer

components/humberger-menu/GeneralInformation.tsx

@@ -0,0 +1,35 @@
+import Link from 'next/link'
+
+export const GeneralInformation = () => {
+  return (
+    <>
+      <div className="collapse collapse-arrow">
+        <input type="checkbox" className="peer" />
+
+        <div className="collapse-title pl-0">
+          <div>各種情報</div>
+        </div>
+
+        <div className="collapse-content">
+          <div>
+            <Link
+              href="/events-in-event/result-illustration-applications"
+              passHref
+            >
+              <span className="link link-hover">開票イラスト応募状況</span>
+            </Link>
+          </div>
+          <div className="my-4" />
+          <div>
+            <Link
+              href="/events-in-event/novels-on-themes-application-results"
+              passHref
+            >
+              <span className="link link-hover">「お題」募集結果</span>
+            </Link>
+          </div>
+        </div>
+      </div>
+    </>
+  )
+}

components/humberger-menu/HumbergerNavigation.tsx

@@ -1,12 +1,11 @@
 import { push as Menu } from 'react-burger-menu'
 import Link from 'next/link'
-import PreviousWebsites from '@/components/humberger-menu/PreviousWebsites'
+import { PreviousWebsites } from '@/components/humberger-menu/PreviousWebsites'
+import { GeneralInformation } from '@/components/humberger-menu/GeneralInformation'
 import { useLocale } from '@/hooks/useLocale'
-// import useTranslation from 'next-translate/useTranslation'
 
 const Navigation = () => {
   const { t, locale } = useLocale()
-  // const { t } = useTranslation('')
 
   return (
     <div id="outer-container">
@@ -127,6 +126,9 @@ const Navigation = () => {
               </div>
             </div>
           </div>
+          <div className="text-lg">
+            <GeneralInformation />
+          </div>
           <div className="text-lg">
             <PreviousWebsites />
           </div>

components/humberger-menu/PreviousWebsiteLink.tsx

@@ -1,4 +1,4 @@
-const PreviousWebsiteLink = (props: any) => {
+export const PreviousWebsiteLink = (props: any) => {
   return (
     <div className="py-2">
       <a
@@ -34,5 +34,3 @@ const PreviousWebsiteLink = (props: any) => {
     </div>
   )
 }
-
-export default PreviousWebsiteLink

components/humberger-menu/PreviousWebsites.tsx

@@ -1,10 +1,8 @@
-import PreviousWebsiteLink from '@/components/humberger-menu/PreviousWebsiteLink'
+import { PreviousWebsiteLink } from '@/components/humberger-menu/PreviousWebsiteLink'
 import { useLocale } from '@/hooks/useLocale'
-// import useTranslation from 'next-translate/useTranslation'
 
-const PreviousWebsites = () => {
+export const PreviousWebsites = () => {
   const { t, locale } = useLocale()
-  // const { t } = useTranslation('')
 
   const previousWebsiteNamesAndUrls = [
     {
@@ -58,5 +56,3 @@ const PreviousWebsites = () => {
     </>
   )
 }
-
-export default PreviousWebsites

package.json

@@ -20,6 +20,7 @@
     "axios": "^0.27.2",
     "cypress": "10.2.0",
     "daisyui": "2.17.0",
+    "dayjs": "^1.11.3",
     "eslint": "8.18.0",
     "eslint-config-next": "12.1.6",
     "eslint-config-prettier": "^8.5.0",
@@ -33,7 +34,7 @@
     "prettier": "2.7.1",
     "react-burger-menu": "3.0.8",
     "react-twitter-embed": "^4.0.4",
-    "sass": "1.52.3",
+    "sass": "1.53.0",
     "sharp": "0.30.7",
     "styled-components": "^5.3.5",
     "stylelint": "14.9.1",

pages/index.tsx

@@ -1,6 +1,10 @@
 import React from 'react'
 import Image from 'next/image'
 import type { NextPage } from 'next'
+import { useState, useEffect } from 'react'
+import dayjs from 'dayjs'
+import ja from 'dayjs/locale/ja'
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter'
 
 import HumbergerNavigation from '@/components/humberger-menu/HumbergerNavigation'
 
@@ -26,9 +30,25 @@ import { useLocale } from '@/hooks/useLocale'
 import useTranslation from 'next-translate/useTranslation'
 
 const Home: NextPage = () => {
+  dayjs.locale(ja)
+  dayjs.extend(isSameOrAfter)
+
   const { t } = useLocale()
   const { lang } = useTranslation()
 
+  const [isDuringVoteTerm, setIsDuringVoteTerm] = useState(false)
+
+  useEffect(() => {
+    const dayjsCurrentDateTime = dayjs(
+      new Date().toLocaleString('ja-JP', { timeZone: 'Asia/Tokyo' })
+    )
+    const dayjsVoteStartDateTime = dayjs('2022-06-24 21:00:00')
+
+    setIsDuringVoteTerm(
+      dayjsCurrentDateTime.isSameOrAfter(dayjsVoteStartDateTime)
+    )
+  }, [])
+
   return (
     <div className="bg-white text-black">
       <title>{`${t.PAGE_TITLE_HOME} - ${t.WEBSITE_TITLE}`}</title>
@@ -98,7 +118,7 @@ const Home: NextPage = () => {
           </div>
 
           {/* 投票開始とともに開く */}
-          {false && (
+          {isDuringVoteTerm && (
             <div id="about-check-vote-card" className="-mt-32 pt-32">
               <AboutCheckVoteCard />
             </div>

yarn.lock

@@ -2194,6 +2194,11 @@ dayjs@^1.10.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.0.tgz#009bf7ef2e2ea2d5db2e6583d2d39a4b5061e805"
   integrity sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==
 
+dayjs@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.3.tgz#4754eb694a624057b9ad2224b67b15d552589258"
+  integrity sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==
+
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
@@ -5346,10 +5351,10 @@ safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@1.52.3:
-  version "1.52.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.3.tgz#b7cc7ffea2341ccc9a0c4fd372bf1b3f9be1b6cb"
-  integrity sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==
+sass@1.53.0:
+  version "1.53.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.53.0.tgz#eab73a7baac045cc57ddc1d1ff501ad2659952eb"
+  integrity sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"