diff --git a/front/components/Products/AddProductModal.vue b/front/components/Products/AddProductModal.vue index eb351a8..d350c66 100644 --- a/front/components/Products/AddProductModal.vue +++ b/front/components/Products/AddProductModal.vue @@ -14,13 +14,13 @@ - + - + - + @@ -57,22 +57,30 @@ ], kcal: [ { - required: false + required: true, + message: 'Proszę podać wartość kcal', + trigger: 'blur' } ], carbohydrates: [ { - required: false + required: true, + message: 'Proszę podać ilość węglowodanów', + trigger: 'blur' } ], protein: [ { - required: false + required: true, + message: 'Proszę podać ilość białka', + trigger: 'blur' } ], fat: [ { - required: false + required: true, + message: 'Proszę podać ilość tłuszczu', + trigger: 'blur' } ] }, @@ -81,6 +89,7 @@ methods: { cancel() { this.active = false; + this.resetForm(); this.$Message.error('Anulowano'); }, ok() { diff --git a/front/components/Products/ProductsList.vue b/front/components/Products/ProductsList.vue index 84e51e7..6adbe89 100644 --- a/front/components/Products/ProductsList.vue +++ b/front/components/Products/ProductsList.vue @@ -1,6 +1,6 @@ @@ -23,15 +23,15 @@ key: 'kcal' }, { - title: 'Węglowodany', + title: 'Węglowodany (g)', key: 'carbohydrates' }, { - title: 'Białko', + title: 'Białk (g)', key: 'protein' }, { - title: 'Tłuszcz', + title: 'Tłuszcz (g)', key: 'fat' } ], diff --git a/front/components/Recipes/AddRecipeModal.vue b/front/components/Recipes/AddRecipeModal.vue new file mode 100644 index 0000000..3ed009d --- /dev/null +++ b/front/components/Recipes/AddRecipeModal.vue @@ -0,0 +1,224 @@ + + + + + diff --git a/front/pages/index.vue b/front/pages/index.vue index bfe11a0..f5d4eae 100644 --- a/front/pages/index.vue +++ b/front/pages/index.vue @@ -2,12 +2,14 @@ - - -
-

Przepisy

-
-
+ + + +
+

Przepisy

+
+
+
diff --git a/front/pages/recipes.vue b/front/pages/recipes.vue new file mode 100644 index 0000000..add763f --- /dev/null +++ b/front/pages/recipes.vue @@ -0,0 +1,21 @@ + + + + +