placementt-core 1.20.211 → 11.10.151

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}})
+    
 }

package/src/features/updates/useUpdates.tsx

@@ -1,38 +1,38 @@
-import FirebaseQuery from "../../firebase/firebaseQuery";
-import {orderBy, limit, arrayUnion} from "firebase/firestore";
-import {useState}  from "react";
-import { UserData } from "../../typeDefinitions";
-
-export function useUpdates({user}: {user: UserData}){
-   const [active, setActive] = useState<{title: string, body: string, id: string}>();
-   const firebaseQuery = new FirebaseQuery();
-
-   const fetchUpdates = async () => {
-    try {
-        const docs = await firebaseQuery.getDocsWhere("updates", [orderBy("created", "desc"), limit(1)])
-        const item = Object.values(docs as {[key:string]: {title: string, body: string, id: string}})[0];
-        if (!user?.readUpdates?.includes(item.id)) setActive(item);
-
-    } catch(error) {
-         console.log(error)
-    }
-    
-}
-  
-
-    const dismiss = () => {
-        if (!user) return
-
-        try {
-            firebaseQuery.update(["users", user.id], {readUpdates: arrayUnion(active?.id)})
-            //dispatch(updateUser({userId: user.id, attributes: {readUpdates: arrayUnion(active?.id)}}))
-            setActive(undefined);
-        }
-        catch(error) {
-            console.log(error)
-        }
-    }
-
-  return ({...{active, dismiss, fetchUpdates}})
-
-}  
+import FirebaseQuery from "../../firebase/firebaseQuery";
+import {orderBy, limit, arrayUnion} from "firebase/firestore";
+import {useState}  from "react";
+import { UserData } from "../../typeDefinitions";
+
+export function useUpdates({user}: {user: UserData}){
+   const [active, setActive] = useState<{title: string, body: string, id: string}>();
+   const firebaseQuery = new FirebaseQuery();
+
+   const fetchUpdates = async () => {
+    try {
+        const docs = await firebaseQuery.getDocsWhere("updates", [orderBy("created", "desc"), limit(1)])
+        const item = Object.values(docs as {[key:string]: {title: string, body: string, id: string}})[0];
+        if (!user?.readUpdates?.includes(item.id)) setActive(item);
+
+    } catch(error) {
+         console.log(error)
+    }
+    
+}
+  
+
+    const dismiss = () => {
+        if (!user) return
+
+        try {
+            firebaseQuery.update(["users", user.id], {readUpdates: arrayUnion(active?.id)})
+            //dispatch(updateUser({userId: user.id, attributes: {readUpdates: arrayUnion(active?.id)}}))
+            setActive(undefined);
+        }
+        catch(error) {
+            console.log(error)
+        }
+    }
+
+  return ({...{active, dismiss, fetchUpdates}})
+
+}  

package/src/firebase/firebase.tsx

@@ -1,138 +1,144 @@
-import {onAuthStateChanged, signInWithEmailAndPassword} from "firebase/auth";
-import {httpsCallable} from "firebase/functions";
-import {SetStateAction} from "react";
-import {getUser} from "./readDatabase";
-import {UserData} from "../typeDefinitions";
-import FirebaseQuery from "./firebaseQuery";
-import {auth, functions} from "./firebaseConfig";
-import {addJob, setJobStatus} from "../features/jobs/jobsSlice";
-import { useAppDispatch } from "../reduxHooks";
-
-
-export const authListener = (setUser: SetStateAction<any>) => {
-    return onAuthStateChanged(auth, (aUser) => {
-        if (!aUser) {
-            setUser(false)
-            return;
-        }
-
-        getUser(aUser.uid, setUser);
-    });
-};
-
-export const login = async (credentials: {email: string, password: string}) => {
-    console.log("creds", credentials);
-    return signInWithEmailAndPassword(auth, credentials.email, credentials.password);
-};
-
-export type RegistrationData = {
-    email: string,
-    passwordOne: string,
-    instituteName: string,
-    "address-line1": string,
-    "address-line2": string,
-    locality: string,
-    postal_code: string,
-    country: string,
-    first_name: string,
-    family_name: string
-}
-
-export const register = async (credentials: RegistrationData, type:"Institute"|"Provider"|"Student") => {
-    console.log("creds", credentials);
-    return await executeCallable(`registration-register${type}`, credentials).catch((e) => {
-        console.log("Error in regsiter", e);
-        throw e;
-    }).then(async (res) => {
-        if (type === "Student") {
-            await login({email: credentials.email, password: credentials.passwordOne});
-        }
-        return (res.data as {msg: {uid: string}}).msg.uid as string;
-    });
-};
-
-export const executeCallable = async (functionName: string, data: unknown) => {
-    const funcCallable = httpsCallable(functions, functionName);
-    return await funcCallable(data);
-};
-
-
-export function useExecuteCallableJob({user}:{user: UserData}) {
-    type CallableFunctionJobs = "userManagement-addUsers"|"userManagement-activateUsers"|
-    "userManagement-deactivateUsers"|"userManagement-deleteUsers"|"admissions-createCohort"|"userManagement-uploadAnalytics"|
-    "placementListing-add"
-    const dispatch = useAppDispatch();
-
-    const execute = async (functionName:CallableFunctionJobs, data:{[key:string]:unknown}) => {
-        const getCode = () => {
-            switch (functionName) {
-            case "userManagement-addUsers":
-                return {
-                    title: "Add users",
-                    description: `Adding ${(data as {users:unknown[]}).users.length} ${(data as {userType:string}).userType.toLowerCase()}`,
-                };
-            case "userManagement-activateUsers":
-                return {
-                    title: "Activating users",
-                    description: `Attempting activation of ${Array.isArray((data as {users:{[key:string]:unknown}}).users) ?
-                        "multiple" : Object.entries((data as {users:{[key: string]: UserData}}).users).length} users.`,
-                };
-            case "userManagement-deactivateUsers":
-                return {
-                    title: "Deactivating users",
-                    description: `Deactivating ${Array.isArray((data as {users:{[key:string]:unknown}}).users) ?
-                        "multiple" : Object.entries((data as {users:{[key: string]: UserData}}).users).length || "multiple"} users.`,
-                };
-            case "userManagement-deleteUsers":
-                return {
-                    title: "Deleting users",
-                    description: `Attempting deletion of ${Array.isArray((data as {users:{[key:string]:unknown}}).users) ?
-                        "multiple" : Object.entries((data as {users:{[key: string]: UserData}}).users).length || "multiple"} users.`,
-                };
-            case "placementListing-add":
-                return {
-                    title: "Adding placements",
-                    description: `Attempting addition of ${(data as {data:[]}).data.length} placements`,
-                };
-            default:
-                return;
-            }
-        };
-
-        const date = new Date();
-        const firebaseQuery = new FirebaseQuery();
-
-        const jobObject = {
-            title: getCode()?.title,
-            description: getCode()?.description,
-            status: "processing",
-            viewedBy: [],
-            started: date.toISOString(),
-            updated: date.toISOString(),
-            oId: user.oId,
-            product: user.product,
-        };
-
-        const jobId = (await firebaseQuery.add(["jobs"], jobObject)).id;
-
-        console.log("jobId", jobId);
-        dispatch(addJob({
-            jobId: jobId,
-            job: jobObject,
-        }));
-
-        const items = {...data, jobId: jobId};
-
-        const funcCallable = httpsCallable(functions, functionName);
-        console.log(items);
-        funcCallable(items).then(() => {
-            dispatch(setJobStatus({
-                jobId: jobId,
-                status: "success",
-            }));
-        });
-        return;
-    };
-
-    return {execute};
-}
+import {onAuthStateChanged, signInWithEmailAndPassword} from "firebase/auth";
+import {httpsCallable} from "firebase/functions";
+import {SetStateAction} from "react";
+import {getUser} from "./readDatabase";
+import {UserData} from "../typeDefinitions";
+import FirebaseQuery from "./firebaseQuery";
+import {auth, functions} from "./firebaseConfig";
+import {addJob, setJobStatus} from "../features/jobs/jobsSlice";
+import { useAppDispatch } from "../reduxHooks";
+
+
+export const authListener = (setUser: SetStateAction<any>) => {
+    return onAuthStateChanged(auth, (aUser) => {
+        if (!aUser) {
+            console.log("User not logged in.");
+            setUser(false)
+            return;
+        }
+        console.log("User logged in.");
+        getUser(aUser.uid, setUser);
+    });
+};
+
+export const login = async (credentials: {email: string, password: string}) => {
+    console.log("creds", credentials);
+    return signInWithEmailAndPassword(auth, credentials.email, credentials.password);
+};
+
+export type RegistrationData = {
+    email: string,
+    passwordOne: string,
+    instituteName: string,
+    "address-line1": string,
+    "address-line2": string,
+    locality: string,
+    postal_code: string,
+    country: string,
+    first_name: string,
+    family_name: string
+}
+
+export const register = async (credentials: RegistrationData, type:"Institute"|"Provider"|"Student") => {
+    console.log("creds", credentials);
+    return await executeCallable(`registration-register${type}`, credentials).catch((e) => {
+        console.log("Error in regsiter", e);
+        throw e;
+    }).then(async (res) => {
+        if (type === "Student") {
+            await login({email: credentials.email, password: credentials.passwordOne});
+        }
+        return (res.data as { msg: {uid: string}}).msg.uid as string;
+    });
+};
+
+export const executeCallable = async (functionName: string, data: unknown) => {
+    const funcCallable = httpsCallable(functions, functionName);
+    const res = await funcCallable(data).catch((e) => {
+        console.log("callableError", functionName, e);
+        throw e;
+    });
+
+    return res as {data: any};
+};
+
+
+export function useExecuteCallableJob({user}:{user: UserData}) {
+    type CallableFunctionJobs = "userManagement-addUsers"|"userManagement-activateUsers"|
+    "userManagement-deactivateUsers"|"userManagement-deleteUsers"|"admissions-createCohort"|"userManagement-uploadAnalytics"|
+    "placementListing-add"
+    const dispatch = useAppDispatch();
+
+    const execute = async (functionName:CallableFunctionJobs, data:{[key:string]:unknown}) => {
+        const getCode = () => {
+            switch (functionName) {
+            case "userManagement-addUsers":
+                return {
+                    title: "Add users",
+                    description: `Adding ${(data as {users:unknown[]}).users.length} ${(data as {userType:string}).userType.toLowerCase()}`,
+                };
+            case "userManagement-activateUsers":
+                return {
+                    title: "Activating users",
+                    description: `Attempting activation of ${Array.isArray((data as {users:{[key:string]:unknown}}).users) ?
+                        "multiple" : Object.entries((data as {users:{[key: string]: UserData}}).users).length} users.`,
+                };
+            case "userManagement-deactivateUsers":
+                return {
+                    title: "Deactivating users",
+                    description: `Deactivating ${Array.isArray((data as {users:{[key:string]:unknown}}).users) ?
+                        "multiple" : Object.entries((data as {users:{[key: string]: UserData}}).users).length || "multiple"} users.`,
+                };
+            case "userManagement-deleteUsers":
+                return {
+                    title: "Deleting users",
+                    description: `Attempting deletion of ${Array.isArray((data as {users:{[key:string]:unknown}}).users) ?
+                        "multiple" : Object.entries((data as {users:{[key: string]: UserData}}).users).length || "multiple"} users.`,
+                };
+            case "placementListing-add":
+                return {
+                    title: "Adding placements",
+                    description: `Attempting addition of ${(data as {data:[]}).data.length} placements`,
+                };
+            default:
+                return;
+            }
+        };
+
+        const date = new Date();
+        const firebaseQuery = new FirebaseQuery();
+
+        const jobObject = {
+            title: getCode()?.title,
+            description: getCode()?.description,
+            status: "processing",
+            viewedBy: [],
+            started: date.toISOString(),
+            updated: date.toISOString(),
+            oId: user.oId,
+            product: user.product,
+        };
+
+        const jobId = (await firebaseQuery.add(["jobs"], jobObject)).id;
+
+        console.log("jobId", jobId);
+        dispatch(addJob({
+            jobId: jobId,
+            job: jobObject,
+        }));
+
+        const items = {...data, jobId: jobId};
+
+        const funcCallable = httpsCallable(functions, functionName);
+        console.log(items);
+        funcCallable(items).then(() => {
+            dispatch(setJobStatus({
+                jobId: jobId,
+                status: "success",
+            }));
+        });
+        return;
+    };
+
+    return {execute};
+}

package/src/firebase/firebaseConfig.tsx

@@ -1,42 +1,45 @@
-/* eslint-disable no-multiple-empty-lines */
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import {getApp, getApps, initializeApp} from "firebase/app";
-import {getAuth, initializeAuth} from "firebase/auth";
-import {getFirestore} from "firebase/firestore";
-import {getFunctions} from "firebase/functions";
-import {getStorage} from "firebase/storage";
-import {getReactNativePersistence} from "./persistence";
-
-export const credentialsDev = {
-    apiKey: "AIzaSyBpGWwNsYsitD-yer3bS0jPe1jZgDCvfYI",
-    authDomain: "placementt-dev.firebaseapp.com",
-    projectId: "placementt-dev",
-    storageBucket: "placementt-dev.appspot.com",
-    messagingSenderId: "735359304180",
-    appId: "1:735359304180:web:0ffd3bb86db13e140339a1",
-    measurementId: "G-F34T7Y8YYT"
-};
-
-export const credentialsProd = {
-    apiKey: "AIzaSyBOSSi4iHxOoAS9tLAJUAC_46HlZ6-D5Ss",
-    authDomain: "placementt-dfa17.firebaseapp.com",
-    projectId: "placementt-dfa17",
-    storageBucket: "placementt-dfa17.appspot.com",
-    messagingSenderId: "728019353765",
-    appId: "1:728019353765:web:954b5547d62a6dd6a64d4c",
-    measurementId: "G-NW5YMC6JN8",
-};
-
-const firebaseConfig = !getApps().length ? initializeApp(process.env.NODE_ENV === "development" ? credentialsDev : credentialsProd) : getApp();
-
-initializeAuth(firebaseConfig, {
-    persistence: getReactNativePersistence(AsyncStorage),
-});
-
-
-export const auth = getAuth(firebaseConfig);
-export const db = getFirestore(firebaseConfig);
-export const functions = getFunctions(firebaseConfig, "europe-west2");
-export const storage = getStorage(firebaseConfig);
-
-
+/* eslint-disable no-multiple-empty-lines */
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import {getApp, getApps, initializeApp} from "firebase/app";
+import {getAuth, initializeAuth} from "firebase/auth";
+import {getFirestore, initializeFirestore} from "firebase/firestore";
+import {getFunctions} from "firebase/functions";
+import {getStorage} from "firebase/storage";
+import {getReactNativePersistence} from "./persistence";
+
+export const credentialsDev = {
+    apiKey: "AIzaSyBpGWwNsYsitD-yer3bS0jPe1jZgDCvfYI",
+    authDomain: "placementt-dev.firebaseapp.com",
+    projectId: "placementt-dev",
+    storageBucket: "placementt-dev.appspot.com",
+    messagingSenderId: "735359304180",
+    appId: "1:735359304180:web:0ffd3bb86db13e140339a1",
+    measurementId: "G-F34T7Y8YYT"
+};
+
+export const credentialsProd = {
+    apiKey: "AIzaSyBOSSi4iHxOoAS9tLAJUAC_46HlZ6-D5Ss",
+    authDomain: "placementt-dfa17.firebaseapp.com",
+    projectId: "placementt-dfa17",
+    storageBucket: "placementt-dfa17.appspot.com",
+    messagingSenderId: "728019353765",
+    appId: "1:728019353765:web:954b5547d62a6dd6a64d4c",
+    measurementId: "G-NW5YMC6JN8",
+};
+
+const firebaseConfig = !getApps().length ? initializeApp(process.env.NODE_ENV === "development" ? credentialsDev : credentialsProd) : getApp();
+
+initializeAuth(firebaseConfig, {
+    persistence: getReactNativePersistence(AsyncStorage),
+});
+
+initializeFirestore(firebaseConfig, {
+    ignoreUndefinedProperties: true,
+})
+
+export const auth = getAuth(firebaseConfig);
+export const db = getFirestore(firebaseConfig);
+export const functions = getFunctions(firebaseConfig, "europe-west2");
+export const storage = getStorage(firebaseConfig);
+
+