Merge pull request #40 from CloudBoost/staging

Staging
CloudBoost · Sep 20, 2017 · 1f9b0a6 · 1f9b0a6
2 parents dd02bba + 5b369ea
commit 1f9b0a6
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 82 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ after_success:
     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;
+    openssl enc -in config_staging.enc -out config -d -aes256 -k $KUBE_ENC;
     mkdir ~/.kube;
     mv config ~/.kube/;
     kubectl rolling-update cloudboost-tutorial-staging --image=cloudboost/tutorial:staging --image-pull-policy=Always;

diff --git a/app.js b/app.js
@@ -31,7 +31,7 @@ module.exports = function () {
 	//View engine setup
 	app.set('views', path.join(__dirname, 'views'));
 	app.set('view engine', 'ejs');
-	app.use(express.static(path.join(__dirname, 'public')));
+	app.use('*/public/',express.static(path.join(__dirname, 'public')));
 
 	//Usefull functions for ejs
 	app.locals.nospacelowcase = function (text) {

diff --git a/circle.yml b/circle.yml
diff --git a/public/app.js b/public/app.js
@@ -12,15 +12,14 @@ var thisURL = '';
 
 if(__isDevelopment){
 	serverURL="http://localhost:3000";	
-	serverURL="https://service.cloudboost.io";	
 	dashboardURL = "http://localhost:1440";
 	signUpURL="http://localhost:1440/accounts/#/signup";
 	loginURL="http://localhost:1440/accounts";
 	thisURL="http://localhost:1446";
 }else{
-	serverURL="https://service.cloudboost.io";	
-	dashboardURL = "https://dashboard.cloudboost.io";
-	signUpURL="https://dashboard.cloudboost.io/accounts/#/signup";	
-	loginURL="https://dashboard.cloudboost.io/accounts";
-	thisURL="https://tutorials.cloudboost.io";
+	serverURL="https://cloudboost.io/engine/";	
+	dashboardURL = "https://cloudboost.io/dashboard/";
+	signUpURL="https://cloudboost.io/accounts/signup";	
+	loginURL="https://cloudboost.io/accounts/";
+	thisURL="https://cloudboost.io/tutorials/";
 }
diff --git a/routes/routes.js b/routes/routes.js
@@ -25,7 +25,8 @@ router.get('/', function (req, res) {
       category: categoryName,
       subCategory: subCategoryName,
       tutorialTopics: list[1],
-      tutorialDetails: list[0]
+      tutorialDetails: list[0],
+      TUTORIALS_BASE_URL:global.TUTORIALS_BASE_URL
     });
   }, function (error) {
 
@@ -52,7 +53,8 @@ router.get('/en/:category/:subcategory', function (req, res) {
       category: categoryName,
       subCategory: subCategoryName,
       tutorialTopics: list[1],
-      tutorialDetails: list[0]
+      tutorialDetails: list[0],
+      TUTORIALS_BASE_URL:global.TUTORIALS_BASE_URL
     });
   }, function (error) {
     console.log(error);
@@ -74,7 +76,8 @@ router.get('*', function (req, res) {
       category: categoryName,
       subCategory: subCategoryName,
       tutorialTopics: list[1],
-      tutorialDetails: list[0]
+      tutorialDetails: list[0],
+      TUTORIALS_BASE_URL:global.TUTORIALS_BASE_URL
     });
   }, function (error) {
     console.log(error);

diff --git a/server.js b/server.js
@@ -1,3 +1,5 @@
+global.__isHosted = process.env["CLOUDBOOST_HOSTED"] || false
+global.TUTORIALS_BASE_URL = __isHosted ? '/tutorials/' : '/'
 
 global.isStaging = false;
 process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';

diff --git a/views/index.ejs b/views/index.ejs
@@ -119,7 +119,7 @@
                         <div class="flex-general-column-wrapper-center">
                             <div class="flex-general-column-wrapper-center">
                                 <!--<i class="fa fa-spinner fa-spin fa-3x"></i>-->
-                                <img id="on-load-spinner" src="/img/loading.gif" style="height:180px;">
+                                <img id="on-load-spinner" src="public/img/loading.gif" style="height:180px;">
                                 <span id="error-display" style="font-size:18px;font-weight:800px; color:#7F7E7E;">Couldn't load this time</span>
                             </div>
                         </div>

diff --git a/views/partials/commonHeadLinks.ejs b/views/partials/commonHeadLinks.ejs
@@ -1,13 +1,13 @@
 <link rel="shortcut icon" href="assets/img/icon.png">
-<link href="/css/bootstrap.min.css" rel="stylesheet">
-<link href="/fonts/font-awesome/css/font-awesome.css" rel="stylesheet">
+<link href="public/css/bootstrap.min.css" rel="stylesheet">
+<link href="public/fonts/font-awesome/css/font-awesome.css" rel="stylesheet">
 
-<link href="/css/animate.css" rel="stylesheet">    
-<link href="/css/style.css" rel="stylesheet">
-<link href="/css/cbtutorials.css" rel="stylesheet">
+<link href="public/css/animate.css" rel="stylesheet">    
+<link href="public/css/style.css" rel="stylesheet">
+<link href="public/css/cbtutorials.css" rel="stylesheet">
 
 <!--Custom css-->
-<link href="/js/codemirror/lib/codemirror.css" rel="stylesheet">
+<link href="public/js/codemirror/lib/codemirror.css" rel="stylesheet">
 <link href="https://cdn.jsdelivr.net/jquery.mcustomscrollbar/3.0.6/jquery.mCustomScrollbar.min.css" rel="stylesheet">  
 
 <!-- start Mixpanel -->

diff --git a/views/partials/commonNav.ejs b/views/partials/commonNav.ejs
@@ -6,7 +6,7 @@
                 <div class="dropdown profile-element">
 
                     <span class="flex-general-row-wrapper-center">
-                        <img alt="image" style="width: 60%; border-radius: 50%;" class="animated slideInLeft menu-img" src="/img/CbLogoIcon.png"/>
+                        <img alt="image" style="width: 60%; border-radius: 50%;" class="animated slideInLeft menu-img" src="public/img/CbLogoIcon.png"/>
                         <!--<i class="fa fa-book fa-2x" style="color:white;"></i>-->
                     </span>
 
@@ -37,7 +37,7 @@
                                 <li class="change-topic">
                             <% } %>
                           
-                                <a  class="category-select-menubtn" href="/<%= eachSub.tutorialLink.lang %>/<%= eachSub.tutorialLink.category %>/<%= eachSub.tutorialLink.subcategory %>" data-subcat="<%= eachSub.tutorialLink.subcategory %>">
+                                <a  class="category-select-menubtn" href="<%= TUTORIALS_BASE_URL %><%= eachSub.tutorialLink.lang %>/<%= eachSub.tutorialLink.category %>/<%= eachSub.tutorialLink.subcategory %>" data-subcat="<%= eachSub.tutorialLink.subcategory %>">
                                  <%= eachSub.name %>
                                 </a>
                             </li>

diff --git a/views/partials/commonScripts.ejs b/views/partials/commonScripts.ejs
@@ -1,21 +1,21 @@
 <!-- Mainly scripts -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script> 
 <script>$(".togglemenu-tut-wrapper").hide();</script> 
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
-<script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>     
+<script src="public/js/bootstrap.min.js"></script>
+<script src="public/js/plugins/metisMenu/jquery.metisMenu.js"></script>
+<script src="public/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>     
 
 <!-- Custom and plugin javascript -->
-<script src="/js/inspinia.js"></script>
-<script src="/js/plugins/pace/pace.min.js"></script> 
-<script src="/app.js"></script>         
-<script src="/bower_components/jquery.scrollTo/jquery.scrollTo.min.js"></script>   
-<script src="/js/markdowncon/Markdown.Converter.js"></script>    
-<script src="/js/codemirror/lib/codemirror.js"></script>
-<script src="/js/codemirror/codemirror-javascript.js"></script>
+<script src="public/js/inspinia.js"></script>
+<script src="public/js/plugins/pace/pace.min.js"></script> 
+<script src="public/app.js"></script>         
+<script src="public/bower_components/jquery.scrollTo/jquery.scrollTo.min.js"></script>   
+<script src="public/js/markdowncon/Markdown.Converter.js"></script>    
+<script src="public/js/codemirror/lib/codemirror.js"></script>
+<script src="public/js/codemirror/codemirror-javascript.js"></script>
 
 <!--<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.5/highlight.min.js"></script>-->
-<script src="/js/highlight.pack.js"></script>
-<script src="/js/header.js"></script>
-<script src="/js/main.js"></script>
-<script src="/js/index.js"></script>
+<script src="public/js/highlight.pack.js"></script>
+<script src="public/js/header.js"></script>
+<script src="public/js/main.js"></script>
+<script src="public/js/index.js"></script>