From 088c04abdc260be1d0bafb25fa3e74e8d08aeddb Mon Sep 17 00:00:00 2001 From: gibbyb Date: Fri, 1 Nov 2024 09:54:10 -0500 Subject: [PATCH] will compile this way --- .gitignore | 7 +++++-- app.json | 6 ++++-- components/auth/SignInScreen.tsx | 3 ++- eas.json | 26 ++++++++++++++++++++++++++ package.json | 2 +- 5 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 eas.json diff --git a/.gitignore b/.gitignore index 2d1b664..81d2ca5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,10 @@ npm-debug.* web-build/ .env .env* - +*.env +.env* +eas.json +*.ipa # macOS .DS_Store @@ -19,4 +22,4 @@ web-build/ # The following patterns were generated by expo-cli expo-env.d.ts -# @end expo-cli \ No newline at end of file +# @end expo-cli diff --git a/app.json b/app.json index 398afa2..3b4d445 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,7 @@ { "expo": { - "name": "Wavelength_App", + "name": "Wavelength", + "displayName": "Wavelength", "slug": "Wavelength_App", "version": "1.0.0", "orientation": "portrait", @@ -21,7 +22,8 @@ "infoPList": { "NSLocationWhenInUseUsageDescription": "This app uses your location in order to allow you to share your location in chat.", "NSCameraUsageDescription": "This app uses your camera to take photos & send them in the chat." - } + }, + "bundleIdentifier": "com.gbrown.Wavelength" }, "android": { "adaptiveIcon": { diff --git a/components/auth/SignInScreen.tsx b/components/auth/SignInScreen.tsx index bb0f264..a69b623 100644 --- a/components/auth/SignInScreen.tsx +++ b/components/auth/SignInScreen.tsx @@ -58,10 +58,11 @@ const SignInScreen = ({onSignIn}: {onSignIn: () => void}) => { pushToken.data ) as User; await saveUser(user); + //Alert.alert(`${user.appleId} - ${user.email} - ${user.fullName} - ${user.pushToken}`); } else if (initialDataResponse.ok) { const initialData: InitialData = await initialDataResponse.json() as InitialData; console.log('Existing user found! Saving data...'); - + //Alert.alert('Existing user found! Saving data...'); if (initialData.user.pushToken !== pushToken.data) { const updatePushTokenResponse = await updatePushToken( initialData.user.id, diff --git a/eas.json b/eas.json new file mode 100644 index 0000000..62eb83a --- /dev/null +++ b/eas.json @@ -0,0 +1,26 @@ +{ + "cli": { + "version": ">= 12.6.2", + "appVersionSource": "remote" + }, + "build": { + "development": { + "developmentClient": true, + "distribution": "internal" + }, + "preview": { + "distribution": "internal" + }, + "production": { + "env": { + "EXPO_PUBLIC_API_URL": "https://madelinemcguigan.com", + "EXPO_PUBLIC_API_KEY": "Carport-Exporter-Starlight9", + "EXPO_PUBLIC_WEBSOCKET_URL": "https://push.madelinemcguigan.com" + }, + "autoIncrement": true + } + }, + "submit": { + "production": {} + } +} diff --git a/package.json b/package.json index 60c8960..e191b6a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "wavelength_app", + "name": "wavelength", "main": "expo-router/entry", "version": "1.0.0", "scripts": {