FlowzPlatform · rbajaniya · Jan 16, 2018 · Jan 16, 2018
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -2,6 +2,7 @@ FROM whiledo/letsencrypt-apache-ubuntu
 
 ARG accesskey
 ARG secretkey
+ARG domainkey
 
 #FROM ubuntu:16.04
 

diff --git a/client/config/dev.env.js b/client/config/dev.env.js
@@ -4,5 +4,6 @@ var prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   accesskey: JSON.stringify(process.env.accesskey),
-  secretkey: JSON.stringify(process.env.secretkey)
+  secretkey: JSON.stringify(process.env.secretkey),
+  domainkey: JSON.stringify(process.env.domainkey)
 })
diff --git a/client/config/prod.env.js b/client/config/prod.env.js
@@ -1,3 +1,6 @@
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  accesskey: JSON.stringify(process.env.accesskey),
+  secretkey: JSON.stringify(process.env.secretkey),
+  domainkey: JSON.stringify(process.env.domainkey)
 }
diff --git a/client/debug.log b/client/debug.log
@@ -0,0 +1,3 @@
+[0108/124056.032:ERROR:process_info.cc(632)] range at 0xbf9994aa00000000, size 0x21b fully unreadable
+[0108/124056.034:ERROR:process_info.cc(632)] range at 0xbf99950c00000000, size 0x21b fully unreadable
+[0108/124056.034:ERROR:process_info.cc(632)] range at 0x0, size 0x21b fully unreadable
diff --git a/client/index.html b/client/index.html
@@ -7,53 +7,43 @@
   <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.4/lodash.min.js"></script>
   <!-- <meta charset="utf-8"> -->
   <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
-  <link rel="shortcut icon" href="./static/img/favicon.ico" type="image/ico" sizes="16x16">
   <title>Flowz Builder | The next generation Dynamic website builder.</title>
 
-  <!-- <link href="/static/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"> -->
-
   <!-- Fonts -->
   <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
   <link href="https://unpkg.com/vue-multiselect@2.0.3/dist/vue-multiselect.min.css" rel="stylesheet">
-  <link href="/static/css/font-awesome.min.css" rel="stylesheet" crossorigin="anonymous">
-
-  <!-- jQuery -->
-  <script src="/static/js/jquery-3.2.1.min.js" crossorigin="anonymous"></script>
-  <script src="/static/js/jquery-ui.min.js" crossorigin="anonymous"></script>
-
-  <!-- Grapes JS COmponent -->
-  <link rel="stylesheet" type="text/css" href="/static/css/grapes.min.css">
-  <script src="/static/grapes.min.js"></script>
-  <script src="/static/js/grapesjs-plugin-forms.min.js"></script>
-  <script src="/static/js/product-plugin.js"></script>
-  <script src="/static/js/grapesjs-plugin-export.min.js"></script>
-  <script type="text/javascript" src="/static/js/aviary-editor.js"></script>
-  <script src="/static/js/grapesjs-aviary.min.js"></script>
-  <script type="text/javascript" src="/static/js/grapesjs-preset-webpage.js"></script>
-  <script src="/static/js/grapesjs-component-countdown.min.js"></script>
-  <script src="/static/js/grapesjs-navbar.min.js"></script>
-  <link rel="stylesheet" href="/static/grapes.min.css">
-  <script src="/static/grapesjs-mjml.min.js"></script>
-
-  <!-- Domenu Select2  -->
-  <link href="/static/css/select2.min.css" rel="stylesheet" />
-  <script src="/static/js/select2.min.js"></script>
 
+  <link rel='stylesheet' href='/static/dropzone/dropzone.css'>
+  <script src='/static/dropzone/dropzone.js'></script>
   <script src="https://docs.handsontable.com/pro/1.14.3/bower_components/handsontable-pro/dist/handsontable.full.min.js"></script>
   <link href="https://docs.handsontable.com/pro/1.14.3/bower_components/handsontable-pro/dist/handsontable.full.min.css" rel="stylesheet" />
-
-  <!-- for amazon s3 -->
-  <!-- <script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.24.min.js"></script>
-  <script src="https://unpkg.com/axios/dist/axios.min.js"></script> -->
-
 </head>
 
 <body>
   <div id="app"></div>
   <!-- built files will be auto injected -->
-  <!-- <script type="text/javascript">
-
-  </script> -->
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.20.1/moment.min.js"></script>
+  <script type="text/javascript">
+    String.prototype.capitalize = function() { // eslint-disable-line
+      return this.charAt(0).toUpperCase() + this.slice(1).toLowerCase()
+    }
+    String.prototype.stripHTMLTags = function() { // eslint-disable-line
+      return this.replace(/<[^>]*>/g, '')
+    }
+    String.prototype.stripSpecialCharacter = function() { // eslint-disable-line
+      return this.replace(/[\/\\#,+()$~%'":*<>{}]/g, '') // eslint-disable-line
+    }
+    String.prototype.toDecimal = function(precision) { // eslint-disable-line
+      return parseFloat(this).toFixed(precision)
+    }
+    String.prototype.toInteger = function() { // eslint-disable-line
+      return parseInt(this)
+    }
+    String.prototype.formatDate = function(format) { // eslint-disable-line
+      return moment(this).format(format)
+    }
+  </script>
 </body>
 
-</html>
+</html>
diff --git a/client/package.json b/client/package.json
@@ -27,10 +27,12 @@
     "camunda-bpmn-moddle": "^0.13.0",
     "child_process": "^1.0.2",
     "codemirror": "^5.30.0",
+    "csv-write-stream": "^2.0.0",
     "diagram-js": "^0.21.1",
     "element-ui": "^1.4.12",
     "feathers-hooks": "^2.1.0",
     "feathers-socketio": "^2.0.0",
+    "file-saver": "^1.3.3",
     "fs": "0.0.1-security",
     "grapesjs": "^0.10.7",
     "grapesjs-blocks-basic": "^0.1.1",
@@ -43,6 +45,7 @@
     "jquery-ui": "^1.12.1",
     "jsdom": "^11.2.0",
     "json-daex": "0.0.13",
+    "json2csv": "^3.11.5",
     "location": "0.0.1",
     "lodash": "^4.17.4",
     "moment": "^2.19.1",

diff --git a/client/rethinkdb_data/log_file b/client/rethinkdb_data/log_file
diff --git a/client/rethinkdb_data/metadata b/client/rethinkdb_data/metadata
diff --git a/client/src/api/csvtodb/index.js b/client/src/api/csvtodb/index.js
@@ -0,0 +1,41 @@
+import api from '../../api'
+let model = 'csvtodb'
+export default {
+  get: (id) => {
+    if (id === undefined) {
+      return api.request('get', '/' + model).then(response => {
+        return response.data.data
+      })
+    } else {
+      return api.request('get', '/' + model + '/' + id).then(response => {
+        return response.data
+      })
+    }
+  },
+  post: (data) => {
+    return api.request('post', '/' + model, data).then(response => {
+      return response.data
+    })
+  },
+  put: (id, data) => {
+    return api.request('put', '/' + model + '/' + id, data).then(response => {
+      return response.data
+    })
+  },
+  patch: (id, data) => {
+    return api.request('patch', '/' + model + '/' + id, data).then(response => {
+      return response.data.data
+    })
+  },
+  delete: (id) => {
+    if (id === undefined) {
+      return api.request('delete', '/' + model).then(response => {
+        return response.data.data
+      })
+    } else {
+      return api.request('delete', '/' + model + '/' + id).then(response => {
+        return response.data
+      })
+    }
+  }
+}
diff --git a/client/src/api/import-to-external-db/index.js b/client/src/api/import-to-external-db/index.js
@@ -1,10 +1,10 @@
 import api from '../../api'
 let model = 'import-to-external-db'
 export default {
-  get: (id) => {
-    if (id === undefined) {
-      return api.request('get', '/' + model).then(response => {
-        return response.data.data
+  get: (id = null, params = null) => {
+    if (id === null) {
+      return api.request('get', '/' + model, null, params).then(response => {
+        return response.data
       })
     } else {
       return api.request('get', '/' + model + '/' + id).then(response => {

diff --git a/client/src/api/importTracker/index.js b/client/src/api/importTracker/index.js
@@ -0,0 +1,16 @@
+import api from '../../api'
+let model = 'import-tracker'
+
+export default {
+  get: (id, schemaname) => {
+    if (id === undefined) {
+      return api.request('get', '/' + model).then(res => {
+        return res.data
+      })
+    } else {
+      return api.request('get', '/' + model + '/' + id).then(res => {
+        return res.data
+      })
+    }
+  }
+}
diff --git a/client/src/api/index.js b/client/src/api/index.js
@@ -2,7 +2,7 @@ import axios from 'axios'
 import config from '../config'
 
 export default {
-  request (method, uri, data = null) {
+  request (method, uri, data = null, params = null) {
     if (!method) {
       console.error('API function call requires method argument')
       return
@@ -14,6 +14,6 @@ export default {
     }
 
     var url = config.serverURI + uri
-    return axios({ method, url, data })
+    return axios({ method, url, data, params })
   }
 }
diff --git a/client/src/assets/styles/custom.less b/client/src/assets/styles/custom.less
@@ -2,6 +2,18 @@
 @css-prefix: f-;
 
 .@{css-prefix}{
+
+  &pagination {
+    margin-top:10px;
+    clear: both;
+    > .total-page{
+      float: left;
+      line-height: 2.5;
+    }
+    > .page{
+      float: right;
+    }
+  } 
   &logo{
     width: 140px;
     height: 30px;
@@ -16,7 +28,7 @@
     }
   }
   &layout-content{
-    min-height: 200px;
+    min-height: ~"calc(100vh - 130px)";
     margin: 15px;
     /*overflow: hidden;*/
     background: #fff;
@@ -30,6 +42,8 @@
     text-align: center;
     padding: 10px 0 10px;
     color: #9ea7b4;
+    border-top: 1px solid #ccc;
+    box-shadow: 0px 0px 5px rgba(50, 50, 50, 0.50);
     // border-top: 1px solid #ccc;
   }
 }
@@ -127,7 +141,7 @@
   background-color: rgba(48, 121, 244,.1);
   margin: 5px 5px 5px 0;
   border-radius: 20px;
-  height: calc(100% - 10px);
+  height: ~"calc(100% - 10px)";
   display: block;
 }
 
@@ -150,5 +164,8 @@
 .vb.vb-dragging-phantom > .vb-dragger > .vb-dragger-styler {
   background-color: rgba(48, 121, 244,.5);
 }
+.ivu-poptip-inner{
+  box-shadow: 0 1px 6px rgba(0,0,0,1);
+}
 
 @import '//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/skins/lightgray/skin.min.css';
diff --git a/client/src/components/Db.vue b/client/src/components/Db.vue
@@ -95,6 +95,27 @@ export default {
                     this.$router.push('/instancejoblist/' + params.row.id)
                   }
                 }
+              }, ''),
+              h('Button', {
+                props: {
+                  type: 'text',
+                  size: 'large',
+                  icon: 'ios-upload'
+                },
+                style: {
+                  // color: '#CC0000',
+                  color: '#5cadff',
+                  marginRight: '3px',
+                  padding: '0px',
+                  fontSize: '20px'
+                },
+                on: {
+                  click: () => {
+                    // alert(this.tabPane)
+                    this.$router.push('/Dbsetting/importcsv/' + params.row.id)
+                    // this.importcsv(params.row.id)
+                  }
+                }
               }, '')
             ])
           }

diff --git a/client/src/components/Import.vue b/client/src/components/Import.vue
@@ -54,7 +54,7 @@
                             <Icon  v-if="check_conn" :type="conn_icon" style="padding-left:5px;font-size:12px;"/>
                         </span>
                     </Button>
-                    <Checkbox v-model="eDuplicate" style="float:right">Exclude eDuplicate records?</Checkbox>
+                    <Checkbox v-model="eDuplicate" style="float:right">Exclude Duplicate records?</Checkbox>
                 </Form>
             </Card>
         </Col>
@@ -306,8 +306,8 @@
     </div>
     <!-- <hr><hr><hr><hr> -->
     <!-- {{sdatabase}} -->
-    <hr><hr><hr><hr>
-    {{tableData}}
+    <!-- <hr><hr><hr><hr> -->
+    <!-- {{tableData}} -->
     <!-- <hr><hr><hr><hr> -->
     <!-- {{disableCheck}} -->
     <!-- {{importedData}} -->
@@ -532,6 +532,7 @@ export default {
           this.conn_icon = 'load-a'
           var sCheck = false
           this.s_collection = await modelSchema.postData(this.source).then(response => {
+            console.log('response..........', response)
             this.issConnect = true
             sCheck = true
             this.sourceDisable = true
@@ -686,12 +687,3 @@ export default {
   }
 }
 </script>
-<style>
-  .ivu-table th {
-    height: 44px;
-    white-space: nowrap;
-    overflow: hidden;
-    background-color: #394263;
-    color: #fff;
-}
-</style>