Dev

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "TAMU SHPE",
     "slug": "TAMU-SHPE",
-    "version": "1.0.14",
+    "version": "1.0.15",
     "owner": "tamu-shpe",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
@@ -54,7 +54,7 @@
       "permissions": [
         "android.permission.RECORD_AUDIO"
       ],
-      "versionCode": 85,
+      "versionCode": 87,
       "userInterfaceStyle": "automatic",
       "config": {
         "googleMaps": {

functions/src/index.ts

@@ -2,11 +2,11 @@ export { notifyUpcomingEvents, sendNotificationOfficeHours, sendNotificationMemb
 export { updateUserPoints, updateAllUserPoints, scheduledUpdateAllPoints } from "./pointSheet";
 export { updateCommitteeCount, scheduleCommitteeCount } from "./committees";
 // export { resetOfficeScheduler } from "./officeReset";
+export { isUserInBlacklist } from "./restriction";
 export { resetOfficeOnCall } from "./officeReset";
 export { zipResume } from "./resume";
 export { updateUserRole } from "./roles";
 export { checkUsernameUniqueness } from "./checkUsername";
 export { eventSignIn, eventSignOut, eventLogDelete, addInstagramPoints } from "./events";
-export { isUserInBlacklist } from "./restriction";
 export { calculateMOTM } from "./points";
 export { scheduledFirestoreExport, httpFirestoreExport, resetPointsWithPassword } from "./backup"

functions/src/pushNotification.ts

@@ -189,7 +189,7 @@ export const sendNotificationResumeConfirm = functions.https.onCall(async (data,
 });
 
 
-export const notifyUpcomingEvents = functions.pubsub.schedule('every 5 minutes').onRun(async (context) => {
+export const notifyUpcomingEvents = functions.pubsub.schedule('every 30 minutes').onRun(async (context) => {
     console.log('Running Event Notification Sent');
     const now = new Date();
     const oneHourLater = new Date(now.getTime() + 60 * 60 * 1000);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "shpe-app",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "scripts": {
     "start": "npx expo start --dev-client",
     "test": "jest --coverage=true --verbose --bail --config ./jest.config.ts",

src/api/firebaseUtils.ts

@@ -1462,67 +1462,6 @@ export const getMOTM = async () => {
 // Misc. Utilities
 // ============================================================================
 
-export const getWatchlist = async () => {
-    const docRef = doc(db, "restrictions/watchlist");
-    const docSnap = await getDoc(docRef);
-    return docSnap.exists() ? docSnap.data().list : [];
-};
-
-export const getBlacklist = async () => {
-    const docRef = doc(db, "restrictions/blacklist");
-    const docSnap = await getDoc(docRef);
-    return docSnap.exists() ? docSnap.data().list : [];
-};
-
-
-export const addToWatchlist = async (userToAdd: PublicUserInfo) => {
-    const currentWatchlist = await getWatchlist() || [];
-
-    if (!currentWatchlist.some((user: PublicUserInfo) => user.uid === userToAdd.uid)) {
-        const updatedWatchlist = [...currentWatchlist, userToAdd];
-        await setDoc(doc(db, "restrictions/watchlist"), { list: updatedWatchlist }, { merge: true });
-    }
-};
-
-export const addToBlacklist = async (userToAdd: PublicUserInfo) => {
-    const currentBlacklist = await getBlacklist() || [];
-
-    if (!currentBlacklist.some((user: PublicUserInfo) => user.uid === userToAdd.uid)) {
-        const updatedBlacklist = [...currentBlacklist, userToAdd];
-        await setDoc(doc(db, "restrictions/blacklist"), { list: updatedBlacklist }, { merge: true });
-    }
-};
-
-export const removeFromWatchlist = async (userToRemove: PublicUserInfo) => {
-    const currentWatchlist = await getWatchlist() || [];
-
-    const updatedWatchlist = currentWatchlist.filter((user: PublicUserInfo) => user.uid !== userToRemove.uid);
-
-    await setDoc(doc(db, "restrictions/watchlist"), { list: updatedWatchlist }, { merge: true });
-};
-
-export const removeFromBlacklist = async (userToRemove: PublicUserInfo) => {
-    const currentBlacklist = await getBlacklist() || [];
-
-    const updatedBlacklist = currentBlacklist.filter((user: PublicUserInfo) => user.uid !== userToRemove.uid);
-
-    await setDoc(doc(db, "restrictions/blacklist"), { list: updatedBlacklist }, { merge: true });
-};
-
-export const isUserInBlacklist = async (uid: string): Promise<boolean> => {
-    const blacklistDocRef = doc(db, "restrictions/blacklist");
-    const docSnap = await getDoc(blacklistDocRef);
-
-    if (docSnap.exists()) {
-        const blacklist = docSnap.data().list;
-        return blacklist.some((user: PublicUserInfo) => user.uid === uid);
-    } else {
-        // Blacklist document does not exist or has no data
-        return false;
-    }
-};
-
-
 export const submitFeedback = async (feedback: string, userInfo: User) => {
     try {
         await addDoc(collection(db, 'feedback'), {

src/navigation/HomeStack.tsx

@@ -8,7 +8,6 @@ import AdminDashboard from "../screens/admin/AdminDashboard";
 import MOTMEditor from "../screens/admin/MOTMEditor";
 import ResumeDownloader from "../screens/admin/ResumeDownloader";
 import LinkEditor from "../screens/admin/LinkEditor";
-import RestrictionsEditor from "../screens/admin/RestrictionsEditor";
 import MemberSHPEConfirm from "../screens/admin/MemberSHPEConfirm";
 import ResumeConfirm from "../screens/admin/ResumeConfirm";
 import ShirtConfirm from "../screens/admin/ShirtConfirm";
@@ -54,7 +53,6 @@ const HomeStack = () => {
                 <Stack.Screen name="MOTMEditor" component={MOTMEditor} />
                 <Stack.Screen name="ResumeDownloader" component={ResumeDownloader} />
                 <Stack.Screen name="LinkEditor" component={LinkEditor} />
-                <Stack.Screen name="RestrictionsEditor" component={RestrictionsEditor} />
                 <Stack.Screen name="MemberSHPEConfirm" component={MemberSHPEConfirm} />
                 <Stack.Screen name="ResumeConfirm" component={ResumeConfirm} />
                 <Stack.Screen name="ShirtConfirm" component={ShirtConfirm} />

src/navigation/index.tsx

@@ -76,32 +76,6 @@ const RootNavigator = () => {
     //     }
     // }, [userInfo]);
 
-
-    useEffect(() => {
-        const handleBannedUser = async () => {
-            if (!auth.currentUser?.uid) {
-                return;
-            }
-
-            const functions = getFunctions();
-            const isUserInBlacklist = httpsCallable<{ uid: string }, { isInBlacklist: boolean }>(functions, 'isUserInBlacklist');
-            try {
-                const checkBlackListResponse = await isUserInBlacklist({ uid: auth.currentUser?.uid! });
-
-                if (checkBlackListResponse.data.isInBlacklist) {
-                    signOutUser(true);
-                    alert("You have been banned from the app");
-                    return;
-                }
-            } catch (error) {
-                console.error('Error during user authentication:', error);
-            }
-
-        }
-
-        handleBannedUser();
-    }, [auth.currentUser?.uid])
-
     if (userLoading) {
         return <RenderUserLoading />;
     }

src/screens/admin/AdminDashboard.tsx

@@ -207,24 +207,7 @@ const AdminDashboard = ({ navigation }: NativeStackScreenProps<HomeStackParams>)
                             <Text className='text-xl font-semibold text-black text-center'>App Feedback</Text>
                         </TouchableOpacity>
                     </View>
-                    <View className='flex-row justify-between mt-4'>
-                        <TouchableOpacity
-                            className={`bg-secondary-blue-2 items-center justify-center h-20 rounded-lg w-[48%]`}
-                            style={{
-                                shadowColor: "#000",
-                                shadowOffset: {
-                                    width: 0,
-                                    height: 2,
-                                },
-                                shadowOpacity: 0.25,
-                                shadowRadius: 3.84,
-                                elevation: 5,
-                            }}
-                            onPress={() => navigation.navigate('RestrictionsEditor')}
-                        >
-                            <Text className='text-xl font-semibold text-black text-center'>App Restriction</Text>
-                        </TouchableOpacity>
-                    </View>
+
 
                     <Text className={`mt-8 font-bold text-2xl ${darkMode ? "text-white" : "text-black"}`}>Developer Tools</Text>
                     <View>