Merge pull request #161 from SCCapstone/feat-poc-release-changes

Resolved important peer dependencies for release, added .easignore

.easignore

@@ -0,0 +1,36 @@
+node_modules/
+package-lock.json
+.expo/
+dist/
+npm-debug.*
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
+*.orig.*
+web-build/
+
+# macOS
+.DS_Store
+
+#amplify-do-not-edit-begin
+# amplify/\#current-cloud-backend
+# amplify/.config/local-*
+# amplify/logs
+# amplify/mock-data
+# amplify/backend/amplify-meta.json
+# amplify/backend/.temp
+# build/
+# dist/
+# node_modules/
+# # aws-exports.js
+# awsconfiguration.json
+# amplifyconfiguration.json
+# amplifyconfiguration.dart
+# amplify-build-config.json
+# amplify-gradle-config.json
+# amplifytools.xcconfig
+# .secret-*
+# **.sample
+#amplify-do-not-edit-end

.gitignore

@@ -34,3 +34,64 @@ amplifytools.xcconfig
 .secret-*
 **.sample
 #amplify-do-not-edit-end
+
+# @generated expo-cli sync-e7dcf75f4e856f7b6f3239b3f3a7dd614ee755a8
+# The following patterns were generated by expo-cli
+
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+*.hprof
+
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# BUCK
+buck-out/
+\.buckd/
+*.keystore
+!debug.keystore
+
+# Bundle artifacts
+*.jsbundle
+
+# CocoaPods
+/ios/Pods/
+
+# Expo
+.expo/
+web-build/
+dist/
+
+# @end expo-cli

app.json

@@ -24,7 +24,8 @@
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#FFFFFF"
-      }
+      },
+      "package": "com.jewzydee.gymbit"
     },
     "web": {
       "favicon": "./assets/favicon.png"

eas.json

@@ -1,18 +1,18 @@
 {
-  "cli": {
-    "version": ">= 2.8.0"
-  },
   "build": {
-    "development": {
-      "developmentClient": true,
-      "distribution": "internal"
-    },
     "preview": {
-      "distribution": "internal"
+      "android": {
+        "buildType": "apk"
+      }
+    },
+    "preview2": {
+      "android": {
+        "gradleCommand": ":app:assembleRelease"
+      }
+    },
+    "preview3": {
+      "developmentClient": true
     },
-    "production": {}
-  },
-  "submit": {
     "production": {}
   }
 }

package.json

@@ -1,11 +1,10 @@
 {
   "name": "nunchuckducks",
   "version": "1.0.0",
-  "main": "node_modules/expo/AppEntry.js",
   "scripts": {
-    "start": "expo start",
-    "android": "expo start --android",
-    "ios": "expo start --ios",
+    "start": "expo start --dev-client",
+    "android": "expo run:android",
+    "ios": "expo run:ios",
     "web": "expo start --web",
     "amplify-modelgen": "node amplify/scripts/amplify-modelgen.js",
     "amplify-push": "node amplify/scripts/amplify-push.js"
@@ -16,15 +15,32 @@
     "@aws-amplify/datastore": "^3.14.0",
     "@aws-amplify/storage": "^4.5.14",
     "@aws-sdk/eventstream-codec": "^3.208.0",
+    "@babel/preset-env": "^7.20.2",
     "@react-native-async-storage/async-storage": "^1.17.10",
     "@react-native-community/netinfo": "9.3.0",
+    "@react-native-picker/picker": "2.4.2",
     "@react-navigation/native": "^6.0.13",
     "@react-navigation/native-stack": "^6.9.1",
+    "amazon-cognito-identity-js": "^6.0.1",
+    "aws-amplify": "^4.3.43",
     "aws-amplify-react-native": "^6.0.8",
     "expo": "~46.0.16",
     "expo-image-picker": "~13.3.1",
+    "expo-modules-autolinking": "~0.10.1",
+    "expo-splash-screen": "~0.16.2",
+    "expo-status-bar": "~1.4.0",
+    "graphql": "^14.7.0",
     "react": "18.0.0",
-    "react-native": "0.69.6"
+    "react-dom": "18.0.0",
+    "react-native": "0.69.6",
+    "react-native-safe-area-context": "^4.3.1",
+    "react-native-screens": "~3.15.0",
+    "react-native-web": "~0.18.7"
+  },
+  "overrides": {
+    "@react-native-picker/picker": {
+      "react": "17.0.2"
+    }
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

src/crud/UserOperations.js

@@ -57,7 +57,7 @@ export async function findUserByUsername(username) {
 
 /**
  * This function returns the profile picture
- * @param {String} username 
+ * @param {String} username
  * @returns image
  */
 export async function getProfilePicture(username) {
@@ -81,6 +81,7 @@ export async function getUserId(username) {
   try {
     const user = await DataStore.query(User, (u) => u.username("eq", username));
 
+    if (!user || !user.length) return "";
     console.log(`Found userID ${user[0].id} for ${username} successfully.`);
 
     return user[0].id;