Merge pull request #41 from lugvitc/main

chore: open results
lugvitc · Sep 6, 2024 · e3115b8 · e3115b8
2 parents 2092b54 + 1cc0371
commit e3115b8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -12,9 +12,9 @@ import Login from "./pages/login";
 // import Apply from "./pages/apply";
 import { useEffect, useState } from "react";
 import { supabase, SessionContext } from "./supabase";
-import Book from "./pages/book"
+import Book from "./pages/book";
 import Level from "./pages/level";
-// import Result from "./pages/results"
+import Result from "./pages/results";
 
 function ErrorBoundary() {
   const error: any = useRouteError();
@@ -23,14 +23,14 @@ function ErrorBoundary() {
   return (
     <div className="flex justify-center items-center h-full w-full">
       <div className="max-w-80">
-        <h1 className="text-7xl text-yellow-400 uppercase font-mono font-semibold italic">{error.status}</h1>
-        <p className="text-3xl">
-          {error.statusText}
-        </p>
+        <h1 className="text-7xl text-yellow-400 uppercase font-mono font-semibold italic">
+          {error.status}
+        </h1>
+        <p className="text-3xl">{error.statusText}</p>
         <p className="font-mono">{error.data}</p>
       </div>
     </div>
-  )
+  );
 }
 
 const router = createBrowserRouter(
@@ -42,7 +42,7 @@ const router = createBrowserRouter(
         {/* <Route path="apply" element={<Apply />} /> */}
         <Route path="book" element={<Book />} />
         <Route path="admin" element={<Level />} />
-        {/* <Route path="result" element={<Result />} /> */}
+        <Route path="result" element={<Result />} />
       </Route>
     </>,
   ),

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -6,7 +6,8 @@ import "./index.scss";
 
 export const rec_open = false;
 export const booking = !rec_open && true;
-export const results = !rec_open && !booking && false;
+// export const results = !rec_open && !booking && false;
+export const results = true;
 
 export default function Root() {
   // const txtsh = "0px 0px 2px rgb(250 204 21)";
@@ -33,10 +34,22 @@ export default function Root() {
             ) : null}
             <Link
               aria-disabled="true"
-              to="/apply"
+              to="/result"
               className={
                 "rounded-md mt-4 text-xl text-center p-2 text-black font-semibold transition-all border" +
-                (!rec_open
+                (!results
+                  ? " bg-yellow-700 border-yellow-700 pointer-events-none"
+                  : " bg-yellow-400 hover:bg-black hover:text-white border-yellow-400")
+              }
+            >
+              View Result
+            </Link>
+            <Link
+              aria-disabled="true"
+              to="/apply"
+              className={
+                "rounded-md hidden mt-4 text-xl text-center p-2 text-black font-semibold transition-all border" +
+                (rec_open
                   ? " bg-yellow-700 border-yellow-700 pointer-events-none"
                   : " bg-yellow-400 hover:bg-black hover:text-white border-yellow-400")
               }