Responsive filtering (#78)

* 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

* wrote departments filter option

* added check to make sure to not recommend courses the client has taken before

* initial state good

* departments go to model

* trying to add filtering out courses with NULL fields as an implementable filter option, merging with main start as per teams request

* merging into brain?

---------

Co-authored-by: kexana <deotsts@gmail.com>

Author: boldizsarbenedek

my-app/src/model.js

@@ -18,16 +18,20 @@ export const model = {
         applyTranscriptFilter: true,
         eligibility: "weak",  //the possible values for the string are: "weak"/"moderate"/"strong"
         applyLevelFilter: true,
-        level: [], //the possible values for the array are: "PREPARATORY", "BASIC", "ADVANCED", "RESEARCH"
+        level: ["PREPARATORY", "BASIC", "ADVANCED", "RESEARCH"], //the possible values for the array are: "PREPARATORY", "BASIC", "ADVANCED", "RESEARCH"
         applyLanguageFilter: true,
         language: "none", //the possible values for the string are: "none"/"english"/"swedish"/"both"
         applyLocationFilter:true,
         location: [], //the possible values for the array are: 'KTH Campus', 'KTH Kista', 'AlbaNova', 'KTH Flemingsberg', 'KTH Solna', 'KTH Södertälje', 'Handelshögskolan', 'KI Solna', 'Stockholms universitet', 'KONSTFACK'
         applyCreditsFilter:true,
         creditMin: 0,
         creditMax: 45,
-        applyDepartmentFilter:false,
-        department: []
+        applyDepartmentFilter: true,
+        department: ["EECS/Computational Science and  Technology", "EECS/Theoretical Computer Science", "EECS/Electric Power and Energy Systems", "EECS/Network and Systems Engineering",
+        "ITM/Learning in Engineering Sciences", "ITM/Industrial Economics and Management", "ITM/Energy Systems", "ITM/Integrated Product Development and Design", "ITM/SKD GRU",
+        "SCI/Mathematics", "SCI/Applied Physics", "SCI/Mechanics", "SCI/Aeronautical and Vehicle Engineering", 
+        "ABE/Sustainability and Environmental Engineering", "ABE/Concrete Structures", "ABE/Structural Design & Bridges", "ABE/History of Science, Technology and Environment", ],
+        applyRemoveNullCourses: false
     },
 
     setUser(user) {
@@ -144,6 +148,11 @@ export const model = {
         this.filterOptions.eligibility = eligibility;
     },
 
+    updateDepartmentFilter(department) {
+        console.log(department);
+        this.filterOptions.department = department;
+    },
+
     //setters for the filter options
     setApplyTranscriptFilter(transcriptFilterState) {
         this.filterOptions.applyTranscriptFilter = transcriptFilterState;
@@ -160,9 +169,9 @@ export const model = {
     setApplyCreditsFilter(creditsFilterState) {
         this.filterOptions.applyCreditsFilter = creditsFilterState;
     },
-    // setApplyDepartmentFilter(departmentFilterState) {
-    //     this.filterOptions.applyDepartmentFilter = departmentFilterState;
-    // },
+    setApplyDepartmentFilter(departmentFilterState) {
+        this.filterOptions.applyDepartmentFilter = departmentFilterState;
+    },
 
     async getAverageRating(courseCode) {
         const reviews = await getReviewsForCourse(courseCode);

my-app/src/pages/App.jsx

@@ -10,7 +10,6 @@ import { model } from '/src/model.js';
 function MainAppLayout({ model }) {
 	return (
 		<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} />
 			</div>
@@ -21,6 +20,7 @@ function MainAppLayout({ model }) {
 				<div className="flex-auto border bg-[#121212] relative">
 					<ListViewPresenter model={model} />
 				</div>
+			<FilterPresenter model={model} />
 			</div>
 		</div>
 	);