Deploy "yellow" (#369)

* P5 undefined parameter added (#366) * Improve scanning status responses (#368) * Add profile link to leaderboard (#370) * Fix dashboard on staff menu (#371) Co-authored-by: Ruben Adão <[email protected]> Co-authored-by: Nelson Estevão <[email protected]>
cesium · Feb 16, 2022 · ec4bbee · ec4bbee
2 parents 05df13f + e207991
commit ec4bbee
Show file tree

Hide file tree

Showing 13 changed files with 143 additions and 162 deletions.
diff --git a/components/moonstone/staff/utils/Base/index.jsx b/components/moonstone/staff/utils/Base/index.jsx
@@ -66,7 +66,7 @@ const MobileNavbar = ({
               </div>
               <nav className="mt-5 flex-1">
                 {navigation.map((item) => (
-                  <Link key={item} href={item} passHref>
+                  <Link key={item} href={`/manager/${item}`} passHref>
                     <a
                       className={classNames(
                         item == href
@@ -129,7 +129,7 @@ export default function Dashboard({
             </div>
             <nav className="mt-5 flex-1">
               {navigation.map((item) => (
-                <Link key={item} href={item} passHref>
+                <Link key={item} href={`/manager/${item}`} passHref>
                   <a
                     key={item}
                     className={classNames(

diff --git a/components/moonstone/user/leaderboard/Table/index.jsx b/components/moonstone/user/leaderboard/Table/index.jsx
@@ -1,3 +1,5 @@
+import Link from "next/link";
+
 export default function Table({ list, user, maxUsersToShow }) {
   const toShow = list.slice(0, Math.min(maxUsersToShow, list.length));
   const rows = toShow.map((entry, id) => (
@@ -14,7 +16,7 @@ export default function Table({ list, user, maxUsersToShow }) {
           entry.id == user ? "text-quinary" : ""
         }`}
       >
-        {entry.name}
+        <Link href={`/attendees/${entry.id}`}>{entry.name}</Link>
       </div>
       <div
         className={`w-1/3 text-right font-iregular ${

diff --git a/components/moonstone/utils/QRScanner/index.jsx b/components/moonstone/utils/QRScanner/index.jsx
@@ -2,59 +2,66 @@ import BarebonesQRScanner from "/components/moonstone/utils/QRScanner/BarebonesQ
 
 import Button from "/components/moonstone/utils/Button";
 
+export const FEEDBACK = {
+  SUCCESS: {
+    message: "Success",
+    color: "bg-success",
+  },
+  SCANNING: {
+    message: "Scanning...",
+    color: "bg-gray-500",
+  },
+  ALREADY_HAS: {
+    message: "User already has badge",
+    color: "bg-warning",
+  },
+  FAILURE: {
+    message: "Failure",
+    color: "bg-failure",
+  },
+  INVALID: {
+    message: "Invalid QR",
+    color: "bg-failure",
+  },
+};
+
 function QRScanner({
   handleCode,
   pauseRef,
   text,
-  successRef,
-  feedbackText,
+  feedback,
   showScanner,
   setScanner,
   removeClose,
 }) {
-  function feedbackColor(success) {
-    switch (success) {
-      case true:
-        return "bg-success";
-      case false:
-        return "bg-failure";
-      default:
-        return "bg-gray-500";
-    }
+  if (!showScanner) {
+    return null;
   }
 
-  if (showScanner) {
-    return (
-      <>
-        <div className="grid-cols-1, grid gap-6">
-          <div className="m-auto block flex h-16 w-full items-center justify-center rounded-2xl bg-warning">
-            <p className="font-ibold font-bold">{text}</p>
-          </div>
-          <BarebonesQRScanner handleCode={handleCode} pauseRef={pauseRef} />
-          <div className="w-auto text-white">
-            <div
-              className={`${feedbackColor(
-                successRef.current
-              )} m-auto block flex h-16 w-full items-center justify-center rounded-2xl`}
-            >
-              <p className="font-ibold font-bold">{feedbackText}</p>
-            </div>
-          </div>
-          {removeClose !== true && (
-            <Button
-              onClick={() => {
-                setScanner(false);
-              }}
-            >
-              Close
-            </Button>
-          )}
+  return (
+    <div className="grid-cols-1, grid gap-6">
+      <div className="m-auto block flex h-16 w-full items-center justify-center rounded-2xl bg-warning">
+        <p className="font-ibold font-bold">{text}</p>
+      </div>
+      <BarebonesQRScanner handleCode={handleCode} pauseRef={pauseRef} />
+      <div className="w-auto text-white">
+        <div
+          className={`${feedback.color} m-auto block flex h-16 w-full items-center justify-center rounded-2xl`}
+        >
+          <p className="font-ibold font-bold">{feedback.message}</p>
         </div>
-      </>
-    );
-  } else {
-    return null;
-  }
+      </div>
+      {removeClose !== true && (
+        <Button
+          onClick={() => {
+            setScanner(false);
+          }}
+        >
+          Close
+        </Button>
+      )}
+    </div>
+  );
 }
 
 export default QRScanner;
diff --git a/components/website/challenges/Hero/Animation/index.jsx b/components/website/challenges/Hero/Animation/index.jsx
@@ -142,7 +142,7 @@ const Animation = () => {
     }
   }
 
-  function update_vars_nomouse(path, path_index, path_var) {
+  function update_vars_nomouse(p, path, path_index, path_var) {
     if (path_var == undefined) {
       update_path_horizontally(p);
       update_path_vars();
@@ -177,12 +177,12 @@ const Animation = () => {
         update_vars(p, mouseX, mouseY, path3, path3_index_1, path3_var_1);
         update_vars(p, mouseX, mouseY, path3, path3_index_2, path3_var_2);
       } else {
-        update_vars_nomouse(path1, path1_index_1, path1_var_1);
-        update_vars_nomouse(path1, path1_index_2, path1_var_2);
-        update_vars_nomouse(path2, path2_index_1, path2_var_1);
-        update_vars_nomouse(path2, path2_index_2, path2_var_2);
-        update_vars_nomouse(path3, path3_index_1, path3_var_1);
-        update_vars_nomouse(path3, path3_index_2, path3_var_2);
+        update_vars_nomouse(p, path1, path1_index_1, path1_var_1);
+        update_vars_nomouse(p, path1, path1_index_2, path1_var_2);
+        update_vars_nomouse(p, path2, path2_index_1, path2_var_1);
+        update_vars_nomouse(p, path2, path2_index_2, path2_var_2);
+        update_vars_nomouse(p, path3, path3_index_1, path3_var_1);
+        update_vars_nomouse(p, path3, path3_index_2, path3_var_2);
       }
     }
 

diff --git a/components/website/hackathon/Hero/Animation/index.jsx b/components/website/hackathon/Hero/Animation/index.jsx
@@ -142,7 +142,7 @@ const Animation = () => {
     }
   }
 
-  function update_vars_nomouse(path, path_index, path_var) {
+  function update_vars_nomouse(p, path, path_index, path_var) {
     if (path_var == undefined) {
       update_path_horizontally(p);
       update_path_vars();
@@ -177,12 +177,12 @@ const Animation = () => {
         update_vars(p, mouseX, mouseY, path3, path3_index_1, path3_var_1);
         update_vars(p, mouseX, mouseY, path3, path3_index_2, path3_var_2);
       } else {
-        update_vars_nomouse(path1, path1_index_1, path1_var_1);
-        update_vars_nomouse(path1, path1_index_2, path1_var_2);
-        update_vars_nomouse(path2, path2_index_1, path2_var_1);
-        update_vars_nomouse(path2, path2_index_2, path2_var_2);
-        update_vars_nomouse(path3, path3_index_1, path3_var_1);
-        update_vars_nomouse(path3, path3_index_2, path3_var_2);
+        update_vars_nomouse(p, path1, path1_index_1, path1_var_1);
+        update_vars_nomouse(p, path1, path1_index_2, path1_var_2);
+        update_vars_nomouse(p, path2, path2_index_1, path2_var_1);
+        update_vars_nomouse(p, path2, path2_index_2, path2_var_2);
+        update_vars_nomouse(p, path3, path3_index_1, path3_var_1);
+        update_vars_nomouse(p, path3, path3_index_2, path3_var_2);
       }
     }
 

diff --git a/components/website/home/Animation/index.jsx b/components/website/home/Animation/index.jsx
@@ -142,7 +142,7 @@ const Animation = () => {
     }
   }
 
-  function update_vars_nomouse(path, path_index, path_var) {
+  function update_vars_nomouse(p, path, path_index, path_var) {
     if (path_var == undefined) {
       update_path_horizontally(p);
       update_path_vars();
@@ -177,12 +177,12 @@ const Animation = () => {
         update_vars(p, mouseX, mouseY, path3, path3_index_1, path3_var_1);
         update_vars(p, mouseX, mouseY, path3, path3_index_2, path3_var_2);
       } else {
-        update_vars_nomouse(path1, path1_index_1, path1_var_1);
-        update_vars_nomouse(path1, path1_index_2, path1_var_2);
-        update_vars_nomouse(path2, path2_index_1, path2_var_1);
-        update_vars_nomouse(path2, path2_index_2, path2_var_2);
-        update_vars_nomouse(path3, path3_index_1, path3_var_1);
-        update_vars_nomouse(path3, path3_index_2, path3_var_2);
+        update_vars_nomouse(p, path1, path1_index_1, path1_var_1);
+        update_vars_nomouse(p, path1, path1_index_2, path1_var_2);
+        update_vars_nomouse(p, path2, path2_index_1, path2_var_1);
+        update_vars_nomouse(p, path2, path2_index_2, path2_var_2);
+        update_vars_nomouse(p, path3, path3_index_1, path3_var_1);
+        update_vars_nomouse(p, path3, path3_index_2, path3_var_2);
       }
     }
 

diff --git a/components/website/speakers/Hero/Animation/index.jsx b/components/website/speakers/Hero/Animation/index.jsx
@@ -142,7 +142,7 @@ const Animation = () => {
     }
   }
 
-  function update_vars_nomouse(path, path_index, path_var) {
+  function update_vars_nomouse(p, path, path_index, path_var) {
     if (path_var == undefined) {
       update_path_horizontally(p);
       update_path_vars();
@@ -177,12 +177,12 @@ const Animation = () => {
         update_vars(p, mouseX, mouseY, path3, path3_index_1, path3_var_1);
         update_vars(p, mouseX, mouseY, path3, path3_index_2, path3_var_2);
       } else {
-        update_vars_nomouse(path1, path1_index_1, path1_var_1);
-        update_vars_nomouse(path1, path1_index_2, path1_var_2);
-        update_vars_nomouse(path2, path2_index_1, path2_var_1);
-        update_vars_nomouse(path2, path2_index_2, path2_var_2);
-        update_vars_nomouse(path3, path3_index_1, path3_var_1);
-        update_vars_nomouse(path3, path3_index_2, path3_var_2);
+        update_vars_nomouse(p, path1, path1_index_1, path1_var_1);
+        update_vars_nomouse(p, path1, path1_index_2, path1_var_2);
+        update_vars_nomouse(p, path2, path2_index_1, path2_var_1);
+        update_vars_nomouse(p, path2, path2_index_2, path2_var_2);
+        update_vars_nomouse(p, path3, path3_index_1, path3_var_1);
+        update_vars_nomouse(p, path3, path3_index_2, path3_var_2);
       }
     }
 

diff --git a/components/website/team/Hero/Animation/index.jsx b/components/website/team/Hero/Animation/index.jsx
@@ -142,7 +142,7 @@ const Animation = () => {
     }
   }
 
-  function update_vars_nomouse(path, path_index, path_var) {
+  function update_vars_nomouse(p, path, path_index, path_var) {
     if (path_var == undefined) {
       update_path_horizontally(p);
       update_path_vars();
@@ -177,12 +177,12 @@ const Animation = () => {
         update_vars(p, mouseX, mouseY, path3, path3_index_1, path3_var_1);
         update_vars(p, mouseX, mouseY, path3, path3_index_2, path3_var_2);
       } else {
-        update_vars_nomouse(path1, path1_index_1, path1_var_1);
-        update_vars_nomouse(path1, path1_index_2, path1_var_2);
-        update_vars_nomouse(path2, path2_index_1, path2_var_1);
-        update_vars_nomouse(path2, path2_index_2, path2_var_2);
-        update_vars_nomouse(path3, path3_index_1, path3_var_1);
-        update_vars_nomouse(path3, path3_index_2, path3_var_2);
+        update_vars_nomouse(p, path1, path1_index_1, path1_var_1);
+        update_vars_nomouse(p, path1, path1_index_2, path1_var_2);
+        update_vars_nomouse(p, path2, path2_index_1, path2_var_1);
+        update_vars_nomouse(p, path2, path2_index_2, path2_var_2);
+        update_vars_nomouse(p, path3, path3_index_1, path3_var_1);
+        update_vars_nomouse(p, path3, path3_index_2, path3_var_2);
       }
     }
 

diff --git a/package-lock.json b/package-lock.json