update webhooks screen

uzaysan · Sep 16, 2021 · fda31da · fda31da
1 parent f8b6fb5
commit fda31da
Show file tree

Hide file tree

Showing 11 changed files with 277 additions and 20 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
+      android:usesCleartextTraffic="true"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"

diff --git a/ios/ParseMobileDashboard/Info.plist b/ios/ParseMobileDashboard/Info.plist
@@ -25,6 +25,11 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
+	<dict>
+    	<key>NSAllowsArbitraryLoads</key>
+    	<true/>
+	</dict>
+	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>
 		<dict>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
+    "@react-native-async-storage/async-storage": "^1.15.7",
     "@react-navigation/bottom-tabs": "^6.0.5",
     "@react-navigation/native": "^6.0.2",
     "@react-navigation/stack": "^6.0.7",
@@ -20,7 +21,10 @@
     "react-native-screens": "^3.6.0",
     "react-native-svg": "^12.1.1",
     "react-native-toast-message": "1.4.9",
-    "react-native-vector-icons": "8.1.0"
+    "react-native-vector-icons": "8.1.0",
+    "react-redux": "^7.2.4",
+    "redux": "^4.1.1",
+    "redux-persist": "^6.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

diff --git a/src/api/BaseApi.js b/src/api/BaseApi.js
@@ -14,7 +14,7 @@ export default request = {
     });
     return await response.json();
   },
-  GET: async (endpoint, body, headers) => {
+  GET: async (endpoint, headers) => {
     const response = await fetch(`${Config.serverUrl}/${endpoint}`, {
       method: 'GET',
       headers: {
@@ -24,7 +24,6 @@ export default request = {
         ...headers,
       },
     });
-    console.log('Response', response);
     return await response.json();
   },
 };
diff --git a/src/api/Schema.js b/src/api/Schema.js
@@ -3,7 +3,7 @@ import request from './BaseApi';
 export default Schema = {
   async getAllSchema() {
     try {
-      return await request.GET('schemas', {}, {});
+      return await request.GET('schemas', {});
     } catch (err) {
       return {error: err};
     }

diff --git a/src/components/BottomBar.js b/src/components/BottomBar.js
@@ -2,6 +2,7 @@ import React from 'react';
 import {StyleSheet, TouchableHighlight, Text, View} from 'react-native';
 import Ionicons from 'react-native-vector-icons/dist/Ionicons';
 import MaterialCommunityIcons from 'react-native-vector-icons/dist/MaterialCommunityIcons';
+
 const iconSize = 26;
 
 const BottomBar = ({state, navigation}) => {
@@ -144,7 +145,11 @@ const BottomBar = ({state, navigation}) => {
         <View style={styles.touchableChild}>
           <View style={styles.innerView}>
             <Ionicons
-              name={state.index === 4 ? 'cloud-upload' : 'cloud-upload-outline'}
+              name={
+                state.index === 4
+                  ? 'ios-chevron-up-circle'
+                  : 'ios-chevron-up-circle-outline'
+              }
               size={iconSize}
               color="black"
             />
@@ -154,7 +159,7 @@ const BottomBar = ({state, navigation}) => {
                   ? styles.text
                   : {...styles.text, fontWeight: 'normal'}
               }>
-              Api
+              Other
             </Text>
           </View>
           {state.index === 4 && <View style={styles.topLine} />}

diff --git a/src/components/ButtonWithProgress.js b/src/components/ButtonWithProgress.js
@@ -7,21 +7,26 @@ import {
   ActivityIndicator,
 } from 'react-native';
 
-const ButtonWithprogress = ({
+const ButtonWithProgress = ({
   isLoading,
   onPress,
   style,
   underlayColor,
   buttonText,
   progressColor,
+  buttonTextStyle,
 }) => {
   return (
     <TouchableHighlight
       onPress={onPress}
       underlayColor={underlayColor || '#EEEEEE'}
       style={{...styles.main, ...style}}>
       <View style={styles.innerView}>
-        {!isLoading && <Text>{buttonText}</Text>}
+        {!isLoading && (
+          <Text style={{...styles.buttonText, ...buttonTextStyle}}>
+            {buttonText}
+          </Text>
+        )}
         {isLoading && (
           <ActivityIndicator size={30} color={progressColor || 'black'} />
         )}
@@ -42,6 +47,9 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
+  buttonText: {
+    fontWeight: 'bold',
+  },
 });
 
-export default ButtonWithprogress;
+export default ButtonWithProgress;
diff --git a/src/components/EditTextWithIcon.js b/src/components/EditTextWithIcon.js
@@ -18,6 +18,7 @@ const EditTextWithIcon = ({
         <TextInput
           style={{...styles.textStyle, ...textStyle}}
           placeholder={placeholder}
+          placeholderTextColor={'#999999'}
           value={value}
           onChangeText={onChangeText}
           multiline={multiline}