diff --git a/frontend/.nuxtignore b/frontend/.nuxtignore new file mode 100644 index 000000000000..06c1ea25514a --- /dev/null +++ b/frontend/.nuxtignore @@ -0,0 +1 @@ +pages/**/*.ts diff --git a/frontend/composables/use-group-mealplan.ts b/frontend/composables/use-group-mealplan.ts index fbe4d605f101..b3358dcd531d 100644 --- a/frontend/composables/use-group-mealplan.ts +++ b/frontend/composables/use-group-mealplan.ts @@ -34,7 +34,6 @@ export const useMealplans = function (range: Ref) { start_date: format(range.value.start, "yyyy-MM-dd"), end_date: format(range.value.end, "yyyy-MM-dd"), }; - // @ts-ignore TODO Modify typing to allow for string start+limit for mealplans const { data } = await api.mealplans.getAll(1, -1, { start_date: query.start_date, end_date: query.end_date }); if (data) { @@ -53,7 +52,6 @@ export const useMealplans = function (range: Ref) { start_date: format(range.value.start, "yyyy-MM-dd"), end_date: format(range.value.end, "yyyy-MM-dd"), }; - // @ts-ignore TODO Modify typing to allow for string start+limit for mealplans const { data } = await api.mealplans.getAll(1, -1, { start_date: query.start_date, end_date: query.end_date }); if (data && data.items) { diff --git a/frontend/pages/group/mealplan/planner.vue b/frontend/pages/group/mealplan/planner.vue index 5f56cc475065..59bd3200a455 100644 --- a/frontend/pages/group/mealplan/planner.vue +++ b/frontend/pages/group/mealplan/planner.vue @@ -1,369 +1,97 @@ diff --git a/frontend/pages/group/mealplan/planner/types.ts b/frontend/pages/group/mealplan/planner/types.ts new file mode 100644 index 000000000000..61358f1150cc --- /dev/null +++ b/frontend/pages/group/mealplan/planner/types.ts @@ -0,0 +1,6 @@ +import { ReadPlanEntry } from "~/lib/api/types/meal-plan"; + +export type MealsByDate = { + date: Date; + meals: ReadPlanEntry[] +} diff --git a/frontend/pages/group/mealplan/planner/view.vue b/frontend/pages/group/mealplan/planner/view.vue new file mode 100644 index 000000000000..c34d9519ef6d --- /dev/null +++ b/frontend/pages/group/mealplan/planner/view.vue @@ -0,0 +1,106 @@ + + + diff --git a/frontend/pages/group/mealplan/this-week.vue b/frontend/pages/group/mealplan/this-week.vue deleted file mode 100644 index 6103e48a864f..000000000000 --- a/frontend/pages/group/mealplan/this-week.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - - \ No newline at end of file