Merge pull request #1 from FlipFloop/dev

Dev

Author: FlipFloop

src-tauri/src/main.rs

@@ -23,12 +23,6 @@ fn get_courses(courses: String) -> String {
 
     // course num, course full remain, waitlist full
     let mut course_nums: Vec<(u16, bool, bool)> = vec![];
-    // let mut course_nums: Vec<(u16, bool, bool)> = vec![
-    //     (21135, true, true),
-    //     (25587, true, true),
-    //     (27395, true, true),
-    //     (24649, true, true),
-    // ];
 
     let parsed_course_nums: Vec<u16> = courses
         .split(' ')
@@ -141,7 +135,7 @@ fn get_courses(courses: String) -> String {
 }
 
 #[tauri::command]
-fn check_course_exists(course_id: String) -> String {
+fn check_course_exists(course_id: String) -> bool {
     let response = reqwest::blocking::get(format!(
         "https://oscar.gatech.edu/pls/bprod/bwckschd.p_disp_detail_sched?term_in=202302&crn_in={}",
         course_id,
@@ -159,10 +153,10 @@ fn check_course_exists(course_id: String) -> String {
 
     for el in err_exists {
         if el.text().collect::<String>() == "No detailed class information found" {
-            return format!("{}", false);
+            return true;
         }
     }
-    return format!("{}", true);
+    return false;
 }
 
 fn main() {

src/App.tsx

@@ -14,48 +14,57 @@ import {
 } from "./utils";
 
 const [courses, setCourses] = createStore<Course[]>([
-  {
-    id: 1,
-    courseNum: 21135,
-    seatAvailable: false,
-    waitlistAvailable: false,
-  },
-  {
-    id: 2,
-    courseNum: 25587,
-    seatAvailable: false,
-    waitlistAvailable: false,
-  },
-  {
-    id: 3,
-    courseNum: 27395,
-    seatAvailable: false,
-    waitlistAvailable: false,
-  },
-  {
-    id: 4,
-    courseNum: 24649,
-    seatAvailable: false,
-    waitlistAvailable: false,
-  },
+  // {
+  //   id: 1,
+  //   courseNum: 21135,
+  //   seatAvailable: false,
+  //   waitlistAvailable: false,
+  // },
+  // {
+  //   id: 2,
+  //   courseNum: 25587,
+  //   seatAvailable: false,
+  //   waitlistAvailable: false,
+  // },
+  // {
+  //   id: 3,
+  //   courseNum: 27395,
+  //   seatAvailable: false,
+  //   waitlistAvailable: false,
+  // },
+  // {
+  //   id: 4,
+  //   courseNum: 24649,
+  //   seatAvailable: false,
+  //   waitlistAvailable: false,
+  // },
 ]);
 
 const [newCourse, setNewCourse] = createSignal(0);
 
-const addCourse = () => {
+const addCourse = async () => {
   if (newCourse() > courseMAX || newCourse() < courseMIN) {
     toast.error("Course value not in range");
     return;
   }
 
-  if (!checkCourseExists(newCourse())) {
+  const courseExists = await checkCourseExists(newCourse());
+
+  if (courseExists) {
     toast.error("Course CRN doesn't exist");
     return;
   }
 
-  const valid = courses.some((course: any) => course.courseNum == newCourse());
+  const isInList = courses.some(
+    (course: any) => course.courseNum == newCourse()
+  );
 
-  if (!valid) {
+  if (isInList) {
+    toast.error("Course already in your list");
+    return;
+  }
+
+  if (courses.length > 0) {
     setCourses([
       ...courses,
       {
@@ -65,13 +74,27 @@ const addCourse = () => {
         waitlistAvailable: false,
       },
     ]);
+    return;
   }
+
+  setCourses([
+    {
+      id: 1,
+      courseNum: newCourse(),
+      seatAvailable: false,
+      waitlistAvailable: false,
+    },
+  ]);
 };
 
 const App = () => {
   const [data, setData] = createSignal("No data fetched!");
 
   const getData = async () => {
+    if (courses.length == 0) {
+      toast.error("Add a course before fetching data!");
+      return;
+    }
     setData("Loading");
     toast.loading("Fetching your data");