From 818b22078c9e106594fe5c0fbcdd4fb7248e15a6 Mon Sep 17 00:00:00 2001
From: Yaroslav <contact@yaroslavps.com>
Date: Sat, 13 Jun 2020 18:17:58 +0300
Subject: Added links to recipes, recipe archive, smol template changes

---
 content/food/archive.md       |  6 ++++++
 content/weblog/archive.md     |  2 +-
 templates/archive.html        | 20 --------------------
 templates/base.html           | 14 ++++++++++++--
 templates/food_archive.html   | 20 ++++++++++++++++++++
 templates/index.html          |  2 +-
 templates/weblog.html         | 38 ++++++++++++++++++++++++--------------
 templates/weblog_archive.html | 20 ++++++++++++++++++++
 8 files changed, 84 insertions(+), 38 deletions(-)
 create mode 100644 content/food/archive.md
 delete mode 100644 templates/archive.html
 create mode 100644 templates/food_archive.html
 create mode 100644 templates/weblog_archive.html

diff --git a/content/food/archive.md b/content/food/archive.md
new file mode 100644
index 0000000..940ab0c
--- /dev/null
+++ b/content/food/archive.md
@@ -0,0 +1,6 @@
++++
+sort_by = "date"
+template = "food_archive.html"
+paginate_by = 0
++++
+
diff --git a/content/weblog/archive.md b/content/weblog/archive.md
index cfc0b4e..c90f85f 100644
--- a/content/weblog/archive.md
+++ b/content/weblog/archive.md
@@ -1,6 +1,6 @@
 +++
 sort_by = "date"
-template = "archive.html"
+template = "weblog_archive.html"
 paginate_by = 0
 +++
 
diff --git a/templates/archive.html b/templates/archive.html
deleted file mode 100644
index b06bdb2..0000000
--- a/templates/archive.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% block title %}
-Weblog archive - Yaroslav's weblog
-{% endblock %}
-{% block header %}
-<h1>Yaroslav's weblog archive</h1>
-{% endblock %}
-{% block content %}
-{% set section = get_section(path="weblog/_index.md") %}
-<div class="post-container">
-  {% for year, posts in section.pages | group_by(attribute="year") %}
-  <h3>{{ year }}</h3>
-  <ul>
-    {% for post in posts %}
-    <li><span class="publish-date">{{ post.date | date }}</span> - <a href="{{ post.permalink }}">{{ post.title }}</a></li>
-    {% endfor %}
-  </ul>
-  {% endfor %}
-</div>
-{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index ccb167a..2974335 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -28,9 +28,11 @@
         </div>
         <div class="sidebar-container">
           <div class="sticky-wrapper">
+            {% block sbdesc %}
             <p>Hello, my name is Yaroslav de la Peña Smirnov, welcome to my
             weblog. Sometimes I write software, sometimes I might write my mind
             here. </p>
+            {% endblock %}
             <div class="links-container">
               <a href="https://github.com/Yaroslav-95" title="GitHub"><span class="icon"></span></a>
               <a href="https://git.yaroslavps.com/yaroslav" title="Git server"><span class="icon"></span></a>
@@ -39,8 +41,16 @@
             <h3>Navigation</h3>
             <ul class="navigation-list">
               <li><a href="/">Landing page</a></li>
-              <li><a href="/weblog/">Weblog ~</a></li>
-              <li><a href="/weblog/archive">Weblog archive</a></li>
+              <li><a href="/weblog/">Weblog</a>
+                <ul>
+                  <li><a href="/weblog/archive/">Archive</a></li>
+                </ul>
+              </li>
+              <li><a href="/food/">Recipe book</a>
+                <ul>
+                  <li><a href="/food/archive/">Archive</a></li>
+                </ul>
+              </li>
             </ul>
             <h3>Contact</h3>
             <p>If you want to tell me something, you can contact me by email at:</p>
diff --git a/templates/food_archive.html b/templates/food_archive.html
new file mode 100644
index 0000000..bd709e2
--- /dev/null
+++ b/templates/food_archive.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% block title %}
+Recipe archive - Yaroslav's recipe book
+{% endblock %}
+{% block header %}
+<h1>Yaroslav's recipe archive</h1>
+{% endblock %}
+{% block content %}
+{% set section = get_section(path="food/_index.md") %}
+<div class="post-container">
+  {% for year, posts in section.pages | group_by(attribute="year") %}
+  <h3>{{ year }}</h3>
+  <ul>
+    {% for post in posts %}
+    <li><span class="publish-date">{{ post.date | date }}</span> - <a href="{{ post.permalink }}">{{ post.title }}</a></li>
+    {% endfor %}
+  </ul>
+  {% endfor %}
+</div>
+{% endblock %}
diff --git a/templates/index.html b/templates/index.html
index c96bf15..51329cd 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,7 @@
     <h1>Yaroslav de la Peña Smirnov</h1>
     <div class="links-container">
       <a href="/weblog">Weblog</a>
-      <a href="/weblog/archive">Weblog archive</a>
+      <a href="/food">Recipe book</a>
     </div>
     <div class="links-container">
       <a href="https://github.com/Yaroslav-95" title="GitHub"><span class="icon"></span></a>
diff --git a/templates/weblog.html b/templates/weblog.html
index d3d6407..8b2eec6 100644
--- a/templates/weblog.html
+++ b/templates/weblog.html
@@ -1,21 +1,31 @@
 {% extends "base.html" %}
 {% block title %}
-{% if section.permalink is containing("weblog") %}
-A weblog by Yaroslav de la Peña Smirnov
-{% elif section.permalink is containing("food") %}
-A collection of recipes by Yaroslav de la Peña Smirnov
-{% else %}
-A website by Yaroslav de la Peña Smirnov
-{% endif %}
+  {% if section.permalink is containing("weblog") %}
+  A weblog by Yaroslav de la Peña Smirnov
+  {% elif section.permalink is containing("food") %}
+  A collection of recipes by Yaroslav de la Peña Smirnov
+  {% else %}
+  A website by Yaroslav de la Peña Smirnov
+  {% endif %}
 {% endblock %}
 {% block header %}
-{% if section.permalink is containing("weblog") %}
-<h1>Yaroslav's weblog</h1>
-{% elif section.permalink is containing("food") %}
-<h1>Yaroslav's recipe book</h1>
-{% else %}
-<h1>Yaroslav's website</h1>
-{% endif %}
+  {% if section.permalink is containing("weblog") %}
+  <h1>Yaroslav's weblog</h1>
+  {% elif section.permalink is containing("food") %}
+  <h1>Yaroslav's recipe book</h1>
+  {% else %}
+  <h1>Yaroslav's website</h1>
+  {% endif %}
+{% endblock %}
+{% block sbdesc %}
+  {% if section.permalink is containing("weblog") %}
+  <p>Hello, my name is Yaroslav de la Peña Smirnov, welcome to my weblog.
+  Sometimes I write software, sometimes I might write my mind here. </p>
+  {% elif section.permalink is containing("food") %}
+  <p>Here I keep some of the recipes for food that I cook. Nothing really
+  special in here, just food that I find delicious, and generally not very
+  expensive nor time consuming to cook.</p>
+  {% endif %}
 {% endblock %}
 {% block content %}
 <div class="posts-list">
diff --git a/templates/weblog_archive.html b/templates/weblog_archive.html
new file mode 100644
index 0000000..b06bdb2
--- /dev/null
+++ b/templates/weblog_archive.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% block title %}
+Weblog archive - Yaroslav's weblog
+{% endblock %}
+{% block header %}
+<h1>Yaroslav's weblog archive</h1>
+{% endblock %}
+{% block content %}
+{% set section = get_section(path="weblog/_index.md") %}
+<div class="post-container">
+  {% for year, posts in section.pages | group_by(attribute="year") %}
+  <h3>{{ year }}</h3>
+  <ul>
+    {% for post in posts %}
+    <li><span class="publish-date">{{ post.date | date }}</span> - <a href="{{ post.permalink }}">{{ post.title }}</a></li>
+    {% endfor %}
+  </ul>
+  {% endfor %}
+</div>
+{% endblock %}
-- 
cgit v1.2.3