Resolve merge conflics

.gitignore

@@ -65,3 +65,45 @@ amplifytools.xcconfig
 .secret-*
 **.sample
 #amplify-do-not-edit-end
+
+# @generated expo-cli sync-b5df6a44d8735348b729920a7406b633cfb74d4c
+# The following patterns were generated by expo-cli
+
+# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
+
+# dependencies
+node_modules/
+
+# Expo
+.expo/
+dist/
+web-build/
+
+# Native
+*.orig.*
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
+
+# Metro
+.metro-health-check*
+
+# debug
+npm-debug.*
+yarn-debug.*
+yarn-error.*
+
+# macOS
+.DS_Store
+*.pem
+
+# local env files
+.env*.local
+
+# typescript
+*.tsbuildinfo
+
+# @end expo-cli
+android/

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "files.autoSave": "off"
+  "files.autoSave": "afterDelay"
 }

App.js

@@ -8,17 +8,47 @@ import { Filter } from './screens/Filter';
 import { ShoppingListScreen } from './screens/ShoppingList';
 import { LoginScreen } from './screens/Login';
 import { SignUpScreen } from './screens/SignUp';
-import { DietaryAllergenFilterScreen } from './screens/DietaryAllergenFilter';
-import { AcctSavedRecipesScreen } from './screens/AcctSavedRecipes';
 import { AccountSettingsMenu } from './screens/AccountSettingsMenu';
 import { AccountDetailsScreen } from './screens/AccountDetailsScreen';
+import { AddIngredient } from './screens/AddIngredient';
 
 const Stack = createNativeStackNavigator();
 
 function App() {
   return (
     <NavigationContainer>
-      <Stack.Navigator initialRouteName='Home'>
+      <Stack.Navigator initialRouteName='Login'>
+        <Stack.Screen
+          name='Home'
+          component={HomeScreen}
+          options={{ headerShown: false }}
+        />
+
+        <Stack.Screen
+          name='Recipe'
+          component={RecipeScreen}
+          options={{ headerShown: false }}
+        />
+        <Stack.Screen
+          name='Ingredient'
+          component={IngredientScreen}
+          options={{ headerShown: false }}
+        />
+        <Stack.Screen
+          name='Filter'
+          component={FilterScreen}
+          options={{ headerShown: false }}
+        />
+        <Stack.Screen
+          name='ShoppingList'
+          component={ShoppingListScreen}
+          options={{ headerShown: false }}
+        />
+        <Stack.Screen
+          name='AccountSettingsMenu'
+          component={AccountSettingsMenu}
+          options={{ headerShown: false }}
+        />
         <Stack.Screen
           name='Login'
           component={LoginScreen}

Pipfile

@@ -16,6 +16,8 @@ psycopg2-binary = "*"
 python-dotenv = "1.0.1"
 django-allauth = "0.61.1"
 drf-yasg = "1.21.7"
+dj-rest-auth = "6.0.0"
+dj-database-url = "*"
 
 [dev-packages]
 pytest = "*"

Taskfile.yml

@@ -11,4 +11,10 @@ tasks:
   shell:
     desc: Start Python Virtual Environment
     cmds:
+
+  mac-init:
+    desc: Initialize Backend with Mac
+    cmds:
+      - pip3 install pipenv
+      - pipenv install --dev
       - pipenv shell