Merge branch 'dev'

Author: FlipFloop

src-tauri/src/main.rs

@@ -153,10 +153,13 @@ fn check_course_exists(course_id: String) -> bool {
 
     for el in err_exists {
         if el.text().collect::<String>() == "No detailed class information found" {
-            return true;
+            println!("Doesn't exist: {}", course_id);
+            return false;
         }
     }
-    return false;
+
+    println!("Does Exist: {}", course_id);
+    return true;
 }
 
 fn main() {

src/App.tsx

@@ -1,4 +1,4 @@
-import { createEffect, createSignal, For, onMount } from "solid-js";
+import { createEffect, createSignal, For, onMount, Show } from "solid-js";
 import { createStore } from "solid-js/store";
 import toast, { Toaster } from "solid-toast";
 
@@ -50,7 +50,9 @@ const addCourse = async () => {
 
   const courseExists = await checkCourseExists(newCourse());
 
-  if (courseExists) {
+  console.log(courseExists);
+
+  if (!courseExists) {
     toast.error("Course CRN doesn't exist");
     return;
   }
@@ -72,6 +74,7 @@ const addCourse = async () => {
         courseNum: newCourse(),
         seatAvailable: false,
         waitlistAvailable: false,
+        valid: true,
       },
     ]);
     return;
@@ -83,6 +86,7 @@ const addCourse = async () => {
       courseNum: newCourse(),
       seatAvailable: false,
       waitlistAvailable: false,
+      valid: true,
     },
   ]);
 };
@@ -98,22 +102,51 @@ const App = () => {
     }
   });
 
-  createEffect(() => {
+  const saveCourses = () => {
+    checkCoursesValid();
     localStorage.setItem("courses", JSON.stringify(courses));
-  }, courses);
+  };
+
+  const checkCoursesValid = async () => {
+    let invalidCoursesIdx: number[] = [];
+
+    console.log(courses);
+
+    for (let i = 0; i < courses.length; i++) {
+      const courseExists = await checkCourseExists(courses[i].courseNum);
+      if (!courseExists) {
+        invalidCoursesIdx.push(i);
+        console.log(i);
+      }
+    }
+
+    console.log("invalid!");
+
+    for (let i = 0; i < invalidCoursesIdx.length; i++) {
+      console.log(invalidCoursesIdx[i]);
+      setCourses(invalidCoursesIdx[i], { valid: false });
+    }
+  };
 
   const getData = async () => {
     if (courses.length == 0) {
       toast.error("Add a course before fetching data!");
       return;
     }
+
     setData("Loading");
     toast.loading("Fetching your data");
+    checkCoursesValid();
 
-    const courseArr = courses.map((el: Course) => {
-      return el.courseNum;
-    });
+    const courseArr = courses
+      .filter((el: Course) => {
+        return el.valid == true;
+      })
+      .map((el: Course) => {
+        return el.courseNum;
+      });
 
+    console.log(courseArr);
     setData(await get_courses(courseArr));
 
     toast.remove();
@@ -123,7 +156,7 @@ const App = () => {
   return (
     <div class="container">
       <Toaster />
-      <h1>Georgia Tech self-coursicle!</h1>
+      <h1>Georgia Tech self-course checker!</h1>
       <For each={courses}>
         {(course: Course) => (
           <div>
@@ -133,23 +166,25 @@ const App = () => {
               max={courseMAX}
               type="number"
               onChange={async (e) => {
-                const value: number = e.target.value as number;
-
-                if (value < courseMAX && value > courseMIN) {
-                  const idx = courses.findIndex(
-                    (el: Course) => el.id === course.id
-                  );
-                  setCourses(idx, { courseNum: e.target.value as number });
-                }
+                const idx = courses.findIndex(
+                  (el: Course) => el.id === course.id
+                );
+                setCourses(idx, { courseNum: e.target.value as number });
               }}
             />
             <button
               onClick={() => {
                 setCourses(courses.filter((el: any) => el.id !== course.id));
               }}
             >
-              &#10060
+              &#10060 Remove
             </button>
+            <Show when={course.valid}>
+              <button>&#x2705 Course CRN is valid</button>
+            </Show>
+            <Show when={!course.valid}>
+              <button>! CRN Doesn't exist !</button>
+            </Show>
           </div>
         )}
       </For>
@@ -166,6 +201,10 @@ const App = () => {
         />
         <button onClick={addCourse}>&#10133 Add Course</button>
       </div>
+      <button type="button" onClick={saveCourses}>
+        Save Courses
+      </button>
+      <br />
       <button type="button" onClick={getData}>
         Get Course Data
       </button>

src/utils.ts

@@ -6,17 +6,51 @@ export type Course = {
   courseNum: number;
   seatAvailable: boolean;
   waitlistAvailable: boolean;
+  valid: boolean;
 };
 
 export const openLink = async () => {
   open("https://oscar.gatech.edu/bprod/twbkwbis.P_GenMenu?name=bmenu.P_RegMnu");
 };
 
+const existingCourses: number[] = [];
+const nonExistingCourses: number[] = [];
+
 export const checkCourseExists = async (courseNumber: number) => {
+  const startTime = performance.now();
+
+  if (
+    nonExistingCourses.includes(courseNumber) ||
+    courseNumber > courseMAX ||
+    courseNumber < courseMIN
+  ) {
+    console.log("Doesn't exist or not in bounds");
+    return false;
+  }
+
+  if (existingCourses.includes(courseNumber)) {
+    console.log("Exists");
+    return true;
+  }
+
+  console.log("invoke");
+
   const exists = await invoke("check_course_exists", {
     courseId: courseNumber,
   });
 
+  if (exists) {
+    existingCourses.push(courseNumber);
+  } else {
+    nonExistingCourses.push(courseNumber);
+  }
+  console.log("Existing: " + existingCourses);
+  console.log("Non existing: " + nonExistingCourses);
+
+  const endTime = performance.now();
+
+  console.log("TTE: " + (endTime - startTime));
+
   return exists;
 };