Merge pull request #174 from OpenBracketsCH/development

Fix issue with imediately crashes on startup
OpenBracketsCH · Nov 17, 2023 · 45326bb · 45326bb
2 parents 663808c + 8da97ae
commit 45326bb
Show file tree

Hide file tree

Showing 12 changed files with 10,887 additions and 994 deletions.
diff --git a/.github/workflows/app-deployment.yml b/.github/workflows/app-deployment.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   APP_SRC_PATH: "./app/defikarte/" # set this to the path to your web app project, defaults to the repository root
-  RELEASE_PROFILE: "${{ github.ref == 'refs/heads/main' && 'production' || 'development' }}"
+  RELEASE_PROFILE: "${{ github.ref == 'refs/heads/main' && 'production' || 'preview' }}"
   REACT_NATIVE_BASE_URL: "${{ github.ref == 'refs/heads/main' && 'https://defikarte-backend.azurewebsites.net/api' || 'https://defikarte-backend-staging.azurewebsites.net/api' }}"
   REACT_NATIVE_GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API }}
   REACT_NATIVE_API_KEY: ${{ secrets.AZURE_FUNCTIONAPP_API_KEY }}

diff --git a/app/defikarte/.eslintrc.js b/app/defikarte/.eslintrc.js
@@ -0,0 +1,12 @@
+module.exports = {
+  root: false,
+  extends: "@react-native-community",
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  rules: {
+    // Your custom rules go here
+  },
+};
diff --git a/app/defikarte/.expo-shared/assets.json b/app/defikarte/.expo-shared/assets.json
diff --git a/app/defikarte/.gitignore b/app/defikarte/.gitignore
@@ -34,4 +34,8 @@ yarn-error.*
 # typescript
 *.tsbuildinfo
 
-.env
+.env
+
+android
+
+**/*.apk
diff --git a/app/defikarte/.prettierrc b/app/defikarte/.prettierrc
@@ -0,0 +1,7 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "printWidth": 140
+}
diff --git a/app/defikarte/app.config.js b/app/defikarte/app.config.js
@@ -1,21 +1,6 @@
-import 'dotenv/config';
-
-export default ({ config }) => {
-  const googleMapsApiKey = process.env['REACT_NATIVE_GOOGLE_MAPS_API_KEY']
-  if (googleMapsApiKey != null) {
-    config.android.config.googleMaps.apiKey = googleMapsApiKey;
-  }
+module.exports = ({ config }) => {
+  config.android.config.googleMaps.apiKey = process.env.EXPO_PUBLIC_GOOGLE_MAPS_API_KEY || '';
   return {
-    extra: {
-      backendBaseUrl: process.env['REACT_NATIVE_BASE_URL'] ?? '',
-      backendApiKey: process.env['REACT_NATIVE_API_KEY'] ?? '',
-      eas: {
-        projectId: "1d176347-a834-4c1c-92e7-c0f4637108a0",
-      },
-    },
-    plugins: [
-      "expo-localization"
-    ],
     ...config,
   };
 };
diff --git a/app/defikarte/app.json b/app/defikarte/app.json
@@ -3,7 +3,7 @@
     "name": "Defikarte.ch",
     "slug": "Defikarte-ch",
     "owner": "defikarte",
-    "version": "1.0.26",
+    "version": "1.0.34",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -18,14 +18,14 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "ch.defikarte.app",
-      "buildNumber": "1.0.26",
+      "buildNumber": "1.0.34",
       "infoPlist": {
         "NSLocationWhenInUseUsageDescription": "Diese App benötigt die Standortdaten deines Gerätes um den nächsten Defi anzeigen zu können."
       }
     },
     "android": {
       "package": "ch.defikarte.app",
-      "versionCode": 26,
+      "versionCode": 34,
       "permissions": [
         "ACCESS_COARSE_LOCATION",
         "ACCESS_FINE_LOCATION"
@@ -38,6 +38,11 @@
     },
     "web": {
       "favicon": "./assets/favicon.png"
+    },
+    "extra": {
+      "eas": {
+        "projectId": "1d176347-a834-4c1c-92e7-c0f4637108a0"
+      }
     }
   }
 }
diff --git a/app/defikarte/babel.config.js b/app/defikarte/babel.config.js
@@ -2,15 +2,5 @@ module.exports = function(api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],
-    "plugins": [
-      ["transform-inline-environment-variables", {
-        "include": [
-          "NODE_ENV",
-          "REACT_NATIVE_BASE_URL",
-          "REACT_NATIVE_GOOGLE_MAPS_API_KEY",
-          "REACT_NATIVE_API_KEY",
-        ]
-      }]
-    ],
   };
 };
diff --git a/app/defikarte/eas.json b/app/defikarte/eas.json
@@ -8,20 +8,23 @@
       "developmentClient": true,
       "distribution": "internal",
       "env": {
-        "REACT_NATIVE_BASE_URL": "https://defikarte-backend-staging.azurewebsites.net/api"
+        "EXPO_PUBLIC_BASE_URL": "https://defikarte-backend-staging.azurewebsites.net/api"
       }
     },
     "preview": {
       "releaseChannel": "beta",
       "distribution": "internal",
+      "android": {
+        "buildType": "apk"
+      },
       "env": {
-        "REACT_NATIVE_BASE_URL": "https://defikarte-backend.azurewebsites.net/api"
+        "EXPO_PUBLIC_BASE_URL": "https://defikarte-backend-staging.azurewebsites.net/api"
       }
     },
     "production": {
       "releaseChannel": "production",
       "env": {
-        "REACT_NATIVE_BASE_URL": "https://defikarte-backend.azurewebsites.net/api"
+        "EXPO_PUBLIC_BASE_URL": "https://defikarte-backend.azurewebsites.net/api"
       }
     }
   },