Properly merge

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

@@ -7,56 +7,6 @@
         </v-card-title>
         <v-card-text>
           <p>{{ $t("recipe.create-recipe-from-an-image-description") }}</p>
-<<<<<<< HEAD
-          <v-container class="pa-0">
-            <v-row>
-              <v-col cols="auto" align-self="center">
-                <AppButtonUpload
-                  class="ml-auto"
-                  url="none"
-                  file-name="images"
-                  accept="image/*"
-                  :text="uploadedImages.length ? $t('recipe.upload-more-images') : $t('recipe.upload-images')"
-                  :text-btn="false"
-                  :post="false"
-                  :multiple="true"
-                  @uploaded="uploadImages"
-                />
-              </v-col>
-              <v-spacer />
-            </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">
-                      <ImageCropper
-                        :img="imageUrl"
-                        cropper-height="100%"
-                        cropper-width="100%"
-                        @save="(croppedImage) => updateUploadedImage(index, croppedImage)"
-                      />
-
-                      <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-container class="px-0">
             <AppButtonUpload
               class="ml-auto"
@@ -91,18 +41,13 @@
                     @save="(croppedImage) => updateUploadedImage(index, croppedImage)"
                     @delete="clearImage(index)"
                   />
->>>>>>> b0b3d7e5e59ad9b4539ddbfde126bbf12c89d3d9
                 </v-col>
               </v-row>
             </div>
           </v-container>
         </v-card-text>
         <v-card-actions v-if="uploadedImages.length">
-<<<<<<< HEAD
-          <div>
-=======
           <div class="w-100 d-flex flex-column align-center">
->>>>>>> b0b3d7e5e59ad9b4539ddbfde126bbf12c89d3d9
             <p style="width: 250px">
               <BaseButton rounded block type="submit" :loading="loading" />
             </p>
@@ -187,10 +132,7 @@ export default defineNuxtComponent({
 
     function updateUploadedImage(index: number, croppedImage: Blob) {
       uploadedImages.value[index] = croppedImage;
-<<<<<<< HEAD
-=======
       uploadedImagesPreviewUrls.value[index] = URL.createObjectURL(croppedImage);
->>>>>>> b0b3d7e5e59ad9b4539ddbfde126bbf12c89d3d9
     }
 
     return {