Merge branch 'mealie-next' into fix/mealplan-date-off-by-one

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
 

frontend/components/Domain/Recipe/RecipeExplorerPage.vue

@@ -24,7 +24,7 @@
             :items="categories"
           >
             <v-icon left>
-              {{ $globals.icons.tags }}
+              {{ $globals.icons.categories }}
             </v-icon>
             {{ $t("category.categories") }}
           </SearchFilter>
@@ -40,7 +40,7 @@
           <!-- Tool Filter -->
           <SearchFilter v-if="tools" v-model="selectedTools" :require-all.sync="state.requireAllTools" :items="tools">
             <v-icon left>
-              {{ $globals.icons.tools }}
+              {{ $globals.icons.potSteam }}
             </v-icon>
             {{ $t("tool.tools") }}
           </SearchFilter>

frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue

@@ -4,7 +4,9 @@
       <v-card>
         <v-app-bar dense dark color="primary mb-2">
           <v-icon large left class="mt-1">
-            {{ itemType === Organizer.Tool ? $globals.icons.potSteam : $globals.icons.tags }}
+            {{ itemType === Organizer.Tool ? $globals.icons.potSteam :
+              itemType === Organizer.Category ? $globals.icons.categories :
+              $globals.icons.tags }}
           </v-icon>
 
           <v-toolbar-title class="headline">

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"
   >

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,

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

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, string> = {
         [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,

frontend/pages/recipes/categories/index.vue

@@ -3,7 +3,7 @@
     <RecipeOrganizerPage
       v-if="items"
       :items="items"
-      :icon="$globals.icons.tags"
+      :icon="$globals.icons.categories"
       item-type="categories"
       @delete="actions.deleteOne"
       @update="actions.updateOne"

frontend/pages/user/profile/index.vue

@@ -341,7 +341,7 @@ export default defineComponent({
 
     const iconText: { [key: string]: string } = {
       totalUsers: $globals.icons.user,
-      totalCategories: $globals.icons.tags,
+      totalCategories: $globals.icons.categories,
       totalTags: $globals.icons.tags,
       totalTools: $globals.icons.potSteam,
     };