Clean up content model

hugo-modules/core/layouts/storybook/single.stories.js

@@ -109,7 +109,7 @@
 {{- $combinations := partial "combinations" (dict "list" $templateParams) }}
 
 {{ $params := merge site.Params (dict
-  "environment" (or (getenv "HUGO_ENVIRONMENT") hugo.Environment)
+  "environment" (or (getenv "HUGO_ENV") hugo.Environment)
 ) }}
 {{- $js := resources.Get "js/main.js" | js.Build (dict
   "format" "esm"

hugo-modules/core/utils/get-category-name.html

@@ -9,7 +9,7 @@
 
 {{- $result := "" -}}
 
-{{- if hasPrefix $content_type "t-" -}}
+{{- if (or (eq $content_type "page") (hasPrefix $content_type "t-")) -}}
   {{- $result = "templates" -}}
 {{- else if hasPrefix $content_type "m-" -}}
   {{- $result = "modules" -}}

hugo-modules/core/utils/get-data.html

@@ -1,6 +1,6 @@
 {{/*
   utils/get-data
-  Get data from contentful data types.
+  Get data from Contentful data types.
 
   @example - Go Template
     {{ partial "utils/get-data" (dict
@@ -23,8 +23,6 @@
       {{ $result = or (index $contents (string $entry_id)) (index $contents (print (string $entry_id) "." $folder)) dict }}
     {{ end }}
   {{ end }}
-
-
 {{ end }}
 
 {{ return $result }}

hugo-modules/core/utils/get-page.html

@@ -12,7 +12,7 @@
 {{ $content_type := .content_type }}
 {{ $page := dict }}
 {{ if and $content_type $entry_id }}
-  {{ if (eq $content_type "page") }}
+  {{ if (or (eq $content_type "page") (hasPrefix $content_type "t-")) }}
     {{ with index (where site.Pages "Params.sys.id" $entry_id) 0 }}
       {{ $page = . }}
     {{ end }}

hugo-modules/core/utils/get-params.html

@@ -14,15 +14,11 @@
 {{ $content_type := .content_type }}
 {{ $params := dict }}
 
-{{ if (eq $content_type "page") }}
-  {{ $page := partial "utils/get-page" . }}
-  {{ with $page }}
-    {{ $params = .Params }}
-  {{ end }}
+{{ $page := partial "utils/get-page" . }}
+{{ with $page }}
+  {{ $params = .Params }}
 {{ else }}
   {{ $params = merge . (partial "utils/get-data" . )}}
 {{ end }}
 
-
-
 {{ return $params }}

hugo-modules/core/utils/link.html

@@ -43,7 +43,7 @@
     {{ end }}
 
   {{/* Page content type */}}
-  {{ else if eq .content_type "page" }}
+  {{ else if (or (eq .content_type "page") (hasPrefix .content_type "t-")) }}
     {{ with partialCached "utils/get-page" . . }}
       {{ $return = (dict
         "href" (.Permalink | safeURL)

hugo-modules/core/utils/seo/private/get-data.html

@@ -14,7 +14,7 @@
 
   TODO:
     - [ ] Improve type test on "events", `article` seems very opinated.
-		- [ ] Find a reasonable default image when `site.Params.default_image` is not set.
+		- [ ] Find a reasonable default image when `$settings.default_share_image` is not set.
 		- [ ] Twitter can sport "author" handle on top of the site's. Devise a test for author?
 		- [ ] Maybe consider another approach to set the twitter_card (summary, etc...)
 		- [ ] Not sure about image size. Following https://docs.imgix.com/best-practices/improving-seo-traffic, we have a
@@ -27,9 +27,7 @@
 
 {{/* Adding the seo map to scratch which will recieve SEO key/value pairs. */}}
 {{ $s := newScratch }}
-{{ $s.Set "seo" dict  }}
-
-
+{{ $s.Set "seo" dict }}
 
 {{ $seo_params := dict }}
 {{ with .Params.seo }}
@@ -38,33 +36,27 @@
     {{ $seo_params = . }}
   {{ end }}
 {{ end }}
-{{ with .Params.content }}
-  {{ with partialCached "utils/get-params" . . }}
-    {{ $seo_params = merge . $seo_params }}
-  {{ end }}
-{{ end }}
 
-{{ $config := partialCached "utils/seo/private/get-config" "seo/private/get-config" }}
+{{ $settings := partialCached "utils/get-settings" . }}
 
 {{/* Dates
 	----------------------------- */}}
-
-{{  if not .PublishDate.IsZero  }}
-{{  $s.SetInMap "seo" "published_time" (.PublishDate.Format "2006-01-02T15:04:05-07:00")  }}
-{{  else if not .Date.IsZero  }}
-{{  $s.SetInMap "seo" "published_time" (.Date.Format "2006-01-02T15:04:05-07:00")  }}
-{{  else }}
+{{ if not .PublishDate.IsZero }}
+{{ $s.SetInMap "seo" "published_time" (.PublishDate.Format "2006-01-02T15:04:05-07:00") }}
+{{ else if not .Date.IsZero }}
+{{ $s.SetInMap "seo" "published_time" (.Date.Format "2006-01-02T15:04:05-07:00") }}
+{{ else }}
   {{ with .Params.sys.created_at }}
-    {{  $s.SetInMap "seo" "published_time" (dateFormat "2006-01-02T15:04:05-07:00" .) }}
+    {{ $s.SetInMap "seo" "published_time" (dateFormat "2006-01-02T15:04:05-07:00" .) }}
   {{ end }}
-{{  end  }}
-{{  if not .Lastmod.IsZero  }}
-{{  $s.SetInMap "seo" "updated_time" (.Lastmod.Format "2006-01-02T15:04:05-07:00")  }}
+{{ end }}
+{{ if not .Lastmod.IsZero }}
+{{ $s.SetInMap "seo" "updated_time" (.Lastmod.Format "2006-01-02T15:04:05-07:00") }}
 {{ else }}
   {{ with .Params.sys.updated_at }}
-    {{  $s.SetInMap "seo" "updated_time" (dateFormat "2006-01-02T15:04:05-07:00" .) }}
+    {{ $s.SetInMap "seo" "updated_time" (dateFormat "2006-01-02T15:04:05-07:00" .) }}
   {{ end }}
-{{  end  }}
+{{ end }}
 
 {{/* Description
 	----------------------------
@@ -84,7 +76,7 @@
 {{/* 3. Summary */}}
 {{ else if .Summary }}
 	{{ $description = .Summary }}
-{{  else  }}
+{{ else }}
 {{/* 4. site description */}}
 	{{ $description = site.Params.Description }}
 {{ end }}
@@ -96,63 +88,61 @@
 	{{ end }}
 {{ end }}
 
-
 {{/* Title
   ----------------------------
 	We use the following logic
-	1. Every pages: `{.Title} | {site.Title}`
-	2. Homepage: , only {site.Title} */}}
-{{ $title := .Title }}
+	1. Every pages: `Page title | Global site title`
+	2. Homepage: only `Global site title` */}}
+{{ $title := "" }}
 {{ with $seo_params.title }}
 	{{ $title = . }}
 {{ end }}
 {{ if not .IsHome }}
-	{{/* 1. `{.Title} | {.Site.Title}` */}}
-	{{  $s.SetInMap "seo" "title" (printf "%s | %s" $title site.Title)  }}
+	{{/* 1. `Page title | Global site title` */}}
+	{{ $s.SetInMap "seo" "title" (printf "%s | %s" $title $settings.title) }}
 {{ else }}
-	{{/* 2. `{.Site.Title}` */}}
-	{{ $s.SetInMap "seo" "title" site.Title }}
+	{{/* 2. `Global site title` */}}
+	{{ $s.SetInMap "seo" "title" $settings.title }}
 {{ end }}
 
-
 {{/* Site Name
 	---------------------------- */}}
-{{ with $config.site_name }}
-	{{ $s.SetInMap "seo" "site_name" . }}
+{{ with $settings.site_name }}
+	{{ $s.SetInMap "seo" "site_name" $settings.site_name }}
 {{ else }}
-	{{ $s.SetInMap "seo" "site_name" site.Title  }}
+	{{ $s.SetInMap "seo" "site_name" $settings.title }}
 {{ end }}
 
 {{/* Image
 	---------------------------- */}}
 {{ $img := false }}
 
-{{  with $config.default_image  }}
-	{{  $img = .  }}
-{{  end  }}
+{{ with $settings.default_share_image }}
+	{{ $img = .url }}
+{{ end }}
 
-{{  with $seo_params.image  }}
-	{{  $img = .  }}
+{{ with $seo_params.share_image }}
+	{{ $img = .url }}
 {{ else }}
 	{{/* If no SEO IMAGE is set, we look for the .Params.images slice
 		and use the first one if it has an `image` key */}}
-	{{  with .Params.images  }}
-		{{  with index . 0  }}
+	{{ with .Params.images }}
+		{{ with index . 0 }}
 			{{ if reflect.IsMap . }}
-				{{  with .image  }}
-					{{  $img = .  }}
-				{{  end  }}
+				{{ with .image }}
+					{{ $img = .url }}
+				{{ end }}
 			{{ else }}
-				{{  $img = .  }}
+				{{ $img = .url }}
 			{{ end }}
-		{{  end  }}
-	{{  end  }}
-{{  end  }}
+		{{ end }}
+	{{ end }}
+{{ end }}
 
 {{/* Finally if after all of the conditional above we are not able to find an image for the page,
 	we resolve to looking for the following: */}}
 {{ if not $img }}
-	{{  $img_defaults := slice "/static/logo.jpg" "/static/logo.png" "/static/logo.svg"  }}
+	{{ $img_defaults := slice "/static/logo.jpg" "/static/logo.png" "/static/logo.svg" }}
 	{{ range $path := $img_defaults }}
 		{{ if fileExists . }}
 			{{ $img = strings.TrimLeft "/static" $path }}
@@ -169,17 +159,16 @@
 	---------------------------- */}}
 {{ with $img }}
 	{{/* Most of the time we should have an image */}}
-	{{  $s.SetInMap "seo" "twitter_card" "summary_large_image"  }}
+	{{ $s.SetInMap "seo" "twitter_card" "summary_large_image" }}
 {{ else }}
 	{{/* For edge cases without: */}}
-	{{  $s.SetInMap "seo" "twitter_card" "summary"  }}
+	{{ $s.SetInMap "seo" "twitter_card" "summary" }}
 {{ end }}
 
-
 {{/* We check the site config sports a Social.twitter and use as handle */}}
-{{  with .Site.Social.twitter  }}
-	{{  $s.SetInMap "seo" "twitter_handle" (printf "@%s" .)  }}
-{{  end  }}
+{{ with .Site.Social.twitter }}
+	{{ $s.SetInMap "seo" "twitter_handle" (printf "@%s" .) }}
+{{ end }}
 
 {{/* We check if the page is not set as private */}}
 {{ with $.Params.seo.private }}
@@ -191,28 +180,26 @@
 
 {{/* Type
 	---------------------------- */}}
-{{  $s.SetInMap "seo" "type" "website" }}
+{{ $s.SetInMap "seo" "type" "website" }}
 
-{{  if in (slice "blog" "news") .Type  }}
-	{{  $s.SetInMap "seo" "type" "article"  }}
+{{ if in (slice "blog" "news") .Type }}
+	{{ $s.SetInMap "seo" "type" "article" }}
 {{ else if in (slice "article") .Type }}
-	{{  $s.SetInMap "seo" "type" "event"  }}
-{{  end  }}
-
+	{{ $s.SetInMap "seo" "type" "event" }}
+{{ end }}
 
-{{/* robots
+{{/* Robots
 	---------------------------- */}}
 {{ with $seo_params }}
    {{ $no_index := .no_index | default false }}
    {{ $no_follow := .no_follow | default false }}
-   {{ $s.SetInMap "seo" "no_index" $no_index }}
-   {{ $s.SetInMap "seo" "no_follow" $no_follow }}
+{{ $s.SetInMap "seo" "no_index" $no_index }}
+{{ $s.SetInMap "seo" "no_follow" $no_follow }}
 {{ end -}}
 
-
 {{/* Locale and translations
 	---------------------------- */}}
-{{  $s.SetInMap "seo" "locale" .Lang }}
+{{ $s.SetInMap "seo" "locale" .Lang }}
 
 {{ $translations := slice }}
 {{ if .IsTranslated }}
@@ -222,21 +209,15 @@
 {{ $s.SetInMap "seo" "translations" $translations }}
 {{ end }}
 
-
 {{/* Canonical
 ---------------------------- */}}
-{{ with $seo_params.canonical }}
-  {{  $s.SetInMap "seo" "canonical" (. | absURL)  }}
-{{ else }}
-{{  $s.SetInMap "seo" "canonical" .Permalink  }}
-{{ end }}
+{{ $s.SetInMap "seo" "canonical" .Permalink }}
 
 {{ $seo := $s.Get "seo" }}
 {{ if templates.Exists "partials/utils/seo/data.html" }}
   {{ $seo = partial "utils/seo/data" (dict "seo" $seo "Page" $) }}
 {{ end }}
 
-
 {{ with $seo }}
   {{ $s.SetInMap "jsonld" "@context"  "https://schema.org" }}
   {{ $s.SetInMap "jsonld" "@type"  .type }}
@@ -254,7 +235,4 @@
   {{ $seo = merge $seo (dict "jsonld" .) }}
 {{ end }}
 
-
-
-
 {{ return $seo }}