Move ingredient (foodstuff detail) url to food app

Improve url naming Show recipe/ingredient/category selectors on all pages
grahamu · Sep 19, 2021 · 83ad908 · 83ad908
1 parent 85ccb18
commit 83ad908
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/flyingcracker/food/templates/food/category_list.html b/flyingcracker/food/templates/food/category_list.html
@@ -0,0 +1,27 @@
+{% extends "cocktail.html" %}
+
+{% block body %}
+<div class="cocktail">
+    <div class="box">
+        <div class="header">
+            <div class="title">
+                {{ category|capfirst }} {{ recipe_type|capfirst }} Recipes
+            </div>
+        </div>
+    {% if matching_recipes %}
+        <div class="bd">
+        {% for recipe in matching_recipes %}
+            <div class="yui-gd">
+                <div class="yui-u first"><a href="{% url 'food:recipe-detail' recipe_type=recipe_type slug=recipe.slug %}">{{ recipe.title }}</a></div>
+                <div class="yui-u">{{ recipe.teaser }}</div>
+            </div>
+        {% endfor %}
+        </div>
+    {% else %}
+        <p>No {{ recipe_type }} recipes in the database.</p>
+    {% endif %}
+    <br />
+    {% include "food/food_select.html" %}
+    </div>
+</div>
+{% endblock %}
diff --git a/flyingcracker/food/templates/food/foodstuff_list.html b/flyingcracker/food/templates/food/foodstuff_list.html
@@ -12,7 +12,8 @@
         <table>
             {% for foodstuff in all_foodstuff %}
             <tr>
-                <td><a href="{% url 'food:ingredient-detail' recipe_type=recipe_type slug=foodstuff.slug %}">{{ foodstuff }}</a></td>
+                <td><a href="{% url 'food:ingredient-detail' recipe_type=recipe_type slug=foodstuff.slug %}">{{
+                        foodstuff }}</a></td>
             </tr>
             {% endfor %}
         </table>
@@ -26,4 +27,4 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock %}
diff --git a/flyingcracker/food/templates/food/recipe_list.html b/flyingcracker/food/templates/food/recipe_list.html
@@ -5,7 +5,7 @@
     <div class="box">
         <div class="header">
             <div class="title">
-                All {% if category %}{{ category|capfirst }} {% endif %}{{ recipe_type|capfirst }} Recipes
+                All {{ recipe_type|capfirst }} Recipes
             </div>
         </div>
     {% if matching_recipes %}

diff --git a/flyingcracker/food/urls.py b/flyingcracker/food/urls.py
@@ -4,9 +4,9 @@
 
 app_name = 'food'
 urlpatterns = [
-    re_path(r'^ingredients/$', views.foodstuff_list, name='ingredient-list'),
-    re_path(r'^i/(?P<slug>[\w_-]+)/$', views.foodstuff_detail, name='ingredient-detail'),
     re_path(r'^c/(?P<slug>[\w_-]+)/$', views.category_detail, name='category-detail'),
+    re_path(r'^i/(?P<slug>[\w_-]+)/$', views.foodstuff_detail, name='ingredient-detail'),
+    re_path(r'^ingredients/$', views.foodstuff_list, name='ingredient-list'),
     re_path(r'^(?P<slug>[\w_-]+)/$', views.recipe_detail, name='recipe-detail'),
     re_path(r'^$', views.recipe_list, name='recipe-list'),
 ]
diff --git a/flyingcracker/food/views.py b/flyingcracker/food/views.py
@@ -184,7 +184,7 @@ def category_detail(request, recipe_type, slug):
         'matching_recipes': category_recipes,
         'recipe_type': recipe_type,
     }
-    return render(request, 'food/recipe_list.html', context)
+    return render(request, 'food/category_list.html', context)
 
 
 def get_all_lists(recipe_type):