applied filters into the search function using flags in the model, will have to refine more in the filters, but this is great for the demo

Author: boldizsarbenedek

my-app/src/model.js

@@ -10,6 +10,7 @@ export const model = {
     favourites: [],
     isReady: false,
     filtersChange: false,
+    filtersCalculated: false,
     filteredCourses: [],
     filterOptions: {
         applyTranscriptFilter: true,
@@ -108,6 +109,10 @@ export const model = {
     setFiltersChange() {
         this.filtersChange = true;
     },
+
+    setFiltersCalculated() {
+        this.filtersCalculated = true;
+    },
 
     updateLevelFilter(level) {
         this.filterOptions.level = level;

my-app/src/pages/App.jsx

@@ -9,7 +9,7 @@ import { model } from '/src/model.js';
 
 function MainAppLayout({ model }) {
 	return (
-		<div className="flex h-screen w-screen">
+		<div className="flex h-screen w-screen overflow-hidden">
 			<FilterPresenter model={model} />
 			<div className="flex-auto w-40% h-full bg-gradient-to-t from-[#4f3646] to-[#6747c0]">
 				<SidebarPresenter model={model} />

my-app/src/presenters/FilterPresenter.jsx

@@ -28,8 +28,8 @@ const FilterPresenter = observer(({ model }) => {
             //console.log(course?.prerequisites);
             if(course?.prerequisites && (course.prerequisites !== "null"))
                 var resultEligibility = eligibility(storedFinishedCourses, course?.prerequisites);
-            else{
-                //zerocourses.push(course);
+            else{ // {strong: , zero: , moderate: , weak: }
+                zerocourses.push(course);
                 return;
             }
             if(resultEligibility.strong){
@@ -292,6 +292,7 @@ const FilterPresenter = observer(({ model }) => {
 
         model.filteredCourses = [...localFilteredCourses];
         model.filtersChange = false;
+        model.setFiltersCalculated();
         console.log("filtered objects number of elements: ", model.filteredCourses.length);
     }
 });

my-app/src/presenters/SearchbarPresenter.jsx

@@ -11,7 +11,7 @@ const SearchbarPresenter = observer(({ model }) => {
         //model.filteredCourses is essentially a smaller subset of model.courses, if theres no filters, it should be the same
         console.log("---------------search recalculated");
         console.log("filtered courses length: ", model.filteredCourses.length);
-        const searchResults = model.courses.filter(course =>
+        const searchResults = model.filteredCourses.filter(course =>
             course.code.toLowerCase().includes(query.toLowerCase()) ||
             course.name.toLowerCase().includes(query.toLowerCase()) ||
             course.description.toLowerCase().includes(query.toLowerCase())
@@ -61,6 +61,11 @@ const SearchbarPresenter = observer(({ model }) => {
         prerequisiteTree={preP}
     />;
 
+    if(model.filtersCalculated){
+        searchCourses("");
+        model.filtersCalculated = false;
+    }
+
     return (
         <SearchbarView
             model={model}

my-app/src/views/ListView.jsx

@@ -4,10 +4,10 @@ import 'ldrs/react/Quantum.css';
 import InfiniteScroll from 'react-infinite-scroll-component';
 
 function ListView(props) {
-  const coursesToDisplay =
-      (props.searchResults && props.searchResults.length > 0
+  const coursesToDisplay = props.searchResults;
+      /*(props.searchResults && props.searchResults.length > 0
           ? props.searchResults
-          : props.courses) || [];
+          : props.courses) || [];*/
 
   const [displayedCourses, setDisplayedCourses] = useState([]);
   const [hasMore, setHasMore] = useState(true);