From 7ecd173dab3b9ff9493be8fcd692abeef4282cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corentin=20S=C3=A9chet?= <corentin@ki-dour.org>
Date: Wed, 22 May 2024 16:06:24 +0200
Subject: [PATCH] refactor: use macro to generate sections

---
 src/lib/section.html              | 11 +++++++++++
 src/lib/section.html.j2           | 10 ----------
 src/pages/index/games.html        |  9 +++------
 src/pages/index/news.html         |  9 +++------
 src/pages/index/presentation.html | 10 +++-------
 5 files changed, 20 insertions(+), 29 deletions(-)
 create mode 100644 src/lib/section.html
 delete mode 100644 src/lib/section.html.j2

diff --git a/src/lib/section.html b/src/lib/section.html
new file mode 100644
index 0000000..247d31b
--- /dev/null
+++ b/src/lib/section.html
@@ -0,0 +1,11 @@
+{% macro section(title, title_image, title_image_hover) -%}
+  <div class="section"
+    style="
+      --image:url('{{ title_image }}');
+      --hover-image:url('{{ title_image_over or title_image }}');
+    "
+  >
+    <h2 class="section--title">{{ title }}</h2>
+    {{ caller() }}
+  </div>
+{%- endmacro -%}
diff --git a/src/lib/section.html.j2 b/src/lib/section.html.j2
deleted file mode 100644
index e012c3f..0000000
--- a/src/lib/section.html.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="section"
-	style="
-		--image:url('{{ title_image }}');
-		--hover-image:url('{{ title_image_over or title_image }}');
-	"
->
-	<h2 class="section--title">{{ title }}</h2>
-	{% block content %}{% endblock %}
-</div>
-
diff --git a/src/pages/index/games.html b/src/pages/index/games.html
index 76eed68..428b579 100644
--- a/src/pages/index/games.html
+++ b/src/pages/index/games.html
@@ -1,9 +1,6 @@
-{% set title = gettext("Games") %}
-{% set title_image = "/img/section-games.png" %}
+{% from "lib/section.html" import section %}
 
-{% extends "lib/section.html.j2" %}
-
-{% block content %}
+{% call section(gettext("Games"), "/img/section-games.png") %}
   {% for game in glob("games/*.md") | map('markdown') %}
     <div class="game">
       <div class="game--picture-wrapper">
@@ -20,5 +17,5 @@
       </div>
     </div>
   {% endfor %}
-{% endblock %}
+{% endcall %}
 
diff --git a/src/pages/index/news.html b/src/pages/index/news.html
index 52650e8..dd91f40 100644
--- a/src/pages/index/news.html
+++ b/src/pages/index/news.html
@@ -1,9 +1,6 @@
-{% set title = "News" %}
-{% set title_image = "/img/section-news.png" %}
+{% from "lib/section.html" import section %}
 
-{% extends "lib/section.html.j2" %}
-
-{% block content %}
+{% call section(gettext("News"), "/img/section-news.png") %}
   {% for news in glob("news/*.md") | map('markdown') %}
     <div class="news">
       <div class="news--title">
@@ -18,4 +15,4 @@
       </div>
     </div>
   {% endfor %}
-{% endblock %}
+{% endcall %}
diff --git a/src/pages/index/presentation.html b/src/pages/index/presentation.html
index 9a609d2..1a68aec 100644
--- a/src/pages/index/presentation.html
+++ b/src/pages/index/presentation.html
@@ -1,10 +1,6 @@
-{% set title = "Frog Collective" %}
-{% set title_image = "/img/section-collective.png" %}
-{% set title_image_hover = "/img/section-collective-hover.png" %}
+{% from "lib/section.html" import section %}
 
-{% extends "lib/section.html.j2" %}
-
-{% block content %}
+{% call section(gettext("Collective"), "/img/section-collective.png", "/img/section-collective-hover.png") %}
   <p>
     {% trans %}
       Welcome to the cozy world of the Frog Collective, where big dreams come
@@ -53,4 +49,4 @@
       </div>
     {% endfor %}
   </div>
-{% endblock %}
+{% endcall %}