From 5c285f5b510599581cbeb05fecb425183ac6c0a0 Mon Sep 17 00:00:00 2001
From: James Park <jamesdpark1@gmail.com>
Date: Tue, 3 Oct 2023 17:25:04 -0400
Subject: [PATCH 1/3] initialize google log in

---
 src/web/src/components/Login.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/web/src/components/Login.vue b/src/web/src/components/Login.vue
index 51b2db7cf..c664d9b2e 100644
--- a/src/web/src/components/Login.vue
+++ b/src/web/src/components/Login.vue
@@ -9,7 +9,6 @@
         placeholder="Enter email"
       ></b-form-input>
     </b-form-group>
-
     <b-form-group id="input-group-2" label="Password:" label-for="input-2">
       <b-form-input
         id="input-2"
@@ -19,6 +18,7 @@
         placeholder="Enter password"
       ></b-form-input>
     </b-form-group>
+    <div class="g-signin2" data-onsuccess="onSignIn"></div>
     <b-button type="submit" variant="primary">Submit</b-button>
     <div>
       <b-button-group size="md">
@@ -45,7 +45,6 @@
     </div>
   </b-form>
 </template>
-
 <script>
 import { mapGetters } from "vuex";
 import SignUpComponent from "@/components/SignUp";
@@ -65,10 +64,15 @@ export default {
       showForm: true,
     };
   },
+  mounted() {
+    let recaptchaScript = document.createElement('script')
+    recaptchaScript.setAttribute('src', '"https://apis.google.com/js/platform.js"')
+    document.head.appendChild(recaptchaScript)
+  },
   methods: {
     async onSubmit(evt) {
       evt.preventDefault();
-
+      
       try {
         await this.$store.dispatch(userTypes.actions.LOGIN, this.form);
 

From 36398fd5c12954a08f32f192e1e5f08649a28607 Mon Sep 17 00:00:00 2001
From: James Park <jamesdpark1@gmail.com>
Date: Fri, 10 Nov 2023 19:20:06 -0500
Subject: [PATCH 2/3] sidebar redesign

---
 src/web/src/components/CourseList.vue    | 69 +++++++++++++++---------
 src/web/src/pages/NewCourseScheduler.vue |  6 +--
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/src/web/src/components/CourseList.vue b/src/web/src/components/CourseList.vue
index 3ec84265f..c34b0c291 100644
--- a/src/web/src/components/CourseList.vue
+++ b/src/web/src/components/CourseList.vue
@@ -1,38 +1,55 @@
 <template>
   <div class="d-flex flex-column flex-grow-1">
     <div class="course-search">
-      <b-form-group label="Search" label-for="search">
+      <!--label="Search"-->
+      <b-form-group label-for="search">
         <b-form-input
           id="search"
           v-model="textSearch"
           :debounce="debounceTime"
-          placeholder="Intro to College - COLG 1030"
+          placeholder="Search: Intro to College - COLG 1030"
           list="list-id"
         ></b-form-input>
       </b-form-group>
 
-      <b-row>
-        <!-- >2 b/c default ALL option always present -->
-        <b-col v-if="subsemesterOptions.length > 2">
-          <b-form-group label="Filter Sub-Semester" for="sub-semester">
-            <b-form-select
-              v-model="selectedSubsemester"
-              :options="subsemesterOptions"
-            ></b-form-select>
-          </b-form-group>
-        </b-col>
-        <b-col>
-          <b-form-group label="Filter Department" for="department">
-            <b-form-select
-              v-model="selectedDepartment"
-              :options="departmentOptions"
-            ></b-form-select>
-          </b-form-group>
-        </b-col>
-      </b-row>
+      <b-button
+        @click="toggleFilterPrompt();"
+        size="sm"
+        style="margin-right: 5px;"
+        >
+        Filters
+      </b-button>
+      <b-button
+        @click="resetFilters();"
+        size="sm"
+        variant="danger"
+        >
+        Reset
+      </b-button>
+      <b-modal id="courseFilters" title="Course Filters" size="sm">
+          <b-col>
+            <b-row v-if="subsemesterOptions.length > 2">
+              <b-form-group label="Filter Sub-Semester" for="sub-semester">
+                <b-form-select
+                  v-model="selectedSubsemester"
+                  :options="subsemesterOptions"
+                ></b-form-select>
+              </b-form-group>
+            </b-row>
+            <b-row>
+              <b-form-group label="Filter Department" for="department">
+                <b-form-select
+                  v-model="selectedDepartment"
+                  :options="departmentOptions"
+                ></b-form-select>
+              </b-form-group>
+            </b-row>
+          </b-col>
+      </b-modal>
+
     </div>
     <!-- Start of Dynamic Scrolling Rendering To Account For Varying Course Data. > -->
-    <hr />
+    <hr>
     <div id="scroll-box" data-cy="course-list">
       <div v-if="filterCourses.length == 0" class="no-courses">
         Oops, no results!
@@ -124,8 +141,12 @@ export default {
     });
   },
   methods: {
-    courseInfoModalToggle(course) {
-      this.$emit("showCourseInfo", course);
+    resetFilters() {
+      this.selectedDepartment=null;
+      this.selectedSubsemester=null;
+    },
+    toggleFilterPrompt() {
+      this.$root.$emit("bv::show::modal", "courseFilters");
     },
     /* wrapper for querying with search */
     // todo: get courses should be changed
diff --git a/src/web/src/pages/NewCourseScheduler.vue b/src/web/src/pages/NewCourseScheduler.vue
index fc0094ce1..4174d30af 100644
--- a/src/web/src/pages/NewCourseScheduler.vue
+++ b/src/web/src/pages/NewCourseScheduler.vue
@@ -34,7 +34,7 @@
                   <b-card no-body class="h-100">
                     <b-tabs card class="h-100 d-flex flex-column flex-grow-1">
                       <b-tab
-                        title="Course Search"
+                        title="Search"
                         active
                         class="flex-grow-1 w-100"
                         data-cy="course-search-tab"
@@ -64,7 +64,7 @@
                             class="text-center"
                             data-cy="selected-courses-tab-header"
                           >
-                            Selected Courses
+                            Selected
                             <b-badge
                               variant="light"
                               data-cy="num-selected-courses"
@@ -74,7 +74,7 @@
                           </div>
                         </template>
                         <b-card-text
-                          class="w-100 d-flex flex-grow-1 flex-column"
+                          class="w-1500 d-flex flex-grow-1 flex-column"
                         >
                           <SelectedCourses
                             :courses="selectedCourses"

From 5e57ec8a4f6cd441b83ba6f5faeef94178b92fcf Mon Sep 17 00:00:00 2001
From: James Park <jamesdpark1@gmail.com>
Date: Fri, 10 Nov 2023 19:47:30 -0500
Subject: [PATCH 3/3] remove accidental commit

---
 src/web/src/components/Login.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/web/src/components/Login.vue b/src/web/src/components/Login.vue
index c664d9b2e..c6c3ea985 100644
--- a/src/web/src/components/Login.vue
+++ b/src/web/src/components/Login.vue
@@ -9,6 +9,7 @@
         placeholder="Enter email"
       ></b-form-input>
     </b-form-group>
+
     <b-form-group id="input-group-2" label="Password:" label-for="input-2">
       <b-form-input
         id="input-2"
@@ -18,7 +19,6 @@
         placeholder="Enter password"
       ></b-form-input>
     </b-form-group>
-    <div class="g-signin2" data-onsuccess="onSignIn"></div>
     <b-button type="submit" variant="primary">Submit</b-button>
     <div>
       <b-button-group size="md">
@@ -45,6 +45,7 @@
     </div>
   </b-form>
 </template>
+
 <script>
 import { mapGetters } from "vuex";
 import SignUpComponent from "@/components/SignUp";
@@ -64,15 +65,10 @@ export default {
       showForm: true,
     };
   },
-  mounted() {
-    let recaptchaScript = document.createElement('script')
-    recaptchaScript.setAttribute('src', '"https://apis.google.com/js/platform.js"')
-    document.head.appendChild(recaptchaScript)
-  },
   methods: {
     async onSubmit(evt) {
       evt.preventDefault();
-      
+
       try {
         await this.$store.dispatch(userTypes.actions.LOGIN, this.form);
 
@@ -113,4 +109,4 @@ export default {
 };
 </script>
 
-<style></style>
+<style></style>
\ No newline at end of file