Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Message alerts for image upload using image upload button and url button #4665

Open
wants to merge 3 commits into
base: mealie-next
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 95 additions & 46 deletions frontend/components/Domain/Recipe/RecipeImageUploadBtn.vue
Original file line number Diff line number Diff line change
@@ -1,47 +1,46 @@
<template>
<div class="text-center">
<v-menu v-model="menu" offset-y top nudge-top="6" :close-on-content-click="false">
<template #activator="{ on, attrs }">
<v-btn color="accent" dark v-bind="attrs" v-on="on">
<v-icon left>
{{ $globals.icons.fileImage }}
</v-icon>
{{ $t("general.image") }}
</v-btn>
</template>
<v-card width="400">
<v-card-title class="headline flex mb-0">
<div>
{{ $t("recipe.recipe-image") }}
</div>
<AppButtonUpload
class="ml-auto"
url="none"
file-name="image"
:text-btn="false"
:post="false"
@uploaded="uploadImage"
/>
</v-card-title>
<v-card-text class="mt-n5">
<div>
<v-text-field v-model="url" :label="$t('general.url')" class="pt-5" clearable :messages="messages">
<template #append-outer>
<v-btn class="ml-2" color="primary" :loading="loading" :disabled="!slug" @click="getImageFromURL">
{{ $t("general.get") }}
</v-btn>
</template>
</v-text-field>
</div>
</v-card-text>
</v-card>
</v-menu>
</div>
<template>
<v-menu v-model="menu" offset-y top nudge-top="6" :close-on-content-click="false">
<template #activator="{ on, attrs }">
<v-btn color="accent" dark v-bind="attrs" v-on="on">
<v-icon left>
{{ $globals.icons.fileImage }}
</v-icon>
{{ $t("general.image") }}
</v-btn>
</template>
<v-card width="400">
<v-card-title class="headline flex mb-0">
<div>
{{ $t("recipe.recipe-image") }}
</div>
<AppButtonUpload
class="ml-auto"
url="none"
file-name="image"
:text-btn="false"
:post="false"
@uploaded="uploadImage"
/>
</v-card-title>
<v-card-text class="mt-n5">
<div>
<v-text-field v-model="url" :label="$t('general.url')" class="pt-5" clearable :messages="messages">
<template #append-outer>
<v-btn class="ml-2" color="primary" :loading="loading" :disabled="!slug" @click="getImageFromURL">
{{ $t("general.get") }}
</v-btn>
</template>
</v-text-field>
</div>
</v-card-text>
</v-card>
</v-menu>
</template>

<script lang="ts">
import { defineComponent, reactive, toRefs, useContext } from "@nuxtjs/composition-api";
import { useUserApi } from "~/composables/api";
import { alert } from "~/composables/use-toast"; // Import the alert functions

const REFRESH_EVENT = "refresh";
const UPLOAD_EVENT = "upload";
Expand All @@ -58,31 +57,81 @@ export default defineComponent({
url: "",
loading: false,
menu: false,
})
messages: [],
});


// Function to upload the image file
function uploadImage(fileObject: File) {
try{
// Check if the file has an acceptable extension
const allowedExtensions = [".jpg", ".jpeg", ".png", ".gif", ".webp"];
const fileExtension = fileObject.name.split(".").pop()?.toLowerCase();
Comment on lines +67 to +68
Copy link
Collaborator

@Kuchenpirat Kuchenpirat Jan 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix indentation

Suggested change
// Check if the file has an acceptable extension
const allowedExtensions = [".jpg", ".jpeg", ".png", ".gif", ".webp"];
// Check if the file has an acceptable extension
const allowedExtensions = [".jpg", ".jpeg", ".png", ".gif", ".webp"];

Comment on lines +67 to +68
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are missing heic and avif.


// If the file extension is not in the allowed extensions list, show an error message
if (!fileExtension || !allowedExtensions.includes(`.${fileExtension}`)) {
alert.error(i18n.tc("general.invalid-image-extension"));
return;
}

function uploadImage(fileObject: File) {
context.emit(UPLOAD_EVENT, fileObject);
state.menu = false;

// Show success message for image upload
alert.success(i18n.tc("general.image-uploaded"));
}
catch(error){
alert.error(i18n.tc("general.image-upload-failed"));
}
}


const api = useUserApi();
const { i18n } = useContext();

// Function to check if the URL is reachable
async function isURLReachable(url: string) {
try {
const response = await fetch(url, { method: "HEAD" });
return response.ok; // If status is 200, response.ok will be true
} catch (error) {
return false; // Network error or invalid URL
}
}

// Function to get image from URL
async function getImageFromURL() {
state.loading = true;
if (await api.recipes.updateImagebyURL(props.slug, state.url)) {

// Check if the URL is reachable it uses HTTP codes
const isReachable = await isURLReachable(state.url);

if (!isReachable) {
alert.error(i18n.tc("general.invalid-url"));
state.loading = false;
return;
}

// If the URL is reachable, make the API request to update the image using the URL
const response = await api.recipes.updateImagebyURL(props.slug, state.url);

// Check the response from the API and show appropriate alert
if (response) {
alert.success(i18n.tc("general.image-uploaded"));
context.emit(REFRESH_EVENT);
} else {
alert.error(i18n.tc("general.invalid-url"));
}

// Finalize loading state and menu visibility
state.loading = false;
state.menu = false;
}

const { i18n } = useContext();
const messages = props.slug ? [""] : [i18n.t("recipe.save-recipe-before-use")];

return {
...toRefs(state),
uploadImage,
getImageFromURL,
messages,
};
},
});
Expand Down
3 changes: 3 additions & 0 deletions frontend/lang/messages/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
"home": "Home",
"image": "Image",
"image-upload-failed": "Image upload failed",
"image-uploaded": "Image Uploaded",
"invalid-url": "The provided URL is invalid. Please check and try again.",
"invalid-image-extension": "Invalid file extension",
"import": "Import",
"json": "JSON",
"keyword": "Keyword",
Expand Down
Loading