From 6979c455efa257a1deca1acd5e327566bae7c614 Mon Sep 17 00:00:00 2001
From: David Ball <david@daball.me>
Date: Mon, 24 Jun 2024 00:57:28 -0400
Subject: [PATCH 1/3] Removed console log message from config startup.

---
 app/config.mts | 406 ++++++++++++++++++++++++-------------------------
 1 file changed, 202 insertions(+), 204 deletions(-)

diff --git a/app/config.mts b/app/config.mts
index 3ab4eedd..9ff45f88 100644
--- a/app/config.mts
+++ b/app/config.mts
@@ -2,188 +2,186 @@
  * The `ProcessEnv` interface represents the imported environment variables to input from `process.env` dictionary.
  */
 export interface ProcessEnv {
-    /**
-     * `APP_HTTP_LISTEN_HOST` is the host for the HTTP web app.
-     */
-    APP_HTTP_HOST?: string;
-    /**
-     * `APP_HTTP_LISTEN_PORT` is the TCP port used to access the Node application's HTTP interface (usually by a reverse proxy).
-     */
-    APP_HTTP_PORT?: string;
-    /**
-     * `APP_URL` is the URL used to access the Node application (usually by a reverse proxy).
-     */
-    APP_HTTP_URL?: string;
-    /**
-     * `SITE_NAME` is used for page generation.
-     */
-    SITE_NAME?: string;
-    /**
-     * `SITE_HOST` is used for generating links for the search index. (If you leave this blank it should work using relative paths.)
-     */
-    SITE_WELCOME_MESSAGE?: string;
-    /**
-     * `SITE_URL` is used for generating links for the search index. (If you leave this blank it should work using relative paths.)
-     */
-    SITE_HOST?: string;
-    /**
-     * `WELCOME_MESSAGE` is used for the homepage instead of `"Welcome to ${SITE_NAME}!"`
-     */
-    SITE_URL?: string;
-    /**
-     * `PUBLIC_PATH` is the relative path to the directory to this project root for the public files.
-     */
-    PUBLIC_PATH?: string;
-    /**
-     * `PAGES_PATH` is the relative path to the directory to this project root for the pages rather than public files.
-     */
-    PAGES_PATH?: string;
-    /**
-     * `ASSETS_PATH` is the relative path to the directory to this project root for the static asset files.
-     */
-    ASSETS_PATH?: string;
-    /**
-     * `SOLR_DOCS_HOST` is the host for Apache Solr's core for indexed documents.
-     */
-    SOLR_DOCS_HOST?: string;
-    /**
-     * `SOLR_DOCS_PORT` is the port for Apache Solr's core for indexed documents.
-     */
-    SOLR_DOCS_PORT?: string;
-    /**
-     * `SOLR_DOCS_CORE` is the core name for Apache Solr's core for indexed documents.
-     */
-    SOLR_DOCS_CORE?: string;
-    /**
-     * `SOLR_DOCS_URL` is the URL to access Apache Solr's core for indexed documents. It is used by Gulp and the Search feature.
-     */
-    SOLR_DOCS_URL?: string;
-    /**
-     * `SOLR_LAW_HOST` is the host for Apache Solr's core for indexed laws.
-     */
-    SOLR_LAW_HOST?: string;
-    /**
-     * `SOLR_LAW_PORT` is the port for Apache Solr's core for indexed laws.
-     */
-    SOLR_LAW_PORT?: string;
-    /**
-     * `SOLR_LAW_CORE` is the core name for Apache Solr's core for indexed laws.
-     */
-    SOLR_LAW_CORE?: string;
-    /**
-     * `SOLR_LAW_URL` is the URL to access Apache Solr's core for indexed laws. It is used by Gulp and the Search feature.
-     */
-    SOLR_LAW_URL?: string;
-    /**
-     * `TIKA_HOST` is the host to access the Apache Tika app.
-     */
-    TIKA_HOST?: string;
-    /**
-     * `TIKA_PORT` is the port to access the Apache Tika app.
-     */
-    TIKA_PORT?: string;
-    /**
-     * `TIKA_URL` is the URL to access the Apache Tika app.
-     */
-    TIKA_URL?: string;
+  /**
+   * `APP_HTTP_LISTEN_HOST` is the host for the HTTP web app.
+   */
+  APP_HTTP_HOST?: string;
+  /**
+   * `APP_HTTP_LISTEN_PORT` is the TCP port used to access the Node application's HTTP interface (usually by a reverse proxy).
+   */
+  APP_HTTP_PORT?: string;
+  /**
+   * `APP_URL` is the URL used to access the Node application (usually by a reverse proxy).
+   */
+  APP_HTTP_URL?: string;
+  /**
+   * `SITE_NAME` is used for page generation.
+   */
+  SITE_NAME?: string;
+  /**
+   * `SITE_HOST` is used for generating links for the search index. (If you leave this blank it should work using relative paths.)
+   */
+  SITE_WELCOME_MESSAGE?: string;
+  /**
+   * `SITE_URL` is used for generating links for the search index. (If you leave this blank it should work using relative paths.)
+   */
+  SITE_HOST?: string;
+  /**
+   * `WELCOME_MESSAGE` is used for the homepage instead of `"Welcome to ${SITE_NAME}!"`
+   */
+  SITE_URL?: string;
+  /**
+   * `PUBLIC_PATH` is the relative path to the directory to this project root for the public files.
+   */
+  PUBLIC_PATH?: string;
+  /**
+   * `PAGES_PATH` is the relative path to the directory to this project root for the pages rather than public files.
+   */
+  PAGES_PATH?: string;
+  /**
+   * `ASSETS_PATH` is the relative path to the directory to this project root for the static asset files.
+   */
+  ASSETS_PATH?: string;
+  /**
+   * `SOLR_DOCS_HOST` is the host for Apache Solr's core for indexed documents.
+   */
+  SOLR_DOCS_HOST?: string;
+  /**
+   * `SOLR_DOCS_PORT` is the port for Apache Solr's core for indexed documents.
+   */
+  SOLR_DOCS_PORT?: string;
+  /**
+   * `SOLR_DOCS_CORE` is the core name for Apache Solr's core for indexed documents.
+   */
+  SOLR_DOCS_CORE?: string;
+  /**
+   * `SOLR_DOCS_URL` is the URL to access Apache Solr's core for indexed documents. It is used by Gulp and the Search feature.
+   */
+  SOLR_DOCS_URL?: string;
+  /**
+   * `SOLR_LAW_HOST` is the host for Apache Solr's core for indexed laws.
+   */
+  SOLR_LAW_HOST?: string;
+  /**
+   * `SOLR_LAW_PORT` is the port for Apache Solr's core for indexed laws.
+   */
+  SOLR_LAW_PORT?: string;
+  /**
+   * `SOLR_LAW_CORE` is the core name for Apache Solr's core for indexed laws.
+   */
+  SOLR_LAW_CORE?: string;
+  /**
+   * `SOLR_LAW_URL` is the URL to access Apache Solr's core for indexed laws. It is used by Gulp and the Search feature.
+   */
+  SOLR_LAW_URL?: string;
+  /**
+   * `TIKA_HOST` is the host to access the Apache Tika app.
+   */
+  TIKA_HOST?: string;
+  /**
+   * `TIKA_PORT` is the port to access the Apache Tika app.
+   */
+  TIKA_PORT?: string;
+  /**
+   * `TIKA_URL` is the URL to access the Apache Tika app.
+   */
+  TIKA_URL?: string;
 }
 
 /**
  * The `Config` interface represents the imported environment variables after imported from `process.env` dictionary.
  */
 export interface Config {
-    /**
-     * `appHttpHost` is the host for the HTTP web app.
-     */
-    appHttpHost: string;
-    /**
-     * `appHttpPort` is the TCP port used to access the Node application's HTTP interface (usually by a reverse proxy).
-     */
-    appHttpPort: number|string;
-    /**
-     * `appHttpUrl` is the URL used to access the Node application (usually by a reverse proxy).
-     */
-    appHttpUrl: string;
-    /**
-     * `siteName` is used for page generation.
-     */
-    siteName: string;
-    /**
-     * `siteWelcomeMessage` is used for the homepage instead of `"Welcome to ${process.env['SITE_NAME']}!"`
-     */
-    siteWelcomeMessage: string;
-    /**
-     * `siteHost` is used for generating links for the search index. (If you leave this blank it should work using relative paths.)
-     */
-    siteHost: string;
-    /**
-     * `siteUrl` is used for generating links for the search index. (If you leave this blank it should work using relative paths.)
-     */
-    siteUrl: string;
-    /**
-     * `publicPath` is the relative path to the directory to this project root for the public files.
-     */
-    publicPath: string;
-    /**
-     * `pagesPath` is the relative path to the directory to this project root for the pages rather than public files.
-     */
-    pagesPath: string;
-    /**
-     * `assetsPath` is the relative path to the directory to this project root for the static asset files.
-     */
-    assetsPath: string;
-    /**
-     * `viewsPath' is the relative path to the directory to this project root for the view templates.
-     */
-    viewsPath: string;
-    /**
-     * `solrDocsHost` is the host for Apache Solr's core for indexed documents.
-     */
-    solrDocsHost: string;
-    /**
-     * `solrDocsPort` is the port for Apache Solr's core for indexed documents.
-     */
-    solrDocsPort: number|string;
-    /**
-     * `solrDocsCore` is the core name for Apache Solr's core for indexed documents.
-     */
-    solrDocsCore: string;
-    /**
-     * `solrDocsUrl` is the URL to access Apache Solr's core for indexed documents. It is used by Gulp and the Search feature.
-     */
-    solrDocsUrl: string;
-    /**
-     * `solrLawHost` is the host for Apache Solr's core for indexed laws.
-     */
-    solrLawHost: string;
-    /**
-     * `solrLawPort` is the port for Apache Solr's core for indexed laws.
-     */
-    solrLawPort: number|string;
-    /**
-     * `solrLawCore` is the core name for Apache Solr's core for indexed laws.
-     */
-    solrLawCore: string;
-    /**
-     * `solrLawUrl` is the URL to access Apache Solr's core for indexed laws. It is used by Gulp and the Search feature.
-     */
-    solrLawUrl: string;
-    /**
-     * `tikaHost` is the host to access the Apache Tika app.
-     */
-    tikaHost: string;
-    /**
-     * `tikaPort` is the port to access the Apache Tika app.
-     */
-    tikaPort: string|number;
-    /**
-     * `tikaUrl` is the URL to access the Apache Tika app.
-     */
-    tikaUrl: string;
+  /**
+   * `appHttpHost` is the host for the HTTP web app.
+   */
+  appHttpHost: string;
+  /**
+   * `appHttpPort` is the TCP port used to access the Node application's HTTP interface (usually by a reverse proxy).
+   */
+  appHttpPort: number|string;
+  /**
+   * `appHttpUrl` is the URL used to access the Node application (usually by a reverse proxy).
+   */
+  appHttpUrl: string;
+  /**
+   * `siteName` is used for page generation.
+   */
+  siteName: string;
+  /**
+   * `siteWelcomeMessage` is used for the homepage instead of `"Welcome to ${process.env['SITE_NAME']}!"`
+   */
+  siteWelcomeMessage: string;
+  /**
+   * `siteHost` is used for generating links for the search index. (If you leave this blank it should work using relative paths.)
+   */
+  siteHost: string;
+  /**
+   * `siteUrl` is used for generating links for the search index. (If you leave this blank it should work using relative paths.)
+   */
+  siteUrl: string;
+  /**
+   * `publicPath` is the relative path to the directory to this project root for the public files.
+   */
+  publicPath: string;
+  /**
+   * `pagesPath` is the relative path to the directory to this project root for the pages rather than public files.
+   */
+  pagesPath: string;
+  /**
+   * `assetsPath` is the relative path to the directory to this project root for the static asset files.
+   */
+  assetsPath: string;
+  /**
+   * `viewsPath' is the relative path to the directory to this project root for the view templates.
+   */
+  viewsPath: string;
+  /**
+   * `solrDocsHost` is the host for Apache Solr's core for indexed documents.
+   */
+  solrDocsHost: string;
+  /**
+   * `solrDocsPort` is the port for Apache Solr's core for indexed documents.
+   */
+  solrDocsPort: number|string;
+  /**
+   * `solrDocsCore` is the core name for Apache Solr's core for indexed documents.
+   */
+  solrDocsCore: string;
+  /**
+   * `solrDocsUrl` is the URL to access Apache Solr's core for indexed documents. It is used by Gulp and the Search feature.
+   */
+  solrDocsUrl: string;
+  /**
+   * `solrLawHost` is the host for Apache Solr's core for indexed laws.
+   */
+  solrLawHost: string;
+  /**
+   * `solrLawPort` is the port for Apache Solr's core for indexed laws.
+   */
+  solrLawPort: number|string;
+  /**
+   * `solrLawCore` is the core name for Apache Solr's core for indexed laws.
+   */
+  solrLawCore: string;
+  /**
+   * `solrLawUrl` is the URL to access Apache Solr's core for indexed laws. It is used by Gulp and the Search feature.
+   */
+  solrLawUrl: string;
+  /**
+   * `tikaHost` is the host to access the Apache Tika app.
+   */
+  tikaHost: string;
+  /**
+   * `tikaPort` is the port to access the Apache Tika app.
+   */
+  tikaPort: string|number;
+  /**
+   * `tikaUrl` is the URL to access the Apache Tika app.
+   */
+  tikaUrl: string;
 }
 
-console.log(`Configuring .env and expanding .env to include environment variable references.`);
-
 import path from 'path';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
@@ -195,20 +193,20 @@ const __dirname = path.dirname(__filename);
 
 const env: ProcessEnv = {};
 let dotEnvConfig = dotenv.config({
-    path: path.join(__dirname, '.env'),
-    processEnv: dotenv.config({
-        path: path.join(__dirname, '..', '..', '.env'),
-        processEnv: env as dotenv.DotenvPopulateInput}) as dotenv.DotenvPopulateInput
-    });
+  path: path.join(__dirname, '.env'),
+  processEnv: dotenv.config({
+    path: path.join(__dirname, '..', '..', '.env'),
+    processEnv: env as dotenv.DotenvPopulateInput}) as dotenv.DotenvPopulateInput
+  });
 dotEnvConfig = dotenvExpand.expand({
-    parsed: env as dotenvExpand.DotenvParseInput,
-    processEnv: process.env as dotenvExpand.DotenvParseInput
+  parsed: env as dotenvExpand.DotenvParseInput,
+  processEnv: process.env as dotenvExpand.DotenvParseInput
 });
 
 export const getAppHttpHost = () => env.APP_HTTP_HOST||'nm3clol-express-app';
 export const getAppHttpPort = () => process.env.PORT||env.APP_HTTP_PORT||3000;
 export const getAppHttpUrl = () => {
-    return env.APP_HTTP_URL || `http://${getAppHttpHost() + ((getAppHttpPort() == '80') ? '' : ':' + getAppHttpPort())}`
+  return env.APP_HTTP_URL || `http://${getAppHttpHost() + ((getAppHttpPort() == '80') ? '' : ':' + getAppHttpPort())}`
 };
 
 export const getSiteName = () => env.SITE_NAME||"(dev) No Moss 3 Carbo Landfill Online Localhost";
@@ -237,31 +235,31 @@ export const getTikaPort = () => parseInt(env.TIKA_PORT||'9998');
 export const getTikaUrl = () => env.TIKA_URL||`http://${getTikaHost()}:${getTikaPort()}`;
 
 export const config: Config = {
-    appHttpHost: getAppHttpHost(),
-    appHttpPort: getAppHttpPort(),
-    appHttpUrl: getAppHttpUrl(),
+  appHttpHost: getAppHttpHost(),
+  appHttpPort: getAppHttpPort(),
+  appHttpUrl: getAppHttpUrl(),
 
-    siteName: getSiteName(),
-    siteWelcomeMessage: getSiteWelcomeMessage(),
-    siteHost: getSiteHost(),
-    siteUrl: getSiteUrl(),
+  siteName: getSiteName(),
+  siteWelcomeMessage: getSiteWelcomeMessage(),
+  siteHost: getSiteHost(),
+  siteUrl: getSiteUrl(),
 
-    publicPath: getPublicPath(),
-    pagesPath: getPagesPath(),
-    assetsPath: getAssetsPath(),
-    viewsPath: getViewsPath(),
+  publicPath: getPublicPath(),
+  pagesPath: getPagesPath(),
+  assetsPath: getAssetsPath(),
+  viewsPath: getViewsPath(),
 
-    solrDocsHost: getSolrDocsHost(),
-    solrDocsPort: getSolrDocsPort(),
-    solrDocsCore: getSolrDocsCore(),
-    solrDocsUrl: getSolrDocsUrl(),
+  solrDocsHost: getSolrDocsHost(),
+  solrDocsPort: getSolrDocsPort(),
+  solrDocsCore: getSolrDocsCore(),
+  solrDocsUrl: getSolrDocsUrl(),
 
-    solrLawHost: getSolrLawHost(),
-    solrLawPort: getSolrLawPort(),
-    solrLawCore: getSolrLawCore(),
-    solrLawUrl: getSolrLawCore(),
+  solrLawHost: getSolrLawHost(),
+  solrLawPort: getSolrLawPort(),
+  solrLawCore: getSolrLawCore(),
+  solrLawUrl: getSolrLawCore(),
 
-    tikaHost: getTikaHost(),
-    tikaPort: getTikaPort(),
-    tikaUrl: getTikaUrl(),
+  tikaHost: getTikaHost(),
+  tikaPort: getTikaPort(),
+  tikaUrl: getTikaUrl(),
 };

From e0b93cf3558a64c20dbfcf101f8dbb05e8affac1 Mon Sep 17 00:00:00 2001
From: David Ball <david@daball.me>
Date: Mon, 24 Jun 2024 01:00:18 -0400
Subject: [PATCH 2/3] Cleanup a lot of tab stops from 4 spaces to 2 and adjust
 other whitespace.

---
 app/helpers/breadcrumbs.mts          |   6 +-
 app/page/glob-slash.mts              |   2 +-
 app/search/solr-doc.mts              |  28 ++--
 app/server.mts                       |   4 +-
 app/tika/client.mts                  |  10 +-
 app/tika/types.mts                   | 160 ++++++++++-----------
 app/views/error.ejs                  | 199 ++++++++++++---------------
 app/views/includes/bottom-navbar.ejs |   2 +-
 app/views/includes/breadcrumbs.ejs   |   2 +-
 app/views/includes/no-trash-svg.ejs  |  30 ++--
 app/views/includes/top-navbar.ejs    |   2 +-
 app/views/page.ejs                   |   7 -
 app/views/search-error.ejs           |  63 +++++----
 app/views/search-results.ejs         | 139 ++++++++++---------
 app/views/video-player.ejs           |   7 -
 15 files changed, 314 insertions(+), 347 deletions(-)

diff --git a/app/helpers/breadcrumbs.mts b/app/helpers/breadcrumbs.mts
index 3580bdc4..f2586fea 100644
--- a/app/helpers/breadcrumbs.mts
+++ b/app/helpers/breadcrumbs.mts
@@ -1,4 +1,4 @@
 export interface Breadcrumb {
-    title: string;
-    url: string;
-}
+  title: string;
+  url: string;
+}
\ No newline at end of file
diff --git a/app/page/glob-slash.mts b/app/page/glob-slash.mts
index 6491d648..ac29d935 100644
--- a/app/page/glob-slash.mts
+++ b/app/page/glob-slash.mts
@@ -5,4 +5,4 @@
 import path from 'path';
 
 export const normalize = (value: string) => path.posix.normalize(path.posix.join('/', value));;
-export default (value: string) => (value.charAt(0) === '!' ? `!${normalize(value.substr(1))}` : normalize(value));
+export default (value: string) => (value.charAt(0) === '!' ? `!${normalize(value.substr(1))}` : normalize(value));
\ No newline at end of file
diff --git a/app/search/solr-doc.mts b/app/search/solr-doc.mts
index 7c10e40a..f7f4de23 100644
--- a/app/search/solr-doc.mts
+++ b/app/search/solr-doc.mts
@@ -2,24 +2,24 @@
  * Needed until the conversion is completed.
  */
 export interface IncorrectStyleSolrDocument {
-    id: string;
-    sha256sum: string[];
-    url: string[];
-    content_length: number[];
-    content_type: string[];
-    text: string[];
-    _version_?: number;
+  id: string;
+  sha256sum: string[];
+  url: string[];
+  content_length: number[];
+  content_type: string[];
+  text: string[];
+  _version_?: number;
 }
 
 /**
  * Describes Solr full-text search properties for a document file in the public repository.
  */
 export interface SolrDocument {
-    id: string;
-    sha256sum: string;
-    url: string;
-    content_length: number;
-    content_type: string;
-    text: string;
-    _version_?: number;
+  id: string;
+  sha256sum: string;
+  url: string;
+  content_length: number;
+  content_type: string;
+  text: string;
+  _version_?: number;
 }
diff --git a/app/server.mts b/app/server.mts
index 782ac3db..b90eaccf 100644
--- a/app/server.mts
+++ b/app/server.mts
@@ -38,5 +38,5 @@ app.listen(config.appHttpPort, () => {
   console.log(`To access your app, you can use the 127.0.0.1 host, http://127.0.0.1:${config.appHttpPort}.`);
   console.log(`To access your app, you can use the ::1 host, http://[::1]:${config.appHttpPort}.`);
   console.log(`To access your app, you might can use the app host name, ${config.appHttpUrl}.`);
-  console.log(`This app is configured to use the web site URL, ${config.siteUrl}.`);
-});
+  console.log(`This app is configured to use the web site URL for URL generation, as needed, ${config.siteUrl}. Certain site features won't work correctly unless this is on a publicly accessible URL.`);
+});
\ No newline at end of file
diff --git a/app/tika/client.mts b/app/tika/client.mts
index 378d722d..80305f55 100644
--- a/app/tika/client.mts
+++ b/app/tika/client.mts
@@ -1,11 +1,11 @@
 import { ReadStream } from 'fs'
 import fetch from 'node-fetch'
 let join = (...args: String[]) => {
-    let output = "";
-    args.forEach((arg) => {
-        output += arg;
-    })
-    return output;
+  let output = "";
+  args.forEach((arg) => {
+    output += arg;
+  })
+  return output;
 };
 import { ContentResource, MetadataResource } from './types.mjs'
 import { Writable } from 'stream';
diff --git a/app/tika/types.mts b/app/tika/types.mts
index 1ad11bb8..2b3ce2d4 100644
--- a/app/tika/types.mts
+++ b/app/tika/types.mts
@@ -1,81 +1,81 @@
 export interface MetadataResource {
-    'pdf:unmappedUnicodeCharsPerPage': string[]
-    'pdf:PDFVersion': string
-    'xmp:CreatorTool': string
-    'pdf:hasXFA': string
-    'access_permission:modify_annotations': string
-    'access_permission:can_print_degraded': string
-    'X-TIKA:Parsed-By-Full-Set': string[]
-    'pdf:num3DAnnotations': string
-    'dcterms:created': string
-    'language': string
-    'dcterms:modified': string
-    'dc:format': string
-    'pdf:docinfo:creator_tool': string
-    'pdf:overallPercentageUnmappedUnicodeChars': string
-    'access_permission:fill_in_form': string
-    'pdf:docinfo:modified': string
-    'pdf:hasCollection': string
-    'pdf:encrypted': string
-    'pdf:containsNonEmbeddedFont': string
-    'Content-Length': string
-    'pdf:hasMarkedContent': string
-    'Content-Type': string
-    'pdf:producer': string
-    'pdf:totalUnmappedUnicodeChars': string
-    'access_permission:extract_for_accessibility': string
-    'access_permission:assemble_document': string
-    'xmpTPg:NPages': string
-    'pdf:hasXMP': string
-    'pdf:charsPerPage': string[]
-    'access_permission:extract_content': string
-    'access_permission:can_print': string
-    'X-TIKA:Parsed-By': string[]
-    'pdf:annotationTypes': string
-    'access_permission:can_modify': string
-    'pdf:docinfo:producer': string
-    'pdf:docinfo:created': string
-    'pdf:annotationSubtypes': string
-    'pdf:containsDamagedFont': string
-  }
-  
-  export interface ContentResource {
-    'pdf:unmappedUnicodeCharsPerPage': string[]
-    'pdf:PDFVersion': string
-    'xmp:CreatorTool': string
-    'pdf:hasXFA': string
-    'access_permission:modify_annotations': string
-    'access_permission:can_print_degraded': string
-    'X-TIKA:Parsed-By-Full-Set': string[]
-    'pdf:num3DAnnotations': string
-    'dcterms:created': string
-    'dcterms:modified': string
-    'dc:format': string
-    'pdf:docinfo:creator_tool': string
-    'pdf:overallPercentageUnmappedUnicodeChars': string
-    'access_permission:fill_in_form': string
-    'pdf:docinfo:modified': string
-    'pdf:hasCollection': string
-    'pdf:encrypted': string
-    'pdf:containsNonEmbeddedFont': string
-    'Content-Length': string
-    'pdf:hasMarkedContent': string
-    'Content-Type': string
-    'pdf:producer': string
-    'pdf:totalUnmappedUnicodeChars': string
-    'access_permission:extract_for_accessibility': string
-    'access_permission:assemble_document': string
-    'xmpTPg:NPages': string
-    'pdf:hasXMP': string
-    'pdf:charsPerPage': string[]
-    'access_permission:extract_content': string
-    'access_permission:can_print': string
-    'X-TIKA:Parsed-By': string[]
-    'X-TIKA:content': string
-    'pdf:annotationTypes': string
-    'access_permission:can_modify': string
-    'pdf:docinfo:producer': string
-    'pdf:docinfo:created': string
-    'pdf:annotationSubtypes': string
-    'pdf:containsDamagedFont': string
-  }
\ No newline at end of file
+  'pdf:unmappedUnicodeCharsPerPage': string[]
+  'pdf:PDFVersion': string
+  'xmp:CreatorTool': string
+  'pdf:hasXFA': string
+  'access_permission:modify_annotations': string
+  'access_permission:can_print_degraded': string
+  'X-TIKA:Parsed-By-Full-Set': string[]
+  'pdf:num3DAnnotations': string
+  'dcterms:created': string
+  'language': string
+  'dcterms:modified': string
+  'dc:format': string
+  'pdf:docinfo:creator_tool': string
+  'pdf:overallPercentageUnmappedUnicodeChars': string
+  'access_permission:fill_in_form': string
+  'pdf:docinfo:modified': string
+  'pdf:hasCollection': string
+  'pdf:encrypted': string
+  'pdf:containsNonEmbeddedFont': string
+  'Content-Length': string
+  'pdf:hasMarkedContent': string
+  'Content-Type': string
+  'pdf:producer': string
+  'pdf:totalUnmappedUnicodeChars': string
+  'access_permission:extract_for_accessibility': string
+  'access_permission:assemble_document': string
+  'xmpTPg:NPages': string
+  'pdf:hasXMP': string
+  'pdf:charsPerPage': string[]
+  'access_permission:extract_content': string
+  'access_permission:can_print': string
+  'X-TIKA:Parsed-By': string[]
+  'pdf:annotationTypes': string
+  'access_permission:can_modify': string
+  'pdf:docinfo:producer': string
+  'pdf:docinfo:created': string
+  'pdf:annotationSubtypes': string
+  'pdf:containsDamagedFont': string
+}
+
+export interface ContentResource {
+  'pdf:unmappedUnicodeCharsPerPage': string[]
+  'pdf:PDFVersion': string
+  'xmp:CreatorTool': string
+  'pdf:hasXFA': string
+  'access_permission:modify_annotations': string
+  'access_permission:can_print_degraded': string
+  'X-TIKA:Parsed-By-Full-Set': string[]
+  'pdf:num3DAnnotations': string
+  'dcterms:created': string
+  'dcterms:modified': string
+  'dc:format': string
+  'pdf:docinfo:creator_tool': string
+  'pdf:overallPercentageUnmappedUnicodeChars': string
+  'access_permission:fill_in_form': string
+  'pdf:docinfo:modified': string
+  'pdf:hasCollection': string
+  'pdf:encrypted': string
+  'pdf:containsNonEmbeddedFont': string
+  'Content-Length': string
+  'pdf:hasMarkedContent': string
+  'Content-Type': string
+  'pdf:producer': string
+  'pdf:totalUnmappedUnicodeChars': string
+  'access_permission:extract_for_accessibility': string
+  'access_permission:assemble_document': string
+  'xmpTPg:NPages': string
+  'pdf:hasXMP': string
+  'pdf:charsPerPage': string[]
+  'access_permission:extract_content': string
+  'access_permission:can_print': string
+  'X-TIKA:Parsed-By': string[]
+  'X-TIKA:content': string
+  'pdf:annotationTypes': string
+  'access_permission:can_modify': string
+  'pdf:docinfo:producer': string
+  'pdf:docinfo:created': string
+  'pdf:annotationSubtypes': string
+  'pdf:containsDamagedFont': string
+}
\ No newline at end of file
diff --git a/app/views/error.ejs b/app/views/error.ejs
index 91181817..4b9af003 100644
--- a/app/views/error.ejs
+++ b/app/views/error.ejs
@@ -1,122 +1,105 @@
 <!DOCTYPE html>
 <html>
-
-<head>
+  <head>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
     <style>
-        body {
-            margin: 0;
-            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
-                "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-            cursor: default;
-            -webkit-user-select: none;
-            -moz-user-select: none;
-            -ms-user-select: none;
-            user-select: none;
-            -webkit-font-smoothing: antialiased;
-            text-rendering: optimizeLegibility;
-            position: absolute;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            display: flex;
-            flex-direction: column;
-        }
-
-        main,
-        aside,
+      body {
+        margin: 0;
+        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+          "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+        cursor: default;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        -webkit-font-smoothing: antialiased;
+        text-rendering: optimizeLegibility;
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        display: flex;
+        flex-direction: column;
+      }
+      main,
+      aside,
+      section {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+      }
+      main {
+        height: 100%;
+      }
+      aside {
+        background: #000;
+        flex-shrink: 1;
+        padding: 30px 20px;
+      }
+      aside p {
+        margin: 0;
+        color: #999999;
+        font-size: 14px;
+        line-height: 24px;
+      }
+      aside a {
+        color: #fff;
+        text-decoration: none;
+      }
+      section span {
+        font-size: 24px;
+        font-weight: 500;
+        display: block;
+        border-bottom: 1px solid #EAEAEA;
+        text-align: center;
+        padding-bottom: 20px;
+        width: 100px;
+      }
+      section p {
+        font-size: 14px;
+        font-weight: 400;
+      }
+      section span+p {
+        margin: 20px 0 0 0;
+      }
+      @media (min-width: 768px) {
         section {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            flex-direction: column;
+          height: 40px;
+          flex-direction: row;
         }
-
-        main {
-            height: 100%;
-        }
-
-        aside {
-            background: #000;
-            flex-shrink: 1;
-            padding: 30px 20px;
-        }
-
-        aside p {
-            margin: 0;
-            color: #999999;
-            font-size: 14px;
-            line-height: 24px;
-        }
-
-        aside a {
-            color: #fff;
-            text-decoration: none;
-        }
-
-        section span {
-            font-size: 24px;
-            font-weight: 500;
-            display: block;
-            border-bottom: 1px solid #EAEAEA;
-            text-align: center;
-            padding-bottom: 20px;
-            width: 100px;
-        }
-
+        section span,
         section p {
-            font-size: 14px;
-            font-weight: 400;
+          height: 100%;
+          line-height: 40px;
+        }
+        section span {
+          border-bottom: 0;
+          border-right: 1px solid #EAEAEA;
+          padding: 0 20px 0 0;
+          width: auto;
         }
-
         section span+p {
-            margin: 20px 0 0 0;
+          margin: 0;
+          padding-left: 20px;
         }
-
-        @media (min-width: 768px) {
-            section {
-                height: 40px;
-                flex-direction: row;
-            }
-
-            section span,
-            section p {
-                height: 100%;
-                line-height: 40px;
-            }
-
-            section span {
-                border-bottom: 0;
-                border-right: 1px solid #EAEAEA;
-                padding: 0 20px 0 0;
-                width: auto;
-            }
-
-            section span+p {
-                margin: 0;
-                padding-left: 20px;
-            }
-
-            aside {
-                padding: 50px 0;
-            }
-
-            aside p {
-                max-width: 520px;
-                text-align: center;
-            }
+        aside {
+          padding: 50px 0;
         }
+        aside p {
+          max-width: 520px;
+          text-align: center;
+        }
+      }
     </style>
-</head>
-
-<body>
+  </head>
+  <body>
     <main>
-        <section>
-            <span><% if (typeof statusCode !== 'undefined') { %><%= statusCode %><% } %></span>
-            <p><% if (typeof message !== 'undefined') { %><%= message %><% } %></p>
-        </section>
+      <section>
+        <span><% if (typeof statusCode !== 'undefined') { %><%= statusCode %><% } %></span>
+        <p><% if (typeof message !== 'undefined') { %><%= message %><% } %></p>
+      </section>
     </main>
-</body>
-
-</html>
+  </body>
+</html>
\ No newline at end of file
diff --git a/app/views/includes/bottom-navbar.ejs b/app/views/includes/bottom-navbar.ejs
index 5d2df91c..ae233c08 100644
--- a/app/views/includes/bottom-navbar.ejs
+++ b/app/views/includes/bottom-navbar.ejs
@@ -9,4 +9,4 @@
       Your use of this search feature constitutes your agreement with the <a style="color: #eee; font-weight: 900; text-transform: uppercase;" href="/search-policy">Search Policy</a>.
     </p>
   </div>
-</nav>
+</nav>
\ No newline at end of file
diff --git a/app/views/includes/breadcrumbs.ejs b/app/views/includes/breadcrumbs.ejs
index 06e8165d..267d8d2a 100644
--- a/app/views/includes/breadcrumbs.ejs
+++ b/app/views/includes/breadcrumbs.ejs
@@ -9,4 +9,4 @@
             <a href="<%=breadcrumb.url%>"><%=breadcrumb.title%></a>
         <% } %>
     <% }) %>
-</h1>
+</h1>
\ No newline at end of file
diff --git a/app/views/includes/no-trash-svg.ejs b/app/views/includes/no-trash-svg.ejs
index 8a32995e..e333a91d 100644
--- a/app/views/includes/no-trash-svg.ejs
+++ b/app/views/includes/no-trash-svg.ejs
@@ -1,18 +1,18 @@
 <img id="no-trash-svg" alt="" src="/svg/no-trash.svg" class="no-trash-svg" onload="" />
 <script>
-    function is_iOS() {
-        return [
-            'iPad Simulator',
-            'iPhone Simulator',
-            'iPod Simulator',
-            'iPad',
-            'iPhone',
-            'iPod'
-        ].includes(navigator.platform)
-        // iPad on iOS 13 detection
-        || (navigator.userAgent.includes("Mac") && "ontouchend" in document)
-    }
-    if (is_iOS() && navigator.userAgent.indexOf('AppleWebKit')) {
-        document.getElementById("no-trash-svg").style.visibility = "hidden";
-    }
+  function is_iOS() {
+    return [
+      'iPad Simulator',
+      'iPhone Simulator',
+      'iPod Simulator',
+      'iPad',
+      'iPhone',
+      'iPod'
+    ].includes(navigator.platform)
+    // iPad on iOS 13 detection
+    || (navigator.userAgent.includes("Mac") && "ontouchend" in document)
+  }
+  if (is_iOS() && navigator.userAgent.indexOf('AppleWebKit')) {
+    document.getElementById("no-trash-svg").style.visibility = "hidden";
+  }
 </script>
\ No newline at end of file
diff --git a/app/views/includes/top-navbar.ejs b/app/views/includes/top-navbar.ejs
index e2430a77..fcba03bd 100644
--- a/app/views/includes/top-navbar.ejs
+++ b/app/views/includes/top-navbar.ejs
@@ -13,4 +13,4 @@
     </form>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/page.ejs b/app/views/page.ejs
index be4d05d1..6fc892a9 100644
--- a/app/views/page.ejs
+++ b/app/views/page.ejs
@@ -4,18 +4,13 @@
     <title><%= (typeof fm.title !== 'undefined') ? `${fm.title} - ${h.getSiteName()}` : h.getSiteName() %></title>
     <%- include('./includes/common-head.ejs') %>
   </head>
-
   <body onload="initPage()">
-
     <%- include('./includes/top-navbar.ejs') %>
-
     <%- include('./includes/no-trash-svg.ejs') %>
-
     <main class="container">
       <header>
         <%- include('./includes/breadcrumbs.ejs') %>
       </header>
-
       <% if (typeof content !== 'undefined') {%>
         <div class="row p-4 pb-0 pe-lg-0 pt-lg-5 align-items-center rounded-3 border shadow-lg">
           <div class="col-lg-12 p-3 p-lg-5 pt-lg-3">
@@ -29,7 +24,6 @@
           </div>
         </div>
       <% } %>
-    
       <ul id="files" class="list-group shadow-lg">
         <% if (typeof files !== 'undefined') files.forEach(function(value, index) { %>
           <li class="list-group-item list-group-item-action flex-column align-items-start">
@@ -40,7 +34,6 @@
         <% }) %>
       </ul>
     </main>
-
     <%- include('./includes/bottom-navbar.ejs') %>
     <%- include('./includes/bottom-scripts.ejs') %>
 	</body>
diff --git a/app/views/search-error.ejs b/app/views/search-error.ejs
index 54adcd00..89578bcd 100644
--- a/app/views/search-error.ejs
+++ b/app/views/search-error.ejs
@@ -1,35 +1,34 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <title>Search Error for <%- query %> - <%- h.getSiteName() %></title>
-  <%- include('./includes/common-head.ejs') %>
-</head>
-<body>
-  <%- include('./includes/top-navbar.ejs') %>
-  <%- include('./includes/no-trash-svg.ejs') %>
-  <main class="container">
-    <header>
-      <%- include('./includes/breadcrumbs.ejs') %>
-    </header>
-    <div class="mt-3 p-3">
-      <p>
-        Disclaimer: Use of the search feature is subject to both the <a href="/search-policy">Search
-        Policy</a> and the <a href="/privacy-policy">Privacy Policy</a>.
-      </p>
-    </div>
-    <div id="searchError" class="mt-3 shadow-lg p-lg-5">
-      <% if (typeof error !== 'undefined') {%>
-        <p>An error occurred while attempting to perform a search.</p>
-        <% if (typeof query !== 'undefined') {%><p><b>Search Query:</b> <span id="search-query"><%= query %></span></p><% } %>
-        <% if (typeof error.code !== 'undefined') {%><p><b>Error Code:</b> <span id="error-code"><%= error.code %></span></p><% } %>
-        <% if (typeof error.message !== 'undefined') {%><p><b>Error Message:</b> <span id="error-message"><%= error.message %></span></p><% } %>
-        <% if (typeof error.innerError !== 'undefined' && typeof error.innerError.error !== 'undefined') { %>
-          <% if (typeof error.innerError.error.msg !== 'undefined') {%><p><b>Inner Error Message:</b> <span id="inner-error-message"><%- error.innerError.error.msg.replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\n", '<br>') %></span></p><% } %>
+  <head>
+    <title>Search Error for <%- query %> - <%- h.getSiteName() %></title>
+    <%- include('./includes/common-head.ejs') %>
+  </head>
+  <body>
+    <%- include('./includes/top-navbar.ejs') %>
+    <%- include('./includes/no-trash-svg.ejs') %>
+    <main class="container">
+      <header>
+        <%- include('./includes/breadcrumbs.ejs') %>
+      </header>
+      <div class="mt-3 p-3">
+        <p>
+          Disclaimer: Use of the search feature is subject to both the <a href="/search-policy">Search
+          Policy</a> and the <a href="/privacy-policy">Privacy Policy</a>.
+        </p>
+      </div>
+      <div id="searchError" class="mt-3 shadow-lg p-lg-5">
+        <% if (typeof error !== 'undefined') {%>
+          <p>An error occurred while attempting to perform a search.</p>
+          <% if (typeof query !== 'undefined') {%><p><b>Search Query:</b> <span id="search-query"><%= query %></span></p><% } %>
+          <% if (typeof error.code !== 'undefined') {%><p><b>Error Code:</b> <span id="error-code"><%= error.code %></span></p><% } %>
+          <% if (typeof error.message !== 'undefined') {%><p><b>Error Message:</b> <span id="error-message"><%= error.message %></span></p><% } %>
+          <% if (typeof error.innerError !== 'undefined' && typeof error.innerError.error !== 'undefined') { %>
+            <% if (typeof error.innerError.error.msg !== 'undefined') {%><p><b>Inner Error Message:</b> <span id="inner-error-message"><%- error.innerError.error.msg.replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\n", '<br>') %></span></p><% } %>
+          <% } %>
         <% } %>
-      <% } %>
-    </div>
-
-  <%- include('./includes/bottom-navbar.ejs') %>
-  <%- include('./includes/bottom-scripts.ejs') %>
-</body>
-</html>
+      </div>
+    <%- include('./includes/bottom-navbar.ejs') %>
+    <%- include('./includes/bottom-scripts.ejs') %>
+  </body>
+</html>
\ No newline at end of file
diff --git a/app/views/search-results.ejs b/app/views/search-results.ejs
index 0ac46ae9..f3cad141 100644
--- a/app/views/search-results.ejs
+++ b/app/views/search-results.ejs
@@ -1,73 +1,72 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <title>Search Results for <%- query %> - <%- h.getSiteName() %></title>
-  <%- include('./includes/common-head.ejs') %>
-</head>
-<body>
-  <%- include('./includes/top-navbar.ejs') %>
-  <%- include('./includes/no-trash-svg.ejs') %>
-  <main class="container">
-    <header>
-      <%- include('./includes/breadcrumbs.ejs') %>
-    </header>
-    <div class="container">
-      <p>
-        Disclaimer: Use of the search feature is subject to both the <a href="/search-policy">Search
-        Policy</a> and the <a href="/privacy-policy">Privacy Policy</a>.
-      </p>
-    </div>
-      <% if (typeof response !== "undefined" && typeof response.numFound !== "undefined" && typeof response.docs !== "undefined" && typeof highlighting !== "undefined") { %>
-        <div id="searchResults" class="mt-3 shadow-lg">
-          <!-- Search results will be dynamically populated here -->
-          <% if (response.numFound == 0) { %>
-            <p>No documents found matching the search query.</p>
-          <% } else { %>
-            <ul class="list-group shadow-lg">
-              <% response.docs.forEach(doc => { %>
-                <li class="list-group-item list-group-item-action flex-column align-items-start">
-                  <h5><%= doc.title %></h5>
-                  <% if (highlighting[doc.id] && highlighting[doc.id].text) { %>
-                    <% highlighting[doc.id].text.forEach(snippet => { %>
-                      <pre><%- h.stripWebVTT(snippet) %></pre>
-                    <% }); %>
-                  <% } else { %>
-                    <!-- <p>No highlight available.</p> -->
-                  <% } %>
-                  <a href="<%= doc.url %>"><%= doc.url %></a>
-                </li>
-              <% }); %>
-            </ul>
-          <% } %>
-        </div>
+  <head>
+    <title>Search Results for <%- query %> - <%- h.getSiteName() %></title>
+    <%- include('./includes/common-head.ejs') %>
+  </head>
+  <body>
+    <%- include('./includes/top-navbar.ejs') %>
+    <%- include('./includes/no-trash-svg.ejs') %>
+    <main class="container">
+      <header>
+        <%- include('./includes/breadcrumbs.ejs') %>
+      </header>
+      <div class="container">
+        <p>
+          Disclaimer: Use of the search feature is subject to both the <a href="/search-policy">Search
+          Policy</a> and the <a href="/privacy-policy">Privacy Policy</a>.
+        </p>
       </div>
-    <% } %>
-    <!-- Pagination controls -->
-    <% if (typeof totalPages !== "undefined" && totalPages) { %>
-      <nav aria-label="Search results pagination">
-        <ul class="pagination justify-content-center mt-4">
-          <% if (page > 1) { %>
-            <li class="page-item">
-              <a class="page-link" href="/search?q=<%= query %>&page=<%= page - 1 %>&pageSize=<%= pageSize %>">Previous</a>
-            </li>
-          <% } %>
-          <% for (let i = Math.max(Math.min(page - 7, totalPages - 14), 1); i <= Math.min(totalPages, Math.max(page - 7, 1) + 14); i++) { %>
-            <li class="page-item <%= i == page ? 'active' : '' %>">
-              <a class="page-link" href="/search?q=<%= query %>&page=<%= i %>&pageSize=<%= pageSize %>"><%= i %></a>
-            </li>
-          <% } %>
-          <% if (page < totalPages) { %>
-            <li class="page-item">
-              <a class="page-link" href="/search?q=<%= query %>&page=<%= parseInt(page) + 1 %>&pageSize=<%= pageSize %>">Next</a>
-            </li>
-          <% } %>
-        </ul>
-      </nav>
-      <p class="center">Page <%= page %> out of <%= totalPages %>. Displaying results <%= (page-1)*pageSize+1 %> through <%= Math.min(page*pageSize, totalResults) %> out of <%= totalResults %> total results.</p>
-    <% } %>
-  </main>
-
-  <%- include('./includes/bottom-navbar.ejs') %>
-  <%- include('./includes/bottom-scripts.ejs') %>
-</body>
-</html>
+        <% if (typeof response !== "undefined" && typeof response.numFound !== "undefined" && typeof response.docs !== "undefined" && typeof highlighting !== "undefined") { %>
+          <div id="searchResults" class="mt-3 shadow-lg">
+            <!-- Search results will be dynamically populated here -->
+            <% if (response.numFound == 0) { %>
+              <p>No documents found matching the search query.</p>
+            <% } else { %>
+              <ul class="list-group shadow-lg">
+                <% response.docs.forEach(doc => { %>
+                  <li class="list-group-item list-group-item-action flex-column align-items-start">
+                    <h5><%= doc.title %></h5>
+                    <% if (highlighting[doc.id] && highlighting[doc.id].text) { %>
+                      <% highlighting[doc.id].text.forEach(snippet => { %>
+                        <pre><%- h.stripWebVTT(snippet) %></pre>
+                      <% }); %>
+                    <% } else { %>
+                      <!-- <p>No highlight available.</p> -->
+                    <% } %>
+                    <a href="<%= doc.url %>"><%= doc.url %></a>
+                  </li>
+                <% }); %>
+              </ul>
+            <% } %>
+          </div>
+        </div>
+      <% } %>
+      <!-- Pagination controls -->
+      <% if (typeof totalPages !== "undefined" && totalPages) { %>
+        <nav aria-label="Search results pagination">
+          <ul class="pagination justify-content-center mt-4">
+            <% if (page > 1) { %>
+              <li class="page-item">
+                <a class="page-link" href="/search?q=<%= query %>&page=<%= page - 1 %>&pageSize=<%= pageSize %>">Previous</a>
+              </li>
+            <% } %>
+            <% for (let i = Math.max(Math.min(page - 7, totalPages - 14), 1); i <= Math.min(totalPages, Math.max(page - 7, 1) + 14); i++) { %>
+              <li class="page-item <%= i == page ? 'active' : '' %>">
+                <a class="page-link" href="/search?q=<%= query %>&page=<%= i %>&pageSize=<%= pageSize %>"><%= i %></a>
+              </li>
+            <% } %>
+            <% if (page < totalPages) { %>
+              <li class="page-item">
+                <a class="page-link" href="/search?q=<%= query %>&page=<%= parseInt(page) + 1 %>&pageSize=<%= pageSize %>">Next</a>
+              </li>
+            <% } %>
+          </ul>
+        </nav>
+        <p class="center">Page <%= page %> out of <%= totalPages %>. Displaying results <%= (page-1)*pageSize+1 %> through <%= Math.min(page*pageSize, totalResults) %> out of <%= totalResults %> total results.</p>
+      <% } %>
+    </main>
+    <%- include('./includes/bottom-navbar.ejs') %>
+    <%- include('./includes/bottom-scripts.ejs') %>
+  </body>
+</html>
\ No newline at end of file
diff --git a/app/views/video-player.ejs b/app/views/video-player.ejs
index fb47e710..1e87e13c 100644
--- a/app/views/video-player.ejs
+++ b/app/views/video-player.ejs
@@ -4,17 +4,13 @@
     <title><%=h.getDirectoryTitle(directory)%></title>
     <%- include('./includes/common-head.ejs') %>
   </head>
-
   <body onload="initPage()">
-
     <%- include('./includes/top-navbar.ejs') %>
     <%- include('./includes/no-trash-svg.ejs') %>
-
     <main class="container">
       <header>
         <%- include('./includes/breadcrumbs.ejs') %>
       </header>
-
       <% if (typeof videoURL !== 'undefined') {%>
         <div class="row p-4 pb-0 pe-lg-0 pt-lg-5 align-items-center rounded-3 border shadow-lg">
           <div class="col-lg-12 p-3 p-lg-5 pt-lg-3">
@@ -49,7 +45,6 @@
           </div>
         </div>
         <% } %>
-
         <% if (typeof subtitleVTT !== 'undefined') {%>
           <div class="row p-4 pb-0 pe-lg-0 pt-lg-5 align-items-center rounded-3 border shadow-lg" style="max-height:65vh;overflow-y:scroll">
           <div class="col-lg-12 p-3 p-lg-5 pt-lg-3">
@@ -65,9 +60,7 @@
           </div>
         </div>
       <% } %>
-
     </main>
-
     <%- include('./includes/bottom-navbar.ejs') %>
     <%- include('./includes/bottom-scripts.ejs') %>
 	</body>

From 1f1071f5a977b87f6051cf8275b6ddaad641dbe3 Mon Sep 17 00:00:00 2001
From: David Ball <david@daball.me>
Date: Mon, 24 Jun 2024 01:02:26 -0400
Subject: [PATCH 3/3] feat: Embedded Microsoft Office Viewer and Google Docs
 Viewer web services and no longer download as default action when viewer is
 supported when loading directory with file attachment that doesn't
 automatically render.

---
 app/helpers/functions.mts             | 10 ++++
 app/page/router.mts                   |  6 +--
 app/page/vercel-serve.mts             | 60 ++++++++++++------------
 app/views/directory.ejs               | 67 +++++++++++++++++++++++----
 app/views/includes/bottom-scripts.ejs |  3 +-
 app/views/includes/common-head.ejs    |  2 +-
 6 files changed, 104 insertions(+), 44 deletions(-)

diff --git a/app/helpers/functions.mts b/app/helpers/functions.mts
index 13907508..5c6e2000 100644
--- a/app/helpers/functions.mts
+++ b/app/helpers/functions.mts
@@ -186,6 +186,14 @@ const renderArchive = (html: string, paths: string[]) => {
   return html;
 }
 
+const isMsOfficeViewerSupported = (file: string) => {
+  return path.extname(file).search(/^((?:.pptx)|(?:.docx)|(?:.xlsx)|(?:.ppt)|(?:.doc)|(?:.xls))$/ig) != -1;
+}
+
+const isGoogleDocsViewerSupported = (file: string) => {
+  return isMsOfficeViewerSupported(file) || path.extname(file).search(/^((?:.pdf))$/ig) != -1;
+}
+
 export default {
   leftTrimFirstDirectory,
   trimSlashes,
@@ -205,4 +213,6 @@ export default {
   inspect,
   md,
   moment,
+  isMsOfficeViewerSupported,
+  isGoogleDocsViewerSupported,
 };
\ No newline at end of file
diff --git a/app/page/router.mts b/app/page/router.mts
index 65dfb26c..bd072740 100644
--- a/app/page/router.mts
+++ b/app/page/router.mts
@@ -78,7 +78,7 @@ export default function () {
         }
       });
       const renderData = { breadcrumbs, content, filePath, fullFilePath, paths, req, route, ...fmData };
-      res.render("page", { h: helpers, ...renderData });
+      res.render("page", { h: helpers, path, config, ...renderData });
     });
   });
 
@@ -122,7 +122,7 @@ export default function () {
     console.log(`Setting route for ${route}`);
     pageRouter.get(route, async (req, res) => {
       const html = fs.readFileSync(fullFilePath).toString();
-      const renderData = { route, filePath, fullFilePath, req, paths, html };
+      const renderData = { route, filePath, fullFilePath, req, paths, html, path, config };
       res.render("archive", { h: helpers, ...renderData });
     });
   });
@@ -183,7 +183,7 @@ export default function () {
           }	  
         });
         const renderData = { breadcrumbs, route, filePath, fullFilePath, req, paths, directory: path.join('public', directory), videoURL, subtitleURL, subtitleVTT, info };
-        res.render("video-player", { h: helpers, ...renderData });
+        res.render("video-player", { h: helpers, path, config, ...renderData });
       }
     });
   });
diff --git a/app/page/vercel-serve.mts b/app/page/vercel-serve.mts
index 1308e953..98524f1c 100644
--- a/app/page/vercel-serve.mts
+++ b/app/page/vercel-serve.mts
@@ -81,15 +81,15 @@ export interface ServeHandlerOptions {
 	 * current working directory.
 	 * 
 	 * For example, if serving a Jekyll app, it would look like this:
-	 *     {
-	 *       "public": "_site"
-	 *     }
+	 *   {
+	 *     "public": "_site"
+	 *   }
 	 * 
 	 * Using absolute path:
 	 * 
-	 *     {
-	 *         "public": "/path/to/your/_site"
-	 *     }
+	 *   {
+	 *     "public": "/path/to/your/_site"
+	 *   }
 	 * 
 	 * NOTE: The path cannot contain globs or regular expressions.
 	 */
@@ -101,17 +101,17 @@ export interface ServeHandlerOptions {
 	 * with status code 301 to the same path, but with the extension dropped.
 	 * 
 	 * You can disable the feature like follows:
-	 *     {
-	 *         "cleanUrls": false
-	 *     }
+	 *   {
+	 *     "cleanUrls": false
+	 *   }
 	 * 
 	 * However, you can also restrict it to certain paths:
-	 *     {
-	 *         "cleanUrls": [
-	 *             "/app/**",
-	 *             "/!components/**"
-	 *         ]
-	 *     }
+	 *   {
+	 *     "cleanUrls": [
+	 *       "/app/**",
+	 *       "/!components/**"
+	 *     ]
+	 *   }
 	 * 
 	 * NOTE: The paths can only contain globs that are matched using minimatch.
 	 */
@@ -121,19 +121,19 @@ export interface ServeHandlerOptions {
 	 * different one behind the curtains, this option is what you need.
 	 * 
 	 * It's perfect for single page applications (SPAs), for example:
-	 *     {
-	 *         "rewrites": [
-	 *             { "source": "app/**", "destination": "/index.html" },
-	 *             { "source": "projects/edit", "destination": "/edit-project.html" }
-	 *          ]
-     *     }
+	 *   {
+	 *     "rewrites": [
+	 *       { "source": "app/**", "destination": "/index.html" },
+	 *       { "source": "projects/edit", "destination": "/edit-project.html" }
+	 *      ]
+   *   }
 	 * 
 	 * You can also use so-called "routing segments" as follows:
-	 *     {
-	 *         "rewrites": [
-	 *             { "source": "/projects/:id/edit", "destination": "/edit-project-:id.html" },
-	 *         ]
-	 *     }
+	 *   {
+	 *     "rewrites": [
+	 *       { "source": "/projects/:id/edit", "destination": "/edit-project-:id.html" },
+	 *     ]
+	 *   }
 	 * 
 	 * Now, if a visitor accesses /projects/123/edit, it will respond with the file /edit-project-123.html.
 	 * 
@@ -184,8 +184,9 @@ export const directoryTemplate = (vals: ServeDirectoryTemplateParameters) => {
 		});
 	}
 	return new Promise((resolve, reject) => {
-		ejs.renderFile(path.join(config.viewsPath, 'directory.ejs'), { breadcrumbs, h: helpers, ...vals }, (err, str) => {
+		ejs.renderFile(path.join(config.viewsPath, 'directory.ejs'), { h: helpers, path, config, breadcrumbs, ...vals }, (err, str) => {
 			if (err) {
+				console.error(err);
 				reject(err);
 			} else {
 				resolve(str);
@@ -196,8 +197,9 @@ export const directoryTemplate = (vals: ServeDirectoryTemplateParameters) => {
 
 export const errorTemplate = (vals: ServeErrorTemplateParameters) => {
 	return new Promise((resolve, reject) => {
-		ejs.renderFile(path.join(config.viewsPath, 'error.ejs'), { h: helpers, ...vals }, (err, str) => {
+		ejs.renderFile(path.join(config.viewsPath, 'error.ejs'), { h: helpers, path, config, ...vals }, (err, str) => {
 			if (err) {
+				console.error(err);
 				reject(err);
 			} else {
 				resolve(str);
@@ -1012,4 +1014,4 @@ export default async (request: Request, response: ServerResponse, serveConfig: S
 
 	response.writeHead(response.statusCode || 200, headers);
 	stream.pipe(response);
-};
+};
\ No newline at end of file
diff --git a/app/views/directory.ejs b/app/views/directory.ejs
index edfe52dd..adb96576 100644
--- a/app/views/directory.ejs
+++ b/app/views/directory.ejs
@@ -4,18 +4,13 @@
     <title><%=h.getDirectoryTitle(directory)%></title>
     <%- include('./includes/common-head.ejs') %>
   </head>
-
   <body onload="initPage()">
-
     <%- include('./includes/top-navbar.ejs') %>
-
     <%- include('./includes/no-trash-svg.ejs') %>
-
     <main class="container">
       <header>
         <%- include('./includes/breadcrumbs.ejs') %>
       </header>
-
       <% if (h.directoryContainsReadme(directory)) {%>
         <div class="row p-4 pb-0 pe-lg-0 pt-lg-5 align-items-center rounded-3 border shadow-lg">
           <div class="col-lg-12 p-3 p-lg-5 pt-lg-3">
@@ -27,13 +22,69 @@
                     <b>Document Date:</b> <%= h.moment(h.readmeFm(directory).docDate).format('MMMM D, YYYY') %>
                   <% } %>
                   <%if (typeof h.readmeFm(directory).file !== 'undefined') { %>
-                    <b>Attached Document:</b> <a href="<%- encodeURI(h.readmeFm(directory).file) %>"><%- h.readmeFm(directory).file %></a>
+                    <b>Document:</b> <a href="<%- encodeURI(path.basename(h.readmeFm(directory).file)) %>"><%- h.readmeFm(directory).file %></a>
                   <% } %>
                 </small>
               </p>
             <% } %>
             <% if (typeof h.readmeFm(directory).file !== 'undefined') { %>
-              <iframe src="<%- encodeURI(h.readmeFm(directory).file) %>" style="width: 100%; height: 90vh;"></iframe>
+              <ul class="nav nav-tabs" id="readerTab" role="tablist">
+                <% if (h.isMsOfficeViewerSupported(h.readmeFm(directory).file)) { %>
+                  <li class="nav-item" role="presentation">
+                    <button class="nav-link active" id="ms-office-viewer-tab" data-bs-toggle="tab" data-bs-target="#ms-office-viewer" type="button" role="tab" aria-controls="ms-office-viewer" aria-selected="true">Microsoft Office Web Viewer</button>
+                  </li>
+                <% } %>
+                <% if (h.isGoogleDocsViewerSupported(h.readmeFm(directory).file)) { %>
+                  <li class="nav-item" role="presentation">
+                    <button class="nav-link<%=h.isMsOfficeViewerSupported(h.readmeFm(directory).file) ? '' : ' active'%>" id="google-docs-viewer-tab" data-bs-toggle="tab" data-bs-target="#google-docs-viewer" type="button" role="tab" aria-controls="google-docs-viewer" aria-selected="false">Google Docs Viewer</button>
+                  </li>
+                <% } %>
+                <li class="nav-item" role="presentation">
+                  <button class="nav-link" id="view-download-tab" data-bs-toggle="tab" data-bs-target="#view-download" type="button" role="tab" aria-controls="view-download" aria-selected="false">View/Download</button>
+                </li>
+              </ul>
+              <div class="tab-content">
+                <% if (h.isMsOfficeViewerSupported(h.readmeFm(directory).file)) { %>
+                  <div class="tab-pane active" id="ms-office-viewer" role="tabpanel" aria-labelledby="ms-office-viewer-tab" tabindex="0">
+                    <iframe src="https://view.officeapps.live.com/op/embed.aspx?src=<%- encodeURIComponent(h.trimSlashes(config.siteUrl) + path.posix.join(breadcrumbs[breadcrumbs.length-1].url, (h.readmeFm(directory).file.replaceAll('\\', '/')))) %>" style="width: 100%; height: 85vh; border: solid 1px #dfd7ca; border-top: 0px; border-bottom-left-radius: 0.25rem; border-bottom-right-radius: 0.25rem;" frameborder="0"></iframe>
+                  </div>
+                <% } %>
+                <% if (h.isGoogleDocsViewerSupported(h.readmeFm(directory).file)) { %>
+                  <div class="tab-pane<%=h.isMsOfficeViewerSupported(h.readmeFm(directory).file) ? '' : ' active'%>" id="google-docs-viewer" role="tabpanel" aria-labelledby="google-docs-viewer-tab" tabindex="0">
+                    <iframe src="https://docs.google.com/gview?embedded=true&url=<%- encodeURIComponent(h.trimSlashes(config.siteUrl) + path.posix.join(breadcrumbs[breadcrumbs.length-1].url, (h.readmeFm(directory).file.replaceAll('\\', '/')))) %>" style="width: 100%; height: 85vh; border: solid 1px #dfd7ca; border-top: 0px; border-bottom-left-radius: 0.25rem; border-bottom-right-radius: 0.25rem;" frameborder="0"></iframe>
+                  </div>
+                <% } %>
+                <div class="tab-pane<%=(h.isMsOfficeViewerSupported(h.readmeFm(directory).file) || h.isGoogleDocsViewerSupported(h.readmeFm(directory).file)) ? '' : ' active'%>" id="view-download" role="tabpanel" aria-labelledby="view-download-tab" tabindex="0">
+                  <iframe src="about:blank" style="width: 100%; height: 85vh; border: solid 1px #dfd7ca; border-top: 0px; border-bottom-left-radius: 0.25rem; border-bottom-right-radius: 0.25rem;" frameborder="0"></iframe>
+                </div>
+                <script>
+                  $(document).ready(function () {
+                    var viewDownloadTabButton = $('button#view-download-tab');
+                    var viewDownloadTab = new bootstrap.Tab(viewDownloadTabButton);
+                    var viewDownloadTabPaneIFrame = $('#view-download iframe');
+                    viewDownloadTabButton.on('click', function (event) {
+                      event.preventDefault();
+                      viewDownloadTab.show();
+                      if (viewDownloadTabPaneIFrame.attr('src') == 'about:blank') {
+                        console.log('View/Download tab clicked. Loading iframe.');
+                        viewDownloadTabPaneIFrame.attr('src', '<%- encodeURI(h.readmeFm(directory).file) %>');
+                      } else {
+                        console.log('View/Download tab clicked. iframe previously loaded.');
+                      }
+                    })
+                  })
+                </script>
+                <% if (!h.isMsOfficeViewerSupported(h.readmeFm(directory).file) && !h.isGoogleDocsViewerSupported(h.readmeFm(directory).file)) { %>
+                  <script>
+                    $(document).ready(function () {
+                      setTimeout(function () {
+                        var viewDownloadTabButton = $('button#view-download-tab');
+                        viewDownloadTabButton.click();
+                      }, 100);
+                    });
+                  </script>
+                <% } %>
+              </div>
             <% } else { %>
               <%- h.printReadme(directory) %>
             <% } %>
@@ -54,7 +105,6 @@
           </div>
         <% } %>
       <% } %>
-
       <ul id="files" class="list-group shadow-lg">
         <% files.forEach(function(value, index) { %>
           <li class="list-group-item list-group-item-action flex-column align-items-start">
@@ -65,7 +115,6 @@
         <% }); %>
       </ul>
     </main>
-
     <%- include('./includes/bottom-navbar.ejs') %>
     <%- include('./includes/bottom-scripts.ejs') %>
 	</body>
diff --git a/app/views/includes/bottom-scripts.ejs b/app/views/includes/bottom-scripts.ejs
index c0bfd4da..71577113 100644
--- a/app/views/includes/bottom-scripts.ejs
+++ b/app/views/includes/bottom-scripts.ejs
@@ -1,6 +1,5 @@
 <!-- Bootstrap JS (optional, if you need Bootstrap JS features) -->
-<script src="https://daball.me/vendor/jquery/jquery.min.js"></script>
 <script src="https://daball.me/vendor/popper.js/dist/popper.min.js"></script>
 <script src="https://daball.me/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
 <script src="https://daball.me/vendor/jquery-easing/jquery.easing.min.js"></script>
-<script src="https://daball.me/layouts/blog/js/blog.min.js"></script>
+<script src="https://daball.me/layouts/blog/js/blog.min.js"></script>
\ No newline at end of file
diff --git a/app/views/includes/common-head.ejs b/app/views/includes/common-head.ejs
index 7188b755..64a86044 100644
--- a/app/views/includes/common-head.ejs
+++ b/app/views/includes/common-head.ejs
@@ -10,7 +10,6 @@
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-8937572456576531" crossorigin="anonymous"></script>
-
 <!-- Bootstrap CSS -->
 <link href="https://daball.me/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
 <link href="https://fonts.googleapis.com/css?family=Saira+Extra+Condensed:100,200,300,400,500,600,700,800,900" rel="stylesheet" />
@@ -26,3 +25,4 @@
 <link href="https://daball.me/vendor/simple-line-icons/css/simple-line-icons.css" rel="stylesheet" />
 <link href="https://daball.me/layouts/blog/css/blog.min.css" rel="stylesheet" />
 <link href="/css/nm3clol.css" rel="stylesheet" />
+<script src="https://daball.me/vendor/jquery/jquery.min.js"></script>