Merge pull request #9 from marcusfrdk/development

Persistent cookies
marcusfrdk · Sep 2, 2024 · 2750251 · 2750251
2 parents 1232cc1 + 6c5545c
commit 2750251
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/app/components/SelectInitialProgram.tsx b/app/components/SelectInitialProgram.tsx
@@ -5,6 +5,7 @@ import { useData } from "@/contexts/DataProvider";
 import styled from "@emotion/styled";
 import splitProgram from "@/utils/splitProgram";
 import Logo from "@/public/bth-logo.svg";
+import setCookie from "@/utils/setCookie";
 
 export default function SelectInitialProgram(){
     const {programs, updateSelectedProgram} = useData();
@@ -21,8 +22,9 @@ export default function SelectInitialProgram(){
         ) return;
 
         updateSelectedProgram(code + semester);
-        document.cookie = `selectedCode=${code}; SameSite=Strict; Path=/`;
-    }
+        setCookie("selectedCode", code);
+        setCookie("selectedSemester", semester);
+    };
 
     return (
         <Container>

diff --git a/app/contexts/DataProvider.tsx b/app/contexts/DataProvider.tsx
@@ -1,8 +1,9 @@
 "use client";
 
-import { TeachersType } from "@/types/Program";
-import splitProgram from "@/utils/splitProgram";
 import type { ReactNode } from "react";
+import setCookie from "@/utils/setCookie";
+import splitProgram from "@/utils/splitProgram";
+import { TeachersType } from "@/types/Program";
 import { createContext, useState, useContext, useCallback } from "react";
 
 type ProgramType = {
@@ -72,13 +73,13 @@ export default function DataProvider({
 
         setSelectedProgram(data);
         setComparedPrograms(programs => programs.filter(f => f.code !== data.code && f.semester !== data.semester));
-        document.cookie = `selectedCode=${code}; SameSite=Strict; Path=/`;
-        document.cookie = `selectedSemester=${semester}; SameSite=Strict; Path=/`;
+        setCookie("selectedCode", code);
+        setCookie("selectedSemester", semester);
     };
 
     const addComparison = useCallback((program: string) => {
         const programs = [...comparedPrograms.map(cp => cp.code + cp.semester), program];
-        document.cookie = `comparedPrograms=${programs.join(",")}; SameSite=Strict; Path=/`;
+        setCookie("comparedPrograms", programs.join(","));
         setComparedPrograms(programs.map(program => {
             const {code, semester} = splitProgram(program);
             return {
@@ -91,7 +92,7 @@ export default function DataProvider({
 
     function removeComparison(program: string){
         const programs = comparedPrograms.filter(cp => cp.code + cp.semester !== program).map(cp => cp.code + cp.semester);
-        document.cookie = `comparedPrograms=${programs.join(",")}; SameSite=Strict; Path=/`;
+        setCookie("comparedPrograms", programs.join(","));
         setComparedPrograms(programs.map(program => {
             const {code, semester} = splitProgram(program);
             return {

diff --git a/app/utils/setCookie.ts b/app/utils/setCookie.ts
@@ -0,0 +1,6 @@
+export default function setCookie(key: string, value: string) {
+    const currentDate = new Date();
+    const expirationDate = new Date(currentDate.setFullYear(currentDate.getFullYear() + 10));
+    const expires = expirationDate.toUTCString();
+    document.cookie = `${key}=${value}; SameSite=Strict; Expires=${expires}; Path=/`;
+};