diff --git a/frontend/src/app/components/daily-meals/daily-meals.component.html b/frontend/src/app/components/daily-meals/daily-meals.component.html index 93e1332d..9ab0ca44 100644 --- a/frontend/src/app/components/daily-meals/daily-meals.component.html +++ b/frontend/src/app/components/daily-meals/daily-meals.component.html @@ -1,7 +1,11 @@
- {{ dayData.mealDate }} + + + {{ dayData?.mealDate }} + +
@@ -12,11 +16,11 @@
Breakfast - {{ dayData.breakfast.name }} + {{ dayData?.breakfast?.name }} - {{ dayData.breakfast.description }} + {{ dayData?.breakfast?.description }} @@ -33,7 +37,7 @@ - {{ dayData.breakfast.name }} + {{ dayData?.breakfast?.name }} Close @@ -46,9 +50,9 @@ /> -

{{ dayData.breakfast.ingredients }}

-

{{ dayData.breakfast.instructions }}

-

{{ dayData.breakfast.cookingTime }}

+

{{ dayData?.breakfast?.ingredients }}

+

{{ dayData?.breakfast?.instructions }}

+

{{ dayData?.breakfast?.cookingTime }}

@@ -71,11 +75,11 @@
Lunch - {{ dayData.lunch.name }} + {{ dayData?.lunch?.name }} - {{ dayData.lunch.description }} + {{ dayData?.lunch?.description }} @@ -94,7 +98,7 @@ - {{ dayData.lunch.name }} + {{ dayData?.lunch?.name }} Close @@ -107,9 +111,9 @@ /> -

{{ dayData.lunch.ingredients }}

-

{{ dayData.lunch.instructions }}

-

{{ dayData.lunch.cookingTime }}

+

{{ dayData?.lunch?.ingredients }}

+

{{ dayData?.lunch?.instructions }}

+

{{ dayData?.lunch?.cookingTime }}

@@ -131,11 +135,11 @@
Dinner - {{ dayData.dinner.name }} + {{ dayData?.dinner?.name }} - {{ dayData.dinner.description }} + {{ dayData?.dinner?.description }} @@ -154,7 +158,7 @@ - {{ dayData.dinner.name }} + {{ dayData?.dinner?.name }} Close @@ -167,9 +171,9 @@ /> -

{{ dayData.dinner.ingredients }}

-

{{ dayData.dinner.instructions }}

-

{{ dayData.dinner.cookingTime }}

+

{{ dayData?.dinner?.ingredients }}

+

{{ dayData?.dinner?.instructions }}

+

{{ dayData?.dinner?.cookingTime }}

diff --git a/frontend/src/app/components/daily-meals/daily-meals.component.ts b/frontend/src/app/components/daily-meals/daily-meals.component.ts index 54378c58..f5ac5913 100644 --- a/frontend/src/app/components/daily-meals/daily-meals.component.ts +++ b/frontend/src/app/components/daily-meals/daily-meals.component.ts @@ -19,7 +19,7 @@ export class DailyMealsComponent implements OnInit { breakfast: string = "breakfast"; lunch: string = "lunch"; dinner: string = "dinner"; - + mealDate: string | undefined; @Input() todayData!: MealI[]; @Input() dayData!: DaysMealsI; item: DaysMealsI | undefined; diff --git a/frontend/src/app/models/daysMeals.model.ts b/frontend/src/app/models/daysMeals.model.ts index 42ae616f..855b02bc 100644 --- a/frontend/src/app/models/daysMeals.model.ts +++ b/frontend/src/app/models/daysMeals.model.ts @@ -1,8 +1,8 @@ import { MealI } from "./meal.model"; export interface DaysMealsI { - breakfast:MealI; - lunch:MealI; - dinner:MealI; - mealDate:string | "Monday"; + breakfast:MealI | undefined; + lunch:MealI | undefined ; + dinner:MealI | undefined; + mealDate:string | undefined; } \ No newline at end of file diff --git a/frontend/src/app/pages/home/home.page.ts b/frontend/src/app/pages/home/home.page.ts index e029d493..0139b1fb 100644 --- a/frontend/src/app/pages/home/home.page.ts +++ b/frontend/src/app/pages/home/home.page.ts @@ -25,7 +25,7 @@ export class HomePage implements OnInit{ if (Array.isArray(data)) { const mealsWithDate = data.map((item) => ({ ...item, - date: this.getDayOfWeek(index), + mealDate: this.getDayOfWeek(index), })); this.daysMeals.push(...mealsWithDate); } else { diff --git a/frontend/src/app/services/meal-generation/meal-generation.service.ts b/frontend/src/app/services/meal-generation/meal-generation.service.ts index 436f52bd..6b663f53 100644 --- a/frontend/src/app/services/meal-generation/meal-generation.service.ts +++ b/frontend/src/app/services/meal-generation/meal-generation.service.ts @@ -55,7 +55,7 @@ export class MealGenerationService { "breakfast": daysMeal.breakfast, "lunch": daysMeal.lunch, "dinner": daysMeal.dinner, - "mealDate": daysMeal.mealDate.toUpperCase(), + "mealDate": daysMeal?.mealDate?.toUpperCase(), "meal": meal }); }