Merge branch 'main' into 103-開催中表示をdbから取得する

src/components/BackGround.tsx

@@ -11,11 +11,11 @@ export const BackGroundImg = () => {
         src="/image/fireworks/firework.png"
         alt="firework"
         style={{
-          maxHeight: "30vh", // 高さaaaaa
+          maxHeight: "25vh", // 高さ
           width: "auto", // 幅
           position: "absolute", // 位置の指定
-          left: "20vw", // 左方向への移動
-          top: "30vh", // 上方向への移動
+          left: "53vw", // 左方向への移動
+          top: "55vh", // 上方向への移動
           zIndex: -2,
         }}
       />
@@ -26,8 +26,8 @@ export const BackGroundImg = () => {
           maxHeight: "40vh", // 高さ
           width: "auto", // 幅
           position: "absolute", // 位置の指定
-          left: "50vw", // 左方向への移動
-          top: "30vh", // 上方向への移動
+          left: "55vw", // 左方向への移動
+          top: "20vh", // 上方向への移動
           zIndex: -2,
         }}
       />

src/components/Footer.tsx

@@ -0,0 +1,63 @@
+import React from "react";
+import { useRouter } from "next/router";
+
+import { LinkedText } from "./LinkedText";
+import "@/styles/gamingColor.css";
+
+export const Footer = () => {
+  const router = useRouter();
+  return (
+    <footer>
+      <div
+        style={{
+          backgroundColor: "#20e0e0",
+          width: "100vw",
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "center",
+          gap: "10px",
+          fontSize: "1.4vw",
+          marginTop: "5vw",
+        }}
+      >
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "row",
+            alignItems: "center",
+            gap: "5vw",
+            fontSize: "2vw",
+          }}
+        >
+          <LinkedText text={"企画"} link={"contents/schedule"} />
+          <LinkedText text={"露店"} link={"contents/stand"} />
+        </div>
+        <img
+          src={"image/nitfc.png"}
+          alt={"nitfc_logo"}
+          width={"20%"}
+          style={{ cursor: "pointer" }}
+          onClick={() => {
+            router.push("https://www.fukui-nct.ac.jp/");
+          }}
+        />
+        {/* <LinkedText text={"福井高専"} link={"https://www.fukui-nct.ac.jp/"} /> */}
+        <LinkedText
+          text={"お問い合わせ"}
+          link={"https://www.fukui-nct.ac.jp/"}
+        />
+        <div style={{ animation: "rainbow 1s infinite" }}>
+          <LinkedText
+            text={"福井高専祭システム班メンバー募集中!!"}
+            link={"https://github.com/nitfc-festival-system-team"}
+          />
+        </div>
+        <LinkedText
+          text={"GitHub"}
+          link={"https://github.com/nitfc-festival-system-team/2023hp"}
+        />
+        <br />
+      </div>
+    </footer>
+  );
+};

src/components/LinkedText.tsx

@@ -0,0 +1,13 @@
+export const LinkedText = (props: { text: string; link: string }) => {
+  return (
+    <a
+      href={props.link}
+      style={{
+        textDecoration: "none",
+        fontWeight: "bold",
+      }}
+    >
+      {props.text}
+    </a>
+  );
+};

src/components/Schedule.tsx

@@ -1,5 +1,5 @@
+"use client";
 import Timeline from "react-calendar-timeline";
-// make sure you include the timeline stylesheet or the timeline will not be styled
 import "react-calendar-timeline/lib/Timeline.css";
 import moment from "moment";
 

src/components/StandList.tsx

@@ -75,23 +75,14 @@ const StandItem = ({
           </span>
         )}
       </div>
-      {stand.image && (
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center", // 垂直方向に中央揃え
-          }}
-        >
-          <img
-            src={stand.image}
-            alt="stand image"
-            style={{
-              width: "auto",
-              height: "10vw",
-            }}
-          />
-        </div>
-      )}
+      <img
+        src={"/image/stand/" + stand.number + ".png"}
+        alt="stand image"
+        style={{
+          width: "auto",
+          height: "10vw",
+        }}
+      />
     </div>
   );
 };

src/db/notice.ts

@@ -6,79 +6,4 @@ export const notices: NoticeType[] = [
     url: "https://example.com",
     date: new Date(2023, 10, 9),
   },
-  {
-    title: "お知らせ2",
-    url: "https://example.com",
-    date: new Date(2023, 10, 10),
-  },
-  {
-    title: "お知らせ3",
-    url: "https://example.com",
-    date: new Date(2023, 10, 11),
-  },
-  {
-    title: "お知らせ4",
-    url: "https://example.com",
-    date: new Date(2023, 10, 12),
-  },
-  {
-    title: "お知らせ1",
-    url: "https://example.com",
-    date: new Date(2023, 10, 9),
-  },
-  {
-    title: "お知らせ2",
-    url: "https://example.com",
-    date: new Date(2023, 10, 10),
-  },
-  {
-    title: "お知らせ3",
-    url: "https://example.com",
-    date: new Date(2023, 10, 11),
-  },
-  {
-    title: "お知らせ4",
-    url: "https://example.com",
-    date: new Date(2023, 10, 12),
-  },
-  {
-    title: "お知らせ1",
-    url: "https://example.com",
-    date: new Date(2023, 10, 9),
-  },
-  {
-    title: "お知らせ2",
-    url: "https://example.com",
-    date: new Date(2023, 10, 10),
-  },
-  {
-    title: "お知らせ3",
-    url: "https://example.com",
-    date: new Date(2023, 10, 11),
-  },
-  {
-    title: "お知らせ4",
-    url: "https://example.com",
-    date: new Date(2023, 10, 12),
-  },
-  {
-    title: "お知らせ1",
-    url: "https://example.com",
-    date: new Date(2023, 10, 9),
-  },
-  {
-    title: "お知らせ2",
-    url: "https://example.com",
-    date: new Date(2023, 10, 10),
-  },
-  {
-    title: "お知らせ3",
-    url: "https://example.com",
-    date: new Date(2023, 10, 11),
-  },
-  {
-    title: "お知らせ4",
-    url: "https://example.com",
-    date: new Date(2023, 10, 12),
-  },
 ];

src/db/schedule.ts

@@ -2,28 +2,18 @@ import { ScheduleType } from "@/types/schedule";
 
 export const schedules: ScheduleType[] = [
   {
-    title: "イベント1",
-    place: "メインステージ",
-    startDate: new Date(2023, 10, 14, 15, 0),
-    endDate: new Date(2023, 10, 14, 16, 0),
+    title: "オープニングセレモニー",
+    place: "第1体育館",
+    description: "共に輝く！始まる文化の祭典へ！",
+    startDate: new Date(2023, 10, 27, 12, 30),
+    endDate: new Date(2023, 10, 27, 13, 0),
   },
   {
-    title: "ぶどう狩り",
-    place: "ぶどう農園",
-    startDate: new Date(2023, 10, 27, 10, 0),
-    endDate: new Date(2023, 10, 27, 11, 0),
-  },
-  {
-    title: "イベント3",
-    place: "メインステージ",
-    startDate: new Date(2023, 10, 27, 11, 0),
-    endDate: new Date(2023, 10, 27, 12, 0),
-    description: "イベント3の説明",
-  },
-  {
-    title: "イベント",
-    place: "お外",
-    startDate: new Date(2023, 10, 27, 13, 0),
-    endDate: new Date(2023, 10, 27, 14, 0),
+    title: "気配切り",
+    place: "第1体育館",
+    description:
+      "感覚を研ぎ澄ませ！自分を信じて、いざ一振り！！決着の様子は体育館で",
+    startDate: new Date(2023, 10, 27, 13, 20),
+    endDate: new Date(2023, 10, 27, 14, 30),
   },
 ];