diff --git a/app.json b/app.json index 1216a1b..e04971b 100644 --- a/app.json +++ b/app.json @@ -20,19 +20,7 @@ "adaptiveIcon": { "foregroundImage": "./assets/adaptive-icon.png", "backgroundColor": "#ffffff" - }, - "intentFilters": [ - { - "action": "VIEW", - "data": [ - { - "scheme": "com.bobthebob.massphotoapp", - "path": "/oauthredirect" - } - ], - "category": ["BROWSABLE", "DEFAULT"] - } - ] + } }, "web": { "favicon": "./assets/favicon.png" @@ -47,4 +35,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index b664eb6..8b86f81 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "main": "index.js", "scripts": { "start": "expo start", - "android": "expo start --android", - "ios": "expo start --ios", + "android": "expo run:android", + "ios": "expo run:ios", "web": "expo start --web", "backend": "node ServerFiles/server.js" }, @@ -14,7 +14,7 @@ "@react-navigation/native": "^6.1.18", "@react-navigation/native-stack": "^6.9.26", "axios": "^1.7.9", - "expo": "~54.0.33", + "expo": "^51.0.39", "expo-application": "~7.0.8", "expo-auth-session": "~7.0.10", "expo-blur": "~15.0.8", @@ -27,8 +27,8 @@ "expo-sqlite": "~16.0.10", "expo-status-bar": "~3.0.9", "expo-web-browser": "~15.0.10", - "react": "19.1.0", - "react-native": "0.81.5", + "react": "19.2.3", + "react-native": "^0.84.0", "react-native-gesture-handler": "~2.28.0", "react-native-reanimated": "~4.1.1", "react-native-safe-area-context": "~5.6.0", @@ -37,7 +37,10 @@ }, "devDependencies": { "@babel/core": "^7.29.0", - "babel-preset-expo": "~12.0.0" + "@react-native-community/cli": "^15.0.0", + "@react-native-community/cli-platform-android": "^15.0.0", + "@react-native-community/cli-platform-ios": "^15.0.0", + "babel-preset-expo": "^10.0.2" }, "private": true } diff --git a/src/AUTH/GoogleAUTH.js b/src/AUTH/GoogleAUTH.js index 4973a3d..62f409c 100644 --- a/src/AUTH/GoogleAUTH.js +++ b/src/AUTH/GoogleAUTH.js @@ -9,7 +9,8 @@ WebBrowser.maybeCompleteAuthSession(); // Created in Google Cloud Console as "Android" type with package name // com.bobthebob.massphotoapp and the SHA-1 from `eas credentials --platform android`. // Android clients are public (no client_secret needed) — PKCE verifies instead. -const ANDROID_CLIENT_ID = '313090284964-pa9p2rs7g60l9t8hr6haee3qbn2a7vl9.apps.googleusercontent.com'; +const ANDROID_CLIENT_ID = "313090284964-018uf4v1bmmrra09lvmpnuug2qs09047.apps.googleusercontent.com" +//'313090284964-pa9p2rs7g60l9t8hr6haee3qbn2a7vl9.apps.googleusercontent.com'; const GOOGLE_DISCOVERY = { authorizationEndpoint: 'https://accounts.google.com/o/oauth2/v2/auth',