diff --git a/Dockerfile b/Dockerfile index 5aac61cd4e79..8019c89dcf90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -131,7 +131,7 @@ ENV APP_PORT=9000 EXPOSE ${APP_PORT} -HEALTHCHECK CMD curl -f http://localhost:${APP_PORT} || exit 1 +HEALTHCHECK CMD curl -f http://localhost:${APP_PORT}/docs || exit 1 RUN chmod +x $MEALIE_HOME/mealie/run.sh ENTRYPOINT $MEALIE_HOME/mealie/run.sh diff --git a/frontend/composables/use-utils.ts b/frontend/composables/use-utils.ts index f45e1874b2a4..014024a8e47b 100644 --- a/frontend/composables/use-utils.ts +++ b/frontend/composables/use-utils.ts @@ -4,6 +4,13 @@ export const useAsyncKey = function () { return String(Date.now()); }; +export const titleCase = function (str: string) { + return str + .split(" ") + .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) + .join(" "); +}; + export function detectServerBaseUrl(req?: IncomingMessage | null) { if (!req || req === undefined) { return ""; diff --git a/frontend/pages/group/mealplan/settings.vue b/frontend/pages/group/mealplan/settings.vue index 1e7c8260cfae..9b6a326869ec 100644 --- a/frontend/pages/group/mealplan/settings.vue +++ b/frontend/pages/group/mealplan/settings.vue @@ -5,7 +5,7 @@ - Here you can set rules for auto selecting recipes for you meal plans. These rules are used by the server to + You can create rules for auto selecting recipes for you meal plans. These rules are used by the server to determine the random pool of recipes to select from when creating meal plans. Note that if rules have the same day/type constraints then the categories of the rules will be merged. In practice, it's unnecessary to create duplicate rules, but it's possible to do so. @@ -36,9 +36,10 @@
- - - {{ rule.day }} - {{ rule.entryType }} + + + {{ rule.day === "unset" ? "Applies to all days" : `Applies on ${rule.day}s` }} + {{ rule.entryType === "unset" ? "for all meal types" : ` for ${rule.entryType} meal types` }} -
Categories: {{ rule.categories.map((c) => c.name).join(", ") }}
-
Tags: {{ rule.tags.map((t) => t.name).join(", ") }}
+
+

{{ $t("category.categories") }}:

+ +
+ +
+

{{ $t("tag.tags") }}:

+ +