Merge branch 'main' of github.com:InferenceKTH/Find-My-Next-Course into prereq-oaktree

Author: daDevBoat

.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

@@ -2,6 +2,8 @@ import { initializeApp } from "firebase/app";
 import { getAuth, GoogleAuthProvider, onAuthStateChanged } from "firebase/auth";
 import { get, getDatabase, ref, set, onValue, push } from "firebase/database";
 import { reaction, toJS } from "mobx";
+import throttle from "lodash.throttle";
+
 // Your web app's Firebase configuration
 const firebaseConfig = {
 	apiKey: "AIzaSyCBckVI9nhAP62u5jZJW3F4SLulUv7znis",
@@ -24,53 +26,54 @@ googleProvider.addScope("email");
 let noUpload = false;
 
 export function connectToFirebase(model) {
-    loadCoursesFromCacheOrFirebase(model);
+	loadCoursesFromCacheOrFirebase(model);
 	onAuthStateChanged(auth, (user) => {
 		if (user) {
 			model.setUser(user); // Set the user ID once authenticated
-			firebaseToModel(model);  // Set up listeners for user-specific data
-			syncModelToFirebase(model);  // Start syncing changes to Firebase
+			firebaseToModel(model); // Set up listeners for user-specific data
+			syncModelToFirebase(model); // Start syncing changes to Firebase
+			syncScrollPositionToFirebase(model);
 		} else {
-			model.setUser(null);  // If no user, clear user-specific data
+			model.setUser(null); // If no user, clear user-specific data
 		}
 	});
 }
 
 // fetches all relevant information to create the model
 async function firebaseToModel(model) {
-	if (!model.user) 
-        return;
+	if (!model.user) return;
 	const userRef = ref(db, `users/${model.user.uid}`);
 	onValue(userRef, (snapshot) => {
-		if (!snapshot.exists()) 
-            return;
+		if (!snapshot.exists()) return;
 		const data = snapshot.val();
 		noUpload = true;
-		if (data.favourites) 
-            model.setFavourite(data.favourites);
-		// if (data.currentSearch) 
-        //     model.setCurrentSearch(data.currentSearch);
+		if (data.favourites) model.setFavourite(data.favourites);
+		if (data.currentSearchText)
+			model.setCurrentSearchText(data.currentSearchText);
+		if (data.scrollPosition) 
+			model.setScrollPosition(data.scrollPosition);
+		// if (data.currentSearch)
+		//     model.setCurrentSearch(data.currentSearch);
 		noUpload = false;
 	});
 }
 
-
 export function syncModelToFirebase(model) {
 	reaction(
 		() => ({
 			userId: model?.user.uid,
 			favourites: toJS(model.favourites),
+			currentSearchText: toJS(model.currentSearchText),
 			// currentSearch: toJS(model.currentSearch),
 			// Add more per-user attributes here
 		}),
 		// eslint-disable-next-line no-unused-vars
-		({ userId, favourites, currentSearch }) => {
-			if (noUpload || !userId) 
-                return;
+		({ userId, favourites, currentSearchText }) => {
+			if (noUpload || !userId) return;
 			const userRef = ref(db, `users/${userId}`);
 			const dataToSync = {
 				favourites,
-				//currentSearch,
+				currentSearchText,
 			};
 
 			set(userRef, dataToSync)
@@ -80,6 +83,34 @@ export function syncModelToFirebase(model) {
 	);
 }
 
+export function syncScrollPositionToFirebase(model, containerRef) {
+	if (!containerRef?.current) return;
+	let lastSavedPosition = 0;
+	
+    // const throttledSet = throttle((scrollPixel) => {
+    //     if (model?.user?.uid) {
+    //         const userRef = ref(db, `users/${model.user.uid}/scrollPosition`);
+    //         set(userRef, scrollPixel).catch(console.error);
+    //     }
+    // }, 500);
+
+    const handleScroll = () => {
+        const scrollTop = containerRef.current.scrollTop;
+		// make a 100px threshold
+		if (Math.abs(scrollTop - lastSavedPosition) < 100)
+			return;
+
+		lastSavedPosition = scrollTop;
+        model.setScrollPosition(scrollTop);
+        localStorage.setItem("scrollPosition", scrollTop);
+        // throttledSet(scrollTop);
+    };
+
+    containerRef.current.addEventListener('scroll', handleScroll);
+    return () => containerRef.current?.removeEventListener('scroll', handleScroll);
+}
+
+
 function saveCoursesInChunks(courses, timestamp) {
 	const parts = 3; // Adjust this based on course size
 	const chunkSize = Math.ceil(courses.length / parts);
@@ -170,34 +201,26 @@ export async function saveJSONCoursesToFirebase(model, data) {
 	});
 }
 
-
 export async function addReviewForCourse(courseCode, review) {
-    try {
-        const reviewsRef = ref(db, `reviews/${courseCode}`);
-        const newReviewRef = push(reviewsRef);
-        await set(newReviewRef, review);
-    } catch (error) {
-        console.error("Error when adding a course to firebase:", error);
+	try {
+		const reviewsRef = ref(db, `reviews/${courseCode}`);
+		const newReviewRef = push(reviewsRef);
+		await set(newReviewRef, review);
+	} catch (error) {
+		console.error("Error when adding a course to firebase:", error);
 	}
 }
 
-
 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 => {
-        reviews.push({
-            id: childSnapshot.key,  // Firebase-generated unique key
-            userName: childSnapshot.val().userName,
-            text: childSnapshot.val().text
-        });
-    });
-    return reviews;
-}
-
-
-
-
+	const reviewsRef = ref(db, `reviews/${courseCode}`);
+	const snapshot = await get(reviewsRef);
+	if (!snapshot.exists()) return [];
+	const reviews = [];
+	snapshot.forEach(childSnapshot => {
+		reviews.push({
+			id: childSnapshot.key,
+			...childSnapshot.val()
+		});
+	});
+	return reviews;
+}

my-app/package-lock.json

@@ -19,6 +19,7 @@
     "autoprefixer": "^10.4.21",
     "firebase": "^11.5.0",
     "ldrs": "^1.1.6",
+    "lodash.throttle": "^4.1.1",
     "mobx": "^6.13.7",
     "mobx-react-lite": "^4.1.0",
     "pdfjs-dist": "^5.1.91",

my-app/package.json

@@ -19,10 +19,10 @@
             "P4": "null"
         },
         "kth_page_url": "https://www.kth.se/student/kurser/kurs/FEL3310",
-        "description": "null",
-        "prerequisites": "null",
-        "prerequisites_text": "null",
-        "learning_outcomes": "null"
+        "description": "TEST",
+        "prerequisites": "TEST",
+        "prerequisites_text": "TEST",
+        "learning_outcomes": "TEST"
     },
     "FMJ3410": {
         "name": "Theory and Methodology of Science for Energy Research",

my-app/src/assets/example.json

@@ -15,7 +15,6 @@ configure({ enforceActions: "never" });
 const reactiveModel = makeAutoObservable(model);
 connectToFirebase(reactiveModel);
 
-// ✅ Add /share route here
 export function makeRouter(reactiveModel) {
   return createHashRouter([
     {

my-app/src/index.jsx

@@ -3,9 +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)
@@ -16,6 +39,14 @@ export const model = {
         this.currentSearch = searchResults;
     },
 
+    setCurrentSearchText(text){
+        this.currentSearchText = text;
+    },
+    
+    setScrollPosition(position) {
+        this.scrollPosition = position;
+    },
+
     setCourses(courses){
         this.courses = courses;
     },
@@ -68,7 +99,6 @@ export const model = {
             this.addCourse(course);
         });
     },
-
     //for reviews
     async addReview(courseCode, review) {
         try {
@@ -87,4 +117,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;
+    // },
+
+
+
 };