Merge branch 'main' into develop

code4romania · Dec 15, 2023 · 7237710 · 7237710
2 parents d439672 + e0cd277
commit 7237710
Show file tree

Hide file tree

Showing 39 changed files with 232 additions and 326 deletions.
diff --git a/mobile/.env.example b/mobile/.env.example
@@ -1,6 +1,8 @@
-API_URL=
-REDIRECT_URL=
-AWS_REGION=
-USER_POOL_ID=
-USER_POOL_CLIENT_ID=
-AWS_DOMAIN=
+EXPO_PUBLIC_API_URL=
+EXPO_PUBLIC_AWS_REGION=
+EXPO_PUBLIC_USER_POOL_ID=
+EXPO_PUBLIC_USER_POOL_CLIENT_ID=
+EXPO_PUBLIC_AWS_DOMAIN=
+EXPO_PUBLIC_PRIVACY_POLICY_LINK=
+EXPO_PUBLIC_TERMS_AND_CONDITIONS_LINK=
+EXPO_PUBLIC_INFORMATION_LINK=
diff --git a/mobile/.gitignore b/mobile/.gitignore
@@ -9,6 +9,9 @@ npm-debug.*
 *.mobileprovision
 *.orig.*
 web-build/
+.env.production
+.env.test
+.env.development
 
 # macOS
 .DS_Store

diff --git a/mobile/app.config.ts b/mobile/app.config.ts
@@ -4,10 +4,10 @@ import { config } from 'dotenv';
 config(); // Load environment variables from .env file
 
 const expoConfig: ExpoConfig = {
-  name: 'teo',
-  slug: 'teo',
-  scheme: 'teo',
-  version: '0.0.1',
+  name: 'vic',
+  slug: 'vic',
+  scheme: 'vic',
+  version: '1.0.0',
   orientation: 'portrait',
   icon: './src/assets/images/icon.png',
   userInterfaceStyle: 'light',
@@ -18,9 +18,9 @@ const expoConfig: ExpoConfig = {
   },
   assetBundlePatterns: ['**/*'],
   ios: {
-    buildNumber: '3',
+    buildNumber: '1',
     supportsTablet: true,
-    bundleIdentifier: 'com.commitglobal.vic',
+    bundleIdentifier: 'org.commitglobal.vic',
     entitlements: {
       'com.apple.developer.applesignin': ['Default'],
     },
@@ -32,13 +32,13 @@ const expoConfig: ExpoConfig = {
     },
   },
   android: {
-    versionCode: 3,
+    versionCode: 1,
     adaptiveIcon: {
       foregroundImage: './src/assets/images/adaptive-icon.png',
       backgroundColor: '#ffffff',
     },
     googleServicesFile: './google-services.json',
-    package: 'com.commitglobal.vic',
+    package: 'org.commitglobal.vic',
   },
   web: {
     favicon: './src/assets/images/favicon.png',
@@ -60,21 +60,20 @@ const expoConfig: ExpoConfig = {
     ],
   ],
   extra: {
-    apiUrl: process.env.API_URL,
-    redirectUrl: process.env.REDIRECT_URL,
-    awsRegion: process.env.AWS_REGION,
-    userPoolId: process.env.USER_POOL_ID,
-    userPoolClientId: process.env.USER_POOL_CLIENT_ID,
-    awsDomain: process.env.AWS_DOMAIN,
+    apiUrl: process.env.EXPO_PUBLIC_API_URL,
+    awsRegion: process.env.EXPO_PUBLIC_AWS_REGION,
+    userPoolId: process.env.EXPO_PUBLIC_USER_POOL_ID,
+    userPoolClientId: process.env.EXPO_PUBLIC_USER_POOL_CLIENT_ID,
+    awsDomain: process.env.EXPO_PUBLIC_AWS_DOMAIN,
     eas: {
-      projectId: '7dd2fea9-6bb9-4b69-865f-c00ab46b5183',
+      projectId: '6aaad982-5a5c-4af8-b66c-7689afe74e1f',
     },
-    policyLink: process.env.PRIVACY_POLICY_LINK,
-    termsLink: process.env.TERMS_AND_CONDITIONS_LINK,
-    infoLink: process.env.INFORMATION_LINK,
+    policyLink: process.env.EXPO_PUBLIC_PRIVACY_POLICY_LINK,
+    termsLink: process.env.EXPO_PUBLIC_TERMS_AND_CONDITIONS_LINK,
+    infoLink: process.env.EXPO_PUBLIC_INFORMATION_LINK,
   },
   updates: {
-    url: 'https://u.expo.dev/7dd2fea9-6bb9-4b69-865f-c00ab46b5183',
+    url: 'https://u.expo.dev/6aaad982-5a5c-4af8-b66c-7689afe74e1f',
   },
   runtimeVersion: {
     policy: 'sdkVersion',

diff --git a/mobile/eas.json b/mobile/eas.json
@@ -9,7 +9,7 @@
     },
     "preview": {
       "distribution": "internal",
-      "node": "16.15.1"
+      "node": "16.18.1"
     },
     "production": {
       "channel": "production"

diff --git a/mobile/google-services.json b/mobile/google-services.json
@@ -1,33 +1,33 @@
 {
   "project_info": {
-    "project_number": "42831608116",
-    "project_id": "teo-development",
-    "storage_bucket": "teo-development.appspot.com"
+    "project_number": "584495752855",
+    "project_id": "ngohub-407214",
+    "storage_bucket": "ngohub-407214.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:42831608116:android:7fa59eb7d5a6645ae30d61",
+        "mobilesdk_app_id": "1:584495752855:android:f3aaf3a840d319d931abd2",
         "android_client_info": {
-          "package_name": "com.commitglobal.vic"
+          "package_name": "org.commitglobal.vic"
         }
       },
       "oauth_client": [
         {
-          "client_id": "42831608116-9bgd5lbk97dm4s17ncvs9cfe6he457dd.apps.googleusercontent.com",
+          "client_id": "584495752855-d3211kb6fq1j7fahr9r408irh12svkpa.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDXrTVXUs3FCJf-QGKg4Tx2G_j9T9se5sA"
+          "current_key": "AIzaSyARcOpZ96_TKutqvBnuibFq67qk1Tmd6VA"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "42831608116-9bgd5lbk97dm4s17ncvs9cfe6he457dd.apps.googleusercontent.com",
+              "client_id": "584495752855-d3211kb6fq1j7fahr9r408irh12svkpa.apps.googleusercontent.com",
               "client_type": 3
             }
           ]
@@ -36,4 +36,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}