Merge pull request #304 from true-runes/development

v10.0.0
true-runes · May 24, 2022 · 9202dd0 · 9202dd0
2 parents 66fb816 + 19072b8
commit 9202dd0
Show file tree

Hide file tree

Showing 13 changed files with 111 additions and 74 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -69,7 +69,7 @@ jobs:
         run: |
           yarn install
       - name: Cypress を実行する
-        uses: cypress-io/github-action@v3.0.6
+        uses: cypress-io/github-action@v3.1.0
         with:
           start: npx cypress
           working-directory: ./

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15.4
+FROM alpine:3.16.0
 
 WORKDIR /tmp
 

diff --git a/components/HumbergerMenu/HumbergerNavigation.tsx b/components/HumbergerMenu/HumbergerNavigation.tsx
@@ -11,7 +11,9 @@ const Navigation = () => {
       <Menu pageWrapId={'page-wrap'} outerContainerId={'outer-container'}>
         <div className="grid grid-cols-1 divide-y divide-current font-zen-old-mincho">
           <div className="text-2xl py-4">
-            <Link href="/">{t.WEBSITE_TITLE}</Link>
+            <Link href="/" passHref>
+              {t.WEBSITE_TITLE}
+            </Link>
           </div>
           <div className="text-lg">
             <div className="collapse collapse-arrow">
@@ -20,19 +22,26 @@ const Navigation = () => {
                 <div>{locale === 'ja' ? '総選挙内企画' : 'Projects'}</div>
               </div>
               <div className="collapse-content">
-                <div className="py-2 link link-hover underline-offset-4">
-                  <Link href="/events-in-event">
-                    {locale === 'ja'
-                      ? '総選挙内企画について'
-                      : 'About Projects'}
+                <div className="py-2">
+                  <Link href="/events-in-event" passHref>
+                    <span className="link link-hover underline-offset-4">
+                      {locale === 'ja'
+                        ? '総選挙内企画について'
+                        : 'About Projects'}
+                    </span>
                   </Link>
                 </div>
                 <div>
                   <ul className="list-decimal pl-8">
                     <li className="py-2">
-                      <div className="text-base link link-hover underline-offset-4">
-                        <Link href="/events-in-event/election-campaign">
-                          {locale === 'ja' ? '選挙運動' : 'Campaigning'}
+                      <div className="text-base">
+                        <Link
+                          href="/events-in-event/election-campaign"
+                          passHref
+                        >
+                          <span className="link link-hover underline-offset-4">
+                            {locale === 'ja' ? '選挙運動' : 'Campaigning'}
+                          </span>
                         </Link>
                       </div>
                     </li>
@@ -44,11 +53,13 @@ const Navigation = () => {
                       </div>
                     </li>
                     <li className="py-2">
-                      <div className="text-base link link-hover underline-offset-4">
-                        <Link href="/events-in-event/novels-on-themes">
-                          {locale === 'ja'
-                            ? 'お題小説'
-                            : 'Themed short stories'}
+                      <div className="text-base">
+                        <Link href="/events-in-event/novels-on-themes" passHref>
+                          <span className="link link-hover underline-offset-4">
+                            {locale === 'ja'
+                              ? 'お題小説'
+                              : 'Themed short stories'}
+                          </span>
                         </Link>
                       </div>
                     </li>
@@ -60,11 +71,16 @@ const Navigation = () => {
                       </div>
                     </li>
                     <li className="py-2">
-                      <div className="text-base link link-hover underline-offset-4">
-                        <Link href="/events-in-event/op-cl-illustrations">
-                          {locale === 'ja'
-                            ? 'OP&CLイラスト'
-                            : 'Opening illustration / Closing illustration'}
+                      <div className="text-base">
+                        <Link
+                          href="/events-in-event/op-cl-illustrations"
+                          passHref
+                        >
+                          <span className="link link-hover underline-offset-4">
+                            {locale === 'ja'
+                              ? 'OP&CLイラスト'
+                              : 'Opening illustration / Closing illustration'}
+                          </span>
                         </Link>
                       </div>
                     </li>
@@ -83,7 +99,21 @@ const Navigation = () => {
           <div className="text-lg">
             <PreviousWebsites />
           </div>
-          <div />
+          <div className="py-4">
+            <div className="text-lg">
+              <Link href="/" locale={false} passHref>
+                <span className="link link-hover underline-offset-4">
+                  日本語
+                </span>
+              </Link>{' '}
+              /{' '}
+              <Link href="/en" locale={false} passHref>
+                <span className="link link-hover underline-offset-4">
+                  English
+                </span>
+              </Link>
+            </div>
+          </div>
         </div>
       </Menu>
     </div>

diff --git a/components/HumbergerMenu/Navigation.tsx b/components/HumbergerMenu/Navigation.tsx
@@ -7,12 +7,16 @@ const Navigation = () => {
     <div id="outer-container">
       <Menu pageWrapId={'page-wrap'} outerContainerId={'outer-container'}>
         <p className="text-2xl">
-          <Link href="/">幻水総選挙2022</Link>
+          <Link href="/" passHref>
+            幻水総選挙2022
+          </Link>
         </p>
         <div className="divide-neutral-50">
           <div className="divider"></div>
         </div>
-        <Link href="/events-in-event">イベント内企画</Link>
+        <Link href="/events-in-event" passHref>
+          イベント内企画
+        </Link>
         <PreviousWebsites />
       </Menu>
     </div>

diff --git a/components/Kikaku.tsx b/components/Kikaku.tsx
@@ -22,9 +22,9 @@ const Kikaku: NextPage = () => {
               </p>
               <div className="text-base text-left pb-4">
                 <ul className="list-decimal pl-6 pr-2">
-                  <li className="pb-4 underline link link-hover underline-offset-4">
+                  <li className="pb-4">
                     <Link href="/events-in-event/election-campaign">
-                      <span className="underline underline-offset-4 text-blue-500 hover:text-blue-900">
+                      <span className="link link-hover underline underline-offset-4 text-blue-500 hover:text-blue-900">
                         {locale === 'ja' ? '選挙運動' : 'Campaigning'}
                       </span>
                     </Link>
@@ -34,9 +34,9 @@ const Kikaku: NextPage = () => {
                       ? '開票イラスト（準備中）'
                       : 'Voting illustrations (in progress)'}
                   </li>
-                  <li className="pb-4 underline link link-hover underline-offset-4">
+                  <li className="pb-4">
                     <Link href="/events-in-event/novels-on-themes">
-                      <span className="underline underline-offset-4 text-blue-500 hover:text-blue-900">
+                      <span className="link link-hover underline underline-offset-4 text-blue-500 hover:text-blue-900">
                         {locale === 'ja' ? 'お題小説' : 'Themed short stories'}
                       </span>
                     </Link>
@@ -46,9 +46,9 @@ const Kikaku: NextPage = () => {
                       ? '推し台詞（準備中）'
                       : 'Fave quote (in progress)'}
                   </li>
-                  <li className="pb-4 underline link link-hover underline-offset-4">
+                  <li className="pb-4">
                     <Link href="/events-in-event/op-cl-illustrations">
-                      <span className="underline underline-offset-4 text-blue-500 hover:text-blue-900">
+                      <span className="link link-hover underline underline-offset-4 text-blue-500 hover:text-blue-900">
                         {locale === 'ja'
                           ? 'オープニングイラスト・クロージングイラスト'
                           : 'Opening illustration / Closing illustration'}

diff --git a/components/NavBar.tsx b/components/NavBar.tsx
@@ -40,7 +40,9 @@ const NavBar: NextPage = () => {
     <>
       <div className="navbar bg-neutral text-white sticky top-0 z-50">
         <div className="text-xl pl-4 font-zen-old-mincho">
-          <Link href="/">{t.WEBSITE_TITLE}</Link>
+          <Link href="/" passHref>
+            {t.WEBSITE_TITLE}
+          </Link>
         </div>
 
         <div className="absolute right-20 bg-neutral text-white">

diff --git a/deploy_to_railway_development.sh b/deploy_to_railway_development.sh
@@ -2,6 +2,7 @@
 set -euxo pipefail
 cd "$(dirname "$0")"
 
-railway up --service "幻水総選挙2022 (development)"
+"$HOME"/.nodenv/shims/yarn build
+"$HOME"/.nodenv/shims/railway up --service "幻水総選挙2022 (development)"
 
 exit 0
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "@types/react-burger-menu": "^2.8.3",
     "@types/styled-components": "^5.1.25",
     "autoprefixer": "10.4.7",
-    "cypress": "9.6.1",
+    "cypress": "9.7.0",
     "daisyui": "2.15.0",
     "eslint": "8.16.0",
     "eslint-config-next": "12.1.6",
@@ -22,11 +22,11 @@
     "gridjs-react": "^5.0.2",
     "postcss": "8.4.14",
     "prettier": "^2.6.2",
-    "react-burger-menu": "^3.0.6",
+    "react-burger-menu": "3.0.8",
     "react-twitter-embed": "^4.0.4",
     "sass": "1.52.1",
     "styled-components": "^5.3.5",
-    "stylelint": "14.8.3",
+    "stylelint": "14.8.4",
     "stylelint-config-standard": "^25.0.0",
     "stylelint-order": "^5.0.0",
     "tailwindcss": "3.0.24",

diff --git a/pages/events-in-event.tsx b/pages/events-in-event.tsx
@@ -21,10 +21,12 @@ const EventsInEvent: NextPage = () => {
       <main id="page-wrap">
         <NavBar />
 
-        <div className="text-base bg-gray-700 text-white breadcrumbs pl-6 pb-2">
+        <div className="text-base bg-gray-700 text-white breadcrumbs pl-6 pb-2 sticky top-16 z-50">
           <ul>
             <li>
-              <Link href="/">{t.PAGE_TITLE_HOME}</Link>
+              <Link href="/" passHref>
+                {t.PAGE_TITLE_HOME}
+              </Link>
             </li>
             <li>{t.PAGE_TITLE_PROJECTS}</li>
           </ul>

diff --git a/pages/events-in-event/election-campaign.tsx b/pages/events-in-event/election-campaign.tsx
@@ -20,13 +20,17 @@ const ElectionCampaign: NextPage = () => {
       <main id="page-wrap">
         <NavBar />
 
-        <div className="text-base bg-gray-700 text-white breadcrumbs pl-6 pb-2">
+        <div className="text-base bg-gray-700 text-white breadcrumbs pl-6 pb-2 sticky top-16 z-50">
           <ul>
             <li>
-              <Link href="/">{t.PAGE_TITLE_HOME}</Link>
+              <Link href="/" passHref>
+                {t.PAGE_TITLE_HOME}
+              </Link>
             </li>
             <li>
-              <Link href="/events-in-event">{t.PAGE_TITLE_PROJECTS}</Link>
+              <Link href="/events-in-event" passHref>
+                {t.PAGE_TITLE_PROJECTS}
+              </Link>
             </li>
             <li>{t.PAGE_TITLE_CAMPAIGNING}</li>
           </ul>

diff --git a/pages/events-in-event/novels-on-themes.tsx b/pages/events-in-event/novels-on-themes.tsx
@@ -20,13 +20,17 @@ const NovelsOnThemes: NextPage = () => {
       <main id="page-wrap">
         <NavBar />
 
-        <div className="text-base bg-gray-700 text-white breadcrumbs pl-6 pb-2">
+        <div className="text-base bg-gray-700 text-white breadcrumbs pl-6 pb-2 sticky top-16 z-50">
           <ul>
             <li>
-              <Link href="/">{t.PAGE_TITLE_HOME}</Link>
+              <Link href="/" passHref>
+                {t.PAGE_TITLE_HOME}
+              </Link>
             </li>
             <li>
-              <Link href="/events-in-event">{t.PAGE_TITLE_PROJECTS}</Link>
+              <Link href="/events-in-event" passHref>
+                {t.PAGE_TITLE_PROJECTS}
+              </Link>
             </li>
             <li>{t.PAGE_TITLE_NOVELS_ON_THEME}</li>
           </ul>

diff --git a/pages/events-in-event/op-cl-illustrations.tsx b/pages/events-in-event/op-cl-illustrations.tsx
@@ -21,13 +21,17 @@ const OpClIllustrations: NextPage = () => {
       <main id="page-wrap">
         <NavBar />
 
-        <div className="text-base bg-gray-700 text-white breadcrumbs pl-6 pb-2">
+        <div className="text-base bg-gray-700 text-white breadcrumbs pl-6 pb-2 sticky top-16 z-50">
           <ul>
             <li>
-              <Link href="/">{t.PAGE_TITLE_HOME}</Link>
+              <Link href="/" passHref>
+                {t.PAGE_TITLE_HOME}
+              </Link>
             </li>
             <li>
-              <Link href="/events-in-event">{t.PAGE_TITLE_PROJECTS}</Link>
+              <Link href="/events-in-event" passHref>
+                {t.PAGE_TITLE_PROJECTS}
+              </Link>
             </li>
             <li>{t.PAGE_TITLE_OP_CL_ILLUSTS}</li>
           </ul>

diff --git a/yarn.lock b/yarn.lock
@@ -1090,10 +1090,10 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
   integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
 
-cypress@9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.6.1.tgz#a7d6b5a53325b3dc4960181f5800a5ade0f085eb"
-  integrity sha512-ECzmV7pJSkk+NuAhEw6C3D+RIRATkSb2VAHXDY6qGZbca/F9mv5pPsj2LO6Ty6oIFVBTrwCyL9agl28MtJMe2g==
+cypress@9.7.0:
+  version "9.7.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744"
+  integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -2612,11 +2612,6 @@ nanoid@^3.1.30, nanoid@^3.3.1:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
   integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
 
-nanoid@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
-  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
-
 nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
@@ -2960,7 +2955,7 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-[email protected]:
+[email protected], postcss@^8.4.14:
   version "8.4.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
   integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
@@ -2987,15 +2982,6 @@ postcss@^8.3.11, postcss@^8.4.12:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.13:
-  version "8.4.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575"
-  integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==
-  dependencies:
-    nanoid "^3.3.3"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
 preact@^10.5.12:
   version "10.7.1"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.7.1.tgz#bdd2b2dce91a5842c3b9b34dfe050e5401068c9e"
@@ -3068,10 +3054,10 @@ quick-lru@^5.1.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
-react-burger-menu@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/react-burger-menu/-/react-burger-menu-3.0.6.tgz#9003cc1d65dc9e70d1460e5d8d8982f6b1a79d1d"
-  integrity sha512-Xikyl8VRkQBOyFVoMKpbScTLG6LlW64rajiquyCGwtpPswrDxaifusKckzTWAOH0At40Boguhj5lXq451NO0LA==
+[email protected].8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/react-burger-menu/-/react-burger-menu-3.0.8.tgz#78744db0a576f981aeade4f3f8ee956bc094c107"
+  integrity sha512-pkPHOUKKd5ClLg5OERIZLXtnYCO2Vxvti+BBIIVLNiD2xjCdgfkSt4TZ2IPUQBkYUY/id7Mq56YDgQ16p4kZog==
   dependencies:
     browserify-optional "^1.0.0"
     classnames "^2.2.6"
@@ -3541,10 +3527,10 @@ stylelint-order@^5.0.0:
     postcss "^8.3.11"
     postcss-sorting "^7.0.1"
 
-[email protected].3:
-  version "14.8.3"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.8.3.tgz#25d2df1e010cda52ff56327059d1ce25319109be"
-  integrity sha512-aLpskXwSgFEBYbFRKA/BfuyYMGuXNtn2t5GqoffNPSezvw97x/vVNWcZNF0+cwt+LBjfvyq9/MRE3OjInGRgNA==
+[email protected].4:
+  version "14.8.4"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.8.4.tgz#e8bfa12cba88a244bcab4c94b6a7481c5b730963"
+  integrity sha512-VoyFmif50YNL2R1NC0NxbprTbvnihiqE9tdwb/IAUvlncoS3dEllSSEfvTaQQ6BTCp6iv6daIg5v7ryRSlBdgw==
   dependencies:
     balanced-match "^2.0.0"
     colord "^2.9.2"
@@ -3570,7 +3556,7 @@ [email protected]:
     micromatch "^4.0.5"
     normalize-path "^3.0.0"
     picocolors "^1.0.0"
-    postcss "^8.4.13"
+    postcss "^8.4.14"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-safe-parser "^6.0.0"