Component

Dequas · Dequas · commit 4b0294695de7 · 2020-05-05T18:55:00.000+02:00
diff --git a/examples/full/.expo/packager-info.json b/examples/full/.expo/packager-info.json
@@ -0,0 +1,9 @@
+{
+  "devToolsPort": 19002,
+  "expoServerPort": null,
+  "packagerPort": null,
+  "packagerPid": null,
+  "expoServerNgrokUrl": null,
+  "packagerNgrokUrl": null,
+  "ngrokPid": null
+}
diff --git a/examples/full/.expo/settings.json b/examples/full/.expo/settings.json
@@ -0,0 +1,7 @@
+{
+  "hostType": "lan",
+  "lanType": "ip",
+  "dev": true,
+  "minify": false,
+  "urlRandomness": "tm-bsf"
+}
diff --git a/examples/full/App.js b/examples/full/App.js
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import { StyleSheet, Text, View, Button } from "react-native";
-import Weeloop from "./Components/Weloop";
+import Weeloop from "react-native-weloop";
 
 export default class App extends Component {
     constructor(props) {
@@ -24,14 +24,12 @@ export default class App extends Component {
                     ref={this.weeloop}
                     custom={false}
                     appGuid="67540390-b3c1-11e9-a487-43674d54ecce"
-                    /*
                     user={{
                         email: "lucas.delon@yopmail.com",
                         firstname: "lucas",
                         lastname: "delon",
                         key: "wZcD1",
                     }}
-                    */
                 />
             </View>
         );
diff --git a/examples/full/app.json b/examples/full/app.json
diff --git a/examples/full/babel.config.js b/examples/full/babel.config.js
diff --git a/examples/full/package.json b/examples/full/package.json
@@ -0,0 +1,22 @@
+{
+    "main": "node_modules/expo/AppEntry.js",
+    "scripts": {
+        "start": "expo start",
+        "android": "expo start --android",
+        "ios": "expo start --ios",
+        "web": "expo start --web",
+        "eject": "expo eject"
+    },
+    "dependencies": {
+        "expo": "~37.0.3",
+        "react": "^16.13.1",
+        "react-dom": "^16.13.1",
+        "react-native": "https://github.com/expo/react-native/archive/sdk-37.0.1.tar.gz",
+        "react-native-weloop": "file:../../react-native-weloop-1.0.0.tgz"
+    },
+    "devDependencies": {
+        "@babel/core": "^7.8.6",
+        "babel-preset-expo": "~8.1.0"
+    },
+    "private": true
+}
diff --git a/examples/simple/.expo/packager-info.json b/examples/simple/.expo/packager-info.json
@@ -0,0 +1,9 @@
+{
+  "devToolsPort": 19002,
+  "expoServerPort": null,
+  "packagerPort": null,
+  "packagerPid": null,
+  "expoServerNgrokUrl": null,
+  "packagerNgrokUrl": null,
+  "ngrokPid": null
+}
diff --git a/examples/simple/.expo/settings.json b/examples/simple/.expo/settings.json
@@ -0,0 +1,7 @@
+{
+  "hostType": "lan",
+  "lanType": "ip",
+  "dev": true,
+  "minify": false,
+  "urlRandomness": "tm-bsf"
+}
diff --git a/examples/simple/App.js b/examples/simple/App.js
@@ -0,0 +1,25 @@
+import React, { Component } from "react";
+import { StyleSheet, Text, View } from "react-native";
+import Weeloop from "react-native-weloop";
+
+export default class App extends Component {
+    render() {
+        return (
+            <View style={styles.container}>
+                <View style={styles.container}>
+                    <Text>Une application parfaite pour weloop !</Text>
+                </View>
+                <Weeloop appGuid="67540390-b3c1-11e9-a487-43674d54ecce" />
+            </View>
+        );
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        backgroundColor: "#ffa",
+        alignItems: "center",
+        justifyContent: "center",
+    },
+});
diff --git a/examples/simple/app.json b/examples/simple/app.json
@@ -0,0 +1,21 @@
+{
+    "expo": {
+        "name": "WeloopAppTest",
+        "slug": "WeloopAppTest",
+        "platforms": ["ios", "android", "web"],
+        "version": "1.0.0",
+        "privacy": "public",
+        "orientation": "portrait",
+        "splash": {
+            "resizeMode": "contain",
+            "backgroundColor": "#ffffff"
+        },
+        "updates": {
+            "fallbackToCacheTimeout": 0
+        },
+        "assetBundlePatterns": ["**/*"],
+        "ios": {
+            "supportsTablet": true
+        }
+    }
+}
diff --git a/examples/simple/babel.config.js b/examples/simple/babel.config.js
@@ -0,0 +1,6 @@
+module.exports = function(api) {
+  api.cache(true);
+  return {
+    presets: ['babel-preset-expo'],
+  };
+};
diff --git a/examples/simple/package.json b/examples/simple/package.json
@@ -0,0 +1,22 @@
+{
+    "main": "node_modules/expo/AppEntry.js",
+    "scripts": {
+        "start": "expo start",
+        "android": "expo start --android",
+        "ios": "expo start --ios",
+        "web": "expo start --web",
+        "eject": "expo eject"
+    },
+    "dependencies": {
+        "expo": "~37.0.3",
+        "react": "^16.13.1",
+        "react-dom": "^16.13.1",
+        "react-native": "https://github.com/expo/react-native/archive/sdk-37.0.1.tar.gz",
+        "react-native-weloop": "file:../../react-native-weloop-1.0.0.tgz"
+    },
+    "devDependencies": {
+        "@babel/core": "^7.8.6",
+        "babel-preset-expo": "~8.1.0"
+    },
+    "private": true
+}
diff --git a/index.js b/index.js
@@ -87,6 +87,7 @@ export default class Weloop extends Component {
     };
 
     handleOnMessage(event) {
+        console.log(JSON.parse(event.nativeEvent.data).data.name);
         switch (JSON.parse(event.nativeEvent.data).data.name) {
             case "get-screenshot":
                 if (this.state.isCaptured) return;
@@ -110,6 +111,14 @@ export default class Weloop extends Component {
                         notifNb: JSON.parse(event.nativeEvent.data).data.value,
                     });
                 break;
+            case "isLoaded":
+                console.log(this.props.appGuid + " " + this.state.token);
+                if (this.state.token != null) {
+                    this.webView.current.injectJavaScript(
+                        `window.GetCurrentUser({ appGuid: '${this.props.appGuid}', token: '${this.state.token}'});true;`
+                    );
+                }
+                break;
             default:
                 break;
         }
@@ -135,14 +144,6 @@ export default class Weloop extends Component {
                             this.setState({ isLoading: true });
                         }}
                         onLoadEnd={() => {
-                            if (
-                                this.state.token != null &&
-                                this.state.token != null
-                            ) {
-                                this.webView.current.injectJavaScript(
-                                    `window.GetCurrentUser({ appGuid: '${this.props.appGuid}', token: '${this.state.token}'});true;`
-                                );
-                            }
                             this.setState({ isLoading: false });
                         }}
                         injectedJavaScript={`
@@ -189,7 +190,7 @@ export default class Weloop extends Component {
                             <SvgRenderer
                                 width="25"
                                 height="25"
-                                source={require("./../assets/images/logo.svg")}
+                                source={require("./assets/images/logo.svg")}
                             />
                         )}
                         {this.state.notifNb !== "?" &&
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
