Skip to content

Commit 9a2b9e6

Browse files
shubhamqweasdshubhamqweasd
authored
Merge pull request #33 from CloudBoost/staging
Staging
2 parents 133c5a3 + 882d96d commit 9a2b9e6

7 files changed

Lines changed: 136 additions & 12 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,4 @@ branches:
6767
- /^*-v[0-9]/
6868
#Notify Team on Slack
6969
notifications:
70-
slack: cloudboost:gm7nWJDLDtBRyF75VKLKOoMW
71-
70+
slack: cloudboost:gm7nWJDLDtBRyF75VKLKOoMW

‎circle.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
machine:
2+
node:
3+
version: 7.4.0
4+
services:
5+
- docker
6+
environment:
7+
CLOUDSDK_CORE_DISABLE_PROMPTS: 1
8+
dependencies:
9+
override:
10+
- sudo apt-get update
11+
- sudo apt-get install curl libc6 libcurl3 zlib1g
12+
- npm install
13+
post:
14+
- curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
15+
- chmod +x ./kubectl
16+
- sudo mv ./kubectl /usr/local/bin/kubectl
17+
test:
18+
pre:
19+
- docker build -t cloudboost/tutorial:3.0.$CIRCLE_BUILD_NUM .
20+
override:
21+
- echo "NO TESTS REQUIRED FOR tutorial-UI"
22+
deployment:
23+
staging:
24+
branch: staging
25+
commands:
26+
- docker build -t cloudboost/tutorial:staging .
27+
- docker login --username $DOCKERUSERNAME --password $DOCKERPASSWORD --email $DOCKEREMAIL
28+
- docker push cloudboost/tutorial:3.0.$CIRCLE_BUILD_NUM
29+
- docker push cloudboost/tutorial:staging
30+
- git clone https://github.com/CloudBoost/kube-cred.git
31+
- cd kube-cred && openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC
32+
- mkdir ~/.kube
33+
- cd kube-cred && mv config ~/.kube/
34+
- kubectl rolling-update cloudboost-tutorial-staging --image=cloudboost/tutorial:staging --image-pull-policy=Always
35+
- curl -X DELETE "https://api.cloudflare.com/client/v4/zones/"$cloudflare_zone"/purge_cache" -H "X-Auth-Email:hello@cloudboost.io" -H "X-Auth-Key:"$cloud_flare_key -H "Content-Type:application/json" --data "{'purge_everything':true}"
36+
production:
37+
branch: master
38+
commands:
39+
- docker build -t cloudboost/tutorial:latest .
40+
- docker login --username $DOCKERUSERNAME --password $DOCKERPASSWORD --email $DOCKEREMAIL
41+
- docker push cloudboost/tutorial:3.0.$CIRCLE_BUILD_NUM
42+
- docker push cloudboost/tutorial:latest
43+
- git clone https://github.com/CloudBoost/kube-cred.git
44+
- cd kube-cred && openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC
45+
- mkdir ~/.kube
46+
- cd kube-cred && mv config ~/.kube/
47+
- kubectl rolling-update cloudboost-tutorial --image=cloudboost/tutorial:latest --image-pull-policy=Always
48+
- curl -X DELETE "https://api.cloudflare.com/client/v4/zones/"$cloudflare_zone"/purge_cache" -H "X-Auth-Email:hello@cloudboost.io" -H "X-Auth-Key:"$cloud_flare_key -H "Content-Type:application/json" --data "{'purge_everything':true}"

‎public/css/style.css‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4529,5 +4529,4 @@ body.skin-3 {
45294529

45304530
.settings_img{
45314531
height: 415px;
4532-
}
4533-
4532+
}

‎routes/routes.js‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ router.get('/', function (req, res) {
2828
tutorialDetails: list[0]
2929
});
3030
}, function (error) {
31+
3132
console.log(error);
32-
return res.status(500).send(error);
33+
render404(res);
3334
});
3435

3536
});
@@ -60,7 +61,29 @@ router.get('/en/:category/:subcategory', function (req, res) {
6061

6162
});
6263

63-
module.exports = router;
64+
router.get('*', function (req, res) {
65+
66+
67+
var promises = [];
68+
promises.push(getTutorialTopics());
69+
70+
Q.all(promises).then(function (list) {
71+
72+
res.render('index', {
73+
language: language,
74+
category: categoryName,
75+
subCategory: subCategoryName,
76+
tutorialTopics: list[1],
77+
tutorialDetails: list[0]
78+
});
79+
}, function (error) {
80+
console.log(error);
81+
return res.status(500).send(error);
82+
});
83+
84+
});
85+
86+
module.exports = router
6487

6588
/*********************************Private Functions**********************************/
6689
//getTutorials
@@ -107,4 +130,7 @@ function getTutorialDetails(language, categoryName, subCategoryName) {
107130
return deferred.promise;
108131
}
109132

133+
function render404(res) {
110134

135+
res.status(200).render('404');
136+
}

‎tutorials/en/integrations/slack.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ In this section, you'll learn how to sent Notifications to your team on Slack fr
66
77
>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.
88
9-
# Integrate Slack
9+
>### Add CloudBoost to your Slack App Directory
10+
>If you haven't already added the CloudBoost App into your Slack App Directory, you can do so by clicking on following button
11+
12+
><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>
13+
14+
# Integrate Slack
1015

1116
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>.
1217
<img class="settings_img" alt="Your App" src="http://i.imgur.com/PlVMCfC.png">

‎tutorials/en/integrations/zapier.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ In this section, you'll learn how to integrate various plugins using Zapier with
66
77
>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.
88
9-
# Application Credentials
9+
<!--# Application Credentials
1010
1111
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>
1212
<img class="settings_img" alt="CB Dashboard" src="http://i.imgur.com/AC9M7dG.png">
1313
as a result following window will appear,
1414
<img class="settings_img" alt="Your App Credentials" src="http://i.imgur.com/PIBU1O0.png">
15-
Now, copy your application Id & Master Key to your clipboard.
15+
Now, copy your application Id & Master Key to your clipboard.-->
1616

1717

1818
# Integrate Zapier
@@ -29,11 +29,11 @@ Now, copy your application Id & Master Key to your clipboard.
2929
5. Now choose the action which you want to perform from available options, whether add, update, delete etc and click on next to continue.
3030
<img class="settings_img" alt="Actions" src="http://i.imgur.com/GtIpBCC.png">
3131

32-
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.
32+
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.
3333
<img class="settings_img" alt="Connect Account" src="http://i.imgur.com/nuOaNJs.png">
34-
<img class="settings_img" alt="Connect Account" src="http://i.imgur.com/TagHNtU.jpg">
34+
<img class="settings_img" alt="Connect Account" src="http://i.imgur.com/WToxx7a.png">
3535

36-
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)
36+
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)
3737
<img class="settings_img" alt="Fields" src="http://i.imgur.com/RBNEVlU.png">
3838

3939
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‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<title>CloudBoost</title>
6+
7+
<meta charset="utf-8">
8+
<link rel="shortcut icon" href="img/icon.png">
9+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
11+
<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.">
12+
<meta name="keywords" content="database service,database as a service, hybrid database, cloudboost, search, realtime, storage, app storage, nosql">
13+
14+
<!--Common head links-->
15+
<% include ./partials/commonHeadLinks %>
16+
17+
18+
19+
</head>
20+
21+
<body>
22+
23+
<div id="wrapper">
24+
25+
<div id="page-wrapper" class="white-bg" style="background: #2f4050;">
26+
<!--Header Nav-->
27+
<% include ./partials/header %>
28+
<!--Header Nav-->
29+
<div style="margin-top: 15%;color: white;padding-left: 10%;padding-bottom:10%">
30+
<h3 style=" font-family: 'Signika', sans-serif;font-size: 50px;">404</h3>
31+
<h4>Sorry but the page you're looking for does not exist.</h4>
32+
<div style="margin-top:3%">
33+
<a href="/" style="background: #549afc;padding: 16px 24px;border-radius: 20px;color: white;font-weight: 600;">Go back to getting started</a>
34+
<a href="mailto:support@cloudboost.io" style="background: #549afc;padding: 16px 24px;border-radius: 20px;color: white;font-weight: 600;">Report a problem</a>
35+
</div>
36+
</div>
37+
38+
39+
</div>
40+
</div>
41+
42+
<!--Scripts-->
43+
<% include ./partials/commonScripts %>
44+
45+
</body>
46+
47+
</html>

0 commit comments

Comments
 (0)