Merge pull request #735 from gethinode/develop

Add support for card group data

data/structures/card-group.yml

@@ -27,10 +27,11 @@ arguments:
     release: v0.19.0
   list:
     type:
-      - page.Pages
-      - resource.Resources
+      - 'page.Pages'
+      - 'resource.Resources'
+      - '[]map[string]interface {}'
     optional: true
-    comment: Array of pages to be rendered as cards.
+    comment: Array of pages or structured content to be rendered as cards.
     group: partial
   cards:
     type: string

data/structures/card.yml

@@ -159,6 +159,7 @@ arguments:
       Font Awesome icon, displayed on top or the left of the card.
   align:
     type: select
+    parent: cascade
     optional: true
     default: start
     release: v0.23.0-alpha2
@@ -170,6 +171,7 @@ arguments:
         - center
   style:
     type: string
+    parent: cascade
     optional: true
     release: v0.23.0-alpha2
     comment: Icon style.
@@ -187,6 +189,7 @@ arguments:
         - none
   subtle:
     type: bool
+    parent: cascade
     optional: true
     release: v0.23.0-alpha2
     comment: Apply subtle background colors.

exampleSite/content/en/about.md

@@ -8,7 +8,7 @@ showComments: false
 
 {{< image src="/img/logo_var.svg#logo" class="img-fluid w-50" wrapper="text-center" >}}
 
-{{< card-group class="text-center border-0" padding="3" >}}
+{{< card-group align="center" class="border-0" padding="3" >}}
     {{< card title="Bootstrap framework" icon="fab bootstrap" >}}
         Build fast, responsive sites with Bootstrap 5. Easily customize your site with the source Sass files.
     {{< /card >}}

exampleSite/content/fr/about.md

@@ -9,7 +9,7 @@ showComments: false
 
 {{< image src="/img/logo_var.svg#logo" class="img-fluid w-50" wrapper="text-center" >}}
 
-{{< card-group class="text-center border-0" padding="3" >}}
+{{< card-group align="center" class="border-0" padding="3" >}}
     {{< card title="Framework Bootstrap" icon="fab bootstrap" >}}
         Créez des sites rapides et réactifs avec Bootstrap 5. Personnalisez facilement votre site avec les fichiers source Sass.
     {{< /card >}}

exampleSite/content/nl/about.md

@@ -10,7 +10,7 @@ showComments: false
 
 {{< image src="/img/logo_var.svg#logo" class="img-fluid w-50" wrapper="text-center" >}}
 
-{{< card-group class="text-center border-0" padding="3" >}}
+{{< card-group align="center" class="border-0" padding="3" >}}
     {{< card title="Bootstrap raamwerk" icon="fab bootstrap" >}}
         Bouw snelle websites geschikt voor mobiele en desktop schermen met Bootstrap 5. Pas de site eenvoudig aan met bronbestanden in Sass.
     {{< /card >}}

layouts/partials/assets/card-group.html

@@ -33,31 +33,36 @@
 {{- $loading := .loading -}}
 
 <!-- Override arguments -->
+{{ $isPages := in (slice "page.Pages" "resource.Resources") (printf "%T" $pages) }}
 {{ $paginator := "" }}
-{{ if $paginate }}
+{{ if and $isPages $paginate }}
     {{ $paginator = $page.Paginate $pages }}
     {{ $pages = first $paginator.PageSize (after (mul (sub $paginator.PageNumber 1) $paginator.PageSize) $pages) }}
 {{ end }}
 
 {{ $list := slice }}
-{{ range $index, $element := $pages }}
-    {{ $params := dict }}
-    <!-- regular page -->
-    {{- if and $element.RelPermalink $element.File -}}
-        {{- $params = merge $params (dict "path" $element.File.Path) -}}
-    <!-- headless page -->
-    {{- else -}}
-        {{- $thumbnail := (or (and (reflect.IsMap $element.Params.Thumbnail) $element.Params.Thumbnail.url) $element.Params.Thumbnail) -}}
-        {{- $params = merge $params (dict
-            "title" $element.Title
-            "href" $element.RelPermalink
-            "description" (partial "utilities/GetDescription.html" $element)
-            "thumbnail" $thumbnail
-            "icon" $element.Params.icon
-        ) -}}
-    {{- end -}}
+{{ if $isPages }}
+    {{ range $index, $element := $pages }}
+        {{ $params := dict }}
+        <!-- regular page -->
+        {{- if and $element.RelPermalink $element.File -}}
+            {{- $params = merge $params (dict "path" $element.File.Path) -}}
+        <!-- headless page -->
+        {{- else -}}
+            {{- $thumbnail := (or (and (reflect.IsMap $element.Params.Thumbnail) $element.Params.Thumbnail.url) $element.Params.Thumbnail) -}}
+            {{- $params = merge $params (dict
+                "title" $element.Title
+                "href" $element.RelPermalink
+                "description" (partial "utilities/GetDescription.html" $element)
+                "thumbnail" $thumbnail
+                "icon" $element.Params.icon
+            ) -}}
+        {{- end -}}
 
-    {{- $list = $list | append $params }}
+        {{- $list = $list | append $params }}
+    {{ end }}
+{{ else if $pages }}
+    {{ $list = $list | append $pages }}
 {{ end }}
 
 {{- $count := len $list -}}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.23.0-alpha2",
+  "version": "0.23.0-alpha3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.23.0-alpha2",
+      "version": "0.23.0-alpha3",
       "license": "MIT",
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^5.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.23.0-alpha2",
+  "version": "0.23.0-alpha3",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",