Merge pull request #255 from cmurp25/mainline

Frontend fixes + tiger training handler lambda appropriately calls tiger training
clemsonMakerspace · Dec 13, 2024 · 141cbe3 · 141cbe3
2 parents a1d1f10 + edec283
commit 141cbe3
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 61 deletions.
diff --git a/cdk/api_gateway/backend_api.py b/cdk/api_gateway/backend_api.py
@@ -222,7 +222,7 @@ def tiger_training_handler_lambda(self, domain_name: str):
                 'BRIDGE_PROGRAM_ID': makerspace_program_id,
                 'QUALIFICATIONS_LAMBDA': self.lambda_qualifications_handler.function_name
             },
-            handler='equipment_handler.handler',
+            handler='tiger_training_handler.handler',
             timeout=Duration.seconds(30),
             runtime=aws_lambda.Runtime.PYTHON_3_12)
 

diff --git a/cdk/api_gateway/lambda_code/tiger_training_handler/old.tiger_training_handler.py b/cdk/api_gateway/lambda_code/tiger_training_handler/old.tiger_training_handler.py
diff --git a/site/visitor-console/src/pages/EquipmentForm.tsx b/site/visitor-console/src/pages/EquipmentForm.tsx
@@ -154,7 +154,7 @@ const EquipmentForm = () => {
         print_status: form_data.print_status || "In Progress",
         print_notes: form_data.print_notes || "",
       }),
-      timestamp: new Date().toISOString(),
+      timestamp: new Date().toISOString().split(".")[0],
     };
     console.log("Form Submission:", JSON.stringify(dataWithDefaults, null, 2));
 

diff --git a/site/visitor-console/src/pages/EquipmentUsage.tsx b/site/visitor-console/src/pages/EquipmentUsage.tsx
@@ -62,8 +62,12 @@ const EquipmentUsage = () => {
           );
         }
 
-        const data: EquipmentLog[] = await response.json();
-        setEquipmentLogs(Array.isArray(data) ? data : []);
+        const data = await response.json();
+        console.log(data);
+        const logs = Array.isArray(data.equipment_logs)
+          ? data.equipment_logs
+          : [];
+        setEquipmentLogs(logs);
       } catch (error) {
         console.error("Error fetching equipment logs:", error);
         setEquipmentLogs([]);

diff --git a/site/visitor-console/src/pages/Qualifications.tsx b/site/visitor-console/src/pages/Qualifications.tsx
@@ -4,15 +4,23 @@ import { api_endpoint } from "../library/constants";
 import { withAuthenticator } from "@aws-amplify/ui-react";
 import { Link } from "react-router-dom";
 
+type CompletableItem = {
+  name: string;
+  completion_status: string;
+};
+
+type QualificationsObject = {
+  user_id: string;
+  last_updated: string;
+  trainings: CompletableItem[];
+  waivers: CompletableItem[];
+  miscellaneous: CompletableItem[];
+};
+
 const Qualifications = () => {
   const [searchUsername, setSearchUsername] = useState("");
-  const [qualifications, setQualifications] = useState<{
-    last_updated: string;
-    trainings: { name: string; completion_status: string }[];
-    waivers: { name: string; completion_status: string }[];
-    miscellaneous: { name: string; completion_status: string }[];
-  } | null>(null);
-
+  const [qualifications, setQualifications] =
+    useState<QualificationsObject | null>(null);
   const [loading, setLoading] = useState(false);
   const [userNotFound, setUserNotFound] = useState(false);
   const [refreshStatus, setRefreshStatus] = useState<string | null>(null);
@@ -48,7 +56,7 @@ const Qualifications = () => {
           );
         }
       } else {
-        const data = await response.json();
+        const data: QualificationsObject = await response.json();
         setQualifications(data);
       }
     } catch (error) {
@@ -66,6 +74,7 @@ const Qualifications = () => {
       const response = await fetch(`${api_endpoint}/tiger_training`, {
         headers: {
           "Content-Type": "application/json",
+          "X-Api-Key": import.meta.env.VITE_BACKEND_KEY,
         },
       });
 

diff --git a/site/visitor-console/src/pages/Registration.tsx b/site/visitor-console/src/pages/Registration.tsx
@@ -210,8 +210,7 @@ const Registration = () => {
                 <label htmlFor="class" className="form-label">
                   Class standing
                 </label>
-                <FormMultiselect
-                  id="class"
+                <FormSelect
                   name="class"
                   control={control}
                   values={class_list}

diff --git a/site/visitor-console/src/pages/Visits.tsx b/site/visitor-console/src/pages/Visits.tsx
@@ -11,6 +11,10 @@ type Visit = {
   timestamp: string;
 };
 
+type VisitResponse = {
+  visits: Visit[];
+};
+
 const Visits = () => {
   const [searchUsername, setSearchUsername] = useState("");
   const [visits, setVisits] = useState<Visit[]>([]);
@@ -35,8 +39,8 @@ const Visits = () => {
           throw new Error(`Error fetching visits: ${response.statusText}`);
         }
 
-        const data: Visit[] = await response.json();
-        setVisits(Array.isArray(data) ? data : []);
+        const data: VisitResponse = await response.json();
+        setVisits(data.visits);
       } catch (error: any) {
         console.error("Fetch error:", error);
         setError(error.message || "An unknown error occurred.");