Merge pull request #634 from FlowzPlatform/QA

Qa
FlowzPlatform · May 15, 2018 · 869bf71 · 869bf71
2 parents f47797d + af187ff
commit 869bf71
Show file tree

Hide file tree

Showing 218 changed files with 57,196 additions and 4,131 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,7 @@ Start rethinkdb: rethinkdb --http-port 8081
 Start the FlowzServiceApi by npm start
 
 #Changelog
+1. Added New Templates 
 
 
 
diff --git a/favicon.ico b/favicon.ico
diff --git a/finish.sh b/finish.sh
@@ -6,49 +6,61 @@ if [ "$TRAVIS_BRANCH" = "master" ]
 then
     {
     echo "call $TRAVIS_BRANCH branch"
-    ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
+    ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_MASTER":"$RANCHER_SECRETKEY_MASTER"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_MASTER/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
     echo $ENV_ID
+    RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_MASTER";
+    RANCHER_SECRETKEY="$RANCHER_SECRETKEY_MASTER";
+    RANCHER_URL="$RANCHER_URL_MASTER";
   }
 elif [ "$TRAVIS_BRANCH" = "develop" ]
 then
     {
       echo "call $TRAVIS_BRANCH branch"
-      ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
+      ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_DEVELOP":"$RANCHER_SECRETKEY_DEVELOP"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_DEVELOP/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
       echo $ENV_ID
-  }
+      RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_DEVELOP";
+      RANCHER_SECRETKEY="$RANCHER_SECRETKEY_DEVELOP";
+      RANCHER_URL="$RANCHER_URL_DEVELOP";
+  } 
 elif [ "$TRAVIS_BRANCH" = "staging" ]
 then
     {
       echo "call $TRAVIS_BRANCH branch"
-      ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
+      ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_STAGING":"$RANCHER_SECRETKEY_STAGING"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_STAGING/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
       echo $ENV_ID
+      RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
+      RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
+      RANCHER_URL="$RANCHER_URL_STAGING";
   }  
 else
   {
       echo "call $TRAVIS_BRANCH branch"
-      ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
+      ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_QA":"$RANCHER_SECRETKEY_QA"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_QA/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
       echo $ENV_ID
+      RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_QA";
+      RANCHER_SECRETKEY="$RANCHER_SECRETKEY_QA";
+      RANCHER_URL="$RANCHER_URL_QA";
   }
 fi
 
-SERVICE_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services?name=web-builder-fronted-flowz" | jq '.data[].id' | tr -d '"'`
+SERVICE_ID=`curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL/v2-beta/projects/$ENV_ID/services?name=web-builder-fronted-flowz" | jq '.data[].id' | tr -d '"'`
 echo $SERVICE_ID
 
 echo "waiting for service to upgrade "
     while true; do
 
-      case `curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
+      case `curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
           -X GET \
           -H 'Accept: application/json' \
           -H 'Content-Type: application/json' \
-          "http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services/$SERVICE_ID/" | jq '.state'` in
+          "$RANCHER_URL/v2-beta/projects/$ENV_ID/services/$SERVICE_ID/" | jq '.state'` in
           "\"upgraded\"" )
               echo "completing service upgrade"
-              curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
+              curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
                 -X POST \
                 -H 'Accept: application/json' \
                 -H 'Content-Type: application/json' \
-                "http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=finishupgrade"
+                "$RANCHER_URL/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=finishupgrade"
               break ;;
           "\"upgrading\"" )
               echo "still upgrading"

diff --git a/index.html b/index.html
@@ -5,7 +5,7 @@
     <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>
+    <title>Flowz Web-Builder</title>
 
     <!-- Bootstrap Css -->
     <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
@@ -31,16 +31,15 @@
     <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
     <!-- X-Editable -->
-    <link rel="stylesheet" type="text/css" href="https://res.cloudinary.com/flowz/raw/upload/v1515048375/builder/css/bootstrap-editable.css">
-    <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1515047294/builder/js/bootstrap-editable.min.js"></script>
+    <!-- <link rel="stylesheet" type="text/css" href="https://res.cloudinary.com/flowz/raw/upload/v1515048375/builder/css/bootstrap-editable.css"> -->
+    <!-- <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1515047294/builder/js/bootstrap-editable.min.js"></script> -->
 
     <!-- Grapes JS Component -->
     <link rel="stylesheet" type="text/css" href="./static/css/custom-components-for-grapes.min.css">
-    <link rel="stylesheet" type="text/css" href="./static/css/grapes.min.css">
-    <script type="text/javascript" src="./static/grapes.min.js"></script>
-    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.14.5/css/grapes.min.css"></script> -->
-    <!-- <link href="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.12.17/grapes.min.js" rel="stylesheet">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.12.17/css/grapes.min.css"></script> -->
+    <!-- <link rel="stylesheet" type="text/css" href="./static/css/grapes.min.css"> -->
+    <!-- <script type="text/javascript" src="./static/grapes.min.js"></script> -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.14.6/css/grapes.min.css" rel="stylesheet">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.14.6/grapes.min.js"></script>
 
     <!-- Grapes JS Extra Plugins -->
     <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1515047295/builder/js/grapesjs-blocks-basic.min.js"></script>
@@ -51,21 +50,26 @@
     <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1518688189/builder/js/grapesjs-preset-webpage.js"></script>
     <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1515047295/builder/js/grapesjs-component-countdown.min.js"></script>
     <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1515047295/builder/js/grapesjs-navbar.min.js"></script>
-    <script type="text/javascript" src="https://unpkg.com/grapesjs-blocks-flexbox"></script>
+    <!-- <script type="text/javascript" src="https://unpkg.com/grapesjs-blocks-flexbox"></script> -->
+    <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1521026042/builder/js/grapesjs-lory-slider.min.js"></script>
 
     <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1516180838/builder/js/grapesjs-blocks-bootstrap4.min.js"></script>
-
+    <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1521712588/crm/countries.js"></script>
+
     <!-- Filestack for Grapes file uploader -->
     <!-- <link rel="stylesheet" type="text/css" href="https://res.cloudinary.com/flowz/raw/upload/v1515048375/builder/css/grapesjs-plugin-filestack.css"> -->
     <!-- <script type="text/javascript" src="https://static.filestackapi.com/v3/filestack-0.1.10.js"></script> -->
     <!-- <script src="https://code.jquery.com/jquery-3.2.1.js"></script> -->
-    <script src="https://static.filestackapi.com/v3/filestack.js"></script>
+    <!-- <script src="https://static.filestackapi.com/v3/filestack.js"></script> -->
     <!-- <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1515047296/builder/js/grapesjs-plugin-filestack.min.js"></script> -->
 
+    <!-- Cloudinary JS for assets uploader -->
+    <script src="//widget.cloudinary.com/global/all.js" type="text/javascript"></script>
+
     <!-- Custom Components for Grapes Editor -->
     <script type="text/javascript" src="./static/js/product-plugin.js"></script>
     <script type="text/javascript" src="./static/js/globalVariablesComponent.js"></script>
-    <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1519738540/builder/js/flowz-blocks.js"></script>
+    <script type="text/javascript" src="https://res.cloudinary.com/flowz/raw/upload/v1522733776/builder/js/flowz-blocks.js"></script>
     <!-- <script src="./static/js/flowz-blocks.js"></script> -->
     <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.7.3/ckeditor.js"></script>
     <script src="./static/js/grapesjs-plugin-ckeditor.min.js"></script> -->
@@ -106,21 +110,18 @@
             visibility: hidden;
         }
 
-        body::-webkit-scrollbar-track
-        {
-        -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-        background-color: #F5F5F5;
+        body::-webkit-scrollbar-track {
+            -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+            background-color: #F5F5F5;
         }
 
-        body::-webkit-scrollbar
-        {
-        width: 6px;
-        background-color: #F5F5F5;
+        body::-webkit-scrollbar {
+            width: 6px;
+            background-color: #F5F5F5;
         }
 
-        body::-webkit-scrollbar-thumb
-        {
-        background-color: #444;
+        body::-webkit-scrollbar-thumb {
+            background-color: #444;
         }
     </style>
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,14 +24,15 @@
     "file-saver": "^1.3.3",
     "grapesjs-blocks-bootstrap4": "^0.1.3",
     "grapesjs-plugin-filestack": "^0.1.1",
-    "iview": "^2.9.2",
+    "iview": "^2.11.0",
     "jquery": "^3.2.1",
     "js-cookie": "^2.2.0",
     "json-daex": "0.0.9",
     "lodash": "^4.17.4",
     "moment": "^2.20.1",
     "psl": "^1.1.21",
     "sortable": "^2.0.0",
+    "uuid": "^3.2.1",
     "uws": "^9.14.0",
     "vue": "^2.3.3",
     "vue-codemirror": "^3.1.2",
@@ -43,9 +44,9 @@
     "vue-router": "^2.6.0",
     "vue-session": "^0.9.4",
     "vue-sweetalert": "^0.1.18",
+    "vue-widgets": "^1.0.9",
     "vuedraggable": "^2.15.0",
-    "vuex": "^2.3.1",
-    "vuex-persistedstate": "^2.0.0",
+    "vuex": "2.3.1",
     "vuex-router-sync": "^5.0.0"
   },
   "devDependencies": {