-
-
+
+
+
@@ -15,20 +26,19 @@
{{ $t('meal-plan.this-rule-will-apply', {
- dayCriteria: inputDay === "unset" ? $t('meal-plan.to-all-days') : $t('meal-plan.on-days', [inputDay]),
- mealTypeCriteria: inputEntryType === "unset" ? $t('meal-plan.for-all-meal-types') : $t('meal-plan.for-type-meal-types', [inputEntryType])
- }) }}
+ dayCriteria: inputDay === "unset" ? $t('meal-plan.to-all-days') : $t('meal-plan.on-days', [inputDay]),
+ mealTypeCriteria: inputEntryType === "unset" ? $t('meal-plan.for-all-meal-types') : $t('meal-plan.for-type-meal-types', [inputEntryType]),
+ }) }}
diff --git a/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue b/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue
index e5c889938..ea1df3670 100644
--- a/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue
+++ b/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue
@@ -1,157 +1,144 @@
-
-
-
-
-
-
- {{ $t("household.private-household-description") }}
-
-
-
-
-
-
-
-
- {{ $t("household.lock-recipe-edits-from-other-households-description") }}
-
-
-
-
+
+
+
+
+
+
+ {{ $t("household.private-household-description") }}
+
+
+
+
+
+
+
+
+ {{ $t("household.lock-recipe-edits-from-other-households-description") }}
+
+
+
+
-
-
-
-
-
- {{ p.description }}
-
-
-
-
+
+
+
+
+
+ {{ p.description }}
+
+
+
+
diff --git a/frontend/components/Domain/QueryFilterBuilder.vue b/frontend/components/Domain/QueryFilterBuilder.vue
index b87fb2461..85a1672ba 100644
--- a/frontend/components/Domain/QueryFilterBuilder.vue
+++ b/frontend/components/Domain/QueryFilterBuilder.vue
@@ -2,10 +2,10 @@
-
+
{{ $globals.icons.arrowUpDown }}
+
-
-
- {{ item.label }}
+
+
+ {{ item.raw.label }}
+
-
-
- {{ item }}
+
+
+ {{ item.raw }}
+
-
-
- {{ item.label }}
+
+
+ {{ item.raw.label }}
+
-
-
- {{ item.label }}
+
+
+ {{ item.raw.label }}
+
-
+
+
-
-
- {{ item }}
+
+
+ {{ item.raw }}
+
-
+
-
+
+
-
-
+
+
diff --git a/frontend/components/Domain/Recipe/RecipeActionMenu.vue b/frontend/components/Domain/Recipe/RecipeActionMenu.vue
index 6de10c9ee..22a633e8a 100644
--- a/frontend/components/Domain/Recipe/RecipeActionMenu.vue
+++ b/frontend/components/Domain/Recipe/RecipeActionMenu.vue
@@ -1,33 +1,37 @@
-
+
{{ $t("recipe.delete-confirmation") }}
-
+
-
-
+
+
-
-
- {{ $globals.icons.edit }}
+
+
+
+ {{ $globals.icons.edit }}
+
{{ $t("general.edit") }}
@@ -37,14 +41,14 @@
- {{ btn.icon }}
- {{ $vuetify.breakpoint.xs ? "" : btn.text }}
+
+ {{ btn.icon }}
+
+ {{ $vuetify.display.xs ? "" : btn.text }}
-
diff --git a/frontend/components/Domain/Recipe/RecipeCardSection.vue b/frontend/components/Domain/Recipe/RecipeCardSection.vue
index 64fb9c0b3..10a29ec4f 100644
--- a/frontend/components/Domain/Recipe/RecipeCardSection.vue
+++ b/frontend/components/Domain/Recipe/RecipeCardSection.vue
@@ -1,67 +1,102 @@
-
+
-
+
{{ displayTitleIcon }}
- {{ title }}
+
+ {{ title }}
+
-
-
-
+
+
+
{{ $globals.icons.diceMultiple }}
- {{ $vuetify.breakpoint.xsOnly ? null : $t("general.random") }}
+ {{ $vuetify.display.xs ? null : $t("general.random") }}
-
-
-
-
-
+
+
+
+
{{ preferences.sortIcon }}
- {{ $vuetify.breakpoint.xsOnly ? null : $t("general.sort") }}
+ {{ $vuetify.display.xs ? null : $t("general.sort") }}
-
- {{ $globals.icons.orderAlphabeticalAscending }}
-
- {{ $t("general.sort-alphabetically") }}
+
+
+ {{ $globals.icons.orderAlphabeticalAscending }}
+
+ {{ $t("general.sort-alphabetically") }}
+
-
- {{ $globals.icons.star }}
-
- {{ $t("general.rating") }}
+
+
+ {{ $globals.icons.star }}
+
+ {{ $t("general.rating") }}
+
-
- {{ $globals.icons.newBox }}
-
- {{ $t("general.created") }}
+
+
+ {{ $globals.icons.newBox }}
+
+ {{ $t("general.created") }}
+
-
- {{ $globals.icons.update }}
-
- {{ $t("general.updated") }}
+
+
+ {{ $globals.icons.update }}
+
+ {{ $t("general.updated") }}
+
-
- {{ $globals.icons.chefHat }}
-
- {{ $t("general.last-made") }}
+
+
+ {{ $globals.icons.chefHat }}
+
+ {{ $t("general.last-made") }}
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
-
+
-
+
diff --git a/frontend/components/Domain/Recipe/RecipeDataTable.vue b/frontend/components/Domain/Recipe/RecipeDataTable.vue
index 620cdffd0..ac4c28715 100644
--- a/frontend/components/Domain/Recipe/RecipeDataTable.vue
+++ b/frontend/components/Domain/Recipe/RecipeDataTable.vue
@@ -3,60 +3,73 @@
v-model="selected"
item-key="id"
show-select
- sort-by="dateAdded"
- sort-desc
+ :sort-by="[{ key: 'dateAdded', order: 'desc' }]"
:headers="headers"
:items="recipes"
:items-per-page="15"
class="elevation-0"
:loading="loading"
- @input="setValue(selected)"
>
-
-
- |
- Hello |
- |
-
+
+ {{ item.name }}
-
- {{ item.name }}
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+ {{ getMember(item.userId!) }}
+
+
+
-
-
-
- {{ $t('shopping-list.no-shopping-lists-found') }}
-
-
+
+
+
+
+ {{ $t('shopping-list.no-shopping-lists-found') }}
+
+
+
{{ $t("general.cancel") }}
-
-
+
+
@@ -38,32 +54,52 @@
:title="selectedShoppingList ? selectedShoppingList.name : $t('recipe.add-to-list')"
:icon="$globals.icons.cartCheck"
width="70%"
- :submit-text="$tc('recipe.add-to-list')"
+ :submit-text="$t('recipe.add-to-list')"
+ can-submit
@submit="addRecipesToList()"
>
-
+
-
-
+
+
{{ recipeSection.recipeName }}
-
+
-
- ({{ $tc("recipe.quantity") }}: {{ recipeSection.recipeScale }})
+
+ ({{ $t("recipe.quantity") }}: {{ recipeSection.recipeScale }})
@@ -73,36 +109,41 @@
v-for="(ingredientSection, ingredientSectionIndex) in recipeSection.ingredientSections"
:key="recipeSection.recipeId + recipeSectionIndex + ingredientSectionIndex"
>
-
+
{{ ingredientSection.sectionName }}
-
+
-
+ :scale="recipeSection.recipeScale"
+ />
+
@@ -114,12 +155,12 @@
:buttons="[
{
icon: $globals.icons.checkboxBlankOutline,
- text: $tc('shopping-list.uncheck-all-items'),
+ text: $t('shopping-list.uncheck-all-items'),
event: 'uncheck',
},
{
icon: $globals.icons.checkboxOutline,
- text: $tc('shopping-list.check-all-items'),
+ text: $t('shopping-list.check-all-items'),
event: 'check',
},
]"
@@ -132,14 +173,13 @@
diff --git a/frontend/components/Domain/Recipe/RecipeIngredients.vue b/frontend/components/Domain/Recipe/RecipeIngredients.vue
index 63f793b32..d8025be6f 100644
--- a/frontend/components/Domain/Recipe/RecipeIngredients.vue
+++ b/frontend/components/Domain/Recipe/RecipeIngredients.vue
@@ -1,20 +1,51 @@
-
-
{{ $t("recipe.ingredients") }}
-
+
+
+ {{ $t("recipe.ingredients") }}
+
+
-
+
- {{ ingredient.title }}
-
+
+ {{ ingredient.title }}
+
+
-
-
-
-
-
+
+
+
+
+
+
+
@@ -22,12 +53,11 @@
-
+function addNote() {
+ model.value = [...model.value, { title: "", text: "" }];
+}
+
+function removeByIndex(index: number) {
+ const newNotes = [...model.value];
+ newNotes.splice(index, 1);
+ model.value = newNotes;
+}
+
diff --git a/frontend/components/Domain/Recipe/RecipeNutrition.vue b/frontend/components/Domain/Recipe/RecipeNutrition.vue
index aefc6cde7..f9d1bbd3d 100644
--- a/frontend/components/Domain/Recipe/RecipeNutrition.vue
+++ b/frontend/components/Domain/Recipe/RecipeNutrition.vue
@@ -4,23 +4,42 @@
{{ $t("recipe.nutrition") }}
-
+
-
+
+ density="compact"
+ :model-value="modelValue[key]"
+ :label="labels[key].label"
+ :suffix="labels[key].suffix"
+ type="number"
+ autocomplete="off"
+ @update:model-value="updateValue(key, $event)"
+ />
-
-
-
+
+
+
{{ item.label }}
- {{ item.value }}
+
+ {{ item.value }}
+
{{ item.suffix }}
-
+
@@ -28,13 +47,13 @@ dense :value="value[key]" :label="labels[key].label" :suffix="labels[key].suffix
diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
index 26dd1a84d..7d62ebd53 100644
--- a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
+++ b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
@@ -1,62 +1,61 @@
-
+
- {{ data.item.name || data.item }}
+ {{ item.value }}
-
-
-
- {{ $globals.icons.create }}
-
-
-
+
+
+
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
index 53d262ea6..c5f456bce 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
@@ -1,7 +1,10 @@
-
+
{{ $t("recipe.categories") }}
@@ -14,12 +17,19 @@
:show-add="true"
selector-type="categories"
/>
-
+
-
+
{{ $t("tag.tags") }}
@@ -32,20 +42,39 @@
:show-add="true"
selector-type="tags"
/>
-
+
-
- {{ $t('tool.required-tools') }}
+
+
+ {{ $t('tool.required-tools') }}
+
-
+
-
+
-
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue
index c37b04b2e..361f1e7d3 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue
@@ -1,28 +1,21 @@
-
-
-
-
- {{ $t("recipe.edit-scale") }}
-
+
diff --git a/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue b/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue
index a0e0e8cb8..8bfd49852 100644
--- a/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue
+++ b/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue
@@ -1,51 +1,39 @@
+ />
-
diff --git a/frontend/components/Domain/Recipe/RecipeSuggestion.vue b/frontend/components/Domain/Recipe/RecipeSuggestion.vue
index b6b100877..abf4f6b82 100644
--- a/frontend/components/Domain/Recipe/RecipeSuggestion.vue
+++ b/frontend/components/Domain/Recipe/RecipeSuggestion.vue
@@ -12,23 +12,23 @@
/>
-
+
-
{{ organizer.icon }}
-
- {{ $tc("recipe-finder.missing") }}:
+
+ {{ organizer.icon }}
+
+
+ {{ $t("recipe-finder.missing") }}:
-
+
{{ organizer.getLabel(item.item) }}
@@ -42,9 +42,8 @@
diff --git a/frontend/components/Domain/Recipe/RecipeTimeCard.vue b/frontend/components/Domain/Recipe/RecipeTimeCard.vue
index 4aa555ce5..04191fe6f 100644
--- a/frontend/components/Domain/Recipe/RecipeTimeCard.vue
+++ b/frontend/components/Domain/Recipe/RecipeTimeCard.vue
@@ -1,34 +1,77 @@
-
-
-
- {{ $globals.icons.clockOutline }}
-
- {{ validateTotalTime.name }}
{{ validateTotalTime.value }}
-
-
-
-
-
+
-
-
+
+ {{ $globals.icons.clockOutline }}
+
+
+ {{ validateTotalTime.name }}
{{ validateTotalTime.value }}
+
+
+
+
+
+
{{ $globals.icons.knfife }}
-
{{ validatePrepTime.name }}
{{ validatePrepTime.value }}
+
+ {{ validatePrepTime.name }}
{{ validatePrepTime.value }}
+
-
+
+
+
{{ $globals.icons.potSteam }}
-
{{ validatePerformTime.name }}
{{ validatePerformTime.value }}
+
+ {{ validatePerformTime.name }}
{{ validatePerformTime.value }}
+
-
-
+ {{ event.subject }}
+
+
+
+
@@ -95,16 +91,15 @@
diff --git a/frontend/components/Domain/User/UserAvatar.vue b/frontend/components/Domain/User/UserAvatar.vue
index b932e0fe3..e287deaac 100644
--- a/frontend/components/Domain/User/UserAvatar.vue
+++ b/frontend/components/Domain/User/UserAvatar.vue
@@ -4,12 +4,29 @@
:disabled="!user || !tooltip"
right
>
-
-
-
-
-
-
+
+
+
+
+
+
@@ -19,11 +36,9 @@
-
-
diff --git a/frontend/components/Domain/User/UserProfileLinkCard.vue b/frontend/components/Domain/User/UserProfileLinkCard.vue
index 5946e1454..f19df7c01 100644
--- a/frontend/components/Domain/User/UserProfileLinkCard.vue
+++ b/frontend/components/Domain/User/UserProfileLinkCard.vue
@@ -1,55 +1,75 @@
-
-
-
+
+
+
-
-
+
+
-
+
{{ link.text }}
-
diff --git a/frontend/components/Domain/User/UserRegistrationForm.vue b/frontend/components/Domain/User/UserRegistrationForm.vue
index 8b1b945f9..a216f8f9d 100644
--- a/frontend/components/Domain/User/UserRegistrationForm.vue
+++ b/frontend/components/Domain/User/UserRegistrationForm.vue
@@ -1,17 +1,25 @@
- {{ $globals.icons.user }}
+
+ {{ $globals.icons.user }}
+
{{ $t("user-registration.account-details") }}
-
+
@@ -28,7 +36,7 @@
v-model="accountDetails.email.value"
v-bind="inputAttrs"
:prepend-icon="$globals.icons.email"
- :label="$tc('user.email')"
+ :label="$t('user.email')"
:rules="[validators.required, validators.email]"
:error-messages="emailErrorMessages"
@blur="validateEmail"
@@ -37,32 +45,32 @@
v-model="credentials.password1.value"
v-bind="inputAttrs"
:type="pwFields.inputType.value"
- :append-icon="pwFields.passwordIcon.value"
+ :append-inner-icon="pwFields.passwordIcon.value"
:prepend-icon="$globals.icons.lock"
- :label="$tc('user.password')"
+ :label="$t('user.password')"
:rules="[validators.required, validators.minLength(8), validators.maxLength(258)]"
- @click:append="pwFields.togglePasswordShow"
+ @click:append-inner="pwFields.togglePasswordShow"
/>
-
+
- {{ $tc("user.enable-advanced-content-description") }}
+ {{ $t("user.enable-advanced-content-description") }}
@@ -71,7 +79,6 @@
+
+
diff --git a/frontend/components/Layout/LayoutParts/AppSidebar.vue b/frontend/components/Layout/LayoutParts/AppSidebar.vue
index ab3e3fb83..49b028f88 100644
--- a/frontend/components/Layout/LayoutParts/AppSidebar.vue
+++ b/frontend/components/Layout/LayoutParts/AppSidebar.vue
@@ -1,66 +1,52 @@
-
+
-
-
+
+
+
-
- {{ $auth.user.fullName }}
-
-
-
- {{ $globals.icons.heart }}
-
- {{ $t("user.favorite-recipes") }}
-
-
-
+
+
+ {{ sessionUser.fullName }}
+
+
+
+
+ {{ $globals.icons.heart }}
+
+ {{ $t("user.favorite-recipes") }}
+
+
+
+
-
-
- {{ nav.title }}
+
+
+
-
-
- {{ child.icon }}
-
- {{ child.title }}
-
+
-
-
-
- {{ nav.icon }}
-
- {{ nav.title }}
-
-
+
+
+
@@ -68,39 +54,28 @@
-
-
+
+
-
-
- {{ nav.title }}
+
+
+
-
-
- {{ child.icon }}
-
- {{ child.title }}
-
+
-
-
-
- {{ nav.icon }}
-
- {{ nav.title }}
-
-
+
+
+ {{ nav.icon }}
+
+ {{ nav.title }}
+
@@ -108,46 +83,39 @@
-
-
-
-
-
-
- {{ nav.icon }}
-
- {{ nav.title }}
-
-
-
-
-
+
+
+
+
+
+ {{ nav.icon }}
+
+ {{ nav.title }}
+
+
+
+
-
diff --git a/frontend/components/global/BannerExperimental.vue b/frontend/components/global/BannerExperimental.vue
index 35254833f..3b6a71bfe 100644
--- a/frontend/components/global/BannerExperimental.vue
+++ b/frontend/components/global/BannerExperimental.vue
@@ -1,10 +1,16 @@
-
- {{ $t("banner-experimental.issue-link-text") }}
+
+ {{ $t("banner-experimental.issue-link-text") }}
diff --git a/frontend/components/global/BannerWarning.vue b/frontend/components/global/BannerWarning.vue
index 9ffb40880..bf2289bbc 100644
--- a/frontend/components/global/BannerWarning.vue
+++ b/frontend/components/global/BannerWarning.vue
@@ -1,9 +1,21 @@
-
+
{{ title }}
- {{ description }}
-
-
+
+ {{ description }}
+
+
+
diff --git a/frontend/components/global/BaseButton.vue b/frontend/components/global/BaseButton.vue
index 7eebc912c..70630d23f 100644
--- a/frontend/components/global/BaseButton.vue
+++ b/frontend/components/global/BaseButton.vue
@@ -1,18 +1,19 @@
-
+
{{ icon || btnAttrs.icon }}
@@ -20,7 +21,10 @@
{{ text || btnAttrs.text }}
-
+
{{ icon || btnAttrs.icon }}
@@ -29,10 +33,9 @@
diff --git a/frontend/components/global/BaseCardSectionTitle.vue b/frontend/components/global/BaseCardSectionTitle.vue
index 71fe97ad6..031634819 100644
--- a/frontend/components/global/BaseCardSectionTitle.vue
+++ b/frontend/components/global/BaseCardSectionTitle.vue
@@ -7,25 +7,29 @@
'mt-8': section,
}"
>
-
-
+
+
{{ icon }}
{{ title }}
-
+
-
+
diff --git a/frontend/components/global/BaseStatCard.vue b/frontend/components/global/BaseStatCard.vue
index 7e3877e05..582cbb3f9 100644
--- a/frontend/components/global/BaseStatCard.vue
+++ b/frontend/components/global/BaseStatCard.vue
@@ -1,5 +1,9 @@
-
+
- {{ icon }}
-
+
+ {{ icon }}
+
+
-
@@ -31,7 +47,10 @@
-
+
@@ -41,9 +60,7 @@
diff --git a/frontend/components/global/ButtonLink.vue b/frontend/components/global/ButtonLink.vue
index 7580a4dda..98b6b053b 100644
--- a/frontend/components/global/ButtonLink.vue
+++ b/frontend/components/global/ButtonLink.vue
@@ -1,7 +1,14 @@
-
-
+
+
{{ icon }}
{{ text }}
@@ -10,9 +17,7 @@
diff --git a/frontend/components/global/InputColor.vue b/frontend/components/global/InputColor.vue
index 8114c69ea..b9356c3b9 100644
--- a/frontend/components/global/InputColor.vue
+++ b/frontend/components/global/InputColor.vue
@@ -1,22 +1,44 @@
-
+
-
+
{{ $globals.icons.refreshCircle }}
-
-
-
+
+
+
{{ $globals.icons.formatColorFill }}
-
+
@@ -25,24 +47,23 @@
-
-
diff --git a/frontend/components/global/MarkdownEditor.vue b/frontend/components/global/MarkdownEditor.vue
index 0816393d0..e5cb3338e 100644
--- a/frontend/components/global/MarkdownEditor.vue
+++ b/frontend/components/global/MarkdownEditor.vue
@@ -1,11 +1,14 @@
-
+
+
-
diff --git a/frontend/components/global/ReportTable.vue b/frontend/components/global/ReportTable.vue
index aede7b1c4..a57dd0050 100644
--- a/frontend/components/global/ReportTable.vue
+++ b/frontend/components/global/ReportTable.vue
@@ -5,19 +5,22 @@
item-key="id"
class="elevation-0"
:items-per-page="50"
- @click:row="handleRowClick"
+ @click:row="($event, { item }) => handleRowClick(item)"
>
-
+
{{ capitalize(item.category) }}
-
- {{ $d(Date.parse(item.timestamp), "long") }}
+
+ {{ $d(Date.parse(item.timestamp!), "long") }}
-
- {{ capitalize(item.status) }}
+
+ {{ capitalize(item.status!) }}
-
-
+
+
{{ $globals.icons.delete }}
@@ -25,27 +28,27 @@
diff --git a/frontend/components/global/StatsCards.vue b/frontend/components/global/StatsCards.vue
index ca3d8589c..d4bff12eb 100644
--- a/frontend/components/global/StatsCards.vue
+++ b/frontend/components/global/StatsCards.vue
@@ -1,17 +1,29 @@
-
+
-
-
+
+
{{ activeIcon }}
-
+
-
+
+
+
-
diff --git a/frontend/layouts/basic.vue b/frontend/layouts/basic.vue
index c5fe64bf7..2eb9958a9 100644
--- a/frontend/layouts/basic.vue
+++ b/frontend/layouts/basic.vue
@@ -1,22 +1,24 @@
+
-
+
-
+
+
+
-
diff --git a/frontend/layouts/blank.vue b/frontend/layouts/blank.vue
index d3f7c88a0..83d44e823 100644
--- a/frontend/layouts/blank.vue
+++ b/frontend/layouts/blank.vue
@@ -1,8 +1,12 @@
+
-
+
{{ $t("demo.info_message_with_version", { version: version }) }}
@@ -10,24 +14,26 @@
-
+
+
+
diff --git a/frontend/layouts/error.vue b/frontend/layouts/error.vue
index 3f32383d8..55c8a224e 100644
--- a/frontend/layouts/error.vue
+++ b/frontend/layouts/error.vue
@@ -1,37 +1,52 @@
-
+
- {{ $t("page.404-page-not-found") }}
+
+ {{ $t("page.404-page-not-found") }}
+
-
4
-
+
+ 4
+
+
{{ $globals.icons.primary }}
- 4
+
+ 4
+
-
+
-
- {{ button.icon }}
+
+
+ {{ button.icon }}
+
{{ button.text }}
-
+
@@ -119,6 +140,7 @@ export default defineComponent({
h1 {
font-size: 20px;
}
+
p {
padding-bottom: 0 !important;
margin-bottom: 0 !important;
diff --git a/frontend/lib/api/admin/admin-about.ts b/frontend/lib/api/admin/admin-about.ts
index 83eb02a88..f15f71a53 100644
--- a/frontend/lib/api/admin/admin-about.ts
+++ b/frontend/lib/api/admin/admin-about.ts
@@ -1,5 +1,5 @@
import { BaseAPI } from "../base/base-clients";
-import { AdminAboutInfo, CheckAppConfig } from "~/lib/api/types/admin";
+import type { AdminAboutInfo, CheckAppConfig } from "~/lib/api/types/admin";
const prefix = "/api";
diff --git a/frontend/lib/api/admin/admin-analytics.ts b/frontend/lib/api/admin/admin-analytics.ts
index 7a8901d4a..26e0bddf6 100644
--- a/frontend/lib/api/admin/admin-analytics.ts
+++ b/frontend/lib/api/admin/admin-analytics.ts
@@ -1,5 +1,5 @@
import { BaseAPI } from "../base/base-clients";
-import { MealieAnalytics } from "~/lib/api/types/analytics";
+import type { MealieAnalytics } from "~/lib/api/types/analytics";
const prefix = "/api";
diff --git a/frontend/lib/api/admin/admin-backups.ts b/frontend/lib/api/admin/admin-backups.ts
index 936b08a55..0b3a8a87d 100644
--- a/frontend/lib/api/admin/admin-backups.ts
+++ b/frontend/lib/api/admin/admin-backups.ts
@@ -1,6 +1,6 @@
import { BaseAPI } from "../base/base-clients";
-import { AllBackups } from "~/lib/api/types/admin";
-import { ErrorResponse, FileTokenResponse, SuccessResponse } from "~/lib/api/types/response";
+import type { AllBackups } from "~/lib/api/types/admin";
+import type { ErrorResponse, FileTokenResponse, SuccessResponse } from "~/lib/api/types/response";
const prefix = "/api";
diff --git a/frontend/lib/api/admin/admin-debug.ts b/frontend/lib/api/admin/admin-debug.ts
index bfbc4cbc4..af6babfab 100644
--- a/frontend/lib/api/admin/admin-debug.ts
+++ b/frontend/lib/api/admin/admin-debug.ts
@@ -1,5 +1,5 @@
import { BaseAPI } from "../base/base-clients";
-import { DebugResponse } from "~/lib/api/types/admin";
+import type { DebugResponse } from "~/lib/api/types/admin";
const prefix = "/api";
diff --git a/frontend/lib/api/admin/admin-groups.ts b/frontend/lib/api/admin/admin-groups.ts
index fbe372faa..36a70cc19 100644
--- a/frontend/lib/api/admin/admin-groups.ts
+++ b/frontend/lib/api/admin/admin-groups.ts
@@ -1,6 +1,7 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { GroupBase, GroupInDB } from "~/lib/api/types/user";
-import { GroupAdminUpdate } from "~/lib/api/types/group";
+import type { GroupBase, GroupInDB } from "~/lib/api/types/user";
+import type { GroupAdminUpdate } from "~/lib/api/types/group";
+
const prefix = "/api";
const routes = {
diff --git a/frontend/lib/api/admin/admin-households.ts b/frontend/lib/api/admin/admin-households.ts
index 1e49723b7..85aa2bce8 100644
--- a/frontend/lib/api/admin/admin-households.ts
+++ b/frontend/lib/api/admin/admin-households.ts
@@ -1,5 +1,6 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { HouseholdCreate, HouseholdInDB, UpdateHouseholdAdmin } from "~/lib/api/types/household";
+import type { HouseholdCreate, HouseholdInDB, UpdateHouseholdAdmin } from "~/lib/api/types/household";
+
const prefix = "/api";
const routes = {
diff --git a/frontend/lib/api/admin/admin-maintenance.ts b/frontend/lib/api/admin/admin-maintenance.ts
index 51f4121be..eebc86d0b 100644
--- a/frontend/lib/api/admin/admin-maintenance.ts
+++ b/frontend/lib/api/admin/admin-maintenance.ts
@@ -1,6 +1,6 @@
import { BaseAPI } from "../base/base-clients";
-import { SuccessResponse } from "~/lib/api/types/response";
-import { MaintenanceLogs, MaintenanceStorageDetails, MaintenanceSummary } from "~/lib/api/types/admin";
+import type { SuccessResponse } from "~/lib/api/types/response";
+import type { MaintenanceLogs, MaintenanceStorageDetails, MaintenanceSummary } from "~/lib/api/types/admin";
const prefix = "/api";
diff --git a/frontend/lib/api/admin/admin-users.ts b/frontend/lib/api/admin/admin-users.ts
index 478d7c642..21af7e9e1 100644
--- a/frontend/lib/api/admin/admin-users.ts
+++ b/frontend/lib/api/admin/admin-users.ts
@@ -1,5 +1,5 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { ForgotPassword, PasswordResetToken, UnlockResults, UserIn, UserOut } from "~/lib/api/types/user";
+import type { ForgotPassword, PasswordResetToken, UnlockResults, UserIn, UserOut } from "~/lib/api/types/user";
const prefix = "/api";
diff --git a/frontend/lib/api/base/base-clients.ts b/frontend/lib/api/base/base-clients.ts
index d993216eb..636747e02 100644
--- a/frontend/lib/api/base/base-clients.ts
+++ b/frontend/lib/api/base/base-clients.ts
@@ -1,6 +1,6 @@
-import { Recipe } from "../types/recipe";
-import { ApiRequestInstance, PaginationData } from "~/lib/api/types/non-generated";
-import { QueryValue, route } from "~/lib/api/base/route";
+import type { Recipe } from "../types/recipe";
+import type { ApiRequestInstance, PaginationData } from "~/lib/api/types/non-generated";
+import { type QueryValue, route } from "~/lib/api/base/route";
export interface CrudAPIInterface {
requests: ApiRequestInstance;
@@ -23,8 +23,26 @@ export abstract class BaseAPI {
export abstract class BaseCRUDAPIReadOnly
extends BaseAPI
implements CrudAPIInterface {
- abstract baseRoute: (string);
- abstract itemRoute(itemId: string | number): string;
+ public baseRoute: string;
+ public itemRouteFn: (itemId: string | number) => string;
+
+ constructor(
+ requests: ApiRequestInstance,
+ baseRoute: string,
+ itemRoute: (itemId: string | number) => string,
+ ) {
+ super(requests);
+ this.baseRoute = baseRoute;
+ this.itemRouteFn = itemRoute;
+ }
+
+ get baseRouteValue() {
+ return this.baseRoute;
+ }
+
+ itemRoute(itemId: string | number): string {
+ return this.itemRouteFn(itemId);
+ }
async getAll(page = 1, perPage = -1, params = {} as Record) {
params = Object.fromEntries(Object.entries(params).filter(([_, v]) => v !== null && v !== undefined));
diff --git a/frontend/lib/api/base/route.ts b/frontend/lib/api/base/route.ts
index 302b6d697..1074efa06 100644
--- a/frontend/lib/api/base/route.ts
+++ b/frontend/lib/api/base/route.ts
@@ -27,7 +27,8 @@ export function route(rest: string, params: Record | null =
for (const item of value) {
url.searchParams.append(key, String(item));
}
- } else {
+ }
+ else {
url.searchParams.append(key, String(value));
}
}
diff --git a/frontend/lib/api/client-admin.ts b/frontend/lib/api/client-admin.ts
index 274630430..1352edba9 100644
--- a/frontend/lib/api/client-admin.ts
+++ b/frontend/lib/api/client-admin.ts
@@ -6,7 +6,7 @@ import { AdminBackupsApi } from "./admin/admin-backups";
import { AdminMaintenanceApi } from "./admin/admin-maintenance";
import { AdminAnalyticsApi } from "./admin/admin-analytics";
import { AdminDebugAPI } from "./admin/admin-debug";
-import { ApiRequestInstance } from "~/lib/api/types/non-generated";
+import type { ApiRequestInstance } from "~/lib/api/types/non-generated";
export class AdminAPI {
public about: AdminAboutAPI;
diff --git a/frontend/lib/api/client-public.ts b/frontend/lib/api/client-public.ts
index 7745c3c54..14046f5ed 100644
--- a/frontend/lib/api/client-public.ts
+++ b/frontend/lib/api/client-public.ts
@@ -1,7 +1,7 @@
import { ValidatorsApi } from "./public/validators";
import { ExploreApi } from "./public/explore";
import { SharedApi } from "./public/shared";
-import { ApiRequestInstance } from "~/lib/api/types/non-generated";
+import type { ApiRequestInstance } from "~/lib/api/types/non-generated";
export class PublicApi {
public validators: ValidatorsApi;
diff --git a/frontend/lib/api/client-user.ts b/frontend/lib/api/client-user.ts
index 444a17734..7d786f6f2 100644
--- a/frontend/lib/api/client-user.ts
+++ b/frontend/lib/api/client-user.ts
@@ -24,7 +24,7 @@ import { MultiPurposeLabelsApi } from "./user/group-multiple-purpose-labels";
import { GroupEventNotifierApi } from "./user/group-event-notifier";
import { MealPlanRulesApi } from "./user/group-mealplan-rules";
import { GroupDataSeederApi } from "./user/group-seeder";
-import { ApiRequestInstance } from "~/lib/api/types/non-generated";
+import type { ApiRequestInstance } from "~/lib/api/types/non-generated";
export class UserApiClient {
public recipes: RecipeAPI;
diff --git a/frontend/lib/api/public/explore/cookbooks.ts b/frontend/lib/api/public/explore/cookbooks.ts
index 67e051630..ee7e6230c 100644
--- a/frontend/lib/api/public/explore/cookbooks.ts
+++ b/frontend/lib/api/public/explore/cookbooks.ts
@@ -11,10 +11,11 @@ const routes = {
};
export class PublicCookbooksApi extends BaseCRUDAPIReadOnly {
- baseRoute = routes.cookbooksGroupSlug(this.groupSlug);
- itemRoute = (itemId: string | number) => routes.cookbooksGroupSlugCookbookId(this.groupSlug, itemId);
-
- constructor(requests: ApiRequestInstance, private readonly groupSlug: string) {
- super(requests);
+ constructor(requests: ApiRequestInstance, groupSlug: string) {
+ super(
+ requests,
+ routes.cookbooksGroupSlug(groupSlug),
+ (itemId: string | number) => routes.cookbooksGroupSlugCookbookId(groupSlug, itemId)
+ );
}
}
diff --git a/frontend/lib/api/public/explore/foods.ts b/frontend/lib/api/public/explore/foods.ts
index 5367c449e..43a591e73 100644
--- a/frontend/lib/api/public/explore/foods.ts
+++ b/frontend/lib/api/public/explore/foods.ts
@@ -11,10 +11,11 @@ const routes = {
};
export class PublicFoodsApi extends BaseCRUDAPIReadOnly {
- baseRoute = routes.foodsGroupSlug(this.groupSlug);
- itemRoute = (itemId: string | number) => routes.foodsGroupSlugFoodId(this.groupSlug, itemId);
-
- constructor(requests: ApiRequestInstance, private readonly groupSlug: string) {
- super(requests);
+ constructor(requests: ApiRequestInstance, groupSlug: string) {
+ super(
+ requests,
+ routes.foodsGroupSlug(groupSlug),
+ (itemId: string | number) => routes.foodsGroupSlugFoodId(groupSlug, itemId)
+ );
}
}
diff --git a/frontend/lib/api/public/explore/households.ts b/frontend/lib/api/public/explore/households.ts
index 188d75053..8dc3f490d 100644
--- a/frontend/lib/api/public/explore/households.ts
+++ b/frontend/lib/api/public/explore/households.ts
@@ -11,10 +11,11 @@ const routes = {
};
export class PublicHouseholdApi extends BaseCRUDAPIReadOnly {
- baseRoute = routes.householdsGroupSlug(this.groupSlug);
- itemRoute = (itemId: string | number) => routes.householdsGroupSlugHouseholdSlug(this.groupSlug, itemId);
-
- constructor(requests: ApiRequestInstance, private readonly groupSlug: string) {
- super(requests);
+ constructor(requests: ApiRequestInstance, groupSlug: string) {
+ super(
+ requests,
+ routes.householdsGroupSlug(groupSlug),
+ (itemId: string | number) => routes.householdsGroupSlugHouseholdSlug(groupSlug, itemId)
+ );
}
}
diff --git a/frontend/lib/api/public/explore/organizers.ts b/frontend/lib/api/public/explore/organizers.ts
index 1a24866c6..8d1339ed7 100644
--- a/frontend/lib/api/public/explore/organizers.ts
+++ b/frontend/lib/api/public/explore/organizers.ts
@@ -15,28 +15,31 @@ const routes = {
};
export class PublicCategoriesApi extends BaseCRUDAPIReadOnly {
- baseRoute = routes.categoriesGroupSlug(this.groupSlug);
- itemRoute = (itemId: string | number) => routes.categoriesGroupSlugCategoryId(this.groupSlug, itemId);
-
- constructor(requests: ApiRequestInstance, private readonly groupSlug: string) {
- super(requests);
+ constructor(requests: ApiRequestInstance, groupSlug: string) {
+ super(
+ requests,
+ routes.categoriesGroupSlug(groupSlug),
+ (itemId: string | number) => routes.categoriesGroupSlugCategoryId(groupSlug, itemId)
+ );
}
}
export class PublicTagsApi extends BaseCRUDAPIReadOnly {
- baseRoute = routes.tagsGroupSlug(this.groupSlug);
- itemRoute = (itemId: string | number) => routes.tagsGroupSlugTagId(this.groupSlug, itemId);
-
- constructor(requests: ApiRequestInstance, private readonly groupSlug: string) {
- super(requests);
+ constructor(requests: ApiRequestInstance, groupSlug: string) {
+ super(
+ requests,
+ routes.tagsGroupSlug(groupSlug),
+ (itemId: string | number) => routes.tagsGroupSlugTagId(groupSlug, itemId)
+ );
}
}
export class PublicToolsApi extends BaseCRUDAPIReadOnly {
- baseRoute = routes.toolsGroupSlug(this.groupSlug);
- itemRoute = (itemId: string | number) => routes.toolsGroupSlugToolId(this.groupSlug, itemId);
-
- constructor(requests: ApiRequestInstance, private readonly groupSlug: string) {
- super(requests);
+ constructor(requests: ApiRequestInstance, groupSlug: string) {
+ super(
+ requests,
+ routes.toolsGroupSlug(groupSlug),
+ (itemId: string | number) => routes.toolsGroupSlugToolId(groupSlug, itemId)
+ );
}
}
diff --git a/frontend/lib/api/public/explore/recipes.ts b/frontend/lib/api/public/explore/recipes.ts
index 978e4a6d6..cf9f8b3ba 100644
--- a/frontend/lib/api/public/explore/recipes.ts
+++ b/frontend/lib/api/public/explore/recipes.ts
@@ -13,11 +13,12 @@ const routes = {
};
export class PublicRecipeApi extends BaseCRUDAPIReadOnly {
- baseRoute = routes.recipesGroupSlug(this.groupSlug);
- itemRoute = (itemId: string | number) => routes.recipesGroupSlugRecipeSlug(this.groupSlug, itemId);
-
constructor(requests: ApiRequestInstance, private readonly groupSlug: string) {
- super(requests);
+ super(
+ requests,
+ routes.recipesGroupSlug(groupSlug),
+ (itemId: string | number) => routes.recipesGroupSlugRecipeSlug(groupSlug, itemId)
+ );
}
async search(rsq: RecipeSearchQuery) {
@@ -26,7 +27,7 @@ export class PublicRecipeApi extends BaseCRUDAPIReadOnly {
async getSuggestions(q: RecipeSuggestionQuery, foods: string[] | null = null, tools: string[]| null = null) {
return await this.requests.get(
- route(`${this.baseRoute}/suggestions`, { ...q, foods, tools })
+ route(`${routes.recipesGroupSlug(this.groupSlug)}/suggestions`, { ...q, foods, tools })
);
}
}
diff --git a/frontend/lib/api/types/admin.ts b/frontend/lib/api/types/admin.ts
index c330d1776..95b431bc9 100644
--- a/frontend/lib/api/types/admin.ts
+++ b/frontend/lib/api/types/admin.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/analytics.ts b/frontend/lib/api/types/analytics.ts
index f0eb9d489..43cb23663 100644
--- a/frontend/lib/api/types/analytics.ts
+++ b/frontend/lib/api/types/analytics.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/cookbook.ts b/frontend/lib/api/types/cookbook.ts
index 3a34d5983..2daf20aaa 100644
--- a/frontend/lib/api/types/cookbook.ts
+++ b/frontend/lib/api/types/cookbook.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/events.ts b/frontend/lib/api/types/events.ts
index 205c3012c..4a41060b2 100644
--- a/frontend/lib/api/types/events.ts
+++ b/frontend/lib/api/types/events.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/group.ts b/frontend/lib/api/types/group.ts
index bc2fbcf62..1f72c09c5 100644
--- a/frontend/lib/api/types/group.ts
+++ b/frontend/lib/api/types/group.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/household.ts b/frontend/lib/api/types/household.ts
index 4291af758..3f635879c 100644
--- a/frontend/lib/api/types/household.ts
+++ b/frontend/lib/api/types/household.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/labels.ts b/frontend/lib/api/types/labels.ts
index a8fc4c046..9d44342cc 100644
--- a/frontend/lib/api/types/labels.ts
+++ b/frontend/lib/api/types/labels.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/meal-plan.ts b/frontend/lib/api/types/meal-plan.ts
index eede212c9..aa28e6349 100644
--- a/frontend/lib/api/types/meal-plan.ts
+++ b/frontend/lib/api/types/meal-plan.ts
@@ -1,10 +1,12 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
*/
+import type { HouseholdSummary } from "./household";
+
export type PlanEntryType = "breakfast" | "lunch" | "dinner" | "side";
export type PlanRulesDay = "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday" | "sunday" | "unset";
export type PlanRulesType = "breakfast" | "lunch" | "dinner" | "side" | "unset";
@@ -42,6 +44,9 @@ export interface PlanRulesOut {
householdId: string;
id: string;
queryFilter?: QueryFilterJSON;
+ categories?: RecipeCategory[];
+ tags?: RecipeTag[];
+ households?: HouseholdSummary[];
}
export interface QueryFilterJSON {
parts?: QueryFilterJSONPart[];
diff --git a/frontend/lib/api/types/non-generated.ts b/frontend/lib/api/types/non-generated.ts
index 79ebd9183..1a9797ccd 100644
--- a/frontend/lib/api/types/non-generated.ts
+++ b/frontend/lib/api/types/non-generated.ts
@@ -1,4 +1,4 @@
-import { AxiosResponse } from "axios";
+import type { AxiosResponse } from "axios";
export type NoUndefinedField = { [P in keyof T]-?: NoUndefinedField> };
diff --git a/frontend/lib/api/types/recipe.ts b/frontend/lib/api/types/recipe.ts
index a526e602e..e87f95bdf 100644
--- a/frontend/lib/api/types/recipe.ts
+++ b/frontend/lib/api/types/recipe.ts
@@ -226,7 +226,7 @@ export interface Recipe {
groupId?: string;
name?: string | null;
slug?: string;
- image?: unknown;
+ image?: string;
recipeServings?: number;
recipeYieldQuantity?: number;
recipeYield?: string | null;
@@ -512,7 +512,7 @@ export interface ScrapeRecipeTest {
url: string;
useOpenAI?: boolean;
}
-export interface SlugResponse {}
+export interface SlugResponse { }
export interface TagIn {
name: string;
}
diff --git a/frontend/lib/api/types/reports.ts b/frontend/lib/api/types/reports.ts
index 2b763275e..e06788a0f 100644
--- a/frontend/lib/api/types/reports.ts
+++ b/frontend/lib/api/types/reports.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/response.ts b/frontend/lib/api/types/response.ts
index dfa8a54f4..d77f44084 100644
--- a/frontend/lib/api/types/response.ts
+++ b/frontend/lib/api/types/response.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
diff --git a/frontend/lib/api/types/user.ts b/frontend/lib/api/types/user.ts
index a29586b3a..58ef25f6a 100644
--- a/frontend/lib/api/types/user.ts
+++ b/frontend/lib/api/types/user.ts
@@ -1,5 +1,5 @@
/* tslint:disable */
-/* eslint-disable */
+
/**
/* This file was automatically generated from pydantic models by running pydantic2ts.
/* Do not modify it by hand - just update the pydantic models and then re-run the script
@@ -197,6 +197,7 @@ export interface UserBase {
canManage?: boolean;
canManageHousehold?: boolean;
canOrganize?: boolean;
+ advancedOptions?: boolean;
}
export interface UserIn {
id?: string | null;
diff --git a/frontend/lib/api/user/backups.ts b/frontend/lib/api/user/backups.ts
index 774eb14c1..3781a280a 100644
--- a/frontend/lib/api/user/backups.ts
+++ b/frontend/lib/api/user/backups.ts
@@ -1,5 +1,5 @@
import { BaseAPI } from "../base/base-clients";
-import { AllBackups, BackupOptions, CreateBackup } from "~/lib/api/types/admin";
+import type { AllBackups, BackupOptions, CreateBackup } from "~/lib/api/types/admin";
const prefix = "/api";
diff --git a/frontend/lib/api/user/email.ts b/frontend/lib/api/user/email.ts
index 30b840b09..a7bbc1b48 100644
--- a/frontend/lib/api/user/email.ts
+++ b/frontend/lib/api/user/email.ts
@@ -1,7 +1,7 @@
import { BaseAPI } from "../base/base-clients";
-import { EmailInitationResponse, EmailInvitation } from "~/lib/api/types/household";
-import { ForgotPassword } from "~/lib/api/types/user";
-import { EmailTest } from "~/lib/api/types/admin";
+import type { EmailInitationResponse, EmailInvitation } from "~/lib/api/types/household";
+import type { ForgotPassword } from "~/lib/api/types/user";
+import type { EmailTest } from "~/lib/api/types/admin";
const routes = {
base: "/api/admin/email",
diff --git a/frontend/lib/api/user/group-cookbooks.ts b/frontend/lib/api/user/group-cookbooks.ts
index 798b8cdd7..9d5631558 100644
--- a/frontend/lib/api/user/group-cookbooks.ts
+++ b/frontend/lib/api/user/group-cookbooks.ts
@@ -1,5 +1,5 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { CreateCookBook, RecipeCookBook, UpdateCookBook } from "~/lib/api/types/cookbook";
+import type { CreateCookBook, RecipeCookBook, UpdateCookBook } from "~/lib/api/types/cookbook";
const prefix = "/api";
diff --git a/frontend/lib/api/user/group-event-notifier.ts b/frontend/lib/api/user/group-event-notifier.ts
index 9f9f4d981..da51fd1d4 100644
--- a/frontend/lib/api/user/group-event-notifier.ts
+++ b/frontend/lib/api/user/group-event-notifier.ts
@@ -1,5 +1,5 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { GroupEventNotifierCreate, GroupEventNotifierOut, GroupEventNotifierUpdate } from "~/lib/api/types/household";
+import type { GroupEventNotifierCreate, GroupEventNotifierOut, GroupEventNotifierUpdate } from "~/lib/api/types/household";
const prefix = "/api";
diff --git a/frontend/lib/api/user/group-mealplan-rules.ts b/frontend/lib/api/user/group-mealplan-rules.ts
index 87679dd4c..d657c9d84 100644
--- a/frontend/lib/api/user/group-mealplan-rules.ts
+++ b/frontend/lib/api/user/group-mealplan-rules.ts
@@ -1,5 +1,5 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { PlanRulesCreate, PlanRulesOut } from "~/lib/api/types/meal-plan";
+import type { PlanRulesCreate, PlanRulesOut } from "~/lib/api/types/meal-plan";
const prefix = "/api";
diff --git a/frontend/lib/api/user/group-mealplan.ts b/frontend/lib/api/user/group-mealplan.ts
index fcc31f2e3..22d4d4d70 100644
--- a/frontend/lib/api/user/group-mealplan.ts
+++ b/frontend/lib/api/user/group-mealplan.ts
@@ -1,5 +1,5 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { CreatePlanEntry, CreateRandomEntry, ReadPlanEntry, UpdatePlanEntry } from "~/lib/api/types/meal-plan";
+import type { CreatePlanEntry, CreateRandomEntry, ReadPlanEntry, UpdatePlanEntry } from "~/lib/api/types/meal-plan";
const prefix = "/api";
diff --git a/frontend/lib/api/user/group-migrations.ts b/frontend/lib/api/user/group-migrations.ts
index ac6d8d91f..1083662ce 100644
--- a/frontend/lib/api/user/group-migrations.ts
+++ b/frontend/lib/api/user/group-migrations.ts
@@ -1,6 +1,6 @@
import { BaseAPI } from "../base/base-clients";
-import { ReportSummary } from "~/lib/api/types/reports";
-import { SupportedMigrations } from "~/lib/api/types/group";
+import type { ReportSummary } from "~/lib/api/types/reports";
+import type { SupportedMigrations } from "~/lib/api/types/group";
const prefix = "/api";
export interface MigrationPayload {
diff --git a/frontend/lib/api/user/group-multiple-purpose-labels.ts b/frontend/lib/api/user/group-multiple-purpose-labels.ts
index 2761d0bd8..54cbf2520 100644
--- a/frontend/lib/api/user/group-multiple-purpose-labels.ts
+++ b/frontend/lib/api/user/group-multiple-purpose-labels.ts
@@ -1,5 +1,5 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { MultiPurposeLabelCreate, MultiPurposeLabelOut, MultiPurposeLabelUpdate } from "~/lib/api/types/labels";
+import type { MultiPurposeLabelCreate, MultiPurposeLabelOut, MultiPurposeLabelUpdate } from "~/lib/api/types/labels";
const prefix = "/api";
diff --git a/frontend/lib/api/user/group-recipe-actions.ts b/frontend/lib/api/user/group-recipe-actions.ts
index d49cdecec..2753b3465 100644
--- a/frontend/lib/api/user/group-recipe-actions.ts
+++ b/frontend/lib/api/user/group-recipe-actions.ts
@@ -1,19 +1,19 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { CreateGroupRecipeAction, GroupRecipeActionOut } from "~/lib/api/types/household";
+import type { CreateGroupRecipeAction, GroupRecipeActionOut } from "~/lib/api/types/household";
const prefix = "/api";
const routes = {
- groupRecipeActions: `${prefix}/households/recipe-actions`,
- groupRecipeActionsId: (id: string | number) => `${prefix}/households/recipe-actions/${id}`,
- groupRecipeActionsIdTriggerRecipeSlug: (id: string | number, recipeSlug: string) => `${prefix}/households/recipe-actions/${id}/trigger/${recipeSlug}`,
- };
+ groupRecipeActions: `${prefix}/households/recipe-actions`,
+ groupRecipeActionsId: (id: string | number) => `${prefix}/households/recipe-actions/${id}`,
+ groupRecipeActionsIdTriggerRecipeSlug: (id: string | number, recipeSlug: string) => `${prefix}/households/recipe-actions/${id}/trigger/${recipeSlug}`,
+};
- export class GroupRecipeActionsAPI extends BaseCRUDAPI {
- baseRoute = routes.groupRecipeActions;
- itemRoute = routes.groupRecipeActionsId;
+export class GroupRecipeActionsAPI extends BaseCRUDAPI {
+ baseRoute = routes.groupRecipeActions;
+ itemRoute = routes.groupRecipeActionsId;
- async triggerAction(id: string | number, recipeSlug: string) {
- return await this.requests.post(routes.groupRecipeActionsIdTriggerRecipeSlug(id, recipeSlug), {});
- }
+ async triggerAction(id: string | number, recipeSlug: string, scaledAmount: number) {
+ return await this.requests.post(routes.groupRecipeActionsIdTriggerRecipeSlug(id, recipeSlug), { scaledAmount });
}
+}
diff --git a/frontend/lib/api/user/group-reports.ts b/frontend/lib/api/user/group-reports.ts
index 6b0cac7fa..b4d5adce4 100644
--- a/frontend/lib/api/user/group-reports.ts
+++ b/frontend/lib/api/user/group-reports.ts
@@ -1,5 +1,5 @@
import { BaseAPI } from "../base/base-clients";
-import { ReportCategory, ReportOut, ReportSummary } from "~/lib/api/types/reports";
+import type { ReportCategory, ReportOut, ReportSummary } from "~/lib/api/types/reports";
const prefix = "/api";
diff --git a/frontend/lib/api/user/group-seeder.ts b/frontend/lib/api/user/group-seeder.ts
index b9fc5b6be..b7595a4a7 100644
--- a/frontend/lib/api/user/group-seeder.ts
+++ b/frontend/lib/api/user/group-seeder.ts
@@ -1,6 +1,6 @@
import { BaseAPI } from "../base/base-clients";
-import { SuccessResponse } from "~/lib/api/types/response";
-import { SeederConfig } from "~/lib/api/types/group";
+import type { SuccessResponse } from "~/lib/api/types/response";
+import type { SeederConfig } from "~/lib/api/types/group";
const prefix = "/api";
diff --git a/frontend/lib/api/user/group-shopping-lists.ts b/frontend/lib/api/user/group-shopping-lists.ts
index 1eccb05f7..d5f74d291 100644
--- a/frontend/lib/api/user/group-shopping-lists.ts
+++ b/frontend/lib/api/user/group-shopping-lists.ts
@@ -1,6 +1,6 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { ApiRequestInstance } from "~/lib/api/types/non-generated";
-import {
+import type { ApiRequestInstance } from "~/lib/api/types/non-generated";
+import type {
ShoppingListAddRecipeParamsBulk,
ShoppingListCreate,
ShoppingListItemCreate,
diff --git a/frontend/lib/api/user/group-webhooks.ts b/frontend/lib/api/user/group-webhooks.ts
index 8ced73f16..395818c5f 100644
--- a/frontend/lib/api/user/group-webhooks.ts
+++ b/frontend/lib/api/user/group-webhooks.ts
@@ -1,5 +1,5 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { CreateWebhook, ReadWebhook } from "~/lib/api/types/household";
+import type { CreateWebhook, ReadWebhook } from "~/lib/api/types/household";
const prefix = "/api";
diff --git a/frontend/lib/api/user/groups.ts b/frontend/lib/api/user/groups.ts
index 9e379c9cd..bd3611d9c 100644
--- a/frontend/lib/api/user/groups.ts
+++ b/frontend/lib/api/user/groups.ts
@@ -1,8 +1,8 @@
import { BaseCRUDAPI } from "../base/base-clients";
-import { PaginationData } from "../types/non-generated";
-import { QueryValue } from "../base/route";
-import { GroupBase, GroupInDB, GroupSummary, UserSummary } from "~/lib/api/types/user";
-import {
+import type { PaginationData } from "../types/non-generated";
+import type { QueryValue } from "../base/route";
+import type { GroupBase, GroupInDB, GroupSummary, UserSummary } from "~/lib/api/types/user";
+import type {
GroupAdminUpdate,
GroupStorage,
ReadGroupPreferences,
diff --git a/frontend/lib/api/user/households.ts b/frontend/lib/api/user/households.ts
index 9995059dd..363af940d 100644
--- a/frontend/lib/api/user/households.ts
+++ b/frontend/lib/api/user/households.ts
@@ -1,8 +1,8 @@
import { BaseCRUDAPIReadOnly } from "../base/base-clients";
-import { PaginationData } from "../types/non-generated";
-import { QueryValue } from "../base/route";
-import { UserOut } from "~/lib/api/types/user";
-import {
+import type { PaginationData } from "../types/non-generated";
+import type { QueryValue } from "../base/route";
+import type { UserOut } from "~/lib/api/types/user";
+import type {
HouseholdInDB,
HouseholdStatistics,
ReadHouseholdPreferences,
@@ -27,7 +27,7 @@ const routes = {
invitation: `${prefix}/households/invitations`,
householdsId: (id: string | number) => `${prefix}/groups/households/${id}`,
- householdsSelfRecipesSlug: (recipeSlug: string) => `${prefix}/households/self/recipes/${recipeSlug}`,
+ householdsSelfRecipesSlug: (recipeSlug: string) => `${prefix}/households/self/recipes/${recipeSlug}`,
};
export class HouseholdAPI extends BaseCRUDAPIReadOnly