From ebf38add4a132ce666c7a38261a356c0123dec10 Mon Sep 17 00:00:00 2001
From: Florian Dupret <34862846+sephrat@users.noreply.github.com>
Date: Tue, 27 Apr 2021 20:05:32 +0200
Subject: [PATCH] Provide feedback to user when no meal is planned

---
 docs/docs/changelog/v0.5.0.md            |  6 +++++-
 frontend/src/pages/MealPlan/ThisWeek.vue |  4 ++++
 frontend/src/routes/meal.js              | 16 ++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/docs/docs/changelog/v0.5.0.md b/docs/docs/changelog/v0.5.0.md
index 930b272ec..f9060d554 100644
--- a/docs/docs/changelog/v0.5.0.md
+++ b/docs/docs/changelog/v0.5.0.md
@@ -17,6 +17,8 @@
 - Fixes #281 - Slow Handling of Large Sets of Recipes
 
 ## Features and Improvements
+- 'Dinner this week' shows a warning when no meal is planned yet
+- 'Dinner today' shows a warning when no meal is planned yet
 
 ### General
 - More localization
@@ -32,4 +34,6 @@
 
 ### Behind the Scenes
 - Unified Sidebar Components
-- Refactor UI components to fit Vue best practices (WIP)
\ No newline at end of file
+- Refactor UI components to fit Vue best practices (WIP)
+- The API returns more consistent status codes
+- The API returns error code instead of error text when appropriate
\ No newline at end of file
diff --git a/frontend/src/pages/MealPlan/ThisWeek.vue b/frontend/src/pages/MealPlan/ThisWeek.vue
index 9043d549c..ab7e9b543 100644
--- a/frontend/src/pages/MealPlan/ThisWeek.vue
+++ b/frontend/src/pages/MealPlan/ThisWeek.vue
@@ -52,6 +52,7 @@
 
 <script>
 import { api } from "@/api";
+import utils from "@/utils";
 export default {
   data() {
     return {
@@ -60,6 +61,9 @@ export default {
   },
   async mounted() {
     this.mealPlan = await api.mealPlans.thisWeek();
+    if(!this.mealPlan) {
+      utils.notify.warning(this.$t('meal-plan.no-meal-plan-defined-yet'))
+    }
   },
   methods: {
     getOrder(index) {
diff --git a/frontend/src/routes/meal.js b/frontend/src/routes/meal.js
index 83d8ffc50..de226e007 100644
--- a/frontend/src/routes/meal.js
+++ b/frontend/src/routes/meal.js
@@ -2,6 +2,9 @@ import Planner from "@/pages/MealPlan/Planner";
 import ThisWeek from "@/pages/MealPlan/ThisWeek";
 import { api } from "@/api";
 
+import i18n from '@/i18n.js';
+import utils from "@/utils";
+
 export const mealRoutes = [
   {
     path: "/meal-plan/planner",
@@ -21,7 +24,12 @@ export const mealRoutes = [
     path: "/meal-plan/today",
     beforeEnter: async (_to, _from, next) => {
       await todaysMealRoute().then(redirect => {
-        next(redirect);
+        if(redirect) {
+          next(redirect);
+        } else {
+          utils.notify.error(i18n.t('meal-plan.no-meal-planned-for-today'));
+          next(_from);
+        }
       });
     },
   },
@@ -29,5 +37,9 @@ export const mealRoutes = [
 
 async function todaysMealRoute() {
   const response = await api.mealPlans.today();
-  return "/recipe/" + response.data;
+  if (response.status == 200 && response.data) {
+    return "/recipe/" + response.data;
+  } else {
+    return null;
+  }
 }