- {% recipe_rating recipe request.user as rating %}
-
- {% if request.user.is_authenticated %}
- {{ recipe.name }} {{ rating|safe }}
-
-
- {% endif %}
+
-
-
-
+ {% recipe_rating recipe request.user as rating %}
-
-
-
+
- {% if recipe.storage %}
- {% trans 'in' %} {{ recipe.storage.name }}- {% endif %} - - {% if recipe.internal %} - {% trans 'by' %} {{ recipe.created_by.get_user_name }}
- {% endif %} - - {% if recipe.keywords %} - {% for x in recipe.keywords.all %} - {{ x }} - {% endfor %} -
-
- {% endif %} - - {% if recipe.working_time and recipe.working_time != 0 %} - {% trans 'Preparation time ~' %} {{ recipe.working_time }} min - {% endif %} - - {% if recipe.waiting_time and recipe.waiting_time != 0 %} - {% trans 'Waiting time ~' %} {{ recipe.waiting_time }} min - {% endif %} - {% recipe_last recipe request.user as last_cooked %} - {% if last_cooked %} - {% trans 'Last cooked' %} {{ last_cooked|date }} - {% endif %} - - {% if recipe.waiting_time and recipe.waiting_time != 0 or recipe.working_time and recipe.working_time != 0 or last_cooked %} -
-
- {% endif %} - -
-
-
- {% if recipe.nutrition %}
-
-
-
- {% if recipe.image %}
-
-
-
-
-
-
-
-
-
- {% trans 'Ingredients' %}
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- | - [[s.name]] - | -- | - |
| - [[i.note]] - | -- | - |
|
-
-
-
-
-
-
-
- |
- - - [[i.food.name]] - - - [[i.food.name]] - - | -
-
-
- [[i.note]]
-
-
- |
-
| - | - | - |
- 
-
-
-
- {% endif %}
-
- -
-
-
- {% endif %}
-
-
-
-
-
-
-
-
-
- {% if recipe.nutrition.source %}
- Source: {{ recipe.nutrition.source }}
- {% endif %}
-
- {% trans 'Nutrition' %}
-| - {% trans 'Calories' %} - | -{{ recipe.nutrition.calories|floatformat:2 }} | -kcal | -
| - {% trans 'Carbohydrates' %} - | -{{ recipe.nutrition.carbohydrates|floatformat:2 }} | -g | -
| - {% trans 'Fats' %} - | -{{ recipe.nutrition.fats|floatformat:2 }} | -g | -
| - {% trans 'Proteins' %} - | -{{ recipe.nutrition.proteins|floatformat:2 }} | -g | -
| - | - | - |
-
-
-
-
- -
{% trans 'Instructions' %}
--
- {% for s in recipe.steps.all %}
-
-
- {% if recipe.storage %}
-
-
- {% endfor %}
-
- {% if recipe.steps.all|length > 1 %}
-
-
-
-
-
-
-
-
- {% if s.type == 'TEXT' %}
-
- {% elif s.type == 'TIME' %}
-
- {% endif %}
- {% if s.name %}{{ s.name }}{% else %}{% trans 'Step' %}
- {{ forloop.counter }}{% endif %}
- {% if s.time != 0 %}
- - {{ s.time }} {% trans 'Minutes' %}
- {% endif %}
-
-
-
-
-
-
-
- {% endif %}
-
-
-
-
-
-
-
-
-
- | - [[i.note]] - | -- - | -- |
|
-
-
-
-
-
-
-
- |
- - - [[i.food.name]] - - - [[i.food.name]] - - | -
-
-
- [[i.note]]
-
-
- |
-
| - | - | - |
-
-
- {% if s.instruction %}
- {{ s.get_instruction_render | safe }}
- {% endif %}
-
-
- {% if recipe.internal %}
-
- {% else %}
-
- {% if '.pdf' in recipe.file_path %}
-
- {% endif %}
-
{% if request.user.userpreference.comments %}
-
-
- {% endif %}
- {% if '.jpg' in recipe.file_path or '.png' in recipe.file_path or '.jpeg' in recipe.file_path %}
-
- 
-
- {% endif %}
-
-
-
-
-
- {% endif %}
-
-
-
-
- {% trans 'External recipe' %}
-
- {% blocktrans %}
- This is an external recipe, which means you can only view it by opening the link
- above.
- You can convert this recipe to a fancy recipe by pressing the convert button. The
- original
- file
- will still be accessible.
- {% endblocktrans %}.
-
-
- {% trans 'Convert now!' %}
- {% trans 'View external recipe' %}
-
@@ -474,144 +49,27 @@ {% endif %} {% endif %} - {% if recipe.storage %} - {% include 'include/recipe_open_modal.html' %} - {% endif %} - - - - - {% include 'include/log_cooking.html' %} - {% endblock %} + {% block script %} + + + {% if debug %} + + {% else %} + + {% endif %} + + + + {% render_bundle 'chunk-vendors' %} + {% render_bundle 'recipe_view' %} {% endblock %} \ No newline at end of file diff --git a/cookbook/templates/test.html b/cookbook/templates/test.html index a524aa5e6..e69de29bb 100644 --- a/cookbook/templates/test.html +++ b/cookbook/templates/test.html @@ -1,97 +0,0 @@ -{% extends "base.html" %} -{% load render_bundle from webpack_loader %} -{% load static %} -{% load i18n %} -{% load l10n %} -{% load custom_tags %} - -{% block title %}{{ recipe.name }}{% endblock %} - -{% block content %} - {% recipe_rating recipe request.user as rating %} - - -
-
-
- {% if request.user.userpreference.comments %}
- -
- -
{% trans 'Comments' %} -
- {% for c in comments %} - -- {% endfor %} - - {% if request.user.is_authenticated %} -
-
-
-
- {% endif %}
- {% endif %}
-
-{% endblock %}
-
-
-{% block script %}
-
-
- {% if debug %}
-
- {% else %}
-
- {% endif %}
-
-
-
-
- {% render_bundle 'chunk-vendors' %}
- {% render_bundle 'recipe_view' %}
-{% endblock %}
\ No newline at end of file
diff --git a/cookbook/views/views.py b/cookbook/views/views.py
index d3b174680..13cc5b63d 100644
--- a/cookbook/views/views.py
+++ b/cookbook/views/views.py
@@ -153,7 +153,6 @@ def recipe_view(request, pk, share=None):
)
comment_form = CommentForm()
- bookmark_form = RecipeBookEntryForm()
user_servings = None
if request.user.is_authenticated:
@@ -172,18 +171,7 @@ def recipe_view(request, pk, share=None):
.exists():
ViewLog.objects.create(recipe=recipe, created_by=request.user)
- return render(
- request,
- 'recipe_view.html',
- {
- 'recipe': recipe,
- 'comments': comments,
- 'comment_form': comment_form,
- 'bookmark_form': bookmark_form,
- 'share': share,
- 'user_servings': user_servings
- }
- )
+ return render(request, 'recipe_view.html', {'recipe': recipe, 'comments': comments, 'comment_form': comment_form, 'share': share, 'user_servings': user_servings})
@group_required('user')
diff --git a/vue/src/apps/RecipeView/RecipeView.vue b/vue/src/apps/RecipeView/RecipeView.vue
index 4a95e0d91..901e8817f 100644
--- a/vue/src/apps/RecipeView/RecipeView.vue
+++ b/vue/src/apps/RecipeView/RecipeView.vue
@@ -1,132 +1,136 @@
-
+
+
+
-
-
-
-
-
- {{ recipe.name }}
-
-
-
-
-
-
-
- {{ recipe.description }}
-
- -
-
-
-
-
-
-
- {{ _('Preparation') }}
- {{ recipe.working_time }} {{ _('min') }} -
+ - {{ recipe.working_time }} {{ _('min') }} -
+
+
-
+
{{ recipe.name }}
-
-
-
-
-
- {{ _('Waiting') }}
- {{ recipe.waiting_time }} {{ _('min') }} -
+ - {{ recipe.waiting_time }} {{ _('min') }} -
+
+
+
+
-
+ {{ recipe.description }}
-
-
-
+
+
+
+
- -
+
-
-
+
-
+
+
+
+ {{ _('Preparation') }}
+ {{ recipe.working_time }} {{ _('min') }} +
+ {{ recipe.working_time }} {{ _('min') }} +
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ _('Waiting') }}
+ {{ recipe.waiting_time }} {{ _('min') }} +
+ + {{ recipe.waiting_time }} {{ _('min') }} +
+
+
+
+
+
+
+
+
-
-
- {{ _('Servings') }}
+
+
+ {{ _('Servings') }}
+
+
-
-
- - -
-
-
-
-
-
-
-
- {{ _('Ingredients') }}
+
+
-
+
+
-
+
-
+
-
+
{{ _('Ingredients') }}
+-
-
-
-
-
-
-
+
-
@@ -149,6 +153,7 @@ import Nutrition from "@/components/Nutrition";
import moment from 'moment'
import Keywords from "@/components/Keywords";
+import LoadingSpinner from "@/components/LoadingSpinner";
Vue.prototype.moment = moment
@@ -168,6 +173,7 @@ export default {
RecipeContextMenu,
Nutrition,
Keywords,
+ LoadingSpinner,
},
data() {
return {
@@ -191,7 +197,7 @@ export default {
this.ingredient_count += step.ingredients.length
for (let ingredient of step.ingredients) {
- this.$set(ingredient, 'checked', false)
+ this.$set(ingredient, 'checked', false)
}
step.time_offset = total_time
diff --git a/vue/src/components/LoadingSpinner.vue b/vue/src/components/LoadingSpinner.vue
new file mode 100644
index 000000000..968c55773
--- /dev/null
+++ b/vue/src/components/LoadingSpinner.vue
@@ -0,0 +1,17 @@
+
+
-
-
-
+
+
+
-
+
+
+
- ![]()
+ ![]()
+
+
+
+
-
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
diff --git a/vue/webpack-stats.json b/vue/webpack-stats.json
index b0b8976d5..5b35adb19 100644
--- a/vue/webpack-stats.json
+++ b/vue/webpack-stats.json
@@ -1 +1 @@
-{"status":"done","publicPath":"http://localhost:8080/","chunks":{"chunk-vendors":[{"name":"js/chunk-vendors.js","publicPath":"http://localhost:8080/js/chunk-vendors.js","path":"F:\\Developement\\Django\\recipes\\cookbook\\static\\vue\\js\\chunk-vendors.js"}],"recipe_view":[{"name":"js/recipe_view.js","publicPath":"http://localhost:8080/js/recipe_view.js","path":"F:\\Developement\\Django\\recipes\\cookbook\\static\\vue\\js\\recipe_view.js"},{"name":"recipe_view.6a32bc3201ad26dbc898.hot-update.js","publicPath":"http://localhost:8080/recipe_view.6a32bc3201ad26dbc898.hot-update.js","path":"F:\\Developement\\Django\\recipes\\cookbook\\static\\vue\\recipe_view.6a32bc3201ad26dbc898.hot-update.js"}]},"error":"ModuleError","message":"Module Error (from ./node_modules/eslint-loader/index.js):\n\nF:\\Developement\\Django\\recipes\\vue\\src\\components\\Keywords.vue\n 3:7 error Elements in iteration expect to have 'v-bind:key' directives vue/require-v-for-key\n\n✖ 1 problem (1 error, 0 warnings)\n"}
\ No newline at end of file
+{"status":"done","publicPath":"http://localhost:8080/","chunks":{"chunk-vendors":[{"name":"js/chunk-vendors.js","publicPath":"http://localhost:8080/js/chunk-vendors.js","path":"F:\\Developement\\Django\\recipes\\cookbook\\static\\vue\\js\\chunk-vendors.js"}],"recipe_view":[{"name":"js/recipe_view.js","publicPath":"http://localhost:8080/js/recipe_view.js","path":"F:\\Developement\\Django\\recipes\\cookbook\\static\\vue\\js\\recipe_view.js"},{"name":"recipe_view.cfc8fcd2004c1b08df3e.hot-update.js","publicPath":"http://localhost:8080/recipe_view.cfc8fcd2004c1b08df3e.hot-update.js","path":"F:\\Developement\\Django\\recipes\\cookbook\\static\\vue\\recipe_view.cfc8fcd2004c1b08df3e.hot-update.js"}]},"error":"ModuleError","message":"Module Error (from ./node_modules/eslint-loader/index.js):\n\nF:\\Developement\\Django\\recipes\\vue\\src\\components\\Keywords.vue\n 3:7 error Elements in iteration expect to have 'v-bind:key' directives vue/require-v-for-key\n\n✖ 1 problem (1 error, 0 warnings)\n"}
\ No newline at end of file
+
+
+