Prereq oaktree (#133)

* sidebar component add

* tailwind workin, beggining page building

* structure

* fixed app

* Main design layout

* initial sidebar

* courseView init

* the course page initial tests

* Make it run on my comuter

* Tree without database integration

* fixes

* npm update

* add to page

* Biiiiig Refactoring

* Broken version of prereq tree

* Fixed not rendering anything. Still broken

* Working v1

* handling #prereqs

* Test

* removed commented out code

* More info expands now

* More info expands now

* More info expands now

* Start coding on line 135 in PrereqTreePresenter Mr. PO

* Prereqs colored and expands more info

* added css styling

* Fixed copy bug

* Crash fix in PrerequisitePresenter.jsx

* merge fix

* Prereq tree compression, error handling, debuging, database update

* Added null support (hopefully)

* Bug fixes

* Desplays periods

* Bug finally fixed (hopefully)

* Check if course exists before doing pop up

* Set up for url handling

* URL in progress

* URL fix

* Fix try 3

* URL fix again because LSK hates DNS

* Update PrerequisitePresenter.jsx

---------

Co-authored-by: kexana <deotsts@gmail.com>
Co-authored-by: Sami Al Saati <sami.alsaati@hotmail.com>
Co-authored-by: Kacper Lisik <lisik@kth.se>
Co-authored-by: Elias Tosteberg <elias.tosteberg@gmail.com>
Co-authored-by: Sailet03 <52610280+Sailet03@users.noreply.github.com>
Co-authored-by: daDevBoat <elias.richard.naess@gmail.com>
Co-authored-by: daDevBoat <113507675+daDevBoat@users.noreply.github.com>

Author: 5 people

my-app/src/model.js

@@ -326,9 +326,9 @@ export const model = {
 
     handleUrlChange() {
         let current_url = window.location.href;
-        let start_idx = indexOfNth(current_url, '/', 3) + 1;
+        let start_idx = indexOfNth(current_url, '/', 3) + 2;
 
-        if (start_idx > 0 && start_idx < current_url.length && current_url.indexOf("#") == -1) {
+        if (start_idx > 0 && start_idx < current_url.length) {
             let course_code = current_url.slice(start_idx);
             let course = this.getCourse(course_code);
             if (course) {

my-app/src/presenters/ListViewPresenter.jsx

@@ -170,14 +170,15 @@ const ListViewPresenter = observer(({ model }) => {
 
     model.onCoursesSet((courses) => {
         let current_url = window.location.href;
+        if (current_url.indexOf("#") != -1) {return;}
         let course_code = "";
-        let start_index = indexOfNth(current_url, '/', 3) + 1;
+        let start_index = indexOfNth(current_url, '/', 3) + 2;
         if (start_index > 1) {
             course_code = current_url.slice(start_index);
         }
         if (start_index != current_url.length && course_code.length >= 6) {
             window.history.replaceState({}, '', '/');
-            window.history.pushState({}, '', '/' + course_code);
+            window.history.pushState({}, '', '/?' + course_code);
         }
         model.handleUrlChange();
     })

my-app/src/presenters/PrerequisitePresenter.jsx

@@ -480,7 +480,7 @@ export const PrerequisitePresenter = observer((props) => {
                 let courses_taken = [];
                 if (localStorage.getItem("completedCourses") != null) {
                     for (let obj of localStorage.getItem("completedCourses")) {
-                        courses_taken.push(obj?.id);
+                        courses_taken.push(obj?.id);    
                     }
                 }
                 code_to_name = model.getCourseNames(courses_taken);

my-app/src/views/Components/FavouriteDropdown.jsx

@@ -40,7 +40,7 @@ const FavouritesDropdown = observer((props) => {
                                 onClick={() => {
                                     props.setSelectedCourse(course);
                                     props.setIsPopupOpen(true);
-                                    window.history.pushState({}, '', '/' + course.code);
+                                    window.history.pushState({}, '', '/?' + course.code);
 
                                 }}
                                 key={course.code}

my-app/src/views/ListView.jsx

@@ -176,7 +176,7 @@ function ListView(props) {
                                 onClick={() => {
                                     props.setSelectedCourse(course);
                                     props.setPopupOpen(true);
-                                    window.history.pushState({}, '', '/' + course.code);
+                                    window.history.pushState({}, '', '/?' + course.code);
                                 }}
                                 key={course.code}
                                className="p-5 mb-3 hover:bg-blue-100 flex items-center bg-white w-full rounded-lg cursor-pointer shadow-md hover:shadow-lg transition-shadow duration-300"