diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22b2b28b7..695ac4710 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: name: Build Package uses: ./.github/workflows/build-package.yml with: - tag: release + tag: ${{ github.event.release.tag_name }} publish: permissions: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2dd7dc5cc..627ce29e5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: exclude: ^tests/data/ - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.12.2 + rev: v0.12.5 hooks: - id: ruff - id: ruff-format diff --git a/dev/code-generation/gen_ts_locales.py b/dev/code-generation/gen_ts_locales.py index 7e16ab59f..e16554592 100644 --- a/dev/code-generation/gen_ts_locales.py +++ b/dev/code-generation/gen_ts_locales.py @@ -179,9 +179,15 @@ def inject_nuxt_values(): all_langs = [] for match in locales_dir.glob("*.json"): - lang_string = f'{{ code: "{match.stem}", file: "{match.name.replace(".json", ".ts")}" }},' + match_data = LOCALE_DATA.get(match.stem) + match_dir = match_data.dir if match_data else "ltr" + + lang_string = f'{{ code: "{match.stem}", file: "{match.name.replace(".json", ".ts")}", dir: "{match_dir}" }},' all_langs.append(lang_string) + all_langs.sort() + all_date_locales.sort() + log.debug(f"injecting locales into nuxt config -> {nuxt_config}") inject_inline(nuxt_config, CodeKeys.nuxt_local_messages, all_langs) inject_inline(i18n_config, CodeKeys.nuxt_local_dates, all_date_locales) diff --git a/docs/docs/documentation/getting-started/installation/installation-checklist.md b/docs/docs/documentation/getting-started/installation/installation-checklist.md index bf5ef93de..9bae44c00 100644 --- a/docs/docs/documentation/getting-started/installation/installation-checklist.md +++ b/docs/docs/documentation/getting-started/installation/installation-checklist.md @@ -31,7 +31,7 @@ To deploy mealie on your local network, it is highly recommended to use Docker t We've gone through a few versions of Mealie v1 deployment targets. We have settled on a single container deployment, and we've begun publishing the nightly container on github containers. If you're looking to move from the old nightly (split containers _or_ the omni image) to the new nightly, there are a few things you need to do: 1. Take a backup just in case! -2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v2.8.0` +2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.2` 3. Take the external port from the frontend container and set that as the port mapped to port `9000` on the new container. The frontend is now served on port 9000 from the new container, so it will need to be mapped for you to have access. 4. Restart the container diff --git a/docs/docs/documentation/getting-started/installation/postgres.md b/docs/docs/documentation/getting-started/installation/postgres.md index 4e08fa192..adb6320bf 100644 --- a/docs/docs/documentation/getting-started/installation/postgres.md +++ b/docs/docs/documentation/getting-started/installation/postgres.md @@ -7,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In ```yaml services: mealie: - image: ghcr.io/mealie-recipes/mealie:v2.8.0 # (3) + image: ghcr.io/mealie-recipes/mealie:v3.0.2 # (3) container_name: mealie restart: always ports: diff --git a/docs/docs/documentation/getting-started/installation/sqlite.md b/docs/docs/documentation/getting-started/installation/sqlite.md index f33080e0e..38e436176 100644 --- a/docs/docs/documentation/getting-started/installation/sqlite.md +++ b/docs/docs/documentation/getting-started/installation/sqlite.md @@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th ```yaml services: mealie: - image: ghcr.io/mealie-recipes/mealie:v2.8.0 # (3) + image: ghcr.io/mealie-recipes/mealie:v3.0.2 # (3) container_name: mealie restart: always ports: diff --git a/frontend/components/Domain/Cookbook/CookbookEditor.vue b/frontend/components/Domain/Cookbook/CookbookEditor.vue index 1ee47067d..5598fcb1d 100644 --- a/frontend/components/Domain/Cookbook/CookbookEditor.vue +++ b/frontend/components/Domain/Cookbook/CookbookEditor.vue @@ -44,78 +44,54 @@ - diff --git a/frontend/components/Domain/Cookbook/CookbookPage.vue b/frontend/components/Domain/Cookbook/CookbookPage.vue index 8793cef26..a8cff6753 100644 --- a/frontend/components/Domain/Cookbook/CookbookPage.vue +++ b/frontend/components/Domain/Cookbook/CookbookPage.vue @@ -17,7 +17,6 @@ @@ -65,7 +64,7 @@ - diff --git a/frontend/components/Domain/Group/GroupExportData.vue b/frontend/components/Domain/Group/GroupExportData.vue index fc2f0c05f..82549c043 100644 --- a/frontend/components/Domain/Group/GroupExportData.vue +++ b/frontend/components/Domain/Group/GroupExportData.vue @@ -20,45 +20,33 @@ - diff --git a/frontend/components/Domain/Group/GroupPreferencesEditor.vue b/frontend/components/Domain/Group/GroupPreferencesEditor.vue index 82b2f82c7..1bfd0c935 100644 --- a/frontend/components/Domain/Group/GroupPreferencesEditor.vue +++ b/frontend/components/Domain/Group/GroupPreferencesEditor.vue @@ -9,30 +9,10 @@ - diff --git a/frontend/components/Domain/Household/GroupHouseholdSelector.vue b/frontend/components/Domain/Household/GroupHouseholdSelector.vue deleted file mode 100644 index a73e10681..000000000 --- a/frontend/components/Domain/Household/GroupHouseholdSelector.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - diff --git a/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue b/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue index 54e548edb..4ca78ccbd 100644 --- a/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue +++ b/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue @@ -18,7 +18,7 @@ :open-on-hover="mdAndUp" content-class="d-print-none" > - - diff --git a/frontend/components/Domain/Household/GroupWebhookEditor.vue b/frontend/components/Domain/Household/GroupWebhookEditor.vue index 99588e147..131e93c77 100644 --- a/frontend/components/Domain/Household/GroupWebhookEditor.vue +++ b/frontend/components/Domain/Household/GroupWebhookEditor.vue @@ -16,11 +16,11 @@ :label="$t('settings.webhooks.webhook-url')" variant="underlined" /> - @@ -50,52 +50,43 @@ - diff --git a/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue b/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue index ea1df3670..32e433b31 100644 --- a/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue +++ b/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue @@ -41,106 +41,81 @@ - diff --git a/frontend/components/Domain/Recipe/RecipeCardImage.vue b/frontend/components/Domain/Recipe/RecipeCardImage.vue index b7bda2922..e2e8d9069 100644 --- a/frontend/components/Domain/Recipe/RecipeCardImage.vue +++ b/frontend/components/Domain/Recipe/RecipeCardImage.vue @@ -28,84 +28,60 @@ - diff --git a/frontend/components/Domain/Recipe/RecipeCardSection.vue b/frontend/components/Domain/Recipe/RecipeCardSection.vue index 10a29ec4f..712789675 100644 --- a/frontend/components/Domain/Recipe/RecipeCardSection.vue +++ b/frontend/components/Domain/Recipe/RecipeCardSection.vue @@ -36,11 +36,11 @@ offset-y start > - - diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue index 26ec7413a..6706eb582 100644 --- a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue +++ b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue @@ -3,7 +3,7 @@ v-model="selected" v-bind="inputAttrs" v-model:search="searchInput" - :items="storeItem" + :items="items" :label="label" chips closable-chips @@ -46,180 +46,138 @@ - diff --git a/frontend/components/Domain/Recipe/RecipeSuggestion.vue b/frontend/components/Domain/Recipe/RecipeSuggestion.vue index abf4f6b82..25e044ccb 100644 --- a/frontend/components/Domain/Recipe/RecipeSuggestion.vue +++ b/frontend/components/Domain/Recipe/RecipeSuggestion.vue @@ -14,9 +14,7 @@
- - {{ organizer.icon }} - + {{ $t("recipe-finder.missing") }}: @@ -41,7 +39,7 @@ - diff --git a/frontend/components/Domain/Recipe/RecipeTimeCard.vue b/frontend/components/Domain/Recipe/RecipeTimeCard.vue index 4d087bfbc..f5abbe4ce 100644 --- a/frontend/components/Domain/Recipe/RecipeTimeCard.vue +++ b/frontend/components/Domain/Recipe/RecipeTimeCard.vue @@ -1,4 +1,4 @@ -