cleanup

botfront · Apr 11, 2018 · dd15eee · dd15eee
1 parent 5f11643
commit dd15eee
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 100 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,5 +1,5 @@
 /src
-index.js
+index_for_react_app.js
 yarn.lock
 assets
 mocks

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -4,6 +4,10 @@ steps:
 - name: 'gcr.io/cloud-builders/npm'
   args: ['run','build']
 - name: 'gcr.io/cloud-builders/gsutil'
-  args: ['cp', 'dist/mrbotwebchat.js', 'gs://mrbot-cdn/mrbotwebchat.js']
+  args: ['cp', 'dist/webchat.js', 'gs://mrbot-cdn/webchat-$TAG_NAME.js']
 - name: 'gcr.io/cloud-builders/gsutil'
-  args: ['acl', 'ch', '-u', 'AllUsers:R', 'gs://mrbot-cdn/mrbotwebchat.js']
+  args: ['cp', 'dist/webchat.js', 'gs://mrbot-cdn/webchat-$TAG_NAME.js']
+- name: 'gcr.io/cloud-builders/gsutil'
+  args: ['acl', 'ch', '-u', 'AllUsers:R', 'gs://mrbot-cdn/webchat-latest.js']
+- name: 'gcr.io/cloud-builders/gsutil'
+  args: ['acl', 'ch', '-u', 'AllUsers:R', 'gs://mrbot-cdn/webchat$-latest.js']
diff --git a/dev/src/chat_test.js b/dev/src/chat_test.js
diff --git a/dev/src/index.html b/dev/src/index.html
@@ -6,9 +6,9 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <body>
 <script src="index.js" type="text/javascript"></script>
-<div id="mrbot-web-chat"></div><script>
-  MrbotWebChat.default.init({
-    selector: "#mrbot-web-chat",
+<div id="webchat"></div><script>
+  WebChat.default.init({
+    selector: "#webchat",
     socketUrl: "ws://localhost:5500",
     initPayload: "/get_started",
     title:"Support"

diff --git a/index.js b/index.js
@@ -1,23 +1,24 @@
-import ConnectedWidget from './src';
-import {
-  addUserMessage,
-  addResponseMessage,
-  addLinkSnippet,
-  addQuickReply,
-  renderCustomComponent,
-  toggleWidget,
-  toggleInputDisabled,
-  dropMessages
-} from './src/store/actions/dispatcher';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Widget } from './index_for_react_app';
 
-export {
-  ConnectedWidget as Widget,
-  addUserMessage,
-  addResponseMessage,
-  addLinkSnippet,
-  addQuickReply,
-  renderCustomComponent,
-  toggleWidget,
-  toggleInputDisabled,
-  dropMessages
+
+export default {
+
+  init: (args) => {
+    ReactDOM.render(
+      <Widget
+        socketUrl={args.socketUrl}
+        initPayload={args.initPayload}
+        title={args.title}
+        subtitle={args.subtitle}
+        inputTextFieldHint={args.inputTextFieldHint}
+        profileAvatar={args.profileAvatar}
+        showCloseButton={args.showCloseButton}
+        fullScreenMode={args.fullScreenMode}
+        badge={args.badge}
+      />, document.querySelector(args.selector)
+
+    );
+  }
 };
diff --git a/index_facade.js b/index_facade.js
diff --git a/index_for_react_app.js b/index_for_react_app.js
@@ -0,0 +1,23 @@
+import ConnectedWidget from './src';
+import {
+  addUserMessage,
+  addResponseMessage,
+  addLinkSnippet,
+  addQuickReply,
+  renderCustomComponent,
+  toggleWidget,
+  toggleInputDisabled,
+  dropMessages
+} from './src/store/actions/dispatcher';
+
+export {
+  ConnectedWidget as Widget,
+  addUserMessage,
+  addResponseMessage,
+  addLinkSnippet,
+  addQuickReply,
+  renderCustomComponent,
+  toggleWidget,
+  toggleInputDisabled,
+  dropMessages
+};
diff --git a/webpack.dev.js b/webpack.dev.js
@@ -2,11 +2,11 @@ const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
-  entry: path.resolve(__dirname, 'index_facade.js'),
+  entry: path.resolve(__dirname, 'index.js'),
   output: {
     path: path.resolve(__dirname, 'dev'),
     filename: 'index.js',
-    library: 'MrbotWebChat',
+    library: 'WebChat',
     libraryTarget: 'umd'
   },
   devServer: {
@@ -48,7 +48,7 @@ module.exports = {
     }]
   },
   plugins: [new HtmlWebpackPlugin({
-    title: 'React Chat Widget Test',
+    title: 'Web Chat Widget Test',
     filename: 'index.html',
     inject: false,
     template: 'dev/src/index.html',

diff --git a/webpack.prod.js b/webpack.prod.js
@@ -1,11 +1,11 @@
 const path = require('path');
 
 module.exports = {
-  entry: path.join(__dirname, 'index_facade.js'),
+  entry: path.join(__dirname, 'index.js'),
   output: {
     path: path.resolve(__dirname, 'dist'),
-    filename: 'mrbotwebchat.js',
-    library: 'MrbotWebChat',
+    filename: 'webchat.js',
+    library: 'WebChat',
     libraryTarget: 'umd'
   },
   resolve: {