From 0c1e3e5c3b62b40c21a3386acdeee3300803a3d1 Mon Sep 17 00:00:00 2001
From: Justus Grunow <jg@justus.ws>
Date: Sat, 25 Jan 2025 21:17:52 -0500
Subject: [PATCH] Recipes template now extends Menu template for reduced
 duplication

---
 index.html             | 52 +++++++++++++++++++++---------------------
 recipes.html           | 32 --------------------------
 templates/menu.html    |  2 +-
 templates/recipes.html | 20 ++--------------
 4 files changed, 29 insertions(+), 77 deletions(-)

diff --git a/index.html b/index.html
index 1af2938..a82cbee 100644
--- a/index.html
+++ b/index.html
@@ -12,15 +12,15 @@
 		<ul>
 			
 				
-					<li>Bourbon</li>
+				<li>Bourbon</li>
 				
 			
 				
-					<li>Maple syrup</li>
+				<li>Maple syrup</li>
 				
 			
 				
-					<li>Angostura bitters</li>
+				<li>Angostura bitters</li>
 				
 			
 		</ul>
@@ -31,15 +31,15 @@
 		<ul>
 			
 				
-					<li>Bourbon</li>
+				<li>Bourbon</li>
 				
 			
 				
-					<li>Campari</li>
+				<li>Campari</li>
 				
 			
 				
-					<li>Sweet vermouth</li>
+				<li>Sweet vermouth</li>
 				
 			
 		</ul>
@@ -50,19 +50,19 @@
 		<ul>
 			
 				
-					<li>Rye whiskey</li>
+				<li>Rye whiskey</li>
 				
 			
 				
-					<li>Amaro</li>
+				<li>Amaro</li>
 				
 			
 				
-					<li>Angostura bitters</li>
+				<li>Angostura bitters</li>
 				
 			
 				
-					<li>Orange bitters</li>
+				<li>Orange bitters</li>
 				
 			
 		</ul>
@@ -73,19 +73,19 @@
 		<ul>
 			
 				
-					<li>Amaro Montenegro</li>
+				<li>Amaro Montenegro</li>
 				
 			
 				
-					<li>Gin</li>
+				<li>Gin</li>
 				
 			
 				
-					<li>Sweet vermouth</li>
+				<li>Sweet vermouth</li>
 				
 			
 				
-					<li>Angostura bitters</li>
+				<li>Angostura bitters</li>
 				
 			
 		</ul>
@@ -96,15 +96,15 @@
 		<ul>
 			
 				
-					<li>Bourbon</li>
+				<li>Bourbon</li>
 				
 			
 				
-					<li>Cointreau</li>
+				<li>Cointreau</li>
 				
 			
 				
-					<li>Lemon juice</li>
+				<li>Lemon juice</li>
 				
 			
 		</ul>
@@ -115,11 +115,11 @@
 		<ul>
 			
 				
-					<li>Gin</li>
+				<li>Gin</li>
 				
 			
 				
-					<li>Tonic water</li>
+				<li>Tonic water</li>
 				
 			
 		</ul>
@@ -130,15 +130,15 @@
 		<ul>
 			
 				
-					<li>Gin</li>
+				<li>Gin</li>
 				
 			
 				
-					<li>Lime juice</li>
+				<li>Lime juice</li>
 				
 			
 				
-					<li>Simple syrup</li>
+				<li>Simple syrup</li>
 				
 			
 		</ul>
@@ -149,19 +149,19 @@
 		<ul>
 			
 				
-					<li>Gin</li>
+				<li>Gin</li>
 				
 			
 				
-					<li>Lime juice</li>
+				<li>Lime juice</li>
 				
 			
 				
-					<li>Simple syrup</li>
+				<li>Simple syrup</li>
 				
 			
 				
-					<li>Angostura bitters</li>
+				<li>Angostura bitters</li>
 				
 			
 		</ul>
diff --git a/recipes.html b/recipes.html
index 86c27cb..cbd19c5 100644
--- a/recipes.html
+++ b/recipes.html
@@ -24,10 +24,6 @@
 				
 			
 		</ul>
-		<h3>Directions!</h3>
-		1. Stir with ice. Strain into rocks glass over large cube.
-1. Garnish with orange twist.
-
 	
 
 	
@@ -47,10 +43,6 @@
 				
 			
 		</ul>
-		<h3>Directions!</h3>
-		1. Stir with ice. Strain into rocks glass over large cube.
-1. Garnish with orange twist.
-
 	
 
 	
@@ -74,10 +66,6 @@
 				
 			
 		</ul>
-		<h3>Directions!</h3>
-		1. Stir with ice. Strain into chilled coupe.
-1. Garnish with orange twist.
-
 	
 
 	
@@ -101,10 +89,6 @@
 				
 			
 		</ul>
-		<h3>Directions!</h3>
-		1. Stir with ice. Strain into rocks glass over large cube.
-1. Garnish with orange twist.
-
 	
 
 	
@@ -124,9 +108,6 @@
 				
 			
 		</ul>
-		<h3>Directions!</h3>
-		1. Shake with ice. Double strain into chilled coupe.
-
 	
 
 	
@@ -142,11 +123,6 @@
 				
 			
 		</ul>
-		<h3>Directions!</h3>
-		1. Pour gin and tonic over ice in short glass.
-1. Stir gently.
-1. Garnish with lime wheel.
-
 	
 
 	
@@ -166,10 +142,6 @@
 				
 			
 		</ul>
-		<h3>Directions!</h3>
-		1. Shake with ice.
-1. Double strain into chilled coupe.
-
 	
 
 	
@@ -193,10 +165,6 @@
 				
 			
 		</ul>
-		<h3>Directions!</h3>
-		1. Shake with ice.
-1. Double strain into chilled coupe.
-
 	
 
 
diff --git a/templates/menu.html b/templates/menu.html
index 925ef84..3625311 100644
--- a/templates/menu.html
+++ b/templates/menu.html
@@ -7,7 +7,7 @@
 		<ul>
 			{% for ingredient in details['ingredients'] %}
 				{% for name, amount in ingredient.items() %}
-					<li>{{ name }}</li>
+				<li>{% block amount scoped %}{% endblock %}{{ name }}</li>
 				{% endfor %}
 			{% endfor %}
 		</ul>
diff --git a/templates/recipes.html b/templates/recipes.html
index 9b3fb4c..c3df432 100644
--- a/templates/recipes.html
+++ b/templates/recipes.html
@@ -1,18 +1,2 @@
-{% extends "base.html" %}
-{% block title %}Cocktail Menu{% endblock %}
-{% block content %}
-{% for bev in bevs %}
-	{% for name, details in bev.items() %}
-		<h2>{{ name }}</h2>
-		<ul>
-			{% for ingredient in details['ingredients'] %}
-				{% for name, amount in ingredient.items() %}
-				<li>{{ amount }} {{ name }}</li>
-				{% endfor %}
-			{% endfor %}
-		</ul>
-		<h3>Directions!</h3>
-		{{ details['directions'] }}
-	{% endfor %}
-{% endfor %}
-{% endblock %}
+{% extends "menu.html" %}
+{% block amount %}{{ amount }} {% endblock %}