Merge branch 'mealie-next' into feat/consolidate-admin-apis

.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.0
+    rev: v0.12.1
     hooks:
       - id: ruff
       - id: ruff-format

frontend/assets/css/main.css

@@ -64,3 +64,7 @@ a {
 .fill-height {
   min-height: 100vh;
 }
+
+.vue-simple-handler {
+  background-color: rgb(var(--v-theme-primary)) !important;
+}

frontend/components/global/ImageCropper.vue

@@ -1,48 +1,58 @@
 <template>
-  <v-container class="pa-0">
+  <v-card class="ma-0 pt-2" :elevation="4">
-    <v-row no-gutters>
+    <v-card-text>
-      <v-col
+      <!-- Controls Row (Menu) -->
-        cols="8"
+      <v-row class="mb-2 mx-1">
-        align-self="center"
+        <v-btn
+          color="error"
+          :icon="$globals.icons.delete"
+          :disabled="submitted"
+          @click="$emit('delete')"
+        />
+        <v-spacer />
+        <v-btn
+          v-if="changed"
+          class="mr-2"
+          color="success"
+          :icon="$globals.icons.save"
+          :disabled="submitted"
+          @click="() => save()"
+        />
+        <v-menu offset-y :close-on-content-click="false" location="bottom center">
+          <template #activator="{ props }">
+            <v-btn color="info" v-bind="props" :icon="$globals.icons.edit" :disabled="submitted" />
+          </template>
+          <v-list class="mt-1">
+            <template v-for="(row, keyRow) in controls" :key="keyRow">
+              <v-list-item-group>
+                <v-list-item
+                  v-for="(control, keyControl) in row"
+                  :key="keyControl"
+                  :disabled="submitted"
+                  @click="control.callback()"
                 >
+                  <v-list-item-icon>
+                    <v-icon :color="control.color" :icon="control.icon" />
+                  </v-list-item-icon>
+                </v-list-item>
+              </v-list-item-group>
+            </template>
+          </v-list>
+        </v-menu>
+      </v-row>
+
+      <!-- Image Row -->
       <Cropper
         ref="cropper"
         class="cropper"
         :src="img"
         :default-size="defaultSize"
         :style="`height: ${cropperHeight}; width: ${cropperWidth};`"
+        @change="changed = changed + 1"
+        @ready="changed = -1"
       />
-      </v-col>
+    </v-card-text>
-      <v-spacer />
+  </v-card>
-      <v-col
-        cols="2"
-        align-self="center"
-      >
-        <v-container class="pa-0 mx-0">
-          <v-row
-            v-for="(row, keyRow) in controls"
-            :key="keyRow"
-          >
-            <v-col
-              v-for="(control, keyControl) in row"
-              :key="keyControl"
-              :cols="12 / row.length"
-              class="py-2 mx-0"
-              style="display: flex; align-items: center; justify-content: center;"
-            >
-              <v-btn
-                icon
-                :color="control.color"
-                @click="control.callback()"
-              >
-                <v-icon> {{ control.icon }} </v-icon>
-              </v-btn>
-            </v-col>
-          </v-row>
-        </v-container>
-      </v-col>
-    </v-row>
-  </v-container>
 </template>
 
 <script lang="ts">
@@ -64,10 +74,15 @@ export default defineNuxtComponent({
       type: String,
       default: undefined,
     },
+    submitted: {
+      type: Boolean,
+      default: false,
     },
-  emits: ["save"],
+  },
+  emits: ["save", "delete"],
   setup(_, context) {
-    const cropper = ref<Cropper>();
+    const cropper = ref<any>();
+    const changed = ref(0);
     const { $globals } = useNuxtApp();
 
     interface Control {
@@ -101,41 +116,32 @@ export default defineNuxtComponent({
           callback: () => rotate(90),
         },
       ],
-      [
-        {
-          color: "success",
-          icon: $globals.icons.save,
-          callback: () => save(),
-        },
-      ],
     ]);
 
     function flip(hortizontal: boolean, vertical?: boolean) {
       if (!cropper.value) {
         return;
       }
-
       cropper.value.flip(hortizontal, vertical);
+      changed.value = changed.value + 1;
     }
 
     function rotate(angle: number) {
       if (!cropper.value) {
         return;
       }
-
       cropper.value.rotate(angle);
+      changed.value = changed.value + 1;
     }
 
     function save() {
       if (!cropper.value) {
         return;
       }
-
       const { canvas } = cropper.value.getResult();
       if (!canvas) {
         return;
       }
-
       canvas.toBlob((blob) => {
         if (blob) {
           context.emit("save", blob);
@@ -149,11 +155,11 @@ export default defineNuxtComponent({
       flip,
       rotate,
       save,
+      changed,
     };
   },
 
   methods: {
-    // @ts-expect-error https://advanced-cropper.github.io/vue-advanced-cropper/guides/advanced-recipes.html
     defaultSize({ imageSize, visibleArea }) {
       return {
         width: (visibleArea || imageSize).width,

frontend/pages/g/[groupSlug]/r/create/image.vue

@@ -7,9 +7,7 @@
         </v-card-title>
         <v-card-text>
           <p>{{ $t("recipe.create-recipe-from-an-image-description") }}</p>
-          <v-container class="pa-0">
+          <v-container class="px-0">
-            <v-row>
-              <v-col cols="auto" align-self="center">
             <AppButtonUpload
               class="ml-auto"
               url="none"
@@ -21,48 +19,35 @@
               :multiple="true"
               @uploaded="uploadImages"
             />
-              </v-col>
+            <div v-if="uploadedImages.length > 0" class="mt-3">
-              <v-spacer />
+              <p class="my-2">
-            </v-row>
-
-            <div v-if="uploadedImages.length" class="mt-3">
-              <v-row>
-                <v-col cols="12" class="pb-0">
-                  <v-card-text class="pa-0">
-                    <p class="mb-0">
                 {{ $t("recipe.crop-and-rotate-the-image") }}
               </p>
-                  </v-card-text>
-                </v-col>
-              </v-row>
-              <v-row style="max-width: 600px">
-                <v-spacer />
-                <v-col v-for="(imageUrl, index) in uploadedImagesPreviewUrls" :key="index" cols="12">
               <v-row>
-                    <v-col cols="auto" align-self="center">
+                <v-col
+                  v-for="(imageUrl, index) in uploadedImagesPreviewUrls"
+                  :key="index"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
                   <ImageCropper
                     :img="imageUrl"
                     cropper-height="100%"
                     cropper-width="100%"
+                    :submitted="loading"
+                    class="mt-4"
                     @save="(croppedImage) => updateUploadedImage(index, croppedImage)"
+                    @delete="clearImage(index)"
                   />
-
-                      <v-btn color="error" @click="() => clearImage(index)">
-                        <v-icon start>
-                          {{ $globals.icons.close }}
-                        </v-icon>
-                        {{ $t("recipe.remove-image") }}
-                      </v-btn>
                 </v-col>
               </v-row>
-                </v-col>
-                <v-spacer />
-              </v-row>
             </div>
           </v-container>
         </v-card-text>
         <v-card-actions v-if="uploadedImages.length">
-          <div>
+          <div class="w-100 d-flex flex-column align-center">
             <p style="width: 250px">
               <BaseButton rounded block type="submit" :loading="loading" />
             </p>
@@ -147,6 +132,7 @@ export default defineNuxtComponent({
 
     function updateUploadedImage(index: number, croppedImage: Blob) {
       uploadedImages.value[index] = croppedImage;
+      uploadedImagesPreviewUrls.value[index] = URL.createObjectURL(croppedImage);
     }
 
     return {

mealie/core/settings/settings.py

@@ -408,7 +408,7 @@ class AppSettings(AppLoggingSettings):
         description = None
         if not self.OPENAI_API_KEY:
             description = "OPENAI_API_KEY is not set"
-        elif self.OPENAI_MODEL:
+        elif not self.OPENAI_MODEL:
             description = "OPENAI_MODEL is not set"
 
         return FeatureDetails(

poetry.lock

@@ -1855,14 +1855,14 @@ signedtoken = ["cryptography (>=3.0.0)", "pyjwt (>=2.0.0,<3)"]
 
 [[package]]
 name = "openai"
-version = "1.92.2"
+version = "1.93.0"
 description = "The official Python library for the openai API"
 optional = false
 python-versions = ">=3.8"
 groups = ["main"]
 files = [
-    {file = "openai-1.92.2-py3-none-any.whl", hash = "sha256:abb64bee7f2571709edf9a856f598ffe871730129a7d807a8a4d8d2958f5c842"},
+    {file = "openai-1.93.0-py3-none-any.whl", hash = "sha256:3d746fe5498f0dd72e0d9ab706f26c91c0f646bf7459e5629af8ba7c9dbdf090"},
-    {file = "openai-1.92.2.tar.gz", hash = "sha256:b571a79fc7e165e7d00e6963a8a95eb5f42b60ac89fd316f1dc0a2dac5c6fae1"},
+    {file = "openai-1.93.0.tar.gz", hash = "sha256:988f31ade95e1ff0585af11cc5a64510225e4f5cd392698c675d0a9265b8e337"},
 ]
 
 [package.dependencies]