Merge branch 'main' into persistance

Author: jkluge

.github/workflows/docker-build.yml

@@ -0,0 +1,33 @@
+name: Docker CI Build
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Build and start services with Docker Compose (CI Mode)
+      run: |
+        CI=true COMMAND="npx serve -s build" docker compose up -d --build
+
+    - name: Check running containers
+      run: docker ps -a
+
+    - name: Check for container failures
+      run: |
+        docker compose logs --tail=50
+        if [ "$(docker compose ps --format '{{.State}}' | grep -c exited)" -gt 0 ]; then
+          echo "A container has exited with an error. Failing the workflow."
+          exit 1
+        fi

.github/workflows/docker-image.yml

@@ -1,4 +1,4 @@
-name: Docker CI
+name: Docker CI LINT
 
 on:
   push:
@@ -19,7 +19,7 @@ jobs:
 
     - name: Build and start services with Docker Compose (CI Mode)
       run: |
-        CI=true COMMAND="npx serve -s build" docker compose up -d --build
+        CI=true LINT=true COMMAND="npx serve -s build" docker compose up -d --build
 
     - name: Check running containers
       run: docker ps -a

Dockerfile

@@ -3,7 +3,8 @@ WORKDIR /app
 COPY my-app .
 RUN npm ci
 ARG CI=false
+ARG LINT=false
 RUN if [ "$CI" = "true" ]; then npm run build; fi
-RUN if [ "$CI" = "true" ]; then npm run lint; fi
+RUN if [ "$LINT" = "true" ]; then npm run lint; fi
 EXPOSE 5173
 CMD ["npm", "run", "dev"]

my-app/firebase.js

@@ -215,14 +215,12 @@ export async function getReviewsForCourse(courseCode) {
 	const reviewsRef = ref(db, `reviews/${courseCode}`);
 	const snapshot = await get(reviewsRef);
 	if (!snapshot.exists()) return [];
-
 	const reviews = [];
-	snapshot.forEach((childSnapshot) => {
+	snapshot.forEach(childSnapshot => {
 		reviews.push({
-			id: childSnapshot.key, // Firebase-generated unique key
-			userName: childSnapshot.val().userName,
-			text: childSnapshot.val().text,
+			id: childSnapshot.key,
+			...childSnapshot.val()
 		});
 	});
 	return reviews;
-}
+}

my-app/src/model.js

@@ -3,11 +3,32 @@ import { addCourse, addReviewForCourse, getReviewsForCourse } from "../firebase"
 
 export const model = {
     user: undefined,
+    //add searchChange: false,   //this is for reworking the searchbar presenter, so that it triggers as a model, 
+    //instead of passing searchcouses lambda function down into the searchbarview.
     currentSearch: [],
     currentSearchText: "",
     scrollPosition: 0,
     courses: [],
     favourites: [],
+    isReady: false,
+    filtersChange: false,
+    filtersCalculated: false,
+    filteredCourses: [],
+    filterOptions: {
+        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"
+        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: []
+    },
 
     setUser(user) {
         if (!this.user)
@@ -76,7 +97,6 @@ export const model = {
             this.addCourse(course);
         });
     },
-
     //for reviews
     async addReview(courseCode, review) {
         try {
@@ -95,4 +115,53 @@ export const model = {
             return [];
         }
     },
+    //for filters
+
+    setFiltersChange() {
+        this.filtersChange = true;
+    },
+
+    setFiltersCalculated() {
+        this.filtersCalculated = true;
+    },
+    
+    updateLevelFilter(level) {
+        this.filterOptions.level = level;
+    },
+    updateLanguageFilter(languages) {
+        this.filterOptions.language = languages;
+    },
+    updateLocationFilter(location) {
+        this.filterOptions.location = location;
+    },
+    updateCreditsFilter(creditLimits) {
+        this.filterOptions.creditMin = creditLimits[0];
+        this.filterOptions.creditMax = creditLimits[1];
+    },
+    updateTranscriptElegibilityFilter(eligibility) {
+        this.filterOptions.eligibility = eligibility;
+    },
+
+    //setters for the filter options
+    setApplyTranscriptFilter(transcriptFilterState) {
+        this.filterOptions.applyTranscriptFilter = transcriptFilterState;
+    },
+    setApplyLevelFilter(levelFilterState) {
+        this.filterOptions.applyLevelFilter = levelFilterState;
+    },
+    setApplyLanguageFilter(languageFilterState) {
+        this.filterOptions.applyLanguageFilter = languageFilterState;
+    },
+    setApplyLocationFilter(locationFilterState) {
+        this.filterOptions.applyLocationFilter = locationFilterState;
+    },
+    setApplyCreditsFilter(creditsFilterState) {
+        this.filterOptions.applyCreditsFilter = creditsFilterState;
+    },
+    // setApplyDepartmentFilter(departmentFilterState) {
+    //     this.filterOptions.applyDepartmentFilter = departmentFilterState;
+    // },
+
+
+
 };

my-app/src/pages/App.jsx

@@ -2,14 +2,16 @@ import React from 'react';
 import { SidebarPresenter } from '../presenters/SidebarPresenter.jsx';
 import { SearchbarPresenter } from '../presenters/SearchbarPresenter.jsx';
 import { ListViewPresenter } from '../presenters/ListViewPresenter.jsx';
+import { FilterPresenter } from "../presenters/FilterPresenter.jsx";
 import { Routes, Route } from 'react-router-dom';
 import SharedView from '../pages/SharedView.jsx';
 import { model } from '/src/model.js';
 
 function MainAppLayout({ model }) {
 	return (
 		<div className="flex h-screen w-screen overflow-hidden">
-			<div className="w-1/4 h-full bg-gradient-to-t from-[#4f3646] to-[#6747c0]">
+			<FilterPresenter model={model} />
+			<div className="flex-auto w-40% h-full bg-gradient-to-t from-[#4f3646] to-[#6747c0]">
 				<SidebarPresenter model={model} />
 			</div>
 			<div className="w-3/4 h-full flex flex-col">