Merge branch 'mealie-recipes:mealie-next' into mealie-next

mealie-recipes · Dec 12, 2024 · f3dac5a · f3dac5a
2 parents 82a187f + cc37147
commit f3dac5a
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 77 deletions.
diff --git 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.8.1
+    rev: v0.8.2
     hooks:
       - id: ruff
       - id: ruff-format
diff --git a/frontend/components/global/CrudTable.vue b/frontend/components/global/CrudTable.vue
@@ -99,6 +99,8 @@ export interface TableHeaders {
   value: string;
   show: boolean;
   align?: string;
+  sortable?: boolean;
+  sort?: (a: any, b: any) => number;
 }
 
 export interface BulkAction {

diff --git a/frontend/components/global/SafeMarkdown.vue b/frontend/components/global/SafeMarkdown.vue
@@ -48,3 +48,20 @@ export default defineComponent({
   },
 });
 </script>
+
+<style scoped>
+::v-deep table {
+  border-collapse: collapse;
+  width: 100%;
+}
+
+::v-deep th, ::v-deep td {
+  border: 1px solid;
+  padding: 8px;
+  text-align: left;
+}
+
+::v-deep th {
+  font-weight: bold;
+}
+</style>
diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue
@@ -290,6 +290,7 @@ import MultiPurposeLabel from "~/components/Domain/ShoppingList/MultiPurposeLabe
 import { useLocales } from "~/composables/use-locales";
 import { useFoodStore, useLabelStore } from "~/composables/store";
 import { VForm } from "~/types/vuetify";
+import { MultiPurposeLabelOut } from "~/lib/api/types/labels";
 
 export default defineComponent({
   components: { MultiPurposeLabel, RecipeDataAliasManagerDialog },
@@ -325,6 +326,11 @@ export default defineComponent({
         text: i18n.tc("shopping-list.label"),
         value: "label",
         show: true,
+        sort: (label1: MultiPurposeLabelOut | null, label2: MultiPurposeLabelOut | null) => {
+          const label1Name = label1?.name || "";
+          const label2Name = label2?.name || "";
+          return label1Name.localeCompare(label2Name);
+        },
       },
       {
         text: i18n.tc("tool.on-hand"),

diff --git a/frontend/pages/household/mealplan/planner/edit.vue b/frontend/pages/household/mealplan/planner/edit.vue
@@ -13,6 +13,7 @@
       )"
       color="primary"
       :icon="$globals.icons.foods"
+      :submit-disabled="isCreateDisabled"
       @submit="
         if (newMeal.existing) {
           actions.updateOne(newMeal);
@@ -22,7 +23,6 @@
         resetDialog();
       "
       @close="resetDialog()"
-      :submitDisabled="isCreateDisabled"
     >
       <v-card-text>
         <v-menu