From 5f086c68fba662ca5d575c30c86c2bee3a2b9c38 Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:40:04 +0000
Subject: [PATCH] modules: namespace Core module

Hugo does not namespace modules by default, leading to conflicts. Hence, load partials from a namespaced sub-folder to prevent conflicts with similarly named files in other modules.
---
 modules/wowchemy/go.mod                                  | 5 ++---
 modules/wowchemy/layouts/partials/blocks/collection.html | 2 +-
 modules/wowchemy/layouts/partials/blocks/portfolio.html  | 2 +-
 modules/wowchemy/layouts/partials/page_header.html       | 2 +-
 modules/wowchemy/layouts/partials/site_footer.html       | 2 +-
 modules/wowchemy/layouts/partials/site_head.html         | 6 +++---
 modules/wowchemy/layouts/partials/site_js.html           | 2 +-
 modules/wowchemy/layouts/partials/views/card.html        | 2 +-
 modules/wowchemy/layouts/partials/views/compact.html     | 2 +-
 modules/wowchemy/layouts/partials/views/showcase.html    | 2 +-
 10 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/modules/wowchemy/go.mod b/modules/wowchemy/go.mod
index fa9b4e01..23da73fb 100644
--- a/modules/wowchemy/go.mod
+++ b/modules/wowchemy/go.mod
@@ -3,7 +3,6 @@ module github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy/v5
 go 1.15
 
 require (
-	github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-core v0.2.0
-	github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-seo v0.1.0
+	github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-core v0.2.1-0.20231101183733-7b61e2f369e6
+	github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-seo v0.1.1-0.20231101183733-7b61e2f369e6
 )
-
diff --git a/modules/wowchemy/layouts/partials/blocks/collection.html b/modules/wowchemy/layouts/partials/blocks/collection.html
index 2effdc6d..7268c093 100644
--- a/modules/wowchemy/layouts/partials/blocks/collection.html
+++ b/modules/wowchemy/layouts/partials/blocks/collection.html
@@ -63,7 +63,7 @@
 
 {{/* Sort */}}
 {{ $sort_by := $block.content.sort_by | default "Date" }}
-{{ $sort_by = partial "functions/get_sort_by_parameter" $sort_by }}
+{{ $sort_by = partial "wowchemy-core/functions/get_sort_by_parameter" $sort_by }}
 {{ $sort_ascending := $block.content.sort_ascending | default (eq $block.content.order "asc") | default false }}
 {{ $sort_order := cond $sort_ascending "asc" "desc" }}
 {{ $query = sort $query $sort_by $sort_order }}
diff --git a/modules/wowchemy/layouts/partials/blocks/portfolio.html b/modules/wowchemy/layouts/partials/blocks/portfolio.html
index c0d47096..d542e203 100644
--- a/modules/wowchemy/layouts/partials/blocks/portfolio.html
+++ b/modules/wowchemy/layouts/partials/blocks/portfolio.html
@@ -87,7 +87,7 @@
 
     {{/* Sort */}}
     {{ $sort_by := $block.content.sort_by | default "Date" }}
-    {{ $sort_by = partial "functions/get_sort_by_parameter" $sort_by }}
+    {{ $sort_by = partial "wowchemy-core/functions/get_sort_by_parameter" $sort_by }}
     {{ $sort_ascending := $block.content.sort_ascending | default (eq $block.content.order "asc") | default false }}
     {{ $sort_order := cond $sort_ascending "asc" "desc" }}
     {{ $query = sort $query $sort_by $sort_order }}
diff --git a/modules/wowchemy/layouts/partials/page_header.html b/modules/wowchemy/layouts/partials/page_header.html
index b03f82e3..24a37b6b 100644
--- a/modules/wowchemy/layouts/partials/page_header.html
+++ b/modules/wowchemy/layouts/partials/page_header.html
@@ -1,5 +1,5 @@
 {{ $page := . }}
-{{ $featured := partial "functions/get_featured_image.html" $page }}
+{{ $featured := partial "wowchemy-core/functions/get_featured_image.html" $page }}
 
 {{ $anchor := $page.Params.image.focal_point | default "Smart" }}
 
diff --git a/modules/wowchemy/layouts/partials/site_footer.html b/modules/wowchemy/layouts/partials/site_footer.html
index 9c59d51d..ca2cc8e8 100644
--- a/modules/wowchemy/layouts/partials/site_footer.html
+++ b/modules/wowchemy/layouts/partials/site_footer.html
@@ -1,6 +1,6 @@
 <footer class="site-footer">
 
-  {{ partial "functions/get_hook" (dict "hook" "footer-start" "context" .) }}
+  {{ partial "wowchemy-core/functions/get_hook" (dict "hook" "footer-start" "context" .) }}
 
   {{/* Load footer block */}}
   {{ $footer_section_name := site.Params.footer.block | default "minimal" }}
diff --git a/modules/wowchemy/layouts/partials/site_head.html b/modules/wowchemy/layouts/partials/site_head.html
index 89964e32..81ca4515 100644
--- a/modules/wowchemy/layouts/partials/site_head.html
+++ b/modules/wowchemy/layouts/partials/site_head.html
@@ -10,7 +10,7 @@
   {{ end }}
 
   {{/* EXTENSIBILITY HOOK: HEAD-START */}}
-  {{ partial "functions/get_hook" (dict "hook" "head-start" "context" .) }}
+  {{ partial "wowchemy-core/functions/get_hook" (dict "hook" "head-start" "context" .) }}
 
   {{/* Parse theme and font */}}
   {{ partial "functions/parse_theme" . }}
@@ -210,7 +210,7 @@
 
   {{ partial "cookie_consent" . }}
 
-  {{ $title := partial "functions/get_page_title" . }}
+  {{ $title := partial "wowchemy-core/functions/get_page_title" . }}
   <title>{{$title}}</title>
 
   {{/* EXTENSIBILITY HOOK: HEAD-END */}}
@@ -218,5 +218,5 @@
   {{ if templates.Exists "partials/custom_head.html" }}
     {{ partial "custom_head" . }}
   {{ end }}
-  {{ partial "functions/get_hook" (dict "hook" "head-end" "context" .) }}
+  {{ partial "wowchemy-core/functions/get_hook" (dict "hook" "head-end" "context" .) }}
 </head>
diff --git a/modules/wowchemy/layouts/partials/site_js.html b/modules/wowchemy/layouts/partials/site_js.html
index d0db7015..7713dd63 100644
--- a/modules/wowchemy/layouts/partials/site_js.html
+++ b/modules/wowchemy/layouts/partials/site_js.html
@@ -267,4 +267,4 @@
 {{ if templates.Exists "partials/custom_js.html" }}
   {{ partial "custom_js" . }}
 {{ end }}
-{{ partial "functions/get_hook" (dict "hook" "body-end" "context" .) }}
+{{ partial "wowchemy-core/functions/get_hook" (dict "hook" "body-end" "context" .) }}
diff --git a/modules/wowchemy/layouts/partials/views/card.html b/modules/wowchemy/layouts/partials/views/card.html
index 381e50bd..06c3e5dd 100644
--- a/modules/wowchemy/layouts/partials/views/card.html
+++ b/modules/wowchemy/layouts/partials/views/card.html
@@ -41,7 +41,7 @@
     {{ partial "page_metadata" (dict "page" $item "is_list" 1) }}
   {{ end }}
 
-  {{ $resource := partial "functions/get_featured_image.html" $item }}
+  {{ $resource := partial "wowchemy-core/functions/get_featured_image.html" $item }}
   {{ $anchor := $item.Params.image.focal_point | default "Smart" }}
   {{ with $resource }}
     {{ $image := .Fill (printf "808x455 %s" $anchor) }}
diff --git a/modules/wowchemy/layouts/partials/views/compact.html b/modules/wowchemy/layouts/partials/views/compact.html
index c27fa4dc..854e7f7a 100644
--- a/modules/wowchemy/layouts/partials/views/compact.html
+++ b/modules/wowchemy/layouts/partials/views/compact.html
@@ -74,7 +74,7 @@
 
   </div>
   <div class="ml-3">
-    {{ $resource := partial "functions/get_featured_image.html" $item }}
+    {{ $resource := partial "wowchemy-core/functions/get_featured_image.html" $item }}
     {{ with $resource }}
       {{ $image := .Resize "150x" }}
       {{ if ne $image.MediaType.SubType "gif" }}{{ $image = $image.Process "webp" }}{{ end }}
diff --git a/modules/wowchemy/layouts/partials/views/showcase.html b/modules/wowchemy/layouts/partials/views/showcase.html
index d289330b..46102174 100644
--- a/modules/wowchemy/layouts/partials/views/showcase.html
+++ b/modules/wowchemy/layouts/partials/views/showcase.html
@@ -53,7 +53,7 @@
 
     </div>
     <div class="col-12 col-md-6 order-first {{$order}}">
-      {{ $resource := partial "functions/get_featured_image.html" $item }}
+      {{ $resource := partial "wowchemy-core/functions/get_featured_image.html" $item }}
 
       {{ with $resource }}
         {{/* Use CSS to expand images to consistent widths rather than just Hugo as Hugo can significantly increase the