- {% render 'forms/select.html', id: 'categories', items: site.data.pagefind.app_categories %}
+
- {% render 'forms/select.html', id: 'rating', items: site.data.pagefind.rating %}
+
+ {% render 'forms/select.html',
+ id: 'sort',
+ items: site.data.pagefind.sort,
+ placeholder: 'Sort by',
+ value: 'score/desc'
+ %}
-
-
+
+ {% render 'forms/select.html',
+ id: 'categories',
+ items: site.data.pagefind.app_categories,
+ placeholder: 'Any category'
+ %}
-
- {% render 'forms/select.html', id: 'sort', items: site.data.pagefind.sort %}
+
+ {% render 'forms/select.html', id: 'rating', items: site.data.pagefind.rating, placeholder: 'Any rating' %}
+
+
+
diff --git a/_layouts/search.html b/_layouts/search.html
index fde3926..7a8a75c 100644
--- a/_layouts/search.html
+++ b/_layouts/search.html
@@ -7,6 +7,8 @@ layout: default
url: page.url,
categories: site.data.pagefind.categories,
tags: site.data.pagefind.tags,
+ status: site.data.pagefind.status,
+ topics: site.data.pagefind.topics,
sort: site.data.pagefind.sort
%}
diff --git a/_layouts/value.html b/_layouts/value.html
new file mode 100644
index 0000000..b193f80
--- /dev/null
+++ b/_layouts/value.html
@@ -0,0 +1,40 @@
+---
+layout: default
+---
+
+
+ {{ page.type | capitalize }}: {{ page.title | default: '' | escape }}
+
+
+
+ {% render 'search_box_with_filters.html',
+ url: page.url,
+ categories: site.data.pagefind.categories,
+ tags: site.data.pagefind.tags,
+ status: site.data.pagefind.status,
+ topics: site.data.pagefind.topics,
+ sort: site.data.pagefind.sort,
+ value: page.title,
+ name: page.type
+ %}
+
+
+
+ {% for post in page.posts %}
+ {% render 'card_search.html', **post %}
+ {% endfor %}
+
+
+ {% render 'sutty/placeholder.html', controller: 'pagefind' %}
+
+
+
+
+
diff --git a/_plugins/pagefind.rb b/_plugins/pagefind.rb
index 8442e13..2719e6c 100644
--- a/_plugins/pagefind.rb
+++ b/_plugins/pagefind.rb
@@ -5,6 +5,18 @@ require 'open3'
# This hook keeps the array of categories updated from the schema
# declaration.
Jekyll::Hooks.register :site, :post_read, priority: :low do |site|
+ %w[categories topics].each do |field|
+ site.data['pagefind'][field] = site.data['layouts']['document'][field]['values'].map do |value, item|
+ { value:, item: item[site.locale] }.transform_keys(&:to_s)
+ end
+ end
+
+ %w[status].each do |field|
+ site.data['pagefind'][field] = site.data['layouts']['document'][field]['values'][site.locale].each_pair.map do |value, item|
+ { value:, item: }.transform_keys(&:to_s)
+ end
+ end
+
site.data['pagefind']['categories'] = site.data['layouts']['document']['categories']['values'].map do |value, item|
{ value:, item: item[site.locale] }.transform_keys(&:to_s)
end
@@ -13,8 +25,11 @@ Jekyll::Hooks.register :site, :post_read, priority: :low do |site|
{ item:, value: }.transform_keys(&:to_s)
end
- site.data['pagefind']['tags'] = site.documents.map { _1['tags'] }.flatten.uniq.compact.sort
- site.data['pagefind']['app_categories'] = site.collections['recipes'].docs.map { _1['categories'] }.flatten.uniq.compact.sort
+ site.documents.tap do |documents|
+ site.data['pagefind']['tags'] = documents.map { _1['tags'] }.compact.flatten.map { _1['title'] }.uniq.sort
+ end
+
+ site.data['pagefind']['app_categories'] = site.collections['recipes'].docs.map { _1['categories'] }.compact.flatten.map { _1['title'] }.uniq.sort
end
Jekyll::Hooks.register :site, :post_write, priority: :low do |site|
diff --git a/_plugins/routes.rb b/_plugins/routes.rb
index bfcbe52..5c44af8 100644
--- a/_plugins/routes.rb
+++ b/_plugins/routes.rb
@@ -1,16 +1,12 @@
# frozen_string_literal: true
-Jekyll::Router.draw do |router|
- get '/:recipe/', recipe: (site.data.dig('recipes') || {}).keys do |page, recipe|
+Jekyll::Router.draw do |_router|
+ get '/:recipe/', recipe: (site.data['recipes'] || {}).keys do |page, recipe|
page.data['metadata'] = site.data.dig('recipes', recipe)
page.data['title'] = recipe
page.data['description'] = page['metadata']['description']
page.data['uuid'] = recipe
-
- unless page['metadata']['category'].empty?
- page.data['categories'] = [ page['metadata']['category'] ]
- page.data['tags'] = [ page['metadata']['category'] ]
- end
+ page.data['categories'] = [page['metadata']['category']].compact.map(&:strip).reject(&:empty?)
collection = site.collections['recipes'] ||= Jekyll::Collection.new(site, 'recipes')
collection.docs << page
@@ -26,8 +22,9 @@ with Co-op Cloud."
# Finds every Jekyll::Document whose collection marks it as indexable
# and generates a Hash of UUID => Jekyll::Document.
- indexed_docs = site.collections.slice(*site.data.dig('pagefind', 'collections')).values.map(&:docs).flatten.to_h do |doc|
- [ doc['uuid'], doc ]
+ indexed_docs = site.collections.slice(*site.data.dig('pagefind',
+ 'collections')).values.map(&:docs).flatten.to_h do |doc|
+ [doc['uuid'], doc]
end
# Generates a new page representing every indexed documents and
@@ -40,7 +37,7 @@ with Co-op Cloud."
end
indexed_recipes = site.collections['recipes'].docs.to_h do |doc|
- [ doc['uuid'], doc ]
+ [doc['uuid'], doc]
end
# Generates a new page representing every indexed recipe and
@@ -51,4 +48,49 @@ with Co-op Cloud."
page.data['page'] = indexed_recipes[indexed_recipe]
indexed_recipes[indexed_recipe].data['indexed_recipe'] = page
end
+
+ # Emulates Jekyll::Site#categories including every
+ # collection and not just posts, and also slugifies names.
+ #
+ # If you want to add a new field to create collection pages by, add
+ # the field name to the routes hash.
+ slugs = {}
+ routes = { categories: nil, tags: nil, topics: nil, status: nil }
+ site.collections.values.map(&:docs).flatten.each do |doc|
+ routes.each_key do |route|
+ routes[route] ||= Hash.new { |hash, key| hash[key] = [] }
+
+ case doc[route.to_s]
+ when Array
+ doc[route.to_s]&.each do |value|
+ slug = slugs[value] ||= Jekyll::Utils.slugify(value, mode: 'ascii')
+ routes[route][slug] << doc
+ end
+ when String
+ value = doc[route.to_s]
+ slug = slugs[value] ||= Jekyll::Utils.slugify(value, mode: 'ascii')
+ routes[route][slug] << doc
+ end
+ end
+ end
+
+ routes.each_key do |route|
+ # Generates a page per category
+ get "/#{route}/:value/", value: routes[route].keys do |page, value|
+ page.data['type'] = route
+ page.data['title'] = slugs.key(value)
+ page.data['posts'] = routes[route][value]
+ page.data['uuid'] = page.url
+
+ page.data['posts'].each do |doc|
+ case doc.data[route.to_s]
+ when Array
+ doc.data[route.to_s].delete(page['title'])
+ doc.data[route.to_s] << page
+ else
+ doc.data[route.to_s] = page
+ end
+ end
+ end
+ end
end
diff --git a/assets/css/styles.scss b/assets/css/styles.scss
index 5b0f7dc..a8424b1 100644
--- a/assets/css/styles.scss
+++ b/assets/css/styles.scss
@@ -6,6 +6,11 @@ weight: 100
@use "fonts";
@use "@suttyweb/fork-awesome/scss/fork-awesome";
+$category: #fff;
+$topic: #fff;
+$tag: #fff;
+$status: #fff;
+
@import "bootstrap/scss/functions";
{{ site.theme | yaml_to_scss: site.data.layouts.theme }}