From 14cc44f94848bcc1b44eadc648853bd87b9b004b Mon Sep 17 00:00:00 2001 From: Chris Lane <925091+ChrisLane@users.noreply.github.com> Date: Fri, 20 Oct 2023 18:07:04 +0100 Subject: [PATCH 1/2] docs: Remove link to deleted docs file (#2670) The single-container.md file was deleted in 2ad6af2cce53432d0592b4c80c4eb5469c6b982f --- .../getting-started/installation/installation-checklist.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/docs/documentation/getting-started/installation/installation-checklist.md b/docs/docs/documentation/getting-started/installation/installation-checklist.md index 91f8328fcd6d..c43fb3f52aa6 100644 --- a/docs/docs/documentation/getting-started/installation/installation-checklist.md +++ b/docs/docs/documentation/getting-started/installation/installation-checklist.md @@ -8,7 +8,6 @@ To install Mealie on your server there are a few steps for proper configuration. - [SQLite docker-compose](./sqlite.md) - [Postgres docker-compose](./postgres.md) - - [Single container docker-compose](./single-container.md) ## Pre-work From f7f8c51661d013be4389c381b62feb0464478591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ars=C3=A8ne=20Reymond?= <66876397+p0lycarpio@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:08:58 +0200 Subject: [PATCH 2/2] feat: update organization icons (#2668) * front: update filters icons * remove duplicate --------- Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com> --- frontend/components/Domain/Recipe/RecipeExplorerPage.vue | 4 ++-- frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue | 4 +++- .../components/Domain/Recipe/RecipeOrganizerSelector.vue | 4 +++- frontend/components/Layout/DefaultLayout.vue | 2 +- frontend/lib/icons/icons.ts | 6 ++++-- frontend/pages/group/data/recipes.vue | 4 ++-- frontend/pages/recipes/categories/index.vue | 2 +- frontend/pages/user/profile/index.vue | 2 +- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/frontend/components/Domain/Recipe/RecipeExplorerPage.vue b/frontend/components/Domain/Recipe/RecipeExplorerPage.vue index a169c9fe7c39..ae4eaf9b17aa 100644 --- a/frontend/components/Domain/Recipe/RecipeExplorerPage.vue +++ b/frontend/components/Domain/Recipe/RecipeExplorerPage.vue @@ -24,7 +24,7 @@ :items="categories" > - {{ $globals.icons.tags }} + {{ $globals.icons.categories }} {{ $t("category.categories") }} @@ -40,7 +40,7 @@ - {{ $globals.icons.tools }} + {{ $globals.icons.potSteam }} {{ $t("tool.tools") }} diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue b/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue index e1c8a84a285c..e4c90090b31a 100644 --- a/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue +++ b/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue @@ -4,7 +4,9 @@ - {{ itemType === Organizer.Tool ? $globals.icons.potSteam : $globals.icons.tags }} + {{ itemType === Organizer.Tool ? $globals.icons.potSteam : + itemType === Organizer.Category ? $globals.icons.categories : + $globals.icons.tags }} diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue index 8999a8fd6390..78d521c00498 100644 --- a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue +++ b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue @@ -8,7 +8,9 @@ deletable-chips item-text="name" multiple - :prepend-inner-icon="selectorType === Organizer.Tool ? $globals.icons.potSteam : $globals.icons.tags" + :prepend-inner-icon="selectorType === Organizer.Tool ? $globals.icons.potSteam : + selectorType === Organizer.Category ? $globals.icons.categories : + $globals.icons.tags" return-object v-bind="inputAttrs" > diff --git a/frontend/components/Layout/DefaultLayout.vue b/frontend/components/Layout/DefaultLayout.vue index e585d6c67f32..3af77dea3b01 100644 --- a/frontend/components/Layout/DefaultLayout.vue +++ b/frontend/components/Layout/DefaultLayout.vue @@ -191,7 +191,7 @@ restricted: true, }, { - icon: $globals.icons.tags, + icon: $globals.icons.categories, to: "/recipes/categories", title: i18n.tc("sidebar.categories"), restricted: true, diff --git a/frontend/lib/icons/icons.ts b/frontend/lib/icons/icons.ts index ab198282cad1..ffe43385f74e 100644 --- a/frontend/lib/icons/icons.ts +++ b/frontend/lib/icons/icons.ts @@ -10,13 +10,14 @@ import { mdiClose, mdiTagArrowUpOutline, mdiTagMultipleOutline, + mdiShapeOutline, mdiBookOutline, mdiAccountCog, mdiAccountGroup, mdiSlotMachine, mdiHome, mdiMagnify, - mdiPotSteam, + mdiPotSteamOutline, mdiTranslate, mdiClockTimeFourOutline, mdiImport, @@ -262,7 +263,7 @@ export const icons = { timerPause: mdiTimerPause, timerPlus: mdiTimerPlus, tools: mdiTools, - potSteam: mdiPotSteam, + potSteam: mdiPotSteamOutline, translate: mdiTranslate, upload: mdiCloudUpload, viewDashboard: mdiViewDashboard, @@ -290,6 +291,7 @@ export const icons = { // Organization tags: mdiTagMultipleOutline, tagArrowUp: mdiTagArrowUpOutline, + categories: mdiShapeOutline, pages: mdiBookOutline, // Admin diff --git a/frontend/pages/group/data/recipes.vue b/frontend/pages/group/data/recipes.vue index 26769ac87728..a5482c885c95 100644 --- a/frontend/pages/group/data/recipes.vue +++ b/frontend/pages/group/data/recipes.vue @@ -223,7 +223,7 @@ export default defineComponent({ event: "tag-selected", }, { - icon: $globals.icons.tags, + icon: $globals.icons.categories, text: i18n.tc("data-pages.recipes.categorize"), event: "categorize-selected", }, @@ -379,7 +379,7 @@ export default defineComponent({ const icons: Record = { [MODES.tag]: $globals.icons.tags, - [MODES.category]: $globals.icons.tags, + [MODES.category]: $globals.icons.categories, [MODES.export]: $globals.icons.database, [MODES.delete]: $globals.icons.delete, [MODES.updateSettings]: $globals.icons.cog, diff --git a/frontend/pages/recipes/categories/index.vue b/frontend/pages/recipes/categories/index.vue index 63f012bbc42e..ac4779d6e17f 100644 --- a/frontend/pages/recipes/categories/index.vue +++ b/frontend/pages/recipes/categories/index.vue @@ -3,7 +3,7 @@