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

v2.0.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpage",
-  "version": "2.0.0-rc",
+  "version": "2.0.0",
   "description": "第57回鈴鹿高専祭 公式HP",
   "repository": {
     "type": "git",
@@ -28,9 +28,9 @@
     "chromatic": "npx chromatic --project-token=YOUR_TOKEN"
   },
   "dependencies": {
-    "@emotion/cache": "11.10.3",
-    "@emotion/react": "11.10.4",
-    "@emotion/styled": "11.10.4",
+    "@emotion/cache": "11.10.5",
+    "@emotion/react": "11.10.5",
+    "@emotion/styled": "11.10.5",
     "@iconify/react": "4.0.0",
     "@popperjs/core": "2.11.6",
     "axios": "1.1.3",
@@ -47,8 +47,8 @@
     "@babel/core": "7.19.6",
     "@babel/plugin-transform-react-jsx": "7.19.0",
     "@emotion/babel-plugin-jsx-pragmatic": "0.2.0",
-    "@emotion/css": "11.10.0",
-    "@emotion/serialize": "1.1.0",
+    "@emotion/css": "11.10.5",
+    "@emotion/serialize": "1.1.1",
     "@emotion/server": "11.10.0",
     "@mdx-js/react": "2.1.5",
     "@storybook/addon-a11y": "6.5.13",
@@ -58,7 +58,7 @@
     "@storybook/addon-interactions": "6.5.13",
     "@storybook/addon-links": "6.5.13",
     "@storybook/addon-postcss": "2.0.0",
-    "@storybook/builder-vite": "0.2.4",
+    "@storybook/builder-vite": "0.2.5",
     "@storybook/react": "6.5.13",
     "@storybook/testing-library": "0.0.13",
     "@storybook/testing-react": "1.3.0",
@@ -68,18 +68,18 @@
     "@testing-library/user-event": "14.4.3",
     "@types/google.maps": "3.50.4",
     "@types/gtag.js": "0.0.12",
-    "@types/node": "18.11.6",
-    "@types/react": "18.0.23",
-    "@types/react-dom": "18.0.7",
+    "@types/node": "18.11.7",
+    "@types/react": "18.0.24",
+    "@types/react-dom": "18.0.8",
     "@types/tailwindcss": "3.0.11",
     "@typescript-eslint/eslint-plugin": "5.41.0",
     "@typescript-eslint/parser": "5.41.0",
     "@vitejs/plugin-react": "2.2.0",
     "@vitest/ui": "0.24.3",
-    "autoprefixer": "10.4.12",
-    "babel-loader": "8.2.5",
+    "autoprefixer": "10.4.13",
+    "babel-loader": "9.0.0",
     "babel-plugin-macros": "3.1.0",
-    "chromatic": "6.11.1",
+    "chromatic": "6.11.2",
     "cross-env": "7.0.3",
     "eslint": "8.26.0",
     "eslint-config-airbnb": "19.0.4",

src/components/atoms/icon/__snapshots__/icon.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`(components) atoms/icon > take snap shot 1`] = `
 <div>
   <div
-    class="css-1vlcokg"
+    class="css-qitdt8"
   >
     <span />
   </div>

src/components/atoms/icon/index.tsx

@@ -3,7 +3,7 @@ import { memo } from "react";
 import tw from "twin.macro";
 import type { IconProperties } from "./types/model";
 
-const IconBox = tw.div`flex items-center justify-center flex-shrink-0 w-6 h-6 sm:(w-12 h-12) min-h-full`;
+const IconBox = tw.div`inline-flex items-center justify-center flex-shrink-0 w-6 h-6 sm:(w-12 h-12) min-h-full`;
 
 const Icon = <T extends AnyComponent>({ icon, iconStyles, as, ...rest }: IconProperties<T>): JSX.Element => (
   <IconBox as={as} {...rest}>

src/components/molecules/caution/__snapshots__/caution.test.tsx.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1
 
-exports[`(components) molecules/twitter > take snap shot 1`] = `
+exports[`(components) molecules/caution > take snap shot 1`] = `
 <div>
   <section
     aria-label="注意事項"
@@ -11,7 +11,7 @@ exports[`(components) molecules/twitter > take snap shot 1`] = `
       class="css-1m7spai"
     >
       <div
-        class="css-1vlcokg"
+        class="css-qitdt8"
       >
         <span />
       </div>

src/components/molecules/caution/caution.test.tsx

@@ -9,7 +9,7 @@ const options = {
   name: "注意事項",
 };
 
-describe("(components) molecules/twitter", () => {
+describe("(components) molecules/caution", () => {
   test("to be molecules", () => {
     const { container } = render(<Default />);
     expect(container).toBeMolecule();

src/components/molecules/time-table-row/__snapshots__/time-table-row.test.tsx.snap

@@ -162,6 +162,7 @@ exports[`(components) molecules/time-table-row > take snap shot 1`] = `
         EXBALLON
       </p>
     </li>
+    <div />
   </ul>
 </div>
 `;

src/components/molecules/time-table-row/index.tsx

@@ -16,8 +16,20 @@ const TimeTableRow: FC<TimeTableRowProperties> = ({ events, intervals, stage })
       if (i === 0) {
         return dayjs(event.start_time).format("HH:mm") === "09:00" ? arr.push(event) : arr.push("gap", event);
       }
-      if (events.length - 1 === i) {
-        return dayjs(event.end_time).format("HH:mm") === "16:00" ? arr.push(event) : arr.push("gap", event);
+      if (i === a.length - 1) {
+        /* eslint-disable no-nested-ternary */
+        return dayjs(a[i - 1].end_time).format("HH:mm") === dayjs(a[i].start_time).format("HH:mm") &&
+          dayjs(event.end_time).format("HH:mm") === "16:00"
+          ? arr.push(event)
+          : dayjs(a[i - 1].end_time).format("HH:mm") === dayjs(a[i].start_time).format("HH:mm")
+          ? arr.push(event, "gap")
+          : dayjs(event.end_time).format("HH:mm") === "16:00"
+          ? arr.push("gap", event)
+          : arr.push("gap", event, "gap");
+        /* eslint-enable no-nested-ternary */
+      }
+      if (i === a.length - 1) {
+        return dayjs(event.end_time).format("HH:mm") === "16:00" ? arr.push(event) : arr.push(event, "gap");
       }
       return dayjs(a[i - 1].end_time).format("HH:mm") === dayjs(a[i].start_time).format("HH:mm")
         ? arr.push(event)

src/components/organisms/bazaar-section/__snapshots__/bazaar-section.test.tsx.snap

@@ -20,7 +20,7 @@ exports[`(components) organisms/bazaar-section > take snap shot 1`] = `
         class="css-1m7spai"
       >
         <div
-          class="css-1vlcokg"
+          class="css-qitdt8"
         >
           <span />
         </div>

src/components/organisms/sns-section/__snapshots__/sns-section.test.tsx.snap

@@ -21,31 +21,31 @@ exports[`(components) organisms/sns-section > take snap shot 1`] = `
       class="css-yczkn0"
     >
       <a
-        class="css-9uxhpu-SnsSection"
+        class="css-2cdkd3-SnsSection"
         href="https://twitter.com/KOSENFESTA"
         rel="noopener noreferrer"
         target="_blank"
       >
         <span />
       </a>
       <a
-        class="css-9uxhpu-SnsSection"
+        class="css-2cdkd3-SnsSection"
         href="https://www.instagram.com/kosenfesta/"
         rel="noopener noreferrer"
         target="_blank"
       >
         <span />
       </a>
       <a
-        class="css-9uxhpu-SnsSection"
+        class="css-2cdkd3-SnsSection"
         href="https://www.youtube.com/channel/UCV4zdsdagV2N3juHRz2dqQQ"
         rel="noopener noreferrer"
         target="_blank"
       >
         <span />
       </a>
       <a
-        class="css-9uxhpu-SnsSection"
+        class="css-2cdkd3-SnsSection"
         href="https://open.spotify.com/show/4n0D0dsaFaPbJTz7tGpfTR?si=8yZ1H8LzTM-ZJPyYN6CU-A"
         rel="noopener noreferrer"
         target="_blank"

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

@@ -228,6 +228,7 @@ exports[`(components) organisms/time-table > take snap shot 1`] = `
             EXBALLON
           </p>
         </li>
+        <div />
       </ul>
     </section>
     <section
@@ -349,6 +350,7 @@ exports[`(components) organisms/time-table > take snap shot 1`] = `
             出張Radio
           </p>
         </li>
+        <div />
       </ul>
     </section>
     <section
@@ -452,6 +454,7 @@ exports[`(components) organisms/time-table > take snap shot 1`] = `
             あどばん
           </p>
         </li>
+        <div />
       </ul>
     </section>
     <section

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

@@ -276,6 +276,7 @@ exports[`(components) templates/time-table > take snap shot 1`] = `
                 EXBALLON
               </p>
             </li>
+            <div />
           </ul>
         </section>
         <section
@@ -397,6 +398,7 @@ exports[`(components) templates/time-table > take snap shot 1`] = `
                 出張Radio
               </p>
             </li>
+            <div />
           </ul>
         </section>
         <section
@@ -500,6 +502,7 @@ exports[`(components) templates/time-table > take snap shot 1`] = `
                 あどばん
               </p>
             </li>
+            <div />
           </ul>
         </section>
         <section

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

@@ -19,7 +19,7 @@ exports[`(components) templates/top > take snap shot 1`] = `
           class="css-1m7spai"
         >
           <div
-            class="css-1vlcokg"
+            class="css-qitdt8"
           >
             <span />
           </div>
@@ -191,31 +191,31 @@ exports[`(components) templates/top > take snap shot 1`] = `
         class="css-yczkn0"
       >
         <a
-          class="css-9uxhpu-SnsSection"
+          class="css-2cdkd3-SnsSection"
           href="https://twitter.com/KOSENFESTA"
           rel="noopener noreferrer"
           target="_blank"
         >
           <span />
         </a>
         <a
-          class="css-9uxhpu-SnsSection"
+          class="css-2cdkd3-SnsSection"
           href="https://www.instagram.com/kosenfesta/"
           rel="noopener noreferrer"
           target="_blank"
         >
           <span />
         </a>
         <a
-          class="css-9uxhpu-SnsSection"
+          class="css-2cdkd3-SnsSection"
           href="https://www.youtube.com/channel/UCV4zdsdagV2N3juHRz2dqQQ"
           rel="noopener noreferrer"
           target="_blank"
         >
           <span />
         </a>
         <a
-          class="css-9uxhpu-SnsSection"
+          class="css-2cdkd3-SnsSection"
           href="https://open.spotify.com/show/4n0D0dsaFaPbJTz7tGpfTR?si=8yZ1H8LzTM-ZJPyYN6CU-A"
           rel="noopener noreferrer"
           target="_blank"
@@ -388,7 +388,7 @@ exports[`(components) templates/top > take snap shot 1`] = `
           class="css-1m7spai"
         >
           <div
-            class="css-1vlcokg"
+            class="css-qitdt8"
           >
             <span />
           </div>

src/constants/members/index.ts

@@ -21,6 +21,10 @@ export const members: ReadonlyArray<MemberCardProperties> = [
     imagePath: "/statics/members/akinori_asai.webp",
     name: "Akinori Asai",
   },
+  {
+    imagePath: "/statics/members/amon_kitayama.webp",
+    name: "Amon Kitayama",
+  },
   {
     imagePath: "/statics/members/ayaka_ito.webp",
     name: "Ayaka Ito",

src/hooks/useKeyPress/index.ts

@@ -5,7 +5,6 @@ const useKeyPress = (key: string, handler: () => void): void => {
   useEffect(() => {
     savedHandler.current = handler;
   }, [handler]);
-
   useEffect(() => {
     const onKeyup = (event: KeyboardEvent) => {
       if (event.key === key) {

src/libs/axios/index.ts

@@ -4,14 +4,9 @@ const ax = axios.create({
   baseURL: import.meta.env.VITE_API_URL,
   headers: {
     "Content-type": "application/json",
-    Authorization: `Bearer ${window.localStorage.getItem("tk")}`,
   },
 });
 
-const auth = axios.create({
-  baseURL: import.meta.env.VITE_API_URL,
-});
-
 const fetcher = (url: string) => ax.get(url).then(res => res.data);
 
-export { ax, auth, fetcher };
+export { ax, fetcher };

src/routes.tsx

@@ -3,12 +3,10 @@ import { useRegisterSW } from "virtual:pwa-register/react";
 import { Route, Switch } from "wouter";
 import { TopPage, SponsorPage, BazaarPage, MemberPage, NotFoundPage, TimeTablePage } from "./pages";
 import { useScrollToTop } from "./hooks/useScrollToTop";
-import { useJwt } from "./hooks/useJwt";
 
 const Router: FC = () => {
   useRegisterSW();
   useScrollToTop();
-  useJwt();
   return (
     <Switch>
       <Route path="/" component={TopPage} />