refactor config domains -> urlBase, urlBaseProduction

iliakan · iliakan · commit cf24c7f6bb8b · 2018-07-28T11:33:54.000+03:00
diff --git a/assets/libs/domtree.css b/assets/libs/domtree.css
@@ -0,0 +1,22 @@
+/*
+.domtree .node rect {
+  cursor: pointer;
+  fill: #fff;
+}
+
+.domtree .node text {
+  fill: #333333;
+  font: 12px "Helvetica Nue", sans-serif;
+  pointer-events: none;
+}
+
+.domtree path.link {
+  fill: none;
+  stroke: #BEC3C7;
+  stroke-width: 1px;
+}
+*/
+.domtree {
+  border: 1px solid #f5f2f0;
+  border-radius: 4px;
+}
diff --git a/dev b/dev
@@ -9,7 +9,6 @@ export NODE_ENV=development
 export ASSET_VERSIONING=query
 export WATCH=1
 export SITE_HOST=http://javascript.local
-export PORT=3000
 export TUTORIAL_EDIT=
 
 npm --silent run gulp dev | bunyan -o short -l debug
diff --git a/dev.cmd b/dev.cmd
@@ -4,8 +4,6 @@ set NODE_LANG=%1
 @set NODE_ENV=development
 @set ASSET_VERSIONING=query
 @set WATCH=1
-@set SITE_HOST=http://javascript.local
-@set PORT=3000
 @set NODE_PATH=./handlers;./modules
 
 call gulp dev
diff --git a/edit b/edit
@@ -7,7 +7,6 @@ BRANCH="${1:-$NODE_LANG}"
 export NODE_LANG=$BRANCH
 export NODE_ENV=production
 export TUTORIAL_EDIT=1
-export PORT=3000
 
 npm --silent run -- gulp edit
 
diff --git a/edit.cmd b/edit.cmd
@@ -5,8 +5,6 @@
 @set TUTORIAL_EDIT=1
 @set ASSET_VERSIONING=query
 @set WATCH=1
-@set SITE_HOST=http://javascript.local
-@set PORT=3000
 @set NODE_PATH=./handlers;./modules
 
 call gulp edit
diff --git a/handlers/render.js b/handlers/render.js
@@ -59,7 +59,7 @@ function addStandardHelpers(locals, ctx) {
 
   locals.env = process.env;
 
-  locals.domain = config.domain;
+  locals.urlBase = config.urlBase;
 
   // replace lone surrogates in json, </script> -> <\/script>
   locals.escapeJSON = function(s) {
@@ -162,7 +162,7 @@ exports.init = function(app) {
         loc.canonicalPath = loc.canonicalPath.replace(/\/+$/, '');
       }
 
-      loc.canonicalUrl = config.server.siteHost + loc.canonicalPath;
+      loc.canonicalUrl = config.urlBase.main + loc.canonicalPath;
 
       if (ctx.templateDir) {
         loc.roots = [ctx.templateDir];
diff --git a/handlers/tutorial/lib/tutorialImporter.js b/handlers/tutorial/lib/tutorialImporter.js
@@ -112,7 +112,7 @@ module.exports = class TutorialImporter {
     //this.tree.destroyTree(data.slug);
 
     let options = {
-      staticHost: config.server.staticHost,
+      staticHost: config.urlBase.static,
       resourceWebRoot: Article.getResourceWebRootBySlug(data.slug)
     };
 
@@ -183,7 +183,7 @@ module.exports = class TutorialImporter {
     // this.tree.destroyTree(data.slug);
 
     const options = {
-      staticHost: config.server.staticHost,
+      staticHost: config.urlBase.static,
       resourceWebRoot: Article.getResourceWebRootBySlug(data.slug)
     };
 
@@ -296,7 +296,7 @@ module.exports = class TutorialImporter {
     //this.tree.destroyTree(data.slug);
 
     const options = {
-      staticHost: config.server.staticHost,
+      staticHost: config.urlBase.static,
       resourceWebRoot: Task.getResourceWebRootBySlug(data.slug)
     };
 
@@ -376,7 +376,7 @@ module.exports = class TutorialImporter {
     } else {
       view = new TutorialView({
         webPath,
-        description: "Fork from https://" + config.domain.main
+        description: "Fork from " + config.urlBase.main
       });
       log.debug("Created new plunk (db empty)", view);
     }
@@ -434,7 +434,7 @@ module.exports = class TutorialImporter {
     if (!sourceView) {
       sourceView = new TutorialView({
         webPath: sourceWebPath,
-        description: "Fork from https://" + config.domain.main
+        description: "Fork from " + config.urlBase.main
       });
       TutorialViewStorage.instance().set(sourceWebPath, sourceView);
     }
@@ -463,7 +463,7 @@ module.exports = class TutorialImporter {
     if (!solutionView) {
       solutionView = new TutorialView({
         webPath:     solutionWebPath,
-        description: "Fork from https://" + config.domain.main
+        description: "Fork from " + config.urlBase.main
       });
       TutorialViewStorage.instance().set(solutionWebPath, solutionView);
     }
@@ -491,7 +491,7 @@ module.exports = class TutorialImporter {
 function makeSource(sourceJs, testJs) {
   let source = "<!DOCTYPE HTML>\n<html>\n<head>\n  <meta charset=\"utf-8\">\n";
   if (testJs) {
-    source += "  <script src=\"https://" + config.domain.static + "/test/libs.js\"></script>\n";
+    source += "  <script src=\"" + config.urlBase.static + "/test/libs.js\"></script>\n";
     source += "  <script src=\"test.js\"></script>\n";
   }
   source += "</head>\n<body>\n\n  <script>\n\n";
@@ -506,7 +506,7 @@ function makeSource(sourceJs, testJs) {
 function makeSolution(solutionJs, testJs) {
   let solution = "<!DOCTYPE html>\n<html>\n<head>\n  <meta charset=\"utf-8\">\n";
   if (testJs) {
-    solution += "  <script src=\"https://" + config.domain.static + "/test/libs.js\"></script>\n";
+    solution += "  <script src=\"" + config.urlBase.static + "/test/libs.js\"></script>\n";
     solution += "  <script src=\"test.js\"></script>\n";
   }
   solution += "</head>\n<body>\n\n  <script>\n\n";
diff --git a/handlers/tutorial/renderer/articleRenderer.js b/handlers/tutorial/renderer/articleRenderer.js
@@ -85,7 +85,7 @@ module.exports = class ArticleRenderer {
 
     _.uniq(libs).forEach(function (lib) {
       if (!~lib.indexOf('://')) {
-        lib = '//' + config.domain.static + '/libs/' + lib;
+        lib = config.urlBase.static + '/libs/' + lib;
       }
 
       if (lib.slice(-3) == '.js') {
diff --git a/modules/config/index.js b/modules/config/index.js
@@ -22,18 +22,19 @@ if (env.DEV_TRACE) {
 }
 
 let config = module.exports = {
-  // production domain, for tutorial imports, descriptions, etc
-  // for the places where in-dev we must use a real domain
-  domain: {
-    main:   'javascript.local',
-    static: 'javascript.local'
+  urlBase: {
+    // node may be behind nginx, use this in documents
+    main: env.BASE_CURRENT_MAIN || env.BASE || 'http://localhost:3000',
+    static: env.BASE_CURRENT_STATIC || env.BASE || 'http://localhost:3000',
+  },
+  urlBaseProduction: {
+    main: env.BASE_PRODUCTION_MAIN || env.BASE || 'http://localhost:3000',
+    static: env.BASE_PRODUCTION_STATIC || env.BASE || 'http://localhost:3000'
   },
 
   server: {
-    port:       env.PORT || 3000,
-    host:       env.HOST || '0.0.0.0',
-    siteHost:   env.SITE_HOST || '',
-    staticHost: env.STATIC_HOST || ''
+    port: env.PORT || 3000,
+    host: env.HOST || 'localhost'
   },
 
   appKeys:  [secret.sessionKey],
diff --git a/modules/markit/serverParser.js b/modules/markit/serverParser.js
@@ -51,7 +51,7 @@ module.exports = class ServerParser {
       linkHeaderTag: true,
       html:          true,
       publicRoot:    config.publicRoot,
-      staticHost:    config.server.staticHost,
+      staticHost:    config.urlBase.static,
       quotes:        config.lang === 'ru' ? '«»„“' : '“”‘’'
     }, options));
 
diff --git a/templates/blocks/head.pug b/templates/blocks/head.pug
@@ -17,7 +17,7 @@ meta(name="msapplication-TileImage" content="/img/favicon/tileicon.png")
 // favicon the rest
 link(rel="icon" href="/img/favicon/favicon.png")
 
-meta(itemprop="image", content=(schema.titleImage || "https://" + domain.main + "/img/logo_square.png"))
+meta(itemprop="image", content=(schema.titleImage || urlBase.main + "/img/logo_square.png"))
 
 !=css("styles")
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ module.exports = class ArticleRenderer {`
`85`	`85`
`86`	`86`	`_.uniq(libs).forEach(function (lib) {`
`87`	`87`	`if (!~lib.indexOf('://')) {`
`88`		`- lib = '//' + config.domain.static + '/libs/' + lib;`
	`88`	`+ lib = config.urlBase.static + '/libs/' + lib;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (lib.slice(-3) == '.js') {`