placementt-core 1.20.197 → 11.0.533

package/src/features/placements/studentPlacements/completedStudentPlacementsSlice.ts

@@ -1,98 +1,95 @@
-import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
-import FirebaseQuery from "../../../firebase/firebaseQuery";
-import { PlacementState } from "../types";
-import { StudentPlacementData } from "../../../typeDefinitions";
-
-const initialState: PlacementState = {
-    status: "",
-    lastPlacement: undefined,
-    values: {}
-}
-
-
-  export const updateCompletedStudentPlacement = createAsyncThunk(
-    "completedStudentPlacements/updateStudentPlacement",
-    async ({ placementId, attributes }:{placementId: string, attributes: Partial<StudentPlacementData>}, {rejectWithValue}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            await firebaseQuery.update(["placements", placementId], attributes);
-            return {attributes, placementId}
-            
-        } catch(error) {
-            return rejectWithValue(error);
-        }
-    }
-  );
-
-  export const deleteCompletedStudentPlacement = createAsyncThunk(
-    "completedStudentPlacements/deleteStudentPlacement",
-    async ({placementId}:{placementId: string}, { rejectWithValue}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            await firebaseQuery.delete(["placements", placementId]);
-            return placementId
-        } catch(error) {
-            return rejectWithValue(error);
-        }
-    }
-  );
-  
-
-
-export const completedStudentPlacementsSlice = createSlice({
-    name: "completedStudentPlacements",
-    initialState,
-
-    reducers: {
-        setCompletedStudentPlacements: (state, action) => {
-            state.values = action.payload
-        },
-
-        setCompletedStatus: (state, action) => {
-            state.status = action.payload
-        },
-
-        addCompletedStudentPlacements: (state, action) => {
-            state.values = {...state.values, ...action.payload}
-        },
-
-        setCompletedIsDraft: (state, action) => {
-            const {placementId, draft} = action.payload
-            state.values[placementId].draft = draft
-        },
-
-        addCompletedStudentPlacement: (state, action) => {
-            const {placement, placementId} = action.payload
-            const newPlacements = {...state.values};
-            newPlacements[placementId] = placement;
-            state.values = Object.fromEntries(Object.entries(newPlacements).sort(([, a], [, b]) => b.startDate > a.endDate ? 1 : -1));
-        },
-
-        setLastCompletedPlacement: (state, action) => {
-            state.lastPlacement = action.payload
-        }
-    },
-
-    
-    extraReducers(builder){
-        builder
-        .addCase(updateCompletedStudentPlacement.fulfilled, (state, action) => {
-            const {attributes, placementId} = action.payload
-            if (!placementId) return
-            state.values[placementId] = {...state.values[placementId], ...attributes};
-        })
-
-
-        .addCase(deleteCompletedStudentPlacement.fulfilled, (state, action) => {
-            const placementIdToDelete = action.payload;
-            const newPlacements = { ...state, values: { ...state.values } };
-            delete newPlacements.values[placementIdToDelete];
-            return newPlacements;
-        })
-    }
-})  
-
-
-export const {addCompletedStudentPlacements, addCompletedStudentPlacement, setCompletedStudentPlacements, setLastCompletedPlacement, setCompletedStatus, setCompletedIsDraft} = completedStudentPlacementsSlice.actions
-
+import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
+import FirebaseQuery from "../../../firebase/firebaseQuery";
+import { PlacementState } from "../types";
+
+const initialState: PlacementState = {
+    status: "",
+    lastPlacement: undefined,
+    values: {}
+}
+
+
+  export const updateCompletedStudentPlacement = createAsyncThunk(
+    "completedStudentPlacements/updateStudentPlacement",
+    async ({ placementId, attributes }:{placementId: string, attributes: any}, {rejectWithValue}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            await firebaseQuery.update(["placements", placementId], attributes);
+            return {attributes, placementId}
+            
+        } catch(error) {
+            return rejectWithValue(error);
+        }
+    }
+  );
+
+  export const deleteCompletedStudentPlacement = createAsyncThunk(
+    "completedStudentPlacements/deleteStudentPlacement",
+    async ({placementId}:{placementId: string}, { rejectWithValue}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            await firebaseQuery.delete(["placements", placementId]);
+            return placementId
+        } catch(error) {
+            return rejectWithValue(error);
+        }
+    }
+  );
+  
+
+
+export const completedStudentPlacementsSlice = createSlice({
+    name: "completedStudentPlacements",
+    initialState,
+
+    reducers: {
+        setCompletedStudentPlacements: (state, action) => {
+            state.values = action.payload
+        },
+
+        setCompletedStatus: (state, action) => {
+            state.status = action.payload
+        },
+
+        addCompletedStudentPlacements: (state, action) => {
+            state.values = {...state.values, ...action.payload}
+        },
+
+        setCompletedIsDraft: (state, action) => {
+            const {placementId, draft} = action.payload
+            state.values[placementId].draft = draft
+        },
+
+        addCompletedStudentPlacement: (state, action) => {
+            const {placement, placementId} = action.payload
+            const newPlacements = {...state.values};
+            newPlacements[placementId] = placement;
+            state.values = Object.fromEntries(Object.entries(newPlacements).sort(([, a], [, b]) => b.startDate > a.endDate ? 1 : -1));
+        },
+
+        setLastCompletedPlacement: (state, action) => {
+            state.lastPlacement = action.payload
+        }
+    },
+
+    
+    extraReducers(builder){
+        builder
+        .addCase(updateCompletedStudentPlacement.fulfilled, (state, action) => {
+            state.values[action.payload.placementId] = { ...state.values[action.payload.placementId], ...action.payload.attributes };
+        })
+
+
+        .addCase(deleteCompletedStudentPlacement.fulfilled, (state, action) => {
+            const placementIdToDelete = action.payload;
+            const newPlacements = { ...state, values: { ...state.values } };
+            delete newPlacements.values[placementIdToDelete];
+            return newPlacements;
+        })
+    }
+})  
+
+
+export const {addCompletedStudentPlacements, addCompletedStudentPlacement, setCompletedStudentPlacements, setLastCompletedPlacement, setCompletedStatus, setCompletedIsDraft} = completedStudentPlacementsSlice.actions
+
 export default completedStudentPlacementsSlice.reducer;

package/src/features/placements/studentPlacements/upcomingStudentPlacementsSlice.ts

@@ -1,109 +1,109 @@
-import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
-import FirebaseQuery from "../../../firebase/firebaseQuery";
-import { PlacementState } from "../types";
-import { StudentPlacementData } from "../../../typeDefinitions";
-
-
-export interface UpcomingPlacementState extends PlacementState {
-    upcoming?: StudentPlacementData;
-}
-
-const initialState: UpcomingPlacementState = {
-    status: "",
-    lastPlacement: undefined,
-    upcoming: undefined,
-    values: {}
-}
-
-
-  export const updateUpcomingStudentPlacement = createAsyncThunk(
-    "upcomingStudentPlacements/updateStudentPlacement",
-    async ({ placementId, attributes }:{placementId: string, attributes: Partial<StudentPlacementData>}, {rejectWithValue}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            await firebaseQuery.update(["placements", placementId], attributes);
-            return {attributes, placementId}
-            
-        } catch(error) {
-            return rejectWithValue(error);
-        }
-    }
-  );
-
-  export const deleteUpcomingStudentPlacement = createAsyncThunk(
-    "upcomingStudentPlacements/deleteStudentPlacement",
-    async ({placementId}:{placementId: string}, { rejectWithValue}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            await firebaseQuery.delete(["placements", placementId]);
-            return placementId
-            
-        } catch(error) {
-            return rejectWithValue(error);
-        }
-    }
-  );
-  
-
-
-export const upcomingStudentsPlacementsSlice = createSlice({
-    name: "upcomingStudentsPlacements",
-    initialState,
-
-    reducers: {
-        setUpcomingStudentPlacements: (state, action) => {
-            state.values = action.payload
-        },
-
-        setUpcomingStatus: (state, action) => {
-            state.status = action.payload
-        },
-
-        setUpcoming: (state, action) => {
-            state.upcoming = action.payload
-        },
-
-        setUpcomingIsDraft: (state, action) => {
-            const {placementId, draft} = action.payload
-            state.values[placementId].draft = draft
-        },
-
-        addUpcomingStudentPlacements: (state, action) => {
-            state.values = {...state.values, ...action.payload}
-        },
-
-        addUpcomingStudentPlacement: (state, action) => {
-            const {placement, placementId} = action.payload
-            const newPlacements = {...state.values};
-            newPlacements[placementId] = placement;
-            state.values = Object.fromEntries(Object.entries(newPlacements).sort(([, a], [, b]) => b.startDate > a.endDate ? 1 : -1));
-        },
-
-        setLastUpcomingPlacement: (state, action) => {
-            state.lastPlacement = action.payload
-        }
-    },
-
-    
-    extraReducers(builder){
-        builder
-        .addCase(updateUpcomingStudentPlacement.fulfilled, (state, action) => {
-            const {attributes, placementId} = action.payload
-            if (!placementId) return
-            state.values[placementId] = {...state.values[placementId], ...attributes};
-        })
-
-
-        .addCase(deleteUpcomingStudentPlacement.fulfilled, (state, action) => {
-            const placementIdToDelete = action.payload;
-            const newPlacements = { ...state, values: { ...state.values } };
-            delete newPlacements.values[placementIdToDelete];
-            return newPlacements;
-        })
-    }
-})  
-
-
-export const {addUpcomingStudentPlacements, addUpcomingStudentPlacement, setUpcomingStudentPlacements, setLastUpcomingPlacement, setUpcoming, setUpcomingStatus, setUpcomingIsDraft} = upcomingStudentsPlacementsSlice.actions
-
+import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
+import FirebaseQuery from "../../../firebase/firebaseQuery";
+import { PlacementState } from "../types";
+import { StudentPlacementData } from "../../../typeDefinitions";
+
+
+export interface UpcomingPlacementState extends PlacementState {
+    upcoming?: StudentPlacementData;
+}
+
+const initialState: UpcomingPlacementState = {
+    status: "",
+    lastPlacement: undefined,
+    upcoming: undefined,
+    values: {}
+}
+
+
+  export const updateUpcomingStudentPlacement = createAsyncThunk(
+    "upcomingStudentPlacements/updateStudentPlacement",
+    async ({ placementId, attributes }:{placementId: string, attributes: any}, {rejectWithValue}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            await firebaseQuery.update(["placements", placementId], attributes);
+            return {attributes, placementId}
+            
+        } catch(error) {
+            return rejectWithValue(error);
+        }
+    }
+  );
+
+  export const deleteUpcomingStudentPlacement = createAsyncThunk(
+    "upcomingStudentPlacements/deleteStudentPlacement",
+    async ({placementId}:{placementId: string}, { rejectWithValue}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            await firebaseQuery.delete(["placements", placementId]);
+            return placementId
+            
+        } catch(error) {
+            return rejectWithValue(error);
+        }
+    }
+  );
+  
+
+
+export const upcomingStudentsPlacementsSlice = createSlice({
+    name: "upcomingStudentsPlacements",
+    initialState,
+
+    reducers: {
+        setUpcomingStudentPlacements: (state, action) => {
+            state.values = action.payload
+        },
+
+        setUpcomingStatus: (state, action) => {
+            state.status = action.payload
+        },
+
+        setUpcoming: (state, action) => {
+            state.upcoming = action.payload
+        },
+
+        setUpcomingIsDraft: (state, action) => {
+            const {placementId, draft} = action.payload
+            state.values[placementId].draft = draft
+        },
+
+        addUpcomingStudentPlacements: (state, action) => {
+            state.values = {...state.values, ...action.payload}
+        },
+
+        addUpcomingStudentPlacement: (state, action) => {
+            const {placement, placementId} = action.payload
+            const newPlacements = {...state.values};
+            newPlacements[placementId] = placement;
+            state.values = Object.fromEntries(Object.entries(newPlacements).sort(([, a], [, b]) => b.startDate > a.endDate ? 1 : -1));
+        },
+
+        setLastUpcomingPlacement: (state, action) => {
+            state.lastPlacement = action.payload
+        }
+    },
+
+    
+    extraReducers(builder){
+        builder
+        .addCase(updateUpcomingStudentPlacement.fulfilled, (state, action) => {
+            const {attributes, placementId} = action.payload
+            if (!placementId) return
+            state.values[placementId] = attributes;
+        })
+
+
+        .addCase(deleteUpcomingStudentPlacement.fulfilled, (state, action) => {
+            const placementIdToDelete = action.payload;
+            const newPlacements = { ...state, values: { ...state.values } };
+            delete newPlacements.values[placementIdToDelete];
+            return newPlacements;
+        })
+    }
+})  
+
+
+export const {addUpcomingStudentPlacements, addUpcomingStudentPlacement, setUpcomingStudentPlacements, setLastUpcomingPlacement, setUpcoming, setUpcomingStatus, setUpcomingIsDraft} = upcomingStudentsPlacementsSlice.actions
+
 export default upcomingStudentsPlacementsSlice.reducer;

package/src/features/placements/studentPlacements/useStudentPlacements.tsx

@@ -1,33 +1,33 @@
-import { QueryConstraint, where } from "firebase/firestore";
-import { useEffect, useState } from "react";
-import FirebaseQuery from "../../../firebase/firebaseQuery";
-import { getPlacementsWhere } from "../../../firebase/readDatabase";
-import { convertDate } from "../../../firebase/util";
-import { useStudentPlacementList } from "../../../hooks";
-import { StudentPlacementData, UserData } from "../../../typeDefinitions";
-
-export function useStudentPlacements({user, uid, queryConstraint}: {user: UserData, uid?: string, queryConstraint?: QueryConstraint[]}){    const firebaseQuery = new FirebaseQuery()
-    const [activePlacement, setActivePlacement] = useState<StudentPlacementData>();
-    const {placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, reset} = useStudentPlacementList({...{user: user as UserData, uid: uid || user?.id, queryConstraint}})
-
-    useEffect(() => {
-        firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", user?.id)]).then((docs) => {
-             const d = {...docs as {[key:string]: StudentPlacementData}}
-             setActivePlacement(d[Object.keys(d)[0]] || undefined);
-         });
-     }, [user?.id]);
-
-    const getUserPlacements = async () => {
-        return await getPlacementsWhere({w: where("uid", "==", user?.id)})
-    }
-
-    const getPlacementsStart = async (start: Date, end: Date) => {
-        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("startDate", ">=", convertDate(start, "dbstring")), where("startDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
-    }
-
-    const getPlacementsEnd = async (end: Date) => {
-        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("endDate", ">=", convertDate(end, "dbstring")), where("endDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
-    }
-
-    return ({...{placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, resetPlacements: reset, getUserPlacements, getPlacementsStart, getPlacementsEnd, activePlacement}});
-}
+import { QueryConstraint, where } from "firebase/firestore";
+import { useEffect, useState } from "react";
+import FirebaseQuery from "../../../firebase/firebaseQuery";
+import { getPlacementsWhere } from "../../../firebase/readDatabase";
+import { convertDate } from "../../../firebase/util";
+import { useStudentPlacementList } from "../../../hooks";
+import { StudentPlacementData, UserData } from "../../../typeDefinitions";
+
+export function useStudentPlacements({user, uid, queryConstraint}: {user: UserData, uid?: string, queryConstraint?: QueryConstraint[]}){    const firebaseQuery = new FirebaseQuery()
+    const [activePlacement, setActivePlacement] = useState<StudentPlacementData>();
+    const {placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, reset} = useStudentPlacementList({...{user: user as UserData, uid: uid || user?.id, queryConstraint}})
+
+    useEffect(() => {
+        firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", user?.id)]).then((docs) => {
+             const d = {...docs as {[key:string]: StudentPlacementData}}
+             setActivePlacement(d[Object.keys(d)[0]] || undefined);
+         });
+     }, [user?.id]);
+
+    const getUserPlacements = async () => {
+        return await getPlacementsWhere({w: where("uid", "==", user?.id)})
+    }
+
+    const getPlacementsStart = async (start: Date, end: Date) => {
+        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("startDate", ">=", convertDate(start, "dbstring")), where("startDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
+    }
+
+    const getPlacementsEnd = async (end: Date) => {
+        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("endDate", ">=", convertDate(end, "dbstring")), where("endDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
+    }
+
+    return ({...{placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, resetPlacements: reset, getUserPlacements, getPlacementsStart, getPlacementsEnd, activePlacement}});
+}

package/src/features/placements/types.ts

@@ -1,11 +1,11 @@
-
-import { DocumentData, QueryDocumentSnapshot } from "firebase/firestore"
-import { StudentPlacementData } from "../../typeDefinitions"
-
-export type PlacementState = {
-    status: string
-    lastPlacement: QueryDocumentSnapshot<DocumentData> | undefined,
-    values: {
-        [key: string]: StudentPlacementData
-    }
+
+import { DocumentData, QueryDocumentSnapshot } from "firebase/firestore"
+import { StudentPlacementData } from "../../typeDefinitions"
+
+export type PlacementState = {
+    status: string
+    lastPlacement: QueryDocumentSnapshot<DocumentData> | undefined,
+    values: {
+        [key: string]: StudentPlacementData
+    }
 }

package/src/features/referrals/useReferrals.tsx

@@ -1,57 +1,57 @@
-import { documentId, where } from "firebase/firestore";
-import { useState } from "react";
-import FirebaseQuery from "../../firebase/firebaseQuery";
-import { UserData } from "../../typeDefinitions";
-
-export function useReferrals({user}: {user: UserData}){
-    const firebaseQuery = new FirebaseQuery();
-    const [showNameConsent, setShowNameConsent] = useState<boolean>(user?.shareNameWithReferralLeaderboardConsent === undefined ? true : false);
-
-    const getReferralCode = async (fiveLetterWords: string[]): Promise<string> => {
-      var potentialWord = fiveLetterWords[Math.floor(Math.random()*fiveLetterWords.length)];
-      const existingReferral = await firebaseQuery.getDocsWhere("referrals", where(documentId(), "==", potentialWord));
-
-      if (Object.keys(existingReferral || {}).length > 0) {
-          return await getReferralCode(fiveLetterWords);
-      }
-
-      await firebaseQuery.set(["referrals", potentialWord], {
-          name: user?.id,
-          expiry: new Date(2040,10,30),
-          volume: 1000,
-          product: "students"
-
-      }).then(() => {
-        if (!user) return;
-        firebaseQuery.update(["users", user.id], {
-          referralCode: potentialWord
-        })
-        //dispatch(updateUser({userId: user.id, attributes: {referralCode: potentialWord}}))
-    //    dispatch(setUser((state: UserData) => ({...state, referralCode: potentialWord})))
-      })
-
-      return potentialWord;
-    }
-
-    const consent = async (consent: boolean) => {
-      if (!user) return
-
-      try {
-        await firebaseQuery.update(["users", user.id], {
-            shareNameWithReferralLeaderboardConsent: consent,
-            shareNameWithReferralLeaderboardConsentDate: (new Date()).toISOString()
-        })
-        // dispatch(updateUser({userId: user.id, attributes: { 
-        //   shareNameWithReferralLeaderboardConsent: consent,
-        //   shareNameWithReferralLeaderboardConsentDate: (new Date()).toISOString()}
-        // }))
-      }
-       catch(error) {
-        console.log(error)
-      }
-      setShowNameConsent(false);
-  }
-
-    return ({...{getReferralCode, showNameConsent, setShowNameConsent, consent}})
-    
+import { documentId, where } from "firebase/firestore";
+import { useState } from "react";
+import FirebaseQuery from "../../firebase/firebaseQuery";
+import { UserData } from "../../typeDefinitions";
+
+export function useReferrals({user}: {user: UserData}){
+    const firebaseQuery = new FirebaseQuery();
+    const [showNameConsent, setShowNameConsent] = useState<boolean>(user?.shareNameWithReferralLeaderboardConsent === undefined ? true : false);
+
+    const getReferralCode = async (fiveLetterWords: string[]): Promise<string> => {
+      var potentialWord = fiveLetterWords[Math.floor(Math.random()*fiveLetterWords.length)];
+      const existingReferral = await firebaseQuery.getDocsWhere("referrals", where(documentId(), "==", potentialWord));
+
+      if (Object.keys(existingReferral || {}).length > 0) {
+          return await getReferralCode(fiveLetterWords);
+      }
+
+      await firebaseQuery.set(["referrals", potentialWord], {
+          name: user?.id,
+          expiry: new Date(2040,10,30),
+          volume: 1000,
+          product: "students"
+
+      }).then(() => {
+        if (!user) return;
+        firebaseQuery.update(["users", user.id], {
+          referralCode: potentialWord
+        })
+        //dispatch(updateUser({userId: user.id, attributes: {referralCode: potentialWord}}))
+    //    dispatch(setUser((state: UserData) => ({...state, referralCode: potentialWord})))
+      })
+
+      return potentialWord;
+    }
+
+    const consent = async (consent: boolean) => {
+      if (!user) return
+
+      try {
+        await firebaseQuery.update(["users", user.id], {
+            shareNameWithReferralLeaderboardConsent: consent,
+            shareNameWithReferralLeaderboardConsentDate: (new Date()).toISOString()
+        })
+        // dispatch(updateUser({userId: user.id, attributes: { 
+        //   shareNameWithReferralLeaderboardConsent: consent,
+        //   shareNameWithReferralLeaderboardConsentDate: (new Date()).toISOString()}
+        // }))
+      }
+       catch(error) {
+        console.log(error)
+      }
+      setShowNameConsent(false);
+  }
+
+    return ({...{getReferralCode, showNameConsent, setShowNameConsent, consent}})
+    
 }