Move getCurrentSiteurl() in helpers

jsdelivr · Apr 16, 2020 · 2e3bbd3 · 2e3bbd3
1 parent 04f5b24
commit 2e3bbd3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -10,6 +10,14 @@ const { app, files } = require('../config');
 const PUBLIC_DIR = path.join(__dirname, '../public/');
 const SRI_CACHE = {};
 
+function capitalize(str) {
+    if (typeof str !== 'string') {
+        return '';
+    }
+
+    return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
 function generateSri(file, fromString) {
     if (typeof SRI_CACHE[file] === 'undefined') {
         file = fromString ? file : fs.readFileSync(path.join(PUBLIC_DIR, file));
@@ -70,12 +78,14 @@ function generateDataJson() {
     return data;
 }
 
-function capitalize(str) {
-    if (typeof str !== 'string') {
-        return '';
+function getCurrentSiteurl(req) {
+    let proto = req.get('x-forwarded-proto');
+
+    if (typeof proto === 'undefined') {
+        proto = req.protocol;
     }
 
-    return str.charAt(0).toUpperCase() + str.slice(1);
+    return `${proto}://${req.hostname}`;
 }
 
 function getPageTitle(pageTitle) {
@@ -103,6 +113,7 @@ module.exports = {
         get: getTheme,
         selected: selectedTheme
     },
+    getCurrentSiteurl,
     getPageTitle,
     generateBodyClass,
     generateSri

diff --git a/routes/appendLocals.js b/routes/appendLocals.js
@@ -1,17 +1,10 @@
 'use strict';
 
 const { app, files } = require('../config');
-const { generateBodyClass } = require('../lib/helpers');
-
-function getCurrentSiteurl(req) {
-    let proto = req.get('x-forwarded-proto');
-
-    if (typeof proto === 'undefined') {
-        proto = req.protocol;
-    }
-
-    return `${proto}://${req.hostname}`;
-}
+const {
+    getCurrentSiteurl,
+    generateBodyClass
+} = require('../lib/helpers');
 
 function getThemeQuery(req) {
     const totalThemes = files.bootswatch4.themes.length;