Merge branch 'develop' of https://github.com/vabene1111/recipes into develop

This commit is contained in:
smilerz
2021-02-16 07:45:22 -06:00
96 changed files with 13251 additions and 10154 deletions

View File

@@ -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.png' %}">
<link rel="shortcut icon" href="{% static 'favicon.png' %}">
<link rel="icon" type="image/png" href="{% static 'favicon.png' %}" sizes="32x32">
<link rel="icon" type="image/png" href="{% static 'favicon.png' %}" sizes="96x96">
<link rel="apple-touch-icon" href="{% static 'favicon.png' %}">
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'favicon.png' %}">
<link rel="apple-touch-icon" sizes="152x152" href="{% static 'favicon.png' %}">
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'favicon.png' %}">
<link rel="apple-touch-icon" sizes="167x167" href="{% static 'favicon.png' %}">
<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' %}">
<link rel="manifest" href="{% url 'web_manifest' %}">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/mstile-144x144.png">

View File

@@ -0,0 +1,48 @@
{
"name": "Tandoor Recipes",
"short_name" : "Tandoor",
"description": "Application to manage, tag and search recipes.",
"icons": [
{
"src": "/static/assets/logo_color144.png",
"type": "image/png",
"sizes": "144x144"
},
{
"src": "/static/assets/logo_color512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": "/search",
"background_color": "#ffcb76",
"display": "standalone",
"scope": "/",
"theme_color": "#ffcb76",
"shortcuts": [
{
"name": "Plan",
"short_name": "Plan",
"description": "View your meal Plan",
"url": "/plan"
},
{
"name": "Books",
"short_name": "Cookbooks",
"description": "View your cookbooks",
"url": "/books"
},
{
"name": "Shopping",
"short_name": "Shopping",
"description": "View your shopping lists",
"url": "/list/shopping-list/"
},
{
"name": "Latest Shopping List",
"short_name": "Shopping List",
"description": "View the latest shopping list",
"url": "/shopping/latest/"
}
]
}

View File

@@ -129,7 +129,7 @@
[](https://github.com/vabene1111/recipes)
[GitHub](https://github.com/vabene1111/recipes)
![{% trans 'This will become an image' %}]({% static 'favicon.png' %})
![{% trans 'This will become an image' %}]({% static 'assets/favicon.svg' %})
</code></pre>
<div style="text-align: center">
@@ -142,7 +142,7 @@
<div class="card-body">
<a href="https://github.com/vabene1111/recipes">https://github.com/vabene1111/recipes</a> <br/>
<a href="https://github.com/vabene1111/recipes">GitHub</a> <br/>
<img src="{% static 'favicon.png' %}" class="img-fluid" alt="{% trans 'This will become an image' %}"
<img src="{% static 'assets/favicon.svg' %}" class="img-fluid" alt="{% trans 'This will become an image' %}"
style="height: 3vw">
</div>

View File

@@ -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">

View File

@@ -681,7 +681,7 @@
Promise.allSettled(recipe_promises).then(() => {
console.log("proceeding to update shopping list", this.shopping_list)
if (this.shopping_list_id === null) {
if (this.shopping_list.id === undefined) {
return this.$http.post("{% url 'api:shoppinglist-list' %}", this.shopping_list, {}).then((response) => {
console.log(response)
this.makeToast(gettext('Updated'), gettext('Object created successfully!'), 'success')
@@ -697,7 +697,7 @@
this.loading = false
})
} else {
return this.$http.put("{% url 'api:shoppinglist-detail' shopping_list_id %}", this.shopping_list, {}).then((response) => {
return this.$http.put("{% url 'api:shoppinglist-detail' 123456 %}".replace('123456', this.shopping_list.id), this.shopping_list, {}).then((response) => {
console.log(response)
this.shopping_list = response.body
this.makeToast(gettext('Updated'), gettext('Changes saved successfully!'), 'success')