Merge dd6d6f0 into cfd1655

jsdelivr · Apr 16, 2020 · fcd3881 · fcd3881
2 parents cfd1655 + dd6d6f0
commit fcd3881
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 85 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -28,31 +28,6 @@ function generateSri(file, fromString) {
     return SRI_CACHE[file];
 }
 
-function selectedTheme(selected) {
-    if (typeof selected === 'undefined' || selected === '') {
-        return app.theme;
-    }
-
-    const theme = Number.parseInt(selected, 10);
-
-    return theme === 0 || theme ?
-        theme :
-        app.theme;
-}
-
-function getTheme(selected) {
-    const { themes } = files.bootswatch4;
-
-    selected = selectedTheme(selected);
-
-    return {
-        uri: files.bootswatch4.bootstrap
-            .replace('SWATCH_VERSION', files.bootswatch4.version)
-            .replace('SWATCH_NAME', themes[selected].name),
-        sri: themes[selected].sri
-    };
-}
-
 function generateDataJson() {
     const data = {
         timestamp: new Date().toISOString(),
@@ -106,7 +81,67 @@ function generateBodyClass(pathname) {
     return `page-${pathname}`;
 }
 
+function selectedTheme(selected) {
+    if (typeof selected === 'undefined' || selected === '') {
+        return app.theme;
+    }
+
+    const theme = Number.parseInt(selected, 10);
+
+    return theme === 0 || theme ?
+        theme :
+        app.theme;
+}
+
+function getTheme(selected) {
+    const { themes } = files.bootswatch4;
+
+    selected = selectedTheme(selected);
+
+    return {
+        uri: files.bootswatch4.bootstrap
+            .replace('SWATCH_VERSION', files.bootswatch4.version)
+            .replace('SWATCH_NAME', themes[selected].name),
+        sri: themes[selected].sri
+    };
+}
+
+function getThemeQuery(req) {
+    const totalThemes = files.bootswatch4.themes.length;
+    const query = req.query.theme;
+
+    // Safety checks
+    if (Number.isNaN(query) || query < 0 || query >= totalThemes) {
+        return '';
+    }
+
+    return query;
+}
+
+function appendLocals(req, res) {
+    const siteUrl = getCurrentSiteurl(req);
+    const pageUrl = req.originalUrl;
+    // OK, hack-ish way...
+    const pathname = pageUrl.split('?')[0];
+    const canonicalUrl = new URL(pathname, app.siteurl);
+    const theme = getThemeQuery(req);
+    const bodyClass = generateBodyClass(pathname);
+
+    const locals = {
+        siteUrl,
+        canonicalUrl,
+        pageUrl,
+        theme,
+        bodyClass
+    };
+
+    res.locals = Object.assign(res.locals, locals);
+
+    return res;
+}
+
 module.exports = {
+    appendLocals,
     capitalize,
     generateDataJson,
     theme: {

diff --git a/routes/404.js b/routes/404.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/about.js b/routes/about.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/appendLocals.js b/routes/appendLocals.js
diff --git a/routes/books.js b/routes/books.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/bootlint.js b/routes/bootlint.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/bootswatch.js b/routes/bootswatch.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/bootswatch4.js b/routes/bootswatch4.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/fontawesome.js b/routes/fontawesome.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/home.js b/routes/home.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/integrations.js b/routes/integrations.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/jobs.js b/routes/jobs.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/legacy.js b/routes/legacy.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/privacyPolicy.js b/routes/privacyPolicy.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/redirectToRoot.js b/routes/redirectToRoot.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/showcase.js b/routes/showcase.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();
 

diff --git a/routes/themes.js b/routes/themes.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const express = require('express');
-const appendLocals = require('./appendLocals');
+const { appendLocals } = require('../lib/helpers');
 
 const router = express.Router();