Merge pull request #33 from CloudBoost/staging

Staging

.travis.yml

@@ -67,5 +67,4 @@ branches:
     - /^*-v[0-9]/
 #Notify Team on Slack
 notifications:
-  slack: cloudboost:gm7nWJDLDtBRyF75VKLKOoMW
-
+  slack: cloudboost:gm7nWJDLDtBRyF75VKLKOoMW

circle.yml

@@ -0,0 +1,48 @@
+machine:
+  node:
+    version: 7.4.0
+  services:
+    - docker
+  environment:
+    CLOUDSDK_CORE_DISABLE_PROMPTS: 1
+dependencies:
+  override:
+    - sudo apt-get update
+    - sudo apt-get install curl libc6 libcurl3 zlib1g
+    - npm install
+  post:
+    - curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+    - chmod +x ./kubectl
+    - sudo mv ./kubectl /usr/local/bin/kubectl
+test:
+  pre:
+    - docker build -t cloudboost/tutorial:3.0.$CIRCLE_BUILD_NUM .
+  override:
+    - echo "NO TESTS REQUIRED FOR tutorial-UI"
+deployment:
+  staging:
+    branch: staging
+    commands:
+      - docker build -t cloudboost/tutorial:staging .
+      - docker login --username $DOCKERUSERNAME --password $DOCKERPASSWORD --email $DOCKEREMAIL
+      - docker push cloudboost/tutorial:3.0.$CIRCLE_BUILD_NUM
+      - docker push cloudboost/tutorial:staging
+      - git clone https://github.com/CloudBoost/kube-cred.git
+      - cd kube-cred && openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC
+      - mkdir ~/.kube
+      - cd kube-cred && mv config ~/.kube/
+      - kubectl rolling-update cloudboost-tutorial-staging --image=cloudboost/tutorial:staging --image-pull-policy=Always
+      - curl -X DELETE "https://api.cloudflare.com/client/v4/zones/"$cloudflare_zone"/purge_cache" -H "X-Auth-Email:[email protected]" -H "X-Auth-Key:"$cloud_flare_key -H "Content-Type:application/json" --data "{'purge_everything':true}"
+  production:
+    branch: master
+    commands:
+      - docker build -t cloudboost/tutorial:latest .
+      - docker login --username $DOCKERUSERNAME --password $DOCKERPASSWORD --email $DOCKEREMAIL
+      - docker push cloudboost/tutorial:3.0.$CIRCLE_BUILD_NUM
+      - docker push cloudboost/tutorial:latest
+      - git clone https://github.com/CloudBoost/kube-cred.git
+      - cd kube-cred && openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC
+      - mkdir ~/.kube
+      - cd kube-cred && mv config ~/.kube/
+      - kubectl rolling-update cloudboost-tutorial --image=cloudboost/tutorial:latest --image-pull-policy=Always
+      - curl -X DELETE "https://api.cloudflare.com/client/v4/zones/"$cloudflare_zone"/purge_cache" -H "X-Auth-Email:[email protected]" -H "X-Auth-Key:"$cloud_flare_key -H "Content-Type:application/json" --data "{'purge_everything':true}"

public/css/style.css

@@ -4529,5 +4529,4 @@ body.skin-3 {
 
 .settings_img{
     height: 415px;
-}
-
+}

routes/routes.js

@@ -28,8 +28,9 @@ router.get('/', function (req, res) {
       tutorialDetails: list[0]
     });
   }, function (error) {
+
     console.log(error);
-    return res.status(500).send(error);
+    render404(res);
   });
 
 });
@@ -60,7 +61,29 @@ router.get('/en/:category/:subcategory', function (req, res) {
 
 });
 
-module.exports = router;
+router.get('*', function (req, res) {
+
+
+  var promises = [];
+  promises.push(getTutorialTopics());
+
+  Q.all(promises).then(function (list) {
+
+    res.render('index', {
+      language: language,
+      category: categoryName,
+      subCategory: subCategoryName,
+      tutorialTopics: list[1],
+      tutorialDetails: list[0]
+    });
+  }, function (error) {
+    console.log(error);
+    return res.status(500).send(error);
+  });
+
+});
+
+module.exports = router
 
 /*********************************Private Functions**********************************/
 //getTutorials
@@ -107,4 +130,7 @@ function getTutorialDetails(language, categoryName, subCategoryName) {
   return deferred.promise;
 }
 
+function render404(res) {
 
+  res.status(200).render('404');
+}

tutorials/en/integrations/slack.md

@@ -6,7 +6,12 @@ In this section, you'll learn how to sent Notifications to your team on Slack fr
 
 >If you haven't signed up for [CloudBoost](https://www.cloudboost.io) yet, this is the right time for you to create your new account and get started. CloudBoost gives you a ton of free tier (check [Pricing](https://www.cloudboost.io/pricing)) so you can build your apps and launch it for free.
 
-# Integrate Slack
+>### Add CloudBoost to your Slack App Directory
+>If you haven't already added the CloudBoost App into your Slack App Directory, you can do so by clicking on following button
+
+><a class="addToSlack" href="https://slack.com/oauth/authorize?&client_id=3133949145.212145423984&scope=incoming-webhook"><img class="slackImg" alt="" height="40" width="139" style="margin-right: 550px;" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x" /></a>
+
+# Integrate Slack 
 
 To integrate slack notifications with your application, navigate to <a href="https://dashboard.cloudboost.io">Dashboard</a>, click on <span class="tut-snippet">Manage App</span>.
 <img class="settings_img" alt="Your App" src="http://i.imgur.com/PlVMCfC.png">

tutorials/en/integrations/zapier.md

@@ -6,13 +6,13 @@ In this section, you'll learn how to integrate various plugins using Zapier with
 
 >If you haven't signed up for [CloudBoost](https://www.cloudboost.io) yet, this is the right time for you to create your new account and get started. CloudBoost gives you a ton of free tier (check [Pricing](https://www.cloudboost.io/pricing)) so you can build your apps and launch it for free.
 
-# Application Credentials
+<!--# Application Credentials
 
 To integrate Zapier with your application, you first need to have master key & application Id of your application, to grab your respective credentials, navigate to <a href="https://dashboard.cloudboost.io">Dashboard</a>, click on <span class="tut-snippet">Manage Keys Icon</span>
 <img class="settings_img" alt="CB Dashboard" src="http://i.imgur.com/AC9M7dG.png">
 as a result following window will appear,
 <img class="settings_img" alt="Your App Credentials" src="http://i.imgur.com/PIBU1O0.png">
-Now, copy your application Id & Master Key to your clipboard.
+Now, copy your application Id & Master Key to your clipboard.-->
 
 
 # Integrate Zapier
@@ -29,11 +29,11 @@ Now, copy your application Id & Master Key to your clipboard.
 5. Now choose the action which you want to perform from available options, whether add, update, delete etc and click on next to continue.
 <img class="settings_img" alt="Actions" src="http://i.imgur.com/GtIpBCC.png">
 
-6. Now to connect your **CloudBoost Application** with **Zapier** click on **Connect an Account**. Then, name the connection of Zapier with your CloudBoost Account and provide the credentials which you use to login on CloudBoost along with your app credentials(master-key and appId) into the fields provided in the pop-up window and click on **Save+Continue** to proceed further.
+6. Now to connect your **CloudBoost Application** with **Zapier** click on **Connect an Account**. Then, name the connection of Zapier with your CloudBoost Account and provide the credentials which you use to login on CloudBoost.
 <img class="settings_img" alt="Connect Account" src="http://i.imgur.com/nuOaNJs.png">
-<img class="settings_img" alt="Connect Account" src="http://i.imgur.com/TagHNtU.jpg">
+<img class="settings_img" alt="Connect Account" src="http://i.imgur.com/WToxx7a.png">
 
-7. After that fill in the required fields as prompted according to your actions and also maps the fields from your **Trigger App** to the fields in your **Action App**. (Note: All the fields displayed should contain some values according to their type, otherwise the corresponding action won't trigger)
+7. After that select the application that you want to integrate with Zapier & fill in the required fields as prompted according to your actions and also maps the fields from your **Trigger App** to the fields in your **Action App**. (Note: All the fields displayed should contain some values according to their type, otherwise the corresponding action won't trigger)
 <img class="settings_img" alt="Fields" src="http://i.imgur.com/RBNEVlU.png">
 
 8. Then click on next to continue & test this action out using zapier built-in test functionality to view the result of your respective action.

views/404.ejs

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <title>CloudBoost</title>
+
+    <meta charset="utf-8">
+    <link rel="shortcut icon" href="img/icon.png">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="CloudBoost is one complete Database Solution for your apps which does data-storage, search and realtime, graphs, time-series and much more.">
+    <meta name="keywords" content="database service,database as a service, hybrid database, cloudboost, search, realtime, storage, app storage, nosql">
+
+    <!--Common head links-->
+    <% include ./partials/commonHeadLinks %>
+
+
+
+</head>
+
+<body>
+
+    <div id="wrapper">
+
+        <div id="page-wrapper" class="white-bg" style="background: #2f4050;">
+            <!--Header Nav-->
+            <% include ./partials/header %>
+                <!--Header Nav-->
+                <div style="margin-top: 15%;color: white;padding-left: 10%;padding-bottom:10%">
+                    <h3 style="    font-family: 'Signika', sans-serif;font-size: 50px;">404</h3>
+                    <h4>Sorry but the page you're looking for does not exist.</h4>
+                    <div style="margin-top:3%">
+                        <a href="/" style="background: #549afc;padding: 16px 24px;border-radius: 20px;color: white;font-weight: 600;">Go back to getting started</a>
+                        <a href="mailto:[email protected]" style="background: #549afc;padding: 16px 24px;border-radius: 20px;color: white;font-weight: 600;">Report a problem</a>
+                    </div>
+                </div>
+
+
+        </div>
+    </div>
+
+    <!--Scripts-->
+    <% include ./partials/commonScripts %>
+
+</body>
+
+</html>