Added .env expansion and set welcome message behavior to use WELCOME_MSG environment variable.

app/server.js

@@ -9,7 +9,10 @@ const ejs = require('ejs');
 const helpers = require('../views/helpers/functions');
 const search = require('../routes/search');
 const fs = require('fs');
-require('dotenv').config();
+const dotenv = require('dotenv');
+const dotenvExpand = require('dotenv-expand');
+dotenv.config();
+dotenvExpand.expand(process.env);
 // const advancedSearch = require('../routes/advanced-search');
 
 // Port number for HTTP server

gulpfile.js

@@ -8,7 +8,10 @@ const crypto = require('crypto');
 const url = require('url')
 const { TikaClient } = require('./app/TikaClient/build');
 const { Readable, Writable } = require('stream');
-require('dotenv').config();
+const dotenv = require('dotenv');
+const dotenvExpand = require('dotenv-expand');
+dotenv.config();
+dotenvExpand.expand(process.env);
 
 const relPathToFiles = './public';
 

package-lock.json

@@ -14,6 +14,7 @@
         "cheerio": "^1.0.0-rc.12",
         "content-disposition": "0.5.2",
         "dotenv": "^16.4.5",
+        "dotenv-expand": "^11.0.6",
         "ejs": "^3.1.9",
         "express": "^4.18.3",
         "fast-url-parser": "1.1.3",
@@ -5456,6 +5457,20 @@
         "url": "https://dotenvx.com"
       }
     },
+    "node_modules/dotenv-expand": {
+      "version": "11.0.6",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.6.tgz",
+      "integrity": "sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==",
+      "dependencies": {
+        "dotenv": "^16.4.4"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",

package.json

@@ -21,6 +21,7 @@
     "cheerio": "^1.0.0-rc.12",
     "content-disposition": "0.5.2",
     "dotenv": "^16.4.5",
+    "dotenv-expand": "^11.0.6",
     "ejs": "^3.1.9",
     "express": "^4.18.3",
     "fast-url-parser": "1.1.3",

views/directory.ejs

@@ -20,7 +20,7 @@
           <% } %>
           <% if (h.shouldShowWelcomeBanner({paths})) { %>
             <i>&nbsp;</i>  
-            Get Informed! Stay Informed!
+            <%= h.getWelcomeBanner() %>
           <% } else if (h.shouldOmitLinkOnLastBreadcrumb({paths, index})) { %>
             <%= h.trimSlashes({path: value.name}).replaceAll('_', ' ') %>
           <% } else { %>

views/helpers/functions.js

@@ -19,7 +19,7 @@ const md = markdownit({
 const moment = require('moment-timezone').tz.setDefault("UTC");
 
 const getSiteName = () => {
-  return process.env.SITE_NAME||'No Moss 3 Carbo Landfill Online Library';
+  return process.env.SITE_NAME || '(dev) No Moss 3 Carbo Landfill Online Localhost';
 }
 
 const trimSlashes = ({path}) => {
@@ -40,9 +40,8 @@ const getDirectoryTitle = ({directory}) => {
               .join(' - ');
   return (directory=="public") ? getSiteName() : `${title} - ${getSiteName()}`;
 };
-const getWelcomeBanner = ({directory}) => {
+const getWelcomeBanner = () => {
-  //return trimSlashes({path: directory.replace("public", `Welcome to ${getSiteName()}`)});
+  return process.env.WELCOME_MSG || `Welcome to ${getSiteName()}!`;
-  return "Get Informed! Stay Informed!";
 };
 const shouldShowDirectorySeparator = ({index}) => (index > 0);
 const shouldShowWelcomeBanner = ({paths}) => (paths.length == 1);