new submission permission box + test

.env.example

@@ -155,3 +155,4 @@ REACT_NATIVE_TWITTER_LINK=
 REACT_NATIVE_DISCUSSION_LINK=
 
 REACT_NATIVE_GOOGLE_CLOUD_PROJECT_ID=
+REACT_NATIVE_METADATA_CHECKING_RELEASE_DATE=

.eslintrc.js

@@ -8,6 +8,7 @@ module.exports = {
     'no-unused-vars': 'off',
     'unused-imports/no-unused-imports': 'off',
     '@typescript-eslint/no-unused-vars': 'off',
+    'react/react-in-jsx-scope': 'off',
     'no-console': 0,
     'unused-imports/no-unused-vars': [
       'warn',

.gitignore

@@ -19,3 +19,5 @@ web-build/
 .idea/
 
 .env
+
+/coverage/

android/app/build.gradle

@@ -120,7 +120,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0.0"
+        versionName "2.0.0"
+        versionNameSuffix "-beta.2"
     }
 
     splits {

android/app/src/main/AndroidManifest.xml

@@ -28,13 +28,15 @@
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
       <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
         <data android:scheme="com.treejer.ranger"/>
         <data android:scheme="https" android:host="ranger.treejer.com" android:pathPrefix="/referrer/"/>
         <data android:scheme="https" android:host="ranger.treejer.com" android:pathPrefix="/organization/"/>
-        <data android:scheme="ranger-treejer"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:scheme="ranger-treejer" />
       </intent-filter>
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>

android/app/src/main/assets/custom/README.md

@@ -0,0 +1,3 @@
+# Fonts
+
+> Fonts are in here

android/app/src/main/java/com/treejer/ranger/MainActivity.java

@@ -13,7 +13,7 @@
 public class MainActivity extends ReactActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    // Set the theme to AppTheme BEFORE onCreate to support 
+    // Set the theme to AppTheme BEFORE onCreate to support
     // coloring the background, status bar, and navigation bar.
     // This is required for expo-splash-screen.
     setTheme(R.style.AppTheme);

android/build.gradle

@@ -13,6 +13,7 @@ buildscript {
 
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
+        androidXBrowser = "1.5.0"
     }
     repositories {
         google()

android/link-assets-manifest.json

@@ -0,0 +1,81 @@
+{
+  "migIndex": 1,
+  "data": [
+    {
+      "path": "assets/fonts/Montserrat-Black.ttf",
+      "sha1": "96d03479269d1ba7a3e38f4b64ff87ead267c998"
+    },
+    {
+      "path": "assets/fonts/Montserrat-BlackItalic.ttf",
+      "sha1": "6e84efcb6bf01c47102d6e9f0dbe5958e74c9f20"
+    },
+    {
+      "path": "assets/fonts/Montserrat-Bold.ttf",
+      "sha1": "3a54407a2b26ff4718708a4726b10cb070d16534"
+    },
+    {
+      "path": "assets/fonts/Montserrat-BoldItalic.ttf",
+      "sha1": "6acf078ad5e1b77e6d68b8ff0cde39d81b9f057c"
+    },
+    {
+      "path": "assets/fonts/Montserrat-ExtraBold.ttf",
+      "sha1": "4b5c27dcf59df165606efa247190c0bfa3c02ff0"
+    },
+    {
+      "path": "assets/fonts/Montserrat-ExtraBoldItalic.ttf",
+      "sha1": "28423e53b60316c09f468055ca8c1d27c06ab45b"
+    },
+    {
+      "path": "assets/fonts/Montserrat-ExtraLight.ttf",
+      "sha1": "fe3c849af6231af6c5c43d1045f2011bf683f317"
+    },
+    {
+      "path": "assets/fonts/Montserrat-ExtraLightItalic.ttf",
+      "sha1": "40d3231d668844dab24536fa0c380bdc2311a992"
+    },
+    {
+      "path": "assets/fonts/Montserrat-Italic.ttf",
+      "sha1": "798c701450f6bc08217f73c1ac569100cddc2947"
+    },
+    {
+      "path": "assets/fonts/Montserrat-Light.ttf",
+      "sha1": "83879cec4c934d446eca63aa5cfedcebfd60d610"
+    },
+    {
+      "path": "assets/fonts/Montserrat-LightItalic.ttf",
+      "sha1": "659632ad8a33d96e6a00319d7b0c020e9cc6cc5b"
+    },
+    {
+      "path": "assets/fonts/Montserrat-Medium.ttf",
+      "sha1": "65a98832079c4d2c67f3acc4f4ce2de630fe6cb0"
+    },
+    {
+      "path": "assets/fonts/Montserrat-MediumItalic.ttf",
+      "sha1": "ceadac9926836d5fc0ee14f94567f0ea25979fa2"
+    },
+    {
+      "path": "assets/fonts/Montserrat-Regular.ttf",
+      "sha1": "d25b35242deb1c6ff888b8162ca2aacc356d3899"
+    },
+    {
+      "path": "assets/fonts/Montserrat-SemiBold.ttf",
+      "sha1": "f829de4c176fb2ccf5e33360920f48de6794434e"
+    },
+    {
+      "path": "assets/fonts/Montserrat-SemiBoldItalic.ttf",
+      "sha1": "3c2759411b32ad6779aba08e4c09ed1b3c0bc4d4"
+    },
+    {
+      "path": "assets/fonts/Montserrat-Thin.ttf",
+      "sha1": "1d00ff2f5bc9331aa6e75b5a82dd698976615dc4"
+    },
+    {
+      "path": "assets/fonts/Montserrat-ThinItalic.ttf",
+      "sha1": "ae19fb168e043e6408692c4bc50dd0aab76fdc22"
+    },
+    {
+      "path": "assets/fonts/README.md",
+      "sha1": "e40451f9fc81b083aec8b0df5d69f2c15c932a7e"
+    }
+  ]
+}

app.json

@@ -1,8 +1,9 @@
 {
   "expo": {
     "name": "RangerTreejer",
+    "scheme": "ranger-treejer",
     "slug": "RangerTreejerV2",
-    "version": "1.0.0",
+    "version": "1.0.0-beta.2",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",

babel.config.js

@@ -26,12 +26,20 @@ module.exports = function (api) {
             navigation: './src/navigation',
             types: './src/types',
             'ranger-redux': './src/redux',
+            'ranger-testUtils': './src/testUtils',
+            webServices: './src/webServices',
           },
         },
       ],
       'import-graphql',
-      '@babel/plugin-proposal-export-namespace-from',
       'react-native-reanimated/plugin',
+      ...(process.env.NODE_ENV === 'test'
+        ? [
+            '@babel/plugin-proposal-export-namespace-from',
+            '@babel/plugin-proposal-private-methods',
+            '@babel/plugin-proposal-class-properties',
+          ]
+        : []),
     ],
   };
 };

deploy.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+#  ==> USERNAME and SERVER_IP env variables are needed!!! <==
+
+echo "Start to build web production ..."
+
+yarn web:build
+
+echo "web:prod is done"
+
+SERVER_SSH="$SERVER_USERNAME@$SERVER_IP"
+TIME_FOLDER=$(date +'%m-%d-%Y-%H%M')
+if
+    [[ "$PORT" -eq "" || "$PORT" -eq "4000" ]];
+then
+    PORT_LOCAL=4000;
+    SERVER_FOLDER="/home/deploy/projects/mobiledev-build"
+    PM2_NAME="dev";
+else
+    PORT_LOCAL=$PORT;
+    SERVER_FOLDER="/home/deploy/projects/mobile-build"
+    PM2_NAME="main";
+fi
+BUILD_TAR_FILE="web-build-$TIME_FOLDER.tar.gz"
+
+echo "Start deploying ranger treejer web to $SERVER_IP on port $PORT_LOCAL"
+
+echo "$(TIME_FOLDER) => Folder for deploying"
+
+tar -zcvf "$BUILD_TAR_FILE" web-build
+
+echo "tar.gz file generated"
+
+scp "$BUILD_TAR_FILE" "$SERVER_SSH:$SERVER_FOLDER/$BUILD_TAR_FILE"
+
+echo "tar.gz successfully copied to server."
+
+rm -rf "$BUILD_TAR_FILE"
+
+SSH_COMMAND="ssh $SERVER_SSH 'cd $SERVER_FOLDER; pm2 delete $PM2_NAME; rm -rf web-build; tar -xvf $BUILD_TAR_FILE; pm2 serve web-build $PORT_LOCAL --name $PM2_NAME;'"
+eval "${SSH_COMMAND}"

index.css

@@ -0,0 +1,102 @@
+.slick-slider,
+.slick-slider .slick-list,
+.slick-slider .slick-list .slick-track,
+.slick-slider .slick-list .slick-track .slick-slide,
+.slick-slider .slick-list .slick-track .slick-slide > div,
+.slick-slider .slick-list .slick-track .slick-slide > div > div {
+    height: 100%;
+}
+
+body {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: #faf8f0;
+}
+
+#root {
+    max-width: 768px;
+    margin: auto;
+    box-shadow: 0 0 40px 4px rgba(0, 0, 0, 0.1);
+    overflow: hidden;
+}
+
+@media all and (min-width: 768px) {
+    #root {
+        border-radius: 12px;
+    }
+}
+
+#ranger-web {
+    min-height: -webkit-fill-available;
+    min-height: -moz-fill-available;
+    min-width: -webkit-fill-available;
+    overflow: hidden;
+    display: flex;
+    background-color: #faf8f0;
+}
+
+.mapboxgl-ctrl-top-right {
+    position: fixed !important;
+    top: auto !important;
+    right: 1rem !important;
+    bottom: 10vh !important;
+    width: 100px !important;
+    height: 100px !important;
+    display: none;
+}
+
+#ptr-container > div {
+    height: 100% !important;
+}
+
+@media all and (max-height: 677px) {
+    .mapboxgl-ctrl-top-right {
+        bottom: 13vh !important;
+    }
+}
+
+.mapboxgl-ctrl-geolocate {
+    width: 45px !important;
+    height: 45px !important;
+    padding: 4px !important;
+}
+
+.mapboxgl-ctrl-icon {
+    background-size: cover;
+}
+
+.mapboxgl-ctrl,
+.mapboxgl-ctrl-group {
+    border-radius: 50% !important;
+    overflow: hidden !important;
+}
+
+.mapboxgl-ctrl-bottom-right {
+    display: none !important;
+}
+
+.mapboxgl-ctrl-bottom-left {
+    display: none !important;
+}
+
+input {
+    outline: none;
+}
+
+.Toastify__toast-container--top-right {
+    top: env(safe-area-inset-top, 1em) !important;
+}
+
+@media all and (min-width: 768px) {
+    .Toastify__toast-container--top-right {
+        right: calc(100vw - 768px - calc(50vw - 392px));
+    }
+}
+
+
+#ptr-parent{
+    width: 100% !important;
+}

ios/Podfile

@@ -10,7 +10,7 @@ podfile_properties = JSON.parse(File.read(File.join(__dir__, 'Podfile.properties
 
 ENV['RCT_NEW_ARCH_ENABLED'] = podfile_properties['newArchEnabled'] == 'true' ? '1' : '0'
 
-platform :ios, podfile_properties['ios.deploymentTarget']  || '13.0'
+platform :ios, '13.0'
 install! 'cocoapods',
   :deterministic_uuids => false