Merge pull request #664 from FlowzPlatform/QA

Qa
FlowzPlatform · Jul 18, 2018 · 20e8d11 · 20e8d11
2 parents 869bf71 + 750c4c7
commit 20e8d11
Show file tree

Hide file tree

Showing 33 changed files with 17,130 additions and 10,105 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,11 @@
 # Flowz Website Builder [![Build Status](https://travis-ci.org/FlowzPlatform/website-builder.svg?branch=master)](https://travis-ci.org/FlowzPlatform/website-builder) [![Dependencies Status](https://david-dm.org/FlowzPlatform/website-builder.svg)](https://david-dm.org/FlowzPlatform/website-builder.svg) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/FlowzPlatform/website-builder/issues) [![HitCount](http://hits.dwyl.io/FlowzPlatform/website-builder.svg)](http://hits.dwyl.io/FlowzPlatform/website-builder)
 
-
 > A Vue.js project using [GrapesJS](https://github.com/artf/grapesjs)
 
+## Documentation
+
+View overview of Website Builder [here](https://github.com/FlowzPlatform/website-builder/wiki/Overview)
+
 ## Build Setup
 
 FlowzBuilder website Guide:
@@ -48,6 +51,8 @@ Start the FlowzServiceApi by npm start
 
 #Changelog
 1. Added New Templates 
+2. Added Jobqueue to publish website using metalsmith
+3. User Interface 2.0
 
 
 
diff --git a/finish.sh b/finish.sh
@@ -11,6 +11,7 @@ then
     RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_MASTER";
     RANCHER_SECRETKEY="$RANCHER_SECRETKEY_MASTER";
     RANCHER_URL="$RANCHER_URL_MASTER";
+    SERVICE_NAME="$SERVICE_NAME_MASTER";
   }
 elif [ "$TRAVIS_BRANCH" = "develop" ]
 then
@@ -21,6 +22,7 @@ then
       RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_DEVELOP";
       RANCHER_SECRETKEY="$RANCHER_SECRETKEY_DEVELOP";
       RANCHER_URL="$RANCHER_URL_DEVELOP";
+      SERVICE_NAME="$SERVICE_NAME_DEVELOP";
   } 
 elif [ "$TRAVIS_BRANCH" = "staging" ]
 then
@@ -31,19 +33,21 @@ then
       RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
       RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
       RANCHER_URL="$RANCHER_URL_STAGING";
+      SERVICE_NAME="$SERVICE_NAME_STAGING";
   }  
 else
   {
       echo "call $TRAVIS_BRANCH branch"
-      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 '"'`
+      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=Develop" | jq '.data[].id' | tr -d '"'`
       echo $ENV_ID
       RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_QA";
       RANCHER_SECRETKEY="$RANCHER_SECRETKEY_QA";
       RANCHER_URL="$RANCHER_URL_QA";
+      SERVICE_NAME="$SERVICE_NAME_QA";
   }
 fi
 
-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 '"'`
+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=$SERVICE_NAME" | jq '.data[].id' | tr -d '"'`
 echo $SERVICE_ID
 
 echo "waiting for service to upgrade "

diff --git a/index.html b/index.html
@@ -36,6 +36,7 @@
 
     <!-- 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> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.14.6/css/grapes.min.css" rel="stylesheet">
@@ -68,9 +69,10 @@
 
     <!-- Custom Components for Grapes Editor -->
     <script type="text/javascript" src="./static/js/product-plugin.js"></script>
+    <script type="text/javascript" src="./static/js/datafield-components.js"></script>
     <script type="text/javascript" src="./static/js/globalVariablesComponent.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 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> -->