Merge pull request #376 from suzuka-kosen-festa/dev

管理者おマージですわ

package.json

@@ -101,7 +101,7 @@
     "terser": "5.15.1",
     "token-transformer": "0.0.27",
     "typescript": "4.8.4",
-    "vite": "3.2.0",
+    "vite": "3.2.1",
     "vite-plugin-pwa": "0.13.1",
     "vitest": "0.24.3"
   },

src/components/organisms/time-table/index.tsx

@@ -51,8 +51,8 @@ const TimeTableAxis: FC<TimeTableAxisProperties> = ({ axes }) => (
   </section>
 );
 
-const TimeTable: FC<TimeTableProperties> = ({ events }) => (
-  <section aria-label="Time table" css={tw`grid grid-cols-timetable gap-1 lg:gap-10`}>
+const TimeTable: FC<TimeTableProperties> = ({ events, ...rest }) => (
+  <section aria-label="Time table" css={tw`grid grid-cols-timetable gap-1 lg:gap-10`} {...rest}>
     <TimeTableAxis axes={["09:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00"]} />
     <TimeTableColumn events={events.main} intervals={events.interval.main} stage="main" />
     <TimeTableColumn events={events.sub} intervals={events.interval.sub} stage="sub" />

src/components/organisms/time-table/types/model.ts

@@ -1,3 +1,4 @@
+import type { ComponentProps, ReactHTML } from "react";
 import type { SeparationEventList } from "../../../../api/liveevent";
 import type { LiveEvent, LiveStage } from "../../../../api/prisma";
 
@@ -15,6 +16,6 @@ export type TimeTableAxisProperties = {
   axes: ReadonlyArray<string>;
 };
 
-export type TimeTableProperties = {
+export type TimeTableProperties = ComponentProps<ReactHTML["section"]> & {
   events: SeparationEventList;
 };

src/components/templates/time-table/__snapshots__/time-table.test.tsx.snap

@@ -52,7 +52,7 @@ exports[`(components) templates/time-table > take snap shot 1`] = `
       </div>
       <section
         aria-label="Time table"
-        class="css-1uyb8rf-TimeTable"
+        class="css-79eef2-TimeTable"
       >
         <section
           class="css-paib3t-TimeTableAxis"
@@ -549,6 +549,18 @@ exports[`(components) templates/time-table > take snap shot 1`] = `
           </ul>
         </section>
       </section>
+      <a
+        class="css-jhmgok-Button"
+        href="/"
+        role="button"
+        tabindex="0"
+      >
+        <p
+          class="css-1t0ga8k-Button"
+        >
+          トップページに戻る
+        </p>
+      </a>
     </div>
   </main>
 </div>

src/components/templates/time-table/index.tsx

@@ -1,9 +1,11 @@
 import type { FC } from "react";
 import tw from "twin.macro";
+import { Link } from "wouter";
 import type { TimeTableProperties } from "./types/model";
 import { Title } from "../../molecules/title";
 import { Switching } from "../../atoms/switching";
 import { TimeTable as TT } from "../../organisms/time-table";
+import { Button } from "../../atoms/button";
 
 const Main = tw.main`pt-1 pb-8 sm:(pt-6 pb-40)`;
 
@@ -25,7 +27,12 @@ const TimeTable: FC<TimeTableProperties> = ({ events }) => (
     <Title colorKey="yellow">Time schedule</Title>
     <TimetablePageBox>
       <Switching buttonData={buttonData} color="yellow" />
-      <TT events={events} />
+      <TT events={events} css={tw`mb-8 sm:mb-40`} />
+      <Link to="/">
+        <Button textStyles={tw`text-white`} colorKey="yellow" as="a" role="button">
+          トップページに戻る
+        </Button>
+      </Link>
     </TimetablePageBox>
   </Main>
 );

src/components/templates/top/__snapshots__/top.test.tsx.snap

@@ -65,7 +65,7 @@ exports[`(components) templates/top > take snap shot 1`] = `
               >
                 入場制限
               </span>
-              を設けています。ご入場にはチケットが必要となります。
+              を設けています。ご入場には事前にメールに添付されたQRコードが必要となります。
             </p>
           </li>
           <li
@@ -518,7 +518,7 @@ exports[`(components) templates/top > take snap shot 1`] = `
       </p>
       <a
         class="css-jhmgok-Button"
-        href="https://forms.gle/MU9338vfudKPEnwS7"
+        href="https://forms.gle/SdtmScNMpAFDjftD6"
         rel="noopener noreferrer"
         role="button"
         tabindex="0"

src/components/templates/top/index.tsx

@@ -29,7 +29,8 @@ const cautions = [
     に参加いただけます。
   </CautionText>,
   <CautionText key="1">
-    Re:ROADでは、感染拡大防止のため<Highlight>入場制限</Highlight>を設けています。ご入場にはチケットが必要となります。
+    Re:ROADでは、感染拡大防止のため<Highlight>入場制限</Highlight>
+    を設けています。ご入場には事前にメールに添付されたQRコードが必要となります。
   </CautionText>,
   <CautionText key="2">発熱や風邪などの症状がある方のご入場はご遠慮ください。</CautionText>,
   <CautionText key="3">
@@ -107,7 +108,7 @@ const Top: FC<TopProperties> = ({ events }) => (
         "第57回鈴鹿高専祭を開催するにあたり、多くの方にご支援賜りました。\nこちらのページにてご協賛いただいた企業様、ご支援いただいた個人様のお名前を記載しておりますのでぜひご覧ください。"
       }
     </SponsorSection>
-    <ContactSection buttonText="お問い合わせ" link="https://forms.gle/MU9338vfudKPEnwS7" title="Contact us">
+    <ContactSection buttonText="お問い合わせ" link="https://forms.gle/SdtmScNMpAFDjftD6" title="Contact us">
       第57回鈴鹿高専祭に関するお問い合わせは下のボタンからお願いいたします（google formsが開きます）
     </ContactSection>
     <AccessSection

yarn.lock

@@ -17261,7 +17261,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:3.2.0, vite@npm:^3.0.0":
+"vite@npm:3.2.1":
+  version: 3.2.1
+  resolution: "vite@npm:3.2.1"
+  dependencies:
+    esbuild: ^0.15.9
+    fsevents: ~2.3.2
+    postcss: ^8.4.18
+    resolve: ^1.22.1
+    rollup: ^2.79.1
+  peerDependencies:
+    less: "*"
+    sass: "*"
+    stylus: "*"
+    sugarss: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    less:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    sugarss:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: d33f6f4c80f85f327cf74c56d2189f1ba1d808987501eae9455c65bbb1ba5ea96af0f68647e18fe0c61e82126ea91f10480c1e80964a6836a751502647a42f2b
+  languageName: node
+  linkType: hard
+
+"vite@npm:^3.0.0":
   version: 3.2.0
   resolution: "vite@npm:3.2.0"
   dependencies:
@@ -17661,7 +17696,7 @@ __metadata:
     token-transformer: 0.0.27
     twin.macro: 2.8.2
     typescript: 4.8.4
-    vite: 3.2.0
+    vite: 3.2.1
     vite-plugin-pwa: 0.13.1
     vitest: 0.24.3
     wouter: 2.8.0-alpha.2