finished merge

calblueprint · Nov 18, 2024 · 9f1128f · 9f1128f
1 parent 74ee1d1
commit 9f1128f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 202 deletions.
diff --git a/App.tsx b/App.tsx
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { DefaultTheme, NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import QRCodeScanner from '@/components/QRCodeScanner/QRCodeScanner';
-import HomeScreen from '@/screens/Home/Home';
-import TreeInfoPage from '@/screens/TreeInfo/TreeInfo';
 import AllTreesScreen from '@/screens/all_trees/AllTreesScreen';
 import AvailableTreesScreen from '@/screens/available_trees/AvailableTreesScreen';
+import HomeScreen from '@/screens/Home/Home';
 import LoginScreen from '@/screens/login/LoginScreen';
+import TreeInfoPage from '@/screens/TreeInfo/TreeInfo';
 import { LoginStackParamList, RootStackParamList } from '@/types/navigation';
 
 const RootStack = createNativeStackNavigator<RootStackParamList>();

diff --git a/app.json b/app.json
@@ -9,23 +9,15 @@
     "userInterfaceStyle": "light",
     "plugins": [
       [
-        "expo-dev-launcher",
+        "expo-camera",
         {
-          "launchMode": "most-recent"
+          "cameraPermission": "Allow Our City Forest to access your camera to scan QR codes."
         }
-<<<<<<< HEAD
-      ], 
+      ],
       [
         "expo-dev-launcher",
         {
           "launchMode": "most-recent"
-=======
-      ],
-      [
-        "expo-camera",
-        {
-          "cameraPermission": "Allow Our City Forest to access your camera to scan QR codes."
->>>>>>> 809f175 (changes)
         }
       ]
     ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,8 +6,6 @@
     "start": "expo start",
     "android": "expo run:android",
     "ios": "expo run:ios",
-    "android": "expo run:android",
-    "ios": "expo run:ios",
     "lint:check": "npx eslint .",
     "lint:fix": "npx eslint . --fix",
     "prettier:check": "npx prettier --check .",
@@ -30,15 +28,13 @@
     "expo-cli": "^6.3.12",
     "expo-constants": "~17.0.3",
     "expo-crypto": "~14.0.1",
-    "expo-dev-client": "~5.0.2",
     "expo-device": "~7.0.1",
     "expo-status-bar": "~2.0.0",
     "expo-web-browser": "~14.0.1",
     "nodemon": "^3.1.7",
     "react": "18.3.1",
     "react-native": "0.76.2",
     "react-native-config": "^1.5.3",
-    "react-native-config": "^1.5.3",
     "react-native-dotenv": "^3.4.11",
     "react-native-gesture-handler": "~2.20.2",
     "react-native-reanimated": "~3.16.1",
@@ -49,20 +45,9 @@
     "react-native-url-polyfill": "^2.0.0",
     "react-native-web": "~0.19.13",
     "zod": "^3.23.8",
-<<<<<<< HEAD
     "zustand": "^5.0.0-rc.2",
-<<<<<<< HEAD
-    "react-native-web": "~0.19.10",
     "react-dom": "18.2.0",
-    "@expo/metro-runtime": "~3.2.3",
-    "expo-dev-client": "~4.0.28",
-    "expo-random": "~14.0.1"
-=======
-    "react-dom": "18.2.0"
->>>>>>> 1b578f1 (draft user auth)
-=======
-    "zustand": "^5.0.0-rc.2"
->>>>>>> 809f175 (changes)
+    "expo-dev-client": "~4.0.28"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

diff --git a/src/screens/login/GoogleSignInButton.tsx b/src/screens/login/GoogleSignInButton.tsx
diff --git a/src/screens/login/LoginScreen.tsx b/src/screens/login/LoginScreen.tsx
@@ -1,18 +1,6 @@
 import { Image, Text, TouchableOpacity, View } from 'react-native';
 import { NativeStackScreenProps } from '@react-navigation/native-stack';
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import GoogleSignInButton from '@/components/GoogleSignInButton';
-=======
-import GoogleSignIn from '@/components/GoogleSignIn';
->>>>>>> d83525b (created login screen)
-=======
-import GoogleSignInButton from '@/screens/login/GoogleSignInButton';
->>>>>>> 67e2d98 (hi fi login page created)
-=======
-import GoogleSignInButton from '@/components/GoogleSignInButton';
->>>>>>> c708f3b (changed file structure)
 import { LoginStackParamList } from '@/types/navigation';
 import { styles } from './styles';
 
@@ -27,42 +15,16 @@ export default function LoginScreen({ navigation, route }: LoginProps) {
         <Image style={styles.logo} source={require('~/assets/ocf_logo.png')} />
       </View>
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 67e2d98 (hi fi login page created)
       <TouchableOpacity
         style={styles.button}
         onPress={() => navigation.navigate('AvailableTrees')}
       >
         <Text style={styles.buttonText}>Guest</Text>
-<<<<<<< HEAD
-=======
-      <TouchableOpacity style={styles.button}>
-        <Text
-          style={styles.buttonText}
-          onPress={() => navigation.navigate('TreeAvailability')}
-        >
-          Guest
-        </Text>
->>>>>>> d83525b (created login screen)
-=======
->>>>>>> 67e2d98 (hi fi login page created)
       </TouchableOpacity>
 
       <View style={styles.adminLoginContainer}>
         <Text style={styles.adminLoginText}>Are you an admin? </Text>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <GoogleSignInButton navigation={navigation} route={route} />
-=======
-        <TouchableOpacity onPress={() => GoogleSignIn()}>
-          <Text style={styles.adminLoginLinkText}>Login Here</Text>
-        </TouchableOpacity>
->>>>>>> d83525b (created login screen)
-=======
         <GoogleSignInButton navigation={navigation} route={route} />
->>>>>>> 67e2d98 (hi fi login page created)
       </View>
     </View>
   );

diff --git a/src/screens/login/styles.ts b/src/screens/login/styles.ts
@@ -15,42 +15,22 @@ export const styles = StyleSheet.create({
 
   logoContainer: {
     alignItems: 'center',
-<<<<<<< HEAD
-<<<<<<< HEAD
     paddingTop: 20,
     paddingBottom: 70,
-=======
->>>>>>> d83525b (created login screen)
-=======
-    paddingTop: 20,
-    paddingBottom: 70,
->>>>>>> 67e2d98 (hi fi login page created)
   },
 
   logo: {
     height: 200,
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     marginTop: 20,
     marginBottom: 70,
->>>>>>> d83525b (created login screen)
-=======
->>>>>>> 67e2d98 (hi fi login page created)
   },
 
   button: {
     backgroundColor: '#446127',
     padding: 15,
     borderRadius: 5,
     alignItems: 'center',
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     marginBottom: 10,
->>>>>>> d83525b (created login screen)
-=======
->>>>>>> 67e2d98 (hi fi login page created)
   },
 
   buttonText: {
@@ -63,14 +43,7 @@ export const styles = StyleSheet.create({
     flex: 0,
     flexDirection: 'row',
     justifyContent: 'flex-end',
-<<<<<<< HEAD
-<<<<<<< HEAD
-    paddingTop: 10,
-=======
->>>>>>> d83525b (created login screen)
-=======
     paddingTop: 10,
->>>>>>> 67e2d98 (hi fi login page created)
   },
 
   adminLoginText: {