From 5ddb3d1d5e383a43f93b3dfc63c2a86b50005084 Mon Sep 17 00:00:00 2001
From: Yoojin93 <yoojinbae93@gmail.com>
Date: Mon, 22 Apr 2024 15:05:47 -0500
Subject: [PATCH 1/2] screen updates

---
 components/FavoriteRecipes.jsx  |  2 +-
 components/RecipeList.jsx       |  3 +--
 screens/AccountSettingsMenu.jsx |  7 +++---
 screens/AcctSavedRecipes.jsx    | 44 +++++++++++++++++++++++++++++++++
 screens/AddIngredient.jsx       |  2 +-
 screens/Ingredient.jsx          |  2 +-
 screens/Recipe.jsx              |  2 +-
 zbackend/env.txt                |  8 ++++++
 zbackend/requirements.txt       |  4 +++
 9 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 screens/AcctSavedRecipes.jsx
 create mode 100644 zbackend/env.txt

diff --git a/components/FavoriteRecipes.jsx b/components/FavoriteRecipes.jsx
index e6afa4c..cfdfd52 100644
--- a/components/FavoriteRecipes.jsx
+++ b/components/FavoriteRecipes.jsx
@@ -7,7 +7,7 @@ import { useNavigation } from '@react-navigation/native';
 const FavoriteRecipesList = ({ title, scrollEnabled, numberOfRecipes }) => {
   const [recipes, setRecipes] = useState([]);
   const navigation = useNavigation();
-  const { userId } = '8950a7c8-20c3-4d77-9a10-3622e07fd3dd';
+  const { userId } = '1';
 
   useEffect(() => {
     const fetchRecipes = async () => {
diff --git a/components/RecipeList.jsx b/components/RecipeList.jsx
index 00fd5e5..3382d4e 100644
--- a/components/RecipeList.jsx
+++ b/components/RecipeList.jsx
@@ -3,12 +3,11 @@ import { Pressable, StyleSheet, Text, View } from 'react-native';
 import RecipeCard from './RecipeCard';
 import { FlatList } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import AuthContext from '../auth/auth-context';
 
 const RecipeList = ({ title, scrollEnabled, numberOfRecipes }) => {
   const [recipes, setRecipes] = useState([]);
   const navigation = useNavigation();
-  const { userId } = useContext(AuthContext);
+  const { userId } = "1";
 
   useEffect(() => {
     const fetchRecipes = async () => {
diff --git a/screens/AccountSettingsMenu.jsx b/screens/AccountSettingsMenu.jsx
index 8c85a5d..2966eae 100644
--- a/screens/AccountSettingsMenu.jsx
+++ b/screens/AccountSettingsMenu.jsx
@@ -11,8 +11,9 @@ import {
 } from '@expo/vector-icons';
 import { SettingOption } from '../components/SettingOption';
 import { useState } from 'react';
-import { DietaryAllergenFilter } from './DietaryAllergenFilter';
+import { DietaryAllergenFilterScreen } from './DietaryAllergenFilter';
 import { AccountDetailsScreen } from './AccountDetailsScreen';
+import { AcctSavedRecipesScreen } from './AcctSavedRecipes';
 
 export const SettingsScreen = {
   AccountSettings: 'AccountSettings',
@@ -89,11 +90,11 @@ export const AccountSettingsMenu = () => {
         )}
 
         {screenOption == SettingsScreen.DietaryPreferences && (
-          <DietaryAllergenFilter />
+          <DietaryAllergenFilterScreen />
         )}
         {screenOption == SettingsScreen.MyDetails && <AccountDetailsScreen />}
 
-        {screenOption == SettingsScreen.FavoriteRecipes && <AcctSavedRecipes />}
+        {screenOption == SettingsScreen.FavoriteRecipes && <AcctSavedRecipesScreen />}
       </View>
       <Nav />
     </SafeAreaView>
diff --git a/screens/AcctSavedRecipes.jsx b/screens/AcctSavedRecipes.jsx
new file mode 100644
index 0000000..abf9549
--- /dev/null
+++ b/screens/AcctSavedRecipes.jsx
@@ -0,0 +1,44 @@
+import {
+    SafeAreaView,
+    ScrollView,
+    StyleSheet,
+    View,
+    Pressable,
+  } from 'react-native';
+  import AcctRecipeBar from '../components/AcctRecipeBar';
+  import Nav from '../components/Nav';
+  import { useNavigation } from '@react-navigation/native';
+  
+  export const AcctSavedRecipesScreen = () => {
+    const navigation = useNavigation();
+    return (
+      <SafeAreaView style={styles.container}>
+        <View style={{ flex: 1 }}>
+          <ScrollView contentContainerStyle={styles.scrollContainer}>
+            <View style={styles.homeContainer}>
+              <Pressable
+                onPress={() => navigation.navigate('Recipe', { id: item.id })}
+              >
+                <AcctRecipeBar />
+              </Pressable>
+            </View>
+          </ScrollView>
+        </View>
+        <Nav />
+      </SafeAreaView>
+    );
+  };
+  
+  const styles = StyleSheet.create({
+    container: {
+      flex: 1,
+    },
+    scrollContainer: {
+      flexGrow: 1,
+    },
+    homeContainer: {
+      backgroundColor: '#f2f2f2',
+    },
+  });
+  
+  export default AcctSavedRecipesScreen;
diff --git a/screens/AddIngredient.jsx b/screens/AddIngredient.jsx
index 4546289..0b00a73 100644
--- a/screens/AddIngredient.jsx
+++ b/screens/AddIngredient.jsx
@@ -10,7 +10,7 @@ export const AddIngredientModal = ({
   setModalVisible,
   onClose,
 }) => {
-  const { userId } = useContext(); // fix later
+  const { userId } = "1"; // fix when backend integrated
   const [showError, setShowError] = useState('');
   const [productData, setProductData] = useState({
     productName: '',
diff --git a/screens/Ingredient.jsx b/screens/Ingredient.jsx
index d3198ba..3f42eba 100644
--- a/screens/Ingredient.jsx
+++ b/screens/Ingredient.jsx
@@ -11,7 +11,7 @@ import { AddIngredientModal } from './AddIngredient';
 const imageUrl = 'https://cdn-icons-png.freepik.com/512/6981/6981367.png';
 
 export const IngredientScreen = () => {
-  const { userId } = useContext(); // fix later
+  const { userId } = "1"; // update later when backend working
   const [modalVisible, setModalVisible] = useState(false);
 
   const [search, setSearch] = useState('');
diff --git a/screens/Recipe.jsx b/screens/Recipe.jsx
index c0972e8..74248ad 100644
--- a/screens/Recipe.jsx
+++ b/screens/Recipe.jsx
@@ -34,7 +34,7 @@ export const RecipeScreen = () => {
   const route = useRoute();
   const { id } = route.params;
   const navigation = useNavigation();
-  const { userId } = useContext(AuthContext);
+  const { userId } = "1"; // update after backend integration
   const [isFavourite, setIsFavourite] = useState(false);
   const [isOpenMoreTags, setOpenMoreTags] = useState(false);
 
diff --git a/zbackend/env.txt b/zbackend/env.txt
new file mode 100644
index 0000000..d4fcbc1
--- /dev/null
+++ b/zbackend/env.txt
@@ -0,0 +1,8 @@
+DB_NAME="postgres"
+DB_USER="postgres.xmmvpjtupsyceyyeyfma"
+DB_PASS="!BestTeam123!"
+DB_HOST="aws-0-us-west-1.pooler.supabase.com"
+DB_PORT=5432
+SECRET_KEY="django-insecure-^ww48-*-$v99kc@72ry=3^k5r4wnmu75p+-9wj$#hui0iks7-g"
+SUPABASE_URL="https://xmmvpjtupsyceyyeyfma.supabase.co"
+SUPABASE_SERVICE_ROLE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InhtbXZwanR1cHN5Y2V5eWV5Zm1hIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTcxMzY2MzkwOCwiZXhwIjoyMDI5MjM5OTA4fQ.3XKxn3UCDbFVcK2iaO0wtMwHfTYmYJE9xyiF6FF2nKw"
diff --git a/zbackend/requirements.txt b/zbackend/requirements.txt
index 59fbc0f..33bde6f 100644
--- a/zbackend/requirements.txt
+++ b/zbackend/requirements.txt
@@ -6,3 +6,7 @@ djangorestframework-simplejwt==5.3.1
 gunicorn==21.2.0
 django-allauth==0.61.1
 drf-yasg==1.21.7
+dj-rest-auth==6.0.0
+sqlparse==*
+psycopg2-binary==*
+python-dotenv==1.0.1

From 226eb3b75de43ec1d81b53fa10bf82fcbaf7ba1b Mon Sep 17 00:00:00 2001
From: Yoojin93 <yoojinbae93@gmail.com>
Date: Mon, 22 Apr 2024 15:06:17 -0500
Subject: [PATCH 2/2] lol removing file

---
 Dockerfile         |   7 +-
 docker-compose.yml |  10 +-
 package-lock.json  | 241 ++++++++++++++++++++++++++++++++++++++++-----
 zbackend/env.txt   |   8 --
 4 files changed, 233 insertions(+), 33 deletions(-)
 delete mode 100644 zbackend/env.txt

diff --git a/Dockerfile b/Dockerfile
index 653ac19..88627e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,16 +6,19 @@ ENV PYTHONUNBUFFERED 1
 
 COPY ./zbackend/requirements.txt /tmp/requirements.txt
 COPY ./zbackend/requirements.dev.txt /tmp/requirements.dev.txt
+COPY ./scripts /scripts
 COPY ./zbackend /app
 WORKDIR /app
 EXPOSE 8000
 
+
 ARG DEV=false
 RUN python -m venv /py && \
     /py/bin/pip install --upgrade pip && \
+
+
     /py/bin/pip install -r /tmp/requirements.txt && \
-    if [ $DEV = "true" ]; \
-    then /py/bin/pip install -r /tmp/requirements.dev.txt ; \
+
     fi && \
     rm -rf /tmp && \
     adduser \
diff --git a/docker-compose.yml b/docker-compose.yml
index d418503..5ad92ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,4 +11,12 @@ services:
     volumes:
       - ./zbackend:/app
     command: >
-      sh -c "python manage.py runserver 0.0.0.0:8000"
+      sh -c "python manage.py wait_for_db &&
+      python manage.py migrate &&
+      python manage.py runserver 0.0.0.0:8000"
+    environment:
+      - DB_HOST=aws-0-us-west-1.pooler.supabase.com"
+      - DB_NAME="postgres"
+      - DB_USER="postgres.xmmvpjtupsyceyyeyfma"
+      - DB_PASS="!BestTeam123!"
+      - DB_PORT=5432
diff --git a/package-lock.json b/package-lock.json
index e5dd90c..c6a3bd2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,8 +36,7 @@
         "react-native-render-html": "^6.3.4",
         "react-native-url-polyfill": "^2.0.0",
         "react-native-web": "~0.19.6",
-        "styled-components": "^6.1.8",
-        "typescript": "^5.3.0"
+        "styled-components": "^6.1.8"
       },
       "devDependencies": {
         "@babel/core": "^7.24.4",
@@ -18236,18 +18235,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
     "node_modules/ua-parser-js": {
       "version": "1.0.37",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz",
@@ -21965,9 +21952,9 @@
       "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="
     },
     "@react-native-async-storage/async-storage": {
-      "version": "1.23.1",
-      "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.23.1.tgz",
-      "integrity": "sha512-Qd2kQ3yi6Y3+AcUlrHxSLlnBvpdCEMVGFlVBneVOjaFaPU61g1huc38g339ysXspwY1QZA2aNhrk/KlHGO+ewA==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.21.0.tgz",
+      "integrity": "sha512-JL0w36KuFHFCvnbOXRekqVAUplmOyT/OuCQkogo6X98MtpSaJOKEAeZnYO8JB0U/RIEixZaGI5px73YbRm/oag==",
       "requires": {
         "merge-options": "^3.0.4"
       }
@@ -23284,6 +23271,12 @@
         "joi": "^17.2.1"
       }
     },
+    "@react-native-google-signin/google-signin": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/@react-native-google-signin/google-signin/-/google-signin-11.0.1.tgz",
+      "integrity": "sha512-ZRSEd1ME31XZ+azS3Qe6TRb8NRicGmtRdD1vT4Tz2birnlTfNfRgy4qLrEKNZyMUTodA6+J2UvA2JWwT8ZQ/dw==",
+      "requires": {}
+    },
     "@react-native/assets-registry": {
       "version": "0.73.1",
       "resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.73.1.tgz",
@@ -23810,6 +23803,70 @@
         "@sinonjs/commons": "^3.0.0"
       }
     },
+    "@supabase/auth-js": {
+      "version": "2.63.1",
+      "resolved": "https://registry.npmjs.org/@supabase/auth-js/-/auth-js-2.63.1.tgz",
+      "integrity": "sha512-iwdmIc/w5QN7aMfYThEgUt1l2i0KuohZ4XNk1adECg0LETQYEzmbVToKFKZLLZ+GyNtpsExSgVY/AUWOwubGXA==",
+      "requires": {
+        "@supabase/node-fetch": "^2.6.14"
+      }
+    },
+    "@supabase/functions-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.3.0.tgz",
+      "integrity": "sha512-GPXzSl4MXdc0P7q+TvE8XgaPdvGBeAJ0p6AN0tbKcezpkp32mpsDf58JXaWOJGyiWSVJn6z1W73eKxf6NZNaFA==",
+      "requires": {
+        "@supabase/node-fetch": "^2.6.14"
+      }
+    },
+    "@supabase/node-fetch": {
+      "version": "2.6.15",
+      "resolved": "https://registry.npmjs.org/@supabase/node-fetch/-/node-fetch-2.6.15.tgz",
+      "integrity": "sha512-1ibVeYUacxWYi9i0cf5efil6adJ9WRyZBLivgjs+AUpewx1F3xPi7gLgaASI2SmIQxPoCEjAsLAzKPgMJVgOUQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
+    "@supabase/postgrest-js": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.15.2.tgz",
+      "integrity": "sha512-9/7pUmXExvGuEK1yZhVYXPZnLEkDTwxgMQHXLrN5BwPZZm4iUCL1YEyep/Z2lIZah8d8M433mVAUEGsihUj5KQ==",
+      "requires": {
+        "@supabase/node-fetch": "^2.6.14"
+      }
+    },
+    "@supabase/realtime-js": {
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.9.4.tgz",
+      "integrity": "sha512-wdq+2hZpgw0r2ldRs87d3U08Y8BrsO1bZxPNqbImpYshAEkusDz4vufR8KaqujKxqewmXS6YnUhuRVdvSEIKCA==",
+      "requires": {
+        "@supabase/node-fetch": "^2.6.14",
+        "@types/phoenix": "^1.5.4",
+        "@types/ws": "^8.5.10",
+        "ws": "^8.14.2"
+      }
+    },
+    "@supabase/storage-js": {
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.5.5.tgz",
+      "integrity": "sha512-OpLoDRjFwClwc2cjTJZG8XviTiQH4Ik8sCiMK5v7et0MDu2QlXjCAW3ljxJB5+z/KazdMOTnySi+hysxWUPu3w==",
+      "requires": {
+        "@supabase/node-fetch": "^2.6.14"
+      }
+    },
+    "@supabase/supabase-js": {
+      "version": "2.42.5",
+      "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.42.5.tgz",
+      "integrity": "sha512-T/FlVmNHR/MDl8KhmNLb94dh+cTpqyvFlNI/Zd97dwS1yCm59xM+sTzmQLKnGNY5sPuwp40/w52bWrczdjOYtA==",
+      "requires": {
+        "@supabase/auth-js": "2.63.1",
+        "@supabase/functions-js": "2.3.0",
+        "@supabase/node-fetch": "2.6.15",
+        "@supabase/postgrest-js": "1.15.2",
+        "@supabase/realtime-js": "2.9.4",
+        "@supabase/storage-js": "2.5.5"
+      }
+    },
     "@testing-library/react-native": {
       "version": "12.4.5",
       "resolved": "https://registry.npmjs.org/@testing-library/react-native/-/react-native-12.4.5.tgz",
@@ -24058,6 +24115,11 @@
         "undici-types": "~5.26.4"
       }
     },
+    "@types/phoenix": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/@types/phoenix/-/phoenix-1.6.4.tgz",
+      "integrity": "sha512-B34A7uot1Cv0XtaHRYDATltAdKx0BvVKNgYNqE4WjtPUa4VQJM7kxeXcVKaH+KS+kCmZ+6w+QaUdcljiheiBJA=="
+    },
     "@types/prop-types": {
       "version": "15.7.12",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
@@ -24112,6 +24174,14 @@
       "resolved": "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.25.tgz",
       "integrity": "sha512-XOfUup9r3Y06nFAZh3WvO0rBU4OtlfPB/vgxpjg+NRdGU6CN6djdc6OEiH+PcqHCY6eFLo9Ista73uarf4gnBg=="
     },
+    "@types/ws": {
+      "version": "8.5.10",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/yargs": {
       "version": "17.0.32",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
@@ -25154,6 +25224,14 @@
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
     },
+    "compare-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/compare-urls/-/compare-urls-2.0.0.tgz",
+      "integrity": "sha512-eCJcWn2OYFEIqbm70ta7LQowJOOZZqq1a2YbbFCFI1uwSvj+TWMwXVn7vPR1ceFNcAIt5RSTDbwdlX82gYLTkA==",
+      "requires": {
+        "normalize-url": "^2.0.1"
+      }
+    },
     "component-type": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.2.tgz",
@@ -26014,6 +26092,12 @@
         "whatwg-url-without-unicode": "8.0.0-3"
       }
     },
+    "expo-application": {
+      "version": "5.8.4",
+      "resolved": "https://registry.npmjs.org/expo-application/-/expo-application-5.8.4.tgz",
+      "integrity": "sha512-mH0gSlFzMuiT20TkZnBppzUtdF6TFHwcaTRnvkSZanN9iTOeEEfQQ60hHT4lBizHjFWRs/QYZVtXGvkQ/cyMpg==",
+      "requires": {}
+    },
     "expo-asset": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-9.0.2.tgz",
@@ -26027,6 +26111,19 @@
         "md5-file": "^3.2.3"
       }
     },
+    "expo-auth-session": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/expo-auth-session/-/expo-auth-session-5.4.0.tgz",
+      "integrity": "sha512-ZwjPMsMgCqdMi+vnhDbtjOAF12Y9+y1bYvorn/jQs47aFg6yeIRHycSOM/WL4hpFr+fAxycP3mIJeHVYfF3zuQ==",
+      "requires": {
+        "expo-application": "~5.8.0",
+        "expo-constants": "~15.4.0",
+        "expo-crypto": "~12.8.0",
+        "expo-linking": "~6.2.0",
+        "expo-web-browser": "~12.8.0",
+        "invariant": "^2.2.4"
+      }
+    },
     "expo-constants": {
       "version": "15.4.6",
       "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-15.4.6.tgz",
@@ -26035,6 +26132,14 @@
         "@expo/config": "~8.5.0"
       }
     },
+    "expo-crypto": {
+      "version": "12.8.1",
+      "resolved": "https://registry.npmjs.org/expo-crypto/-/expo-crypto-12.8.1.tgz",
+      "integrity": "sha512-EJEzmfBUSkGfALTlZRKUbh1RMKF7mWI12vkhO2w6bhGO4bjgGB8XzUHgLfrvSjphDFMx/lwaR6bAQDmXKO9UkQ==",
+      "requires": {
+        "base64-js": "^1.3.0"
+      }
+    },
     "expo-file-system": {
       "version": "16.0.9",
       "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-16.0.9.tgz",
@@ -26055,6 +26160,15 @@
       "integrity": "sha512-uiQdGbSX24Pt8nGbnmBtrKq6xL/Tm3+DuDRGBk/3ZE/HlizzNosGRIufIMJ/4B4FRw4dw8KU81h2RLuTjbay6g==",
       "requires": {}
     },
+    "expo-linking": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-6.2.2.tgz",
+      "integrity": "sha512-FEe6lP4f7xFT/vjoHRG+tt6EPVtkEGaWNK1smpaUevmNdyCJKqW0PDB8o8sfG6y7fly8ULe8qg3HhKh5J7aqUQ==",
+      "requires": {
+        "expo-constants": "~15.4.3",
+        "invariant": "^2.2.4"
+      }
+    },
     "expo-modules-autolinking": {
       "version": "1.10.3",
       "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.10.3.tgz",
@@ -26151,6 +26265,15 @@
       "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-1.11.1.tgz",
       "integrity": "sha512-ddQEtCOgYHTLlFUe/yH67dDBIoct5VIULthyT3LRJbEwdpzAgueKsX2FYK02ldh440V87PWKCamh7R9evk1rrg=="
     },
+    "expo-web-browser": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-12.8.2.tgz",
+      "integrity": "sha512-Mw8WoFMSADecNjtC4PZVsVj1/lYdxIAH1jOVV+F8v8SEWYxORWofoShfXg7oUxRLu0iUG8JETfO5y4m8+fOgdg==",
+      "requires": {
+        "compare-urls": "^2.0.0",
+        "url": "^0.11.0"
+      }
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -29674,6 +29797,33 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
     },
+    "normalize-url": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+      "requires": {
+        "prepend-http": "^2.0.0",
+        "query-string": "^5.0.1",
+        "sort-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "query-string": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+          "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+          "requires": {
+            "decode-uri-component": "^0.2.0",
+            "object-assign": "^4.1.0",
+            "strict-uri-encode": "^1.0.0"
+          }
+        },
+        "strict-uri-encode": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+          "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
+        }
+      }
+    },
     "npm-package-arg": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz",
@@ -30077,6 +30227,11 @@
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
+    "prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="
+    },
     "prettier": {
       "version": "3.2.5",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
@@ -30177,6 +30332,14 @@
       "resolved": "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz",
       "integrity": "sha512-Uu7ii+FQy4Qf82G4xu7ShHhjhGahEpCWc3x8UavY3CTcWV+ufmmCtwkr7ZKsX42jdL0kr1B5FKUeqJvAn51jzQ=="
     },
+    "qs": {
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
+      "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
+      "requires": {
+        "side-channel": "^1.0.6"
+      }
+    },
     "query-string": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
@@ -30560,6 +30723,14 @@
       "resolved": "https://registry.npmjs.org/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz",
       "integrity": "sha512-Ns7Bn9H/Tyw278+5SQx9oAblDZ7JixyzeOczcBK8dipQk2pD7Djkcfnf1nB/8RErAmMLL9iXgW0QHqiII8AhKw=="
     },
+    "react-native-url-polyfill": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-2.0.0.tgz",
+      "integrity": "sha512-My330Do7/DvKnEvwQc0WdcBnFPploYKp9CYlefDXzIdEaA+PAhDYllkvGeEroEzvc4Kzzj2O4yVdz8v6fjRvhA==",
+      "requires": {
+        "whatwg-url-without-unicode": "8.0.0-3"
+      }
+    },
     "react-native-vector-icons": {
       "version": "10.0.3",
       "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-10.0.3.tgz",
@@ -31184,6 +31355,21 @@
       "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz",
       "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw=="
     },
+    "sort-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+      "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "is-plain-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+          "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="
+        }
+      }
+    },
     "sort-on": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/sort-on/-/sort-on-6.0.0.tgz",
@@ -31838,11 +32024,6 @@
         "typed-array-byte-offset": "^1.0.2"
       }
     },
-    "typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="
-    },
     "ua-parser-js": {
       "version": "1.0.37",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz",
@@ -31936,6 +32117,22 @@
       "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz",
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
+    "url": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
+      "requires": {
+        "punycode": "^1.4.1",
+        "qs": "^6.11.2"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+        }
+      }
+    },
     "url-join": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz",
diff --git a/zbackend/env.txt b/zbackend/env.txt
deleted file mode 100644
index d4fcbc1..0000000
--- a/zbackend/env.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-DB_NAME="postgres"
-DB_USER="postgres.xmmvpjtupsyceyyeyfma"
-DB_PASS="!BestTeam123!"
-DB_HOST="aws-0-us-west-1.pooler.supabase.com"
-DB_PORT=5432
-SECRET_KEY="django-insecure-^ww48-*-$v99kc@72ry=3^k5r4wnmu75p+-9wj$#hui0iks7-g"
-SUPABASE_URL="https://xmmvpjtupsyceyyeyfma.supabase.co"
-SUPABASE_SERVICE_ROLE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InhtbXZwanR1cHN5Y2V5eWV5Zm1hIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTcxMzY2MzkwOCwiZXhwIjoyMDI5MjM5OTA4fQ.3XKxn3UCDbFVcK2iaO0wtMwHfTYmYJE9xyiF6FF2nKw"