From 7afa809e4b19c327ad14a4cff3f41b21f02344e2 Mon Sep 17 00:00:00 2001
From: Rue Turner <rue@thinlayer.co.uk>
Date: Fri, 1 May 2020 08:23:48 +0100
Subject: [PATCH 1/4] book feature

---
 _data/people.yml              |  8 +++++++
 _includes/book-preview.html   | 28 ++++++++++++++++++++++++
 _includes/recipe-preview.html |  7 ++++++
 _includes/related-books.html  | 12 +++++++++++
 _layouts/book.html            | 40 +++++++++++++++++++++++++++++++++++
 _layouts/recipe.html          |  1 +
 books.html                    | 16 ++++++++++++++
 7 files changed, 112 insertions(+)
 create mode 100644 _data/people.yml
 create mode 100644 _includes/book-preview.html
 create mode 100644 _includes/recipe-preview.html
 create mode 100644 _includes/related-books.html
 create mode 100644 _layouts/book.html
 create mode 100644 books.html

diff --git a/_data/people.yml b/_data/people.yml
new file mode 100644
index 000000000..baf2b9b1b
--- /dev/null
+++ b/_data/people.yml
@@ -0,0 +1,8 @@
+# Store your people here
+# eg:
+#
+# clarklab:
+#   name: Clark Wimberly
+#   twitter: @clarklab
+#   web: http://clarklab.com
+#
diff --git a/_includes/book-preview.html b/_includes/book-preview.html
new file mode 100644
index 000000000..978c87d78
--- /dev/null
+++ b/_includes/book-preview.html
@@ -0,0 +1,28 @@
+{% assign thisbook = include.book %}
+<div class="col sm-col-12 md-col-12 lg-col-6 sm-p2" itemscope itemtype="http://schema.org/Book">
+  <meta itemprop="bookFormat" content="EBook"/>
+  <meta itemprop="genre" content="cooking"/>
+
+  <div class="col sm-col-12 md-col-2 lg-col-3">
+    <img src="/images/{{ thisbook.cover }}" itemprop="image" />
+  </div>
+
+  <div class="col sm-col-12 md-col-10 lg-col-9 px2">
+    <div class="">
+      <h3 class="h1 mt0" itemprop="name">{{ thisbook.title }}</h3>
+      {% if thisbook.author %}
+        {% assign author = site.data.people[thisbook.author] %}
+        <h4 class="gray h5">by {{ author.name }}</h4>
+      {% endif %}
+      <p class="italic" itemprop="description">{{ thisbook.description }}</p>
+      <p class="h5" itemprop="abstract">
+        {{ thisbook.covernotes }}
+      </p>
+
+      {% unless page.url == thisbook.url %}
+      <a class="button button-transparent blue" href="{{ thisbook.url }}">Read on...</a>
+      {% endunless %}
+    </div>
+  </div>
+
+</div>
diff --git a/_includes/recipe-preview.html b/_includes/recipe-preview.html
new file mode 100644
index 000000000..acf5a993b
--- /dev/null
+++ b/_includes/recipe-preview.html
@@ -0,0 +1,7 @@
+{% assign thisrecipe = include.recipe %}
+
+<a class="col col-12 sm-col-4 md-col-4 lg-col-3 button button-transparent blue" href="{{ thisrecipe.url }}">
+  {{ thisrecipe.title }}
+</a>
+
+{% assign thisrecipe = nil %}
diff --git a/_includes/related-books.html b/_includes/related-books.html
new file mode 100644
index 000000000..ac8b83cff
--- /dev/null
+++ b/_includes/related-books.html
@@ -0,0 +1,12 @@
+{% assign booklist = site.books | where: 'id', page.books %}
+
+{% if booklist.first %}
+<aside class="books clearfix">
+  <div class="components bg-darken-2 p2 mt3 mb3 center">
+    This recipe appears in these books
+  </div>
+  {% for book in booklist %}
+  {% include book-preview.html book=book %}
+  {% endfor %}
+</aside>
+{% endif %}
diff --git a/_layouts/book.html b/_layouts/book.html
new file mode 100644
index 000000000..dab7c7e38
--- /dev/null
+++ b/_layouts/book.html
@@ -0,0 +1,40 @@
+---
+layout: default
+---
+
+<div class="container">
+  <article class="post-content px2 clearfix">
+    {{ content }}
+  </article>
+
+  <aside class="px2 clearfix">
+    <div class="components bg-darken-2 p2 mt3 mb3 center">
+      Recipes in this book
+    </div>
+    {% assign bookid = page.id | split: '/' | last %}
+    <div class="p2">
+    {% for recipe in site.recipes %}
+      {% if recipe.books contains bookid %}
+        {% include recipe-preview.html recipe=recipe %}
+      {% endif %}
+    {% endfor %}
+    </div>
+  </aside>
+
+  <aside class="px2 clearfix">
+    <div class="components bg-darken-2 p2 mt3 mb3 center">
+      Books
+      {% assign author = site.data.people[page.author] %}
+      {% if author %}
+      by <span class="blue">{{ author.name }}</span>
+      {% endif %}
+    </div>
+    <div class="p2">
+    {% for book in site.books %}
+      {% if book.author == page.author %}
+        {% include book-preview.html book=book %}
+      {% endif %}
+    {% endfor %}
+    </div>
+  </aside>
+</div>
diff --git a/_layouts/recipe.html b/_layouts/recipe.html
index 33426a7e0..6a2665156 100644
--- a/_layouts/recipe.html
+++ b/_layouts/recipe.html
@@ -127,6 +127,7 @@ <h4 class="blue regular xs-center">{{ site.translation[site.language].directions
     <p class="clearfix">{{ site.translation[site.language].category }}: <span itemprop="recipeCategory">{{ category }}</span></p>
   {% endfor %}
 
+  {% include related-books.html %}
   </article>
 
 </div>
diff --git a/books.html b/books.html
new file mode 100644
index 000000000..828a6d048
--- /dev/null
+++ b/books.html
@@ -0,0 +1,16 @@
+---
+layout: default
+---
+
+<div class="container">
+
+  <h1>Books</h1>
+  <p>Here's all the lovely books we have.</p>
+
+  <div class="clearfix">
+  {% for book in site.books %}
+  {% include book-preview.html book=book %}
+  {% endfor %}
+  </div>
+
+</div>

From 2d14a2aff2a761857b727d20b431fba8eb4a5f09 Mon Sep 17 00:00:00 2001
From: Rue Turner <rue@thinlayer.co.uk>
Date: Fri, 1 May 2020 08:54:36 +0100
Subject: [PATCH 2/4] cleanup assignments

---
 _includes/book-preview.html  | 4 ++++
 _includes/related-books.html | 2 ++
 _layouts/book.html           | 6 +++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/_includes/book-preview.html b/_includes/book-preview.html
index 978c87d78..c3e2c32da 100644
--- a/_includes/book-preview.html
+++ b/_includes/book-preview.html
@@ -1,4 +1,5 @@
 {% assign thisbook = include.book %}
+
 <div class="col sm-col-12 md-col-12 lg-col-6 sm-p2" itemscope itemtype="http://schema.org/Book">
   <meta itemprop="bookFormat" content="EBook"/>
   <meta itemprop="genre" content="cooking"/>
@@ -26,3 +27,6 @@ <h4 class="gray h5">by {{ author.name }}</h4>
   </div>
 
 </div>
+
+{% assign author = nil %}
+{% assign thisbook = nil %}
diff --git a/_includes/related-books.html b/_includes/related-books.html
index ac8b83cff..f281c505f 100644
--- a/_includes/related-books.html
+++ b/_includes/related-books.html
@@ -10,3 +10,5 @@
   {% endfor %}
 </aside>
 {% endif %}
+
+{% assign booklist = nil %}
diff --git a/_layouts/book.html b/_layouts/book.html
index dab7c7e38..8977ca8d3 100644
--- a/_layouts/book.html
+++ b/_layouts/book.html
@@ -1,6 +1,7 @@
 ---
 layout: default
 ---
+{% assign pageAuthor = site.data.people[page.author] %}
 
 <div class="container">
   <article class="post-content px2 clearfix">
@@ -24,9 +25,8 @@
   <aside class="px2 clearfix">
     <div class="components bg-darken-2 p2 mt3 mb3 center">
       Books
-      {% assign author = site.data.people[page.author] %}
-      {% if author %}
-      by <span class="blue">{{ author.name }}</span>
+      {% if pageAuthor %}
+      by <span class="blue">{{ pageAuthor.name }}</span>
       {% endif %}
     </div>
     <div class="p2">

From 9c4de69cffd21590e29361047538d486614525b2 Mon Sep 17 00:00:00 2001
From: Rue Turner <rue@thinlayer.co.uk>
Date: Sat, 2 May 2020 11:55:51 +0100
Subject: [PATCH 3/4] Ignore the current book

---
 _layouts/book.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_layouts/book.html b/_layouts/book.html
index 8977ca8d3..838c1e8cf 100644
--- a/_layouts/book.html
+++ b/_layouts/book.html
@@ -24,14 +24,14 @@
 
   <aside class="px2 clearfix">
     <div class="components bg-darken-2 p2 mt3 mb3 center">
-      Books
+      Other books
       {% if pageAuthor %}
       by <span class="blue">{{ pageAuthor.name }}</span>
       {% endif %}
     </div>
     <div class="p2">
     {% for book in site.books %}
-      {% if book.author == page.author %}
+      {% if book.author == page.author and book.id != page.id %}
         {% include book-preview.html book=book %}
       {% endif %}
     {% endfor %}

From 95c73b34e41e9cfd0a5c5ec4eb6171112b25cc6a Mon Sep 17 00:00:00 2001
From: Rue Turner <rue@thinlayer.co.uk>
Date: Mon, 18 May 2020 15:57:05 +0100
Subject: [PATCH 4/4] bugfix related books

---
 _config.yml                  |  2 ++
 _includes/related-books.html | 14 ++++++++++----
 _layouts/recipe.html         |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/_config.yml b/_config.yml
index a059049d9..633e7b0df 100644
--- a/_config.yml
+++ b/_config.yml
@@ -19,6 +19,8 @@ collections:
     output: true
   recipes:
     output: true
+  books:
+    output: true
 
 exclude: ['Gemfile', 'Gemfile.lock', 'Rakefile', 'README.md']
 
diff --git a/_includes/related-books.html b/_includes/related-books.html
index f281c505f..18ba65d34 100644
--- a/_includes/related-books.html
+++ b/_includes/related-books.html
@@ -1,12 +1,18 @@
-{% assign booklist = site.books | where: 'id', page.books %}
+{% assign thisRecipe = include.recipe %}
+{% assign bookIds = thisRecipe.books %}
 
-{% if booklist.first %}
+{% if thisRecipe.books %}
 <aside class="books clearfix">
   <div class="components bg-darken-2 p2 mt3 mb3 center">
     This recipe appears in these books
   </div>
-  {% for book in booklist %}
-  {% include book-preview.html book=book %}
+  {% for book in site.books %}
+    {% for thisRecipeBookId in thisRecipe.books %}
+      {% assign bookId = thisRecipeBookId | prepend: "/books/" %}
+      {% if book.id == bookId %}
+        {% include book-preview.html book=book %}
+      {% endif %}
+    {% endfor %}
   {% endfor %}
 </aside>
 {% endif %}
diff --git a/_layouts/recipe.html b/_layouts/recipe.html
index 6a2665156..3a193ae95 100644
--- a/_layouts/recipe.html
+++ b/_layouts/recipe.html
@@ -127,7 +127,7 @@ <h4 class="blue regular xs-center">{{ site.translation[site.language].directions
     <p class="clearfix">{{ site.translation[site.language].category }}: <span itemprop="recipeCategory">{{ category }}</span></p>
   {% endfor %}
 
-  {% include related-books.html %}
+  {% include related-books.html recipe=page %}
   </article>
 
 </div>