removing a player will now remove the corresponding pfp on the databa…

…se. (#270)

Utility.js

@@ -140,3 +140,7 @@ export function getTimezoneOffsetTime(time) {
   const localTime = time - timezoneOffset;
   return Math.floor(localTime / 86400000) * 86400000 + timezoneOffset;
 }
+
+export function getPfpName(teamId, userId) {
+  return `${teamId}_${userId}`;
+}

app/content/assignments/index.js

@@ -6,8 +6,8 @@ import ErrorComponent from "~/components/errorComponent";
 import Header from "~/components/header";
 import Loading from "~/components/loading";
 import { useAuthContext } from "~/context/Auth";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
 
 export default function Index() {
   const { currentUserId } = useAuthContext();

app/content/assignments/players.js

@@ -15,10 +15,10 @@ import RefreshInvalidate from "~/components/refreshInvalidate";
 import { useAlertContext } from "~/context/Alert";
 import { useAuthContext } from "~/context/Auth";
 import { useTimeContext } from "~/context/Time";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
+import { invalidateMultipleKeys } from "~/dbOperations/invalidateMultipleKeys";
 import { db } from "~/firebaseConfig";
-import { invalidateMultipleKeys } from "~/hooks/invalidateMultipleKeys";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
 
 function Index() {
   const navigation = useNavigation();

app/content/drill/[id]/description.js

@@ -9,8 +9,8 @@ import Loading from "~/components/loading";
 import RefreshInvalidate from "~/components/refreshInvalidate";
 
 import { useAuthContext } from "~/context/Auth";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
 
 export default function Description() {
   const drillId = useLocalSearchParams()["id"];

app/content/drill/[id]/index.js

@@ -12,8 +12,8 @@ import ErrorComponent from "~/components/errorComponent";
 import Header from "~/components/header";
 import Loading from "~/components/loading";
 import { useAuthContext } from "~/context/Auth";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
 
 export default function Index() {
   const [value, setValue] = React.useState("description");

app/content/drill/[id]/leaderboard.js

@@ -9,10 +9,10 @@ import EmptyScreen from "~/components/emptyScreen";
 import ErrorComponent from "~/components/errorComponent";
 import Loading from "~/components/loading";
 import RefreshInvalidate from "~/components/refreshInvalidate";
-import { useAllTimeRecords } from "~/hooks/useAllTimeRecords";
-import { useBestAttempts } from "~/hooks/useBestAttempts";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
+import { useAllTimeRecords } from "~/dbOperations/hooks/useAllTimeRecords";
+import { useBestAttempts } from "~/dbOperations/hooks/useBestAttempts";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
 
 function getLeaderboardRanks(
   orderedLeaderboard,

app/content/drill/[id]/statistics.js

@@ -3,8 +3,8 @@ import BarChartScreen from "~/components/barChart";
 import ErrorComponent from "~/components/errorComponent";
 import Loading from "~/components/loading";
 import { useAuthContext } from "~/context/Auth";
-import { useAttempts } from "~/hooks/useAttempts";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
+import { useAttempts } from "~/dbOperations/hooks/useAttempts";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
 
 export default function Stat() {
   const drillId = useLocalSearchParams()["id"];

app/content/drill/index.js

@@ -6,7 +6,7 @@ import DrillList from "~/components/drillList";
 import ErrorComponent from "~/components/errorComponent";
 import Header from "~/components/header";
 import Loading from "~/components/loading";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
 
 export default function Index() {
   const { assignedTime, id: drillId, currentTime } = useLocalSearchParams();

app/content/profile/drills/[id].js

@@ -7,8 +7,8 @@ import ErrorComponent from "~/components/errorComponent";
 import Header from "~/components/header";
 import Loading from "~/components/loading";
 import { useAuthContext } from "~/context/Auth";
-import { useAttempts } from "~/hooks/useAttempts";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
+import { useAttempts } from "~/dbOperations/hooks/useAttempts";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
 
 export default function Stat() {
   const navigation = useNavigation();

app/content/profile/index.js

@@ -19,15 +19,11 @@ import {
   Text,
   TouchableOpacity,
   View,
-  useWindowDimensions,
 } from "react-native";
 import { ActivityIndicator, Appbar, Switch } from "react-native-paper";
-import {
-  SafeAreaView,
-  useSafeAreaInsets,
-} from "react-native-safe-area-context";
+import { SafeAreaView } from "react-native-safe-area-context";
 import { themeColors } from "~/Constants";
-import { getErrorString } from "~/Utility";
+import { getErrorString, getPfpName } from "~/Utility";
 import ProfilePicture from "~/components/ProfilePicture";
 import BottomSheetWrapper from "~/components/bottomSheetWrapper";
 import DrillList from "~/components/drillList";
@@ -38,12 +34,12 @@ import Loading from "~/components/loading";
 import ProfileCard from "~/components/profileCard";
 import { useAlertContext } from "~/context/Alert";
 import { useAuthContext } from "~/context/Auth";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
+import { useEmailInfo } from "~/dbOperations/hooks/useEmailInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
+import { handleImageUpload } from "~/dbOperations/imageUpload";
+import { invalidateMultipleKeys } from "~/dbOperations/invalidateMultipleKeys";
 import { db } from "~/firebaseConfig";
-import { handleImageUpload } from "~/hooks/imageUpload";
-import { invalidateMultipleKeys } from "~/hooks/invalidateMultipleKeys";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
-import { useEmailInfo } from "~/hooks/useEmailInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
 
 function Index() {
   const { signOut, currentUserId, currentTeamId } = useAuthContext();
@@ -52,10 +48,6 @@ function Index() {
 
   const { showDialog, showSnackBar } = useAlertContext();
 
-  const insets = useSafeAreaInsets();
-
-  const { height, width } = useWindowDimensions();
-
   const {
     data: userData,
     error: userError,
@@ -315,8 +307,10 @@ function Index() {
                   await handleImageUpload(
                     setImageUploading,
                     showSnackBar,
-                    userId,
+                    getPfpName(currentTeamId, userId),
                     userRef,
+                    profilePicSize,
+                    profilePicSize,
                   );
                   await invalidateMultipleKeys(queryClient, [["userInfo"]]);
                 } catch (e) {

app/content/team/index.js

@@ -37,12 +37,12 @@ import Loading from "~/components/loading";
 import RefreshInvalidate from "~/components/refreshInvalidate";
 import { useAlertContext } from "~/context/Alert";
 import { useAuthContext } from "~/context/Auth";
+import { useTeamInfo } from "~/dbOperations/hooks/useTeamInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
+import { handleImageUpload } from "~/dbOperations/imageUpload";
+import { invalidateMultipleKeys } from "~/dbOperations/invalidateMultipleKeys";
+import { resetLeaderboards } from "~/dbOperations/resetLeaderboards";
 import { db } from "~/firebaseConfig";
-import { handleImageUpload } from "~/hooks/imageUpload";
-import { invalidateMultipleKeys } from "~/hooks/invalidateMultipleKeys";
-import { resetLeaderboards } from "~/hooks/resetLeaderboards";
-import { useTeamInfo } from "~/hooks/useTeamInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
 
 function Index() {
   const { currentUserId, currentTeamId } = useAuthContext();
@@ -216,7 +216,7 @@ function Index() {
           hideResetDialog,
           async () => {
             try {
-              await resetLeaderboards();
+              await resetLeaderboards(currentTeamId);
               await invalidateMultipleKeys(queryClient, [["best_attempts"]]);
               hideResetDialog();
             } catch (e) {
@@ -306,6 +306,8 @@ function Index() {
                         showSnackBar,
                         currentTeamId,
                         teamRef,
+                        175,
+                        100,
                       );
                       await invalidateMultipleKeys(queryClient, [["teamInfo"]]);
                     } catch (e) {

app/content/team/users/[user]/drills/[id].js

@@ -6,8 +6,8 @@ import BarChartScreen from "~/components/barChart";
 import ErrorComponent from "~/components/errorComponent";
 import Header from "~/components/header";
 import Loading from "~/components/loading";
-import { useAttempts } from "~/hooks/useAttempts";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
+import { useAttempts } from "~/dbOperations/hooks/useAttempts";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
 
 export default function Stat() {
   const navigation = useNavigation();

app/content/team/users/[user]/index.js

@@ -18,33 +18,33 @@ import ProfileCard from "~/components/profileCard";
 import RefreshInvalidate from "~/components/refreshInvalidate";
 import { useAlertContext } from "~/context/Alert";
 import { useAuthContext } from "~/context/Auth";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
+import { useEmailInfo } from "~/dbOperations/hooks/useEmailInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
+import { invalidateMultipleKeys } from "~/dbOperations/invalidateMultipleKeys";
+import { removeUser } from "~/dbOperations/removeUser";
 import { db } from "~/firebaseConfig";
-import { invalidateMultipleKeys } from "~/hooks/invalidateMultipleKeys";
-import { removeUser } from "~/hooks/removeUser";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
-import { useEmailInfo } from "~/hooks/useEmailInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
 
 //A function to add a user to the blacklist table with a timestamp
-async function blacklistUser(userId, userInfo) {
+async function blacklistUser(teamId, userId, userInfo) {
   //Create new document with userId as the id and a time field
 
   try {
-    await setDoc(doc(db, "teams", "1", "blacklist", userId), {
+    await setDoc(doc(db, "teams", teamId, "blacklist", userId), {
       time: Date.now(),
       name: userInfo["name"],
     });
     //remove users data
-    await removeUser(userId);
+    await removeUser(teamId, userId);
     console.log("User Removed successfully!");
   } catch (e) {
     console.log("Error removing user:", e);
     throw e; // Rethrow the error to handle it at the caller's level if needed
   }
 }
 
-async function changeRole(userId, newRole) {
-  const userRef = doc(db, "teams", "1", "users", userId);
+async function changeRole(teamId, userId, newRole) {
+  const userRef = doc(db, "teams", teamId, "users", userId);
   try {
     await updateDoc(userRef, { role: newRole });
     console.log("User Role Changed successfully!");
@@ -70,7 +70,7 @@ function Index() {
 
   const { showDialog, showSnackBar } = useAlertContext();
 
-  const { currentUserId } = useAuthContext();
+  const { currentUserId, currentTeamId } = useAuthContext();
 
   const {
     data: userInfo,
@@ -243,11 +243,11 @@ function Index() {
                 }
                 onPress={async () => {
                   try {
-                    if (userInfo.role === "player") {
-                      await changeRole(userId, "coach");
-                    } else {
-                      await changeRole(userId, "player");
-                    }
+                    await changeRole(
+                      currentTeamId,
+                      userId,
+                      userInfo.role === "player" ? "coach" : "player",
+                    );
                     await invalidateMultipleKeys(queryClient, [["userInfo"]]); //invalidate cache
                     showSnackBar("User role changed successfully!");
                     setMenuVisible(false);
@@ -311,7 +311,7 @@ function Index() {
           hideRemoveDialog,
           async () => {
             try {
-              await removeUser(userId);
+              await removeUser(currentTeamId, userId);
               await queryClient.removeQueries(["userInfo", userId]);
               await invalidateMultipleKeys(queryClient, [
                 ["userInfo"],
@@ -336,7 +336,7 @@ function Index() {
           hideBanDialog,
           async () => {
             try {
-              await blacklistUser(userId, userInfo);
+              await blacklistUser(currentTeamId, userId, userInfo);
               await queryClient.removeQueries(["userInfo", userId]);
               await invalidateMultipleKeys(queryClient, [
                 ["userInfo"],

app/segments/(team)/chooseTeam.js

@@ -12,8 +12,8 @@ import ErrorComponent from "~/components/errorComponent";
 import Loading from "~/components/loading";
 import { useAlertContext } from "~/context/Alert";
 import { useAuthContext } from "~/context/Auth";
+import { invalidateMultipleKeys } from "~/dbOperations/invalidateMultipleKeys";
 import { auth, db } from "~/firebaseConfig";
-import { invalidateMultipleKeys } from "~/hooks/invalidateMultipleKeys";
 
 function ChooseTeam() {
   const { signOut, currentUserId, currentUserInfo, setCurrentUserId } =
@@ -99,6 +99,7 @@ function ChooseTeam() {
           >
             <Button
               onPress={async () => {
+                //temporary, should be replaced with multiple team functionality
                 await setDoc(doc(db, "teams", "1", "users", currentUserId), {
                   name: currentUserInfo["displayName"],
                   // hardcoded pfp string for now, add pfp upload to profile settings in future PR

app/segments/drill/[id]/assignment/index.js

@@ -25,9 +25,9 @@ import Loading from "~/components/loading";
 import { useAlertContext } from "~/context/Alert";
 import { useAuthContext } from "~/context/Auth";
 import { useTimeContext } from "~/context/Time";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
+import { invalidateMultipleKeys } from "~/dbOperations/invalidateMultipleKeys";
 import { db } from "~/firebaseConfig";
-import { invalidateMultipleKeys } from "~/hooks/invalidateMultipleKeys";
-import { useUserInfo } from "~/hooks/useUserInfo";
 
 export default function Index() {
   const {

app/segments/drill/[id]/submission/input.js

@@ -35,11 +35,11 @@ import NavigationRectangle from "~/components/input/navigationRectangle";
 import Loading from "~/components/loading";
 import { useAlertContext } from "~/context/Alert";
 import { useAuthContext } from "~/context/Auth";
+import { useBestAttempts } from "~/dbOperations/hooks/useBestAttempts";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
+import { invalidateMultipleKeys } from "~/dbOperations/invalidateMultipleKeys";
 import { db } from "~/firebaseConfig";
-import { invalidateMultipleKeys } from "~/hooks/invalidateMultipleKeys";
-import { useBestAttempts } from "~/hooks/useBestAttempts";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
-import { useUserInfo } from "~/hooks/useUserInfo";
 
 /***************************************
  * Attempt Submission functions

app/segments/drill/[id]/submission/result.js

@@ -6,7 +6,7 @@ import ErrorComponent from "~/components/errorComponent";
 import Header from "~/components/header";
 import Loading from "~/components/loading";
 import ResultScreen from "~/components/resultScreen";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
 
 function Result({ submission, setToggleResult }) {
   const navigation = useNavigation();

components/drillList.js

@@ -7,7 +7,7 @@ import ErrorComponent from "~/components/errorComponent";
 import Loading from "~/components/loading";
 import RefreshInvalidate from "~/components/refreshInvalidate";
 import { useAuthContext } from "~/context/Auth";
-import { useUserInfo } from "~/hooks/useUserInfo";
+import { useUserInfo } from "~/dbOperations/hooks/useUserInfo";
 
 export default function DrillList({
   drillData,

components/refreshInvalidate.js

@@ -1,7 +1,7 @@
 import { useQueryClient } from "@tanstack/react-query";
 import { useCallback, useState } from "react";
 import { RefreshControl } from "react-native";
-import { invalidateMultipleKeys } from "~/hooks/invalidateMultipleKeys";
+import { invalidateMultipleKeys } from "~/dbOperations/invalidateMultipleKeys";
 
 // extra props reason: https://stackoverflow.com/questions/69659094/react-native-custom-refreshcontrol-component-doesnt-work-in-flatlist-on-android
 function RefreshInvalidate({ invalidateKeys = [], ...props }) {

components/resultScreen.js

@@ -14,8 +14,8 @@ import ErrorComponent from "~/components/errorComponent";
 import Loading from "~/components/loading";
 import RefreshInvalidate from "~/components/refreshInvalidate";
 import ShotAccordion from "~/components/shotAccordion";
-import { useAttempts } from "~/hooks/useAttempts";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
+import { useAttempts } from "~/dbOperations/hooks/useAttempts";
+import { useDrillInfo } from "~/dbOperations/hooks/useDrillInfo";
 
 export default function ResultScreen({
   drillId = null,