fix: wip: revisions for hugo templating sys changesversioned

WIP: Revisions for fixing changes to hugo's templating system upgrade.

BREAKING CHANGE: Will not build on versions of hugo prior to 0.145.

4 files changed, 210 insertions, 180 deletions

diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml
index 6c1f7ab..e16657c 100644
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@@ -14,6 +14,10 @@ summaryLength = 20
 # See https://github.com/gohugoio/hugo/issues/7228#issuecomment-714490456
 ignoreErrors = ["error-remote-getjson"]
 
+ignoreFiles = ["/content/communication"]
+
+ignoreLogs = ["warn-invalid-arguments"]
+
 timeout = "180s"
 
 languageCode = "en-us"
@@ -78,11 +82,9 @@ home = ["HTML", "RSS", "REDIR"]
     keepWhitespace = true
 
 [module]
-#  replacements = "github.com/anoduck/mod-popup --> ../../mod-popup"
   [module.hugoVersion]
     extended = true
-    min = "0.134.0"
-    max = "2.0.0"
+    min = "0.136.3"
   [[module.mounts]]
     source = "archetypes"
     target = "archetypes"
@@ -93,13 +95,15 @@ home = ["HTML", "RSS", "REDIR"]
     source = "content"
     target = "content"
   [[module.mounts]]
+    source = "data"
+    target = "data"
+  [[module.mounts]]
     source = "i18n"
     target = "i18n"
   [[module.mounts]]
     source = "layouts"
     target = "layouts"
   [[module.mounts]]
-    excludeFiles = "emails/*"
     source = "static"
     target = "static"
   [[module.imports]]
@@ -115,6 +119,8 @@ home = ["HTML", "RSS", "REDIR"]
   [[module.imports]]
     path = "github.com/anoduck/mod-alwaysdark"
   [[module.imports]]
+    path = "github.com/gethinode/mod-hubspot"
+  [[module.imports]]
     path = "github.com/anoduck/mod-countup"
   [[module.imports]]
     path = "github.com/anoduck/mod-juxtapose"
diff --git a/config/_default/menus/menus.en.toml b/config/_default/menus/menus.en.toml
index 3b9f078..f79ffee 100644
--- a/config/_default/menus/menus.en.toml
+++ b/config/_default/menus/menus.en.toml
@@ -33,10 +33,10 @@
   pageRef = "/legal/"
   weight = 40
 
-[[main]]
-  name = "Communications"
-  pageRef = "/communication/"
-  weight = 50
+# [[main]]
+#   name = "Communications"
+#   pageRef = "/communication/"
+#   weight = 50
 
 [[main]]
   name = "News"
@@ -88,6 +88,12 @@
   weight = 40
 
 [[main]]
+  name = "Takedown"
+  pageRef = "/takedown/"
+  parent = "About"
+  weight = 45
+
+[[main]]
   name = "SolarDump"
   url = "https://solardump.org"
   parent = "About"
@@ -120,11 +126,11 @@
   parent = "Sections"
   weight = 15
 
-[[footer]]
-  name = "Communications"
-  pageRef = "/communication/"
-  parent = "Sections"
-  weight = 20
+# [[footer]]
+#   name = "Communications"
+#   pageRef = "/communication/"
+#   parent = "Sections"
+#   weight = 20
 
 [[footer]]
   name = "Posts"
@@ -162,6 +168,12 @@
   weight = 20
 
 [[footer]]
+  name = "Takedown"
+  pageRef = "/takedown/"
+  parent = "Site Info"
+  weight = 25
+
+[[footer]]
   name = "Terms of Use"
   pageRef = "/terms/"
   parent = "Site Info"
diff --git a/config/_default/params.toml b/config/_default/params.toml
index 02d85fa..208e2f4 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -30,7 +30,8 @@
     checkVersion = false
 
 [home]
-    sections = [ "preface", "reasons", "fpnav", "docs", "evidence", "legal", "communication", "posts", "news" ]
+    # sections = [ "preface", "reasons", "fpnav", "docs", "evidence", "legal", "communication", "posts", "news" ]
+    sections = [ "preface", "reasons", "fpnav", "docs", "evidence", "legal", "posts", "news" ]
     fullCover = true
     centerHeadline = true
     style = "gradient-featured"
@@ -105,166 +106,166 @@
 
 # toml-docs-start sections
 # This determines the layout format for each secton of the site.
-[sections]
-    [sections.preface]
-        title = "What do we mean?"
-        reference = "terms"
-        layout = "card"
-        sort = "weight"
-        reverse = false
-        nested = false
-        background = "body-tertiary"
-        color = "body-tertiary"
-        style = "border-1"
-        wrap = false
-        cols = 1
-        padding = "0"
-        header = "full"
-        footer = "none"
-        orientation = "none"
-        homepage = 1
-        separator = false
-    [sections.docs]
-        title = "Docs"
-        reference = "Documentation"
-        layout = "card"
-        sort = "date"
-        reverse = true
-        nested = true
-        cols = 3
-        background = ""
-        color = ""
-        padding = "0"
-        header = "full"
-        footer = "none"
-        orientation = "stacked"
-        style = "border-0 card-zoom"
-        homepage = 3
-        separator = true
-    [sections.evidence]
-        title = "Evidence"
-        reference = "More Evidence"
-        layout = "card"
-        sort = "date"
-        reverse = true
-        nested = true
-        cols = 3
-        background = ""
-        color = ""
-        padding = "0"
-        header = "full"
-        footer = "none"
-        orientation = "stacked"
-        style = "border-0 card-zoom"
-        homepage = 3
-        separator = true
-    [sections.posts]
-        title = "Posts"
-        reference = "More Posts"
-        layout = "card"
-        sort = "date"
-        reverse = true
-        nested = true
-        cols = 3
-        background = "body-tertiary"
-        color = "body-tertiary"
-        padding = "0"
-        header = "full"
-        footer = "none"
-        orientation = "stacked"
-        style = "border-0 card-zoom"
-        homepage = 3
-        separator = true
-    [sections.persons]
-        title = "More on those involved"
-        reference = "More Persons"
-        layout = "card"
-        sort = "date"
-        reverse = true
-        nested = true
-        cols = 3
-        background = ""
-        color = ""
-        padding = "0"
-        header = "none"
-        footer = "none"
-        orientation = "stacked"
-        style = "border-0 card-zoom"
-        homepage = 3
-        separator = true
-    [sections.fpnav]
-        title = "Involving the usual suspects..."
-        reference = "More People"
-        layout = "nav"
-        sort = "weight"
-        reverse = false
-        nested = false
-        background = "body-tertiary"
-        color = ""
-        style = "justify-content-center"
-        pane = "persona"
-        type = "tabs"
-        width = 100
-        vertical = false
-        class = "nav-fill"
-    [sections.legal]
-        title = "Legal"
-        reference = "More On Legal"
-        layout = "card"
-        sort = "date"
-        reverse = false
-        nested = true
-        cols = 3
-        background = "body-tertiary"
-        color = "body-tertiary"
-        padding = "0"
-        header = "full"
-        footer = "none"
-        orientation = "stacked"
-        style = "border-0 card-zoom"
-        homepage = 3
-        separator = true
-    [sections.communication]
-        title = "Communications"
-        reference = "We Write Letters"
-        layout = "card"
-        sort = "date"
-        reverse = true
-        nested = true
-        cols = 3
-        background = ""
-        color = ""
-        padding = "0"
-        header = "full"
-        footer = "none"
-        orientation = "stacked"
-        style = "border-0 card-zoom"
-        homepage = 3
-        separator = true
-    [sections.news]
-        title = "News"
-        reference = "Recent News"
-        layout = "card"
-        sort = "date"
-        reverse = true
-        nested = true
-        cols = 3
-        background = ""
-        color = ""
-        padding = "0"
-        header = "full"
-        footer = "none"
-        orientation = "stacked"
-        style = "border-0 card-zoom"
-        homepage = 3
-        separator = true
-    [sections.reasons]
-        title = "Reasons why it matters to you:"
-        layout = "list"
-        sort = "weight"
-        reverse = false
-        style = "justify-content-center"
-        separator = true
+# [sections]
+    # [sections.preface]
+    #     title = "What do we mean?"
+    #     reference = "terms"
+    #     layout = "card"
+    #     sort = "weight"
+    #     reverse = false
+    #     nested = false
+    #     background = "body-tertiary"
+    #     color = "body-tertiary"
+    #     style = "border-1"
+    #     wrap = false
+    #     cols = 1
+    #     padding = "0"
+    #     header = "full"
+    #     footer = "none"
+    #     orientation = "none"
+    #     homepage = 1
+    #     separator = false
+    # [sections.docs]
+    #     title = "Docs"
+    #     reference = "Documentation"
+    #     layout = "card"
+    #     sort = "date"
+    #     reverse = true
+    #     nested = true
+    #     cols = 3
+    #     background = ""
+    #     color = ""
+    #     padding = "0"
+    #     header = "full"
+    #     footer = "none"
+    #     orientation = "stacked"
+    #     style = "border-0 card-zoom"
+    #     homepage = 3
+    #     separator = true
+    # [sections.evidence]
+    #     title = "Evidence"
+    #     reference = "More Evidence"
+    #     layout = "card"
+    #     sort = "date"
+    #     reverse = true
+    #     nested = true
+    #     cols = 3
+    #     background = ""
+    #     color = ""
+    #     padding = "0"
+    #     header = "full"
+    #     footer = "none"
+    #     orientation = "stacked"
+    #     style = "border-0 card-zoom"
+    #     homepage = 3
+    #     separator = true
+    # [sections.posts]
+    #     title = "Posts"
+    #     reference = "More Posts"
+    #     layout = "card"
+    #     sort = "date"
+    #     reverse = true
+    #     nested = true
+    #     cols = 3
+    #     background = "body-tertiary"
+    #     color = "body-tertiary"
+    #     padding = "0"
+    #     header = "full"
+    #     footer = "none"
+    #     orientation = "stacked"
+    #     style = "border-0 card-zoom"
+    #     homepage = 3
+    #     separator = true
+    # [sections.persons]
+    #     title = "More on those involved"
+    #     reference = "More Persons"
+    #     layout = "card"
+    #     sort = "date"
+    #     reverse = true
+    #     nested = true
+    #     cols = 3
+    #     background = ""
+    #     color = ""
+    #     padding = "0"
+    #     header = "none"
+    #     footer = "none"
+    #     orientation = "stacked"
+    #     style = "border-0 card-zoom"
+    #     homepage = 3
+    #     separator = true
+    # [sections.fpnav]
+    #     title = "Involving the usual suspects..."
+    #     reference = "More People"
+    #     layout = "nav"
+    #     sort = "weight"
+    #     reverse = false
+    #     nested = false
+    #     background = "body-tertiary"
+    #     color = ""
+    #     style = "justify-content-center"
+    #     pane = "persona"
+    #     type = "tabs"
+    #     width = 100
+    #     vertical = false
+    #     class = "nav-fill"
+    # [sections.legal]
+    #     title = "Legal"
+    #     reference = "More On Legal"
+    #     layout = "card"
+    #     sort = "date"
+    #     reverse = false
+    #     nested = true
+    #     cols = 3
+    #     background = "body-tertiary"
+    #     color = "body-tertiary"
+    #     padding = "0"
+    #     header = "full"
+    #     footer = "none"
+    #     orientation = "stacked"
+    #     style = "border-0 card-zoom"
+    #     homepage = 3
+    #     separator = true
+    # [sections.communication]
+    #     title = "Communications"
+    #     reference = "We Write Letters"
+    #     layout = "card"
+    #     sort = "date"
+    #     reverse = true
+    #     nested = true
+    #     cols = 3
+    #     background = ""
+    #     color = ""
+    #     padding = "0"
+    #     header = "full"
+    #     footer = "none"
+    #     orientation = "stacked"
+    #     style = "border-0 card-zoom"
+    #     homepage = 3
+    #     separator = true
+    # [sections.news]
+    #     title = "News"
+    #     reference = "Recent News"
+    #     layout = "card"
+    #     sort = "date"
+    #     reverse = true
+    #     nested = true
+    #     cols = 3
+    #     background = ""
+    #     color = ""
+    #     padding = "0"
+    #     header = "full"
+    #     footer = "none"
+    #     orientation = "stacked"
+    #     style = "border-0 card-zoom"
+    #     homepage = 3
+    #     separator = true
+    # [sections.reasons]
+    #     title = "Reasons why it matters to you:"
+    #     layout = "list"
+    #     sort = "weight"
+    #     reverse = false
+    #     style = "justify-content-center"
+    #     separator = true
 # toml-docs-end sections
 
 [favicon]
@@ -326,4 +327,8 @@
     debug = false
 
 [modules.timelinejs]
-    debug = false
\ No newline at end of file
+    debug = false
+
+[modules.hubspot]
+    portal = "242946860"
+    region = "na2"
\ No newline at end of file
diff --git a/config/_default/server.toml b/config/_default/server.toml
index e072c6c..eea66d3 100644
--- a/config/_default/server.toml
+++ b/config/_default/server.toml
@@ -7,14 +7,21 @@ for = '/**'
     Content-Security-Policy = """\
         default-src 'self'; \
         child-src 'self' app.netlify.com; \
-        script-src 'unsafe-eval' 'unsafe-inline' 'self' *.netlify.app app.netlify.com netlify-cdp-loader.netlify.app https://*.google-analytics.com https://*.x.com https://*.twitter.com https://*.youtube.com https://*.flickr.com https://*.googletagmanager.com; \
-        style-src 'unsafe-inline' 'self' *.netlify.app app.netlify.com netlify-cdp-loader.netlify.app https://*.knightlab.com https://fonts.googleapis.com https://www.youtube.com; \
+        script-src 'unsafe-eval' 'unsafe-inline' 'self' *.hsforms.net *.hs-scripts.com *.google.com *.gstatic.com \
+        *.netlify.app app.netlify.com netlify-cdp-loader.netlify.app https://*.google-analytics.com https://*.x.com \
+        https://*.twitter.com https://*.youtube.com https://*.flickr.com https://*.googletagmanager.com; \
+        style-src 'unsafe-inline' 'self' *.netlify.app app.netlify.com netlify-cdp-loader.netlify.app \
+        https://*.knightlab.com https://fonts.googleapis.com https://www.youtube.com; \
         object-src 'none'; \
         base-uri 'self'; \
-        connect-src 'self' https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com https://*.knightlab.com; \
+        connect-src 'self' https://*.google-analytics.com https://*.analytics.google.com \
+        https://*.googletagmanager.com https://*.knightlab.com *.hsforms.com *.hubspot.com; \
         font-src 'self' https://*.netlify.app https://fonts.gstatic.com; \
-        frame-src 'self' https://www.youtube-nocookie.com https://www.youtube.com https://*.netlify.com https://*.google.com; \
-        img-src 'self' data: https: https://*.netlify.app https://i.vimeocdn.com https://i.ytimg.com https://*.cloudinary.com https://*.google-analytics.com https://*.googletagmanager.com https://tile.openstreetmap.org; \
+        frame-src 'self' https://www.youtube-nocookie.com https://www.youtube.com https://*.netlify.com \
+        https://*.google.com *.google.com; \
+        img-src 'self' data: https: https://*.netlify.app https://i.vimeocdn.com https://i.ytimg.com \
+        https://*.cloudinary.com https://*.google-analytics.com https://*.googletagmanager.com \
+        https://tile.openstreetmap.org *.hsforms.net *.hsforms.com; \
         manifest-src 'self'; \
         media-src 'self' https://*.netlify.app https://*.cloudinary.com https://*.youtube.com; \
         """