Skip to content

Commit 1f9b0a6

Browse files
shubhamqweasdshubhamqweasd
authored
Merge pull request #40 from CloudBoost/staging
Staging
2 parents dd02bba + 5b369ea commit 1f9b0a6

File tree

10 files changed

+38
-82
lines changed

10 files changed

+38
-82
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ after_success:
2828
docker push cloudboost/tutorial:staging;
2929
git clone https://github.com/CloudBoost/kube-cred.git;
3030
cd kube-cred;
31-
openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC;
31+
openssl enc -in config_staging.enc -out config -d -aes256 -k $KUBE_ENC;
3232
mkdir ~/.kube;
3333
mv config ~/.kube/;
3434
kubectl rolling-update cloudboost-tutorial-staging --image=cloudboost/tutorial:staging --image-pull-policy=Always;

‎app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = function () {
3131
//View engine setup
3232
app.set('views', path.join(__dirname, 'views'));
3333
app.set('view engine', 'ejs');
34-
app.use(express.static(path.join(__dirname, 'public')));
34+
app.use('*/public/',express.static(path.join(__dirname, 'public')));
3535

3636
//Usefull functions for ejs
3737
app.locals.nospacelowcase = function (text) {

‎circle.yml‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎public/app.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ var thisURL = '';
1212

1313
if(__isDevelopment){
1414
serverURL="http://localhost:3000";
15-
serverURL="https://service.cloudboost.io";
1615
dashboardURL = "http://localhost:1440";
1716
signUpURL="http://localhost:1440/accounts/#/signup";
1817
loginURL="http://localhost:1440/accounts";
1918
thisURL="http://localhost:1446";
2019
}else{
21-
serverURL="https://service.cloudboost.io";
22-
dashboardURL = "https://dashboard.cloudboost.io";
23-
signUpURL="https://dashboard.cloudboost.io/accounts/#/signup";
24-
loginURL="https://dashboard.cloudboost.io/accounts";
25-
thisURL="https://tutorials.cloudboost.io";
20+
serverURL="https://cloudboost.io/engine/";
21+
dashboardURL = "https://cloudboost.io/dashboard/";
22+
signUpURL="https://cloudboost.io/accounts/signup";
23+
loginURL="https://cloudboost.io/accounts/";
24+
thisURL="https://cloudboost.io/tutorials/";
2625
}

‎routes/routes.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ router.get('/', function (req, res) {
2525
category: categoryName,
2626
subCategory: subCategoryName,
2727
tutorialTopics: list[1],
28-
tutorialDetails: list[0]
28+
tutorialDetails: list[0],
29+
TUTORIALS_BASE_URL:global.TUTORIALS_BASE_URL
2930
});
3031
}, function (error) {
3132

@@ -52,7 +53,8 @@ router.get('/en/:category/:subcategory', function (req, res) {
5253
category: categoryName,
5354
subCategory: subCategoryName,
5455
tutorialTopics: list[1],
55-
tutorialDetails: list[0]
56+
tutorialDetails: list[0],
57+
TUTORIALS_BASE_URL:global.TUTORIALS_BASE_URL
5658
});
5759
}, function (error) {
5860
console.log(error);
@@ -74,7 +76,8 @@ router.get('*', function (req, res) {
7476
category: categoryName,
7577
subCategory: subCategoryName,
7678
tutorialTopics: list[1],
77-
tutorialDetails: list[0]
79+
tutorialDetails: list[0],
80+
TUTORIALS_BASE_URL:global.TUTORIALS_BASE_URL
7881
});
7982
}, function (error) {
8083
console.log(error);

‎server.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
global.__isHosted = process.env["CLOUDBOOST_HOSTED"] || false
2+
global.TUTORIALS_BASE_URL = __isHosted ? '/tutorials/' : '/'
13

24
global.isStaging = false;
35
process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';

‎views/index.ejs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<div class="flex-general-column-wrapper-center">
120120
<div class="flex-general-column-wrapper-center">
121121
<!--<i class="fa fa-spinner fa-spin fa-3x"></i>-->
122-
<img id="on-load-spinner" src="/img/loading.gif" style="height:180px;">
122+
<img id="on-load-spinner" src="public/img/loading.gif" style="height:180px;">
123123
<span id="error-display" style="font-size:18px;font-weight:800px; color:#7F7E7E;">Couldn't load this time</span>
124124
</div>
125125
</div>

‎views/partials/commonHeadLinks.ejs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<link rel="shortcut icon" href="assets/img/icon.png">
2-
<link href="/css/bootstrap.min.css" rel="stylesheet">
3-
<link href="/fonts/font-awesome/css/font-awesome.css" rel="stylesheet">
2+
<link href="public/css/bootstrap.min.css" rel="stylesheet">
3+
<link href="public/fonts/font-awesome/css/font-awesome.css" rel="stylesheet">
44

5-
<link href="/css/animate.css" rel="stylesheet">
6-
<link href="/css/style.css" rel="stylesheet">
7-
<link href="/css/cbtutorials.css" rel="stylesheet">
5+
<link href="public/css/animate.css" rel="stylesheet">
6+
<link href="public/css/style.css" rel="stylesheet">
7+
<link href="public/css/cbtutorials.css" rel="stylesheet">
88

99
<!--Custom css-->
10-
<link href="/js/codemirror/lib/codemirror.css" rel="stylesheet">
10+
<link href="public/js/codemirror/lib/codemirror.css" rel="stylesheet">
1111
<link href="https://cdn.jsdelivr.net/jquery.mcustomscrollbar/3.0.6/jquery.mCustomScrollbar.min.css" rel="stylesheet">
1212

1313
<!-- start Mixpanel -->

‎views/partials/commonNav.ejs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="dropdown profile-element">
77

88
<span class="flex-general-row-wrapper-center">
9-
<img alt="image" style="width: 60%; border-radius: 50%;" class="animated slideInLeft menu-img" src="/img/CbLogoIcon.png"/>
9+
<img alt="image" style="width: 60%; border-radius: 50%;" class="animated slideInLeft menu-img" src="public/img/CbLogoIcon.png"/>
1010
<!--<i class="fa fa-book fa-2x" style="color:white;"></i>-->
1111
</span>
1212

@@ -37,7 +37,7 @@
3737
<li class="change-topic">
3838
<% } %>
3939
40-
<a class="category-select-menubtn" href="/<%= eachSub.tutorialLink.lang %>/<%= eachSub.tutorialLink.category %>/<%= eachSub.tutorialLink.subcategory %>" data-subcat="<%= eachSub.tutorialLink.subcategory %>">
40+
<a class="category-select-menubtn" href="<%= TUTORIALS_BASE_URL %><%= eachSub.tutorialLink.lang %>/<%= eachSub.tutorialLink.category %>/<%= eachSub.tutorialLink.subcategory %>" data-subcat="<%= eachSub.tutorialLink.subcategory %>">
4141
<%= eachSub.name %>
4242
</a>
4343
</li>

‎views/partials/commonScripts.ejs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<!-- Mainly scripts -->
22
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
33
<script>$(".togglemenu-tut-wrapper").hide();</script>
4-
<script src="/js/bootstrap.min.js"></script>
5-
<script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
6-
<script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
4+
<script src="public/js/bootstrap.min.js"></script>
5+
<script src="public/js/plugins/metisMenu/jquery.metisMenu.js"></script>
6+
<script src="public/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
77

88
<!-- Custom and plugin javascript -->
9-
<script src="/js/inspinia.js"></script>
10-
<script src="/js/plugins/pace/pace.min.js"></script>
11-
<script src="/app.js"></script>
12-
<script src="/bower_components/jquery.scrollTo/jquery.scrollTo.min.js"></script>
13-
<script src="/js/markdowncon/Markdown.Converter.js"></script>
14-
<script src="/js/codemirror/lib/codemirror.js"></script>
15-
<script src="/js/codemirror/codemirror-javascript.js"></script>
9+
<script src="public/js/inspinia.js"></script>
10+
<script src="public/js/plugins/pace/pace.min.js"></script>
11+
<script src="public/app.js"></script>
12+
<script src="public/bower_components/jquery.scrollTo/jquery.scrollTo.min.js"></script>
13+
<script src="public/js/markdowncon/Markdown.Converter.js"></script>
14+
<script src="public/js/codemirror/lib/codemirror.js"></script>
15+
<script src="public/js/codemirror/codemirror-javascript.js"></script>
1616

1717
<!--<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.5/highlight.min.js"></script>-->
18-
<script src="/js/highlight.pack.js"></script>
19-
<script src="/js/header.js"></script>
20-
<script src="/js/main.js"></script>
21-
<script src="/js/index.js"></script>
18+
<script src="public/js/highlight.pack.js"></script>
19+
<script src="public/js/header.js"></script>
20+
<script src="public/js/main.js"></script>
21+
<script src="public/js/index.js"></script>

0 commit comments

Comments
 (0)