From 150d4c73093a74a9fc854a352b591230abd2c618 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 15 Feb 2021 21:01:54 +0100
Subject: [PATCH] refactor assset and paths

---
 cookbook/static/{ => assets}/favicon.svg      |   0
 .../{manifest => assets}/logo_color.svg       |   0
 .../{manifest => assets}/logo_color144.png    | Bin
 .../{manifest => assets}/logo_color512.png    | Bin
 .../static/{ => assets}/recipe_no_image.svg   |   0
 cookbook/templates/base.html                  |  20 +++++++++---------
 .../manifest.json}                            |   4 ++--
 cookbook/templates/recipes_table.html         |   2 +-
 cookbook/urls.py                              |   4 +++-
 9 files changed, 16 insertions(+), 14 deletions(-)
 rename cookbook/static/{ => assets}/favicon.svg (100%)
 rename cookbook/static/{manifest => assets}/logo_color.svg (100%)
 rename cookbook/static/{manifest => assets}/logo_color144.png (100%)
 rename cookbook/static/{manifest => assets}/logo_color512.png (100%)
 rename cookbook/static/{ => assets}/recipe_no_image.svg (100%)
 rename cookbook/{static/manifest/webmanifest.json => templates/manifest.json} (90%)

diff --git a/cookbook/static/favicon.svg b/cookbook/static/assets/favicon.svg
similarity index 100%
rename from cookbook/static/favicon.svg
rename to cookbook/static/assets/favicon.svg
diff --git a/cookbook/static/manifest/logo_color.svg b/cookbook/static/assets/logo_color.svg
similarity index 100%
rename from cookbook/static/manifest/logo_color.svg
rename to cookbook/static/assets/logo_color.svg
diff --git a/cookbook/static/manifest/logo_color144.png b/cookbook/static/assets/logo_color144.png
similarity index 100%
rename from cookbook/static/manifest/logo_color144.png
rename to cookbook/static/assets/logo_color144.png
diff --git a/cookbook/static/manifest/logo_color512.png b/cookbook/static/assets/logo_color512.png
similarity index 100%
rename from cookbook/static/manifest/logo_color512.png
rename to cookbook/static/assets/logo_color512.png
diff --git a/cookbook/static/recipe_no_image.svg b/cookbook/static/assets/recipe_no_image.svg
similarity index 100%
rename from cookbook/static/recipe_no_image.svg
rename to cookbook/static/assets/recipe_no_image.svg
diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index 6223aa5be..9fb64ffed 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -11,17 +11,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
 
-    <link rel="shortcut icon" type="image/x-icon" href="{% static 'favicon.svg' %}">
-    <link rel="shortcut icon" href="{% static 'favicon.svg' %}">
-    <link rel="icon" type="image/png" href="{% static 'favicon.svg' %}" sizes="32x32">
-    <link rel="icon" type="image/png" href="{% static 'favicon.svg' %}" sizes="96x96">
-    <link rel="apple-touch-icon" href="{% static 'favicon.svg' %}">  
-    <link rel="apple-touch-icon" sizes="180x180" href="{% static 'favicon.svg' %}">
-    <link rel="apple-touch-icon" sizes="152x152" href="{% static 'favicon.svg' %}">
-    <link rel="apple-touch-icon" sizes="180x180" href="{% static 'favicon.svg' %}">
-    <link rel="apple-touch-icon" sizes="167x167" href="{% static 'favicon.svg' %}">
+    <link rel="shortcut icon" type="image/x-icon" href="{% static 'assets/favicon.svg' %}">
+    <link rel="shortcut icon" href="{% static 'assets/favicon.svg' %}">
+    <link rel="icon" type="image/png" href="{% static 'assets/favicon.svg' %}" sizes="32x32">
+    <link rel="icon" type="image/png" href="{% static 'assets/favicon.svg' %}" sizes="96x96">
+    <link rel="apple-touch-icon" href="{% static 'assets/favicon.svg' %}">  
+    <link rel="apple-touch-icon" sizes="180x180" href="{% static 'assets/favicon.svg' %}">
+    <link rel="apple-touch-icon" sizes="152x152" href="{% static 'assets/favicon.svg' %}">
+    <link rel="apple-touch-icon" sizes="180x180" href="{% static 'assets/favicon.svg' %}">
+    <link rel="apple-touch-icon" sizes="167x167" href="{% static 'assets/favicon.svg' %}">
 
-    <link rel="manifest" href="{% static 'manifest/webmanifest.json' %}">
+    <link rel="manifest" href="{% url 'web_manifest' %}">
     <meta name="msapplication-TileColor" content="#ffffff">
     <meta name="msapplication-TileImage" content="/mstile-144x144.png">
 
diff --git a/cookbook/static/manifest/webmanifest.json b/cookbook/templates/manifest.json
similarity index 90%
rename from cookbook/static/manifest/webmanifest.json
rename to cookbook/templates/manifest.json
index 615f203cb..1df56f2d9 100644
--- a/cookbook/static/manifest/webmanifest.json
+++ b/cookbook/templates/manifest.json
@@ -4,12 +4,12 @@
   "description": "Application to manage, tag and search recipes.",
   "icons": [
     {
-      "src": "/static/manifest/logo_color144.png",
+      "src": "/static/assets/logo_color144.png",
       "type": "image/png",
       "sizes": "144x144"
     },
     {
-      "src": "/static/manifest/logo_color512.png",
+      "src": "/static/assets/logo_color512.png",
       "type": "image/png",
       "sizes": "512x512"
     }
diff --git a/cookbook/templates/recipes_table.html b/cookbook/templates/recipes_table.html
index 1f178d9e6..1f1f0e4c8 100644
--- a/cookbook/templates/recipes_table.html
+++ b/cookbook/templates/recipes_table.html
@@ -19,7 +19,7 @@
                                                 <img src=" {{ row.cells.image }}" alt="{% trans 'Recipe Image' %}"
                                                      class="card-img" style="object-fit: cover;height: 130px">
                                             {% else %}
-                                                <img src="{% static 'recipe_no_image.svg' %}"
+                                                <img src="{% static 'assets/recipe_no_image.svg' %}"
                                                      alt="{% trans 'Recipe Image' %}"
                                                      class="card-img d-none d-md-block"
                                                      style="object-fit: cover; height: 130px">
diff --git a/cookbook/urls.py b/cookbook/urls.py
index d55d5b3f8..ba9a8d75e 100644
--- a/cookbook/urls.py
+++ b/cookbook/urls.py
@@ -105,8 +105,10 @@ urlpatterns = [
     path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 
     path('offline/', views.offline, name='view_offline'),
-    path('service-worker.js', (TemplateView.as_view(template_name="sw.js", content_type='application/javascript', )), name='service_worker'),
 
+
+    path('service-worker.js', (TemplateView.as_view(template_name="sw.js", content_type='application/javascript', )), name='service_worker'),
+    path('manifest.json', (TemplateView.as_view(template_name="manifest.json", content_type='application/json', )), name='web_manifest'),
 ]
 
 generic_models = (