Merge branch 'main' of https://github.com/nthumodifications/courseweb

nthumodifications · Nov 1, 2023 · fe4d644 · fe4d644
2 parents 00abbf9 + 3b0b6b5
commit fe4d644
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/...lang]/bus/stop/[stopId]/BusDelayAlert.tsx → src/app/[lang]/bus/BusDelayAlert.tsx b/...lang]/bus/stop/[stopId]/BusDelayAlert.tsx → src/app/[lang]/bus/BusDelayAlert.tsx
diff --git a/src/app/[lang]/bus/page.tsx b/src/app/[lang]/bus/page.tsx
@@ -4,6 +4,7 @@ import { useSettings } from "@/hooks/contexts/settings";
 import Link from "next/link";
 import { stops } from "@/const/bus";
 import { Alert } from "@mui/joy";
+import BusDelayAlert from "./BusDelayAlert";
 
 const BusPage = () => {
 //北校門口	綜二館	楓林小徑	奕園停車場	南門停車場	台積館 人社院/生科館	楓林小徑	綜二館	北校門口
@@ -31,6 +32,7 @@ const BusPage = () => {
     return (
         <div className="py-4 flex flex-col">
             <h1 className="text-4xl font-semibold pl-4">校内公車</h1>
+            <BusDelayAlert/>
             <div className="grid grid-cols-2">
                 <h2 className="text-4xl font-semibold pl-6 text-gray-600 py-6">上</h2>
                 <h2 className="text-4xl font-semibold bg-gray-200 dark:bg-neutral-800 pr-6 text-end py-6">下</h2>

diff --git a/src/app/[lang]/bus/stop/[stopId]/BusDelayReportAlert.tsx b/src/app/[lang]/bus/stop/[stopId]/BusDelayReportAlert.tsx
@@ -10,7 +10,7 @@ const BusDelayReportAlert = () => {
     const [openModal, closeModal] = useModal();
     // Wait for 30 seconds before showing the alert
     useEffect(() => {
-        const WAIT_TIME = 30 * 1000;
+        const WAIT_TIME = 10 * 1000;
         // const WAIT_TIME = 1 * 1000;
         const timeout = setTimeout(() => setShow(true), WAIT_TIME);
         return () => clearTimeout(timeout);

diff --git a/src/app/[lang]/bus/stop/[stopId]/page.tsx b/src/app/[lang]/bus/stop/[stopId]/page.tsx
@@ -14,7 +14,7 @@ import useSWR from 'swr'
 import RouteIcon from '@/components/BusIcons/RouteIcon';
 import RoutesFilterChips from './RoutesFilterChips';
 import useTime from '@/hooks/useTime';
-import BusDelayAlert from './BusDelayAlert';
+import BusDelayAlert from '../../BusDelayAlert';
 import BusDelayReportAlert from './BusDelayReportAlert';
 
 type PageProps = {