-
- 
+
);
}
diff --git a/wannameal/src/components/savedMeals/savedMeals.module.css b/wannameal/src/components/savedMeals/savedMeals.module.css
index 15f5041..98d4c06 100644
--- a/wannameal/src/components/savedMeals/savedMeals.module.css
+++ b/wannameal/src/components/savedMeals/savedMeals.module.css
@@ -1,7 +1,8 @@
.recipsContainer {
display: grid;
- grid-template-columns: repeat(auto-fill, minmax(450px, 1fr));
- gap: 30px;
+ grid-template-columns: repeat(auto-fill, minmax(370px, 1fr));
+ justify-content: space-between;
+ gap: 10px;
}
.noMealscontainer {
@@ -11,7 +12,7 @@
flex-direction: column;
gap: 10px;
align-items: center;
- justify-content: center;
+ justify-content: space-around;
}
.noMealscontainer .imageContainer {
diff --git a/wannameal/src/pages/community/comunity.jsx b/wannameal/src/pages/community/comunity.jsx
index a801786..3741f7c 100644
--- a/wannameal/src/pages/community/comunity.jsx
+++ b/wannameal/src/pages/community/comunity.jsx
@@ -222,8 +222,8 @@ export default function Community() {
try {
dispatch(
getProfileById({
- userId: decodedToken.id,
- token: availableUser.token,
+ userId: decodedToken?.id,
+ token: availableUser?.token,
lang: language,
})
);
diff --git a/wannameal/src/pages/contact/contact.jsx b/wannameal/src/pages/contact/contact.jsx
index a485d01..e2324ef 100644
--- a/wannameal/src/pages/contact/contact.jsx
+++ b/wannameal/src/pages/contact/contact.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
import styles from "./contactUS.module.css";
import { MdOutlineLocationOn } from "react-icons/md";
import { FiPhone } from "react-icons/fi";
@@ -8,9 +8,65 @@ import { FaXTwitter } from "react-icons/fa6";
import { TiSocialLinkedin } from "react-icons/ti";
import "animate.css";
import { useTranslation } from "react-i18next";
+import axios from "axios";
+import Swal from "sweetalert2";
+
function ContactUs() {
- const { t } = useTranslation()
- const { head, fname, Email, msg, send, location, phone, mail } = t('contact')
+ const { t } = useTranslation();
+ const { head, fname, Email, msg, send, location, phone, mail } = t("contact");
+
+ const [formData, setFormData] = useState({
+ name: "",
+ email: "",
+ message: "",
+ });
+
+ console.log("🚀 ~ ContactUs ~ formData:", formData);
+ const handleChange = (e) => {
+ const { name, value } = e.target;
+ setFormData({
+ ...formData,
+ [name]: value,
+ });
+ };
+
+ const handleSubmit = async (e) => {
+ e.preventDefault();
+ try {
+ const response = await axios.post(
+ "https://fast-plat1.vercel.app/contactus",
+ formData
+ );
+ console.log("🚀 ~ handleSubmit ~ response:", response);
+ Swal.fire({
+ icon: "success",
+ title: response?.data?.message,
+ toast: true,
+ position: "top-end",
+ showConfirmButton: false,
+ timer: 3000,
+ timerProgressBar: true,
+ });
+
+ setFormData({
+ name: "",
+ email: "",
+ message: "",
+ });
+ } catch (error) {
+ console.error("Failed to send contact: ", error);
+ Swal.fire({
+ icon: "error",
+ title: "Failed to send",
+ toast: true,
+ position: "top-end",
+ showConfirmButton: false,
+ timer: 2000,
+ timerProgressBar: true,
+ });
+ }
+ };
+
return (
+
-
+
+
+ {savedMeals && savedMeals.length > 0 ? (
+ savedMeals.map((meal) => (
+
- )}
+ )}
+
+
+ ))
+ ) : (
+
+
-
+
+
+ + There are no recipes saved yet. +
++ Save the recipes you like to try later and you will find them + saved here.{" "} +
There are no recipes saved yet.
-- Save the recipes you like to try later and you will find them - saved here.{" "} -
-
-
diff --git a/wannameal/src/pages/profile.rar b/wannameal/src/pages/profile.rar
deleted file mode 100644
index d8253a8..0000000
Binary files a/wannameal/src/pages/profile.rar and /dev/null differ
diff --git a/wannameal/src/pages/profile/edit/editProfile.jsx b/wannameal/src/pages/profile/edit/editProfile.jsx
index 24e49a6..742b859 100644
--- a/wannameal/src/pages/profile/edit/editProfile.jsx
+++ b/wannameal/src/pages/profile/edit/editProfile.jsx
@@ -229,7 +229,7 @@ function EditProfile() {
}
};
- let handleDeleteAccount = () => {
+ const handleDeleteAccount = async () => {
Swal.fire({
title: "Are you sure?",
text: "You won't be able to revert this!",
@@ -241,33 +241,58 @@ function EditProfile() {
}).then(async (result) => {
if (result.isConfirmed) {
let timerInterval;
- await dispatch(
- deleteAccount({
- userId: decodedToken.id,
- token: availableUser.token,
- })
- );
- Swal.fire({
- title: "Deleting Account!",
- html: "Your Account will be Deleted in second.",
- timer: 5000,
- timerProgressBar: true,
- didOpen: () => {
- Swal.showLoading();
- const timer = Swal.getPopup().querySelector("b");
- timerInterval = setInterval(() => {
- timer.textContent = `${parseInt(Swal.getTimerLeft() / 1000)}`;
- }, 1000);
- },
- willClose: () => {
- clearInterval(timerInterval);
- },
- }).then((result) => {
- if (result.dismiss === Swal.DismissReason.timer) {
- dispatch(logout());
+ try {
+ await dispatch(
+ deleteAccount({
+ userId: decodedToken.id,
+ token: availableUser.token,
+ })
+ );
+
+ if (userError) {
+ Swal.fire({
+ icon: "error",
+ title: `${userError?.msgError}`,
+ toast: true,
+ position: "top-end",
+ showConfirmButton: false,
+ timer: 2000,
+ timerProgressBar: true,
+ });
+ } else {
+ Swal.fire({
+ title: "Deleting Account!",
+ html: "Your Account will be Deleted in second.",
+ timer: 5000,
+ timerProgressBar: true,
+ didOpen: () => {
+ Swal.showLoading();
+ const timer = Swal.getPopup().querySelector("b");
+ timerInterval = setInterval(() => {
+ timer.textContent = `${parseInt(Swal.getTimerLeft() / 1000)}`;
+ }, 1000);
+ },
+ willClose: () => {
+ clearInterval(timerInterval);
+ },
+ }).then((result) => {
+ if (result.dismiss === Swal.DismissReason.timer) {
+ dispatch(logout());
+ }
+ });
}
- });
+ } catch (error) {
+ Swal.fire({
+ icon: "error",
+ title: `${userError?.msgError || "Failed to delete account"}`,
+ toast: true,
+ position: "top-end",
+ showConfirmButton: false,
+ timer: 2000,
+ timerProgressBar: true,
+ });
+ }
}
});
};
diff --git a/wannameal/src/redux/slices/recomendedMealsSlice.jsx b/wannameal/src/redux/slices/recomendedMealsSlice.jsx
index 5551a03..48957ae 100644
--- a/wannameal/src/redux/slices/recomendedMealsSlice.jsx
+++ b/wannameal/src/redux/slices/recomendedMealsSlice.jsx
@@ -14,7 +14,7 @@ const initialState = {
export const recommendMeals = createAsyncThunk(
"meals/recommendMeals",
- async ({ ingredients, lang }, { rejectWithValue }) => {
+ async ({ ingredients, lang, token }, { rejectWithValue }) => {
try {
console.log("Sending request to API with params:", {
lang: lang,
@@ -22,15 +22,15 @@ export const recommendMeals = createAsyncThunk(
});
const response = await axios.get(
- `https://tesst11.azurewebsites.net/meals/recommendMeal?lang=${lang}`,
- { ingredients },
+ `https://tesst11.azurewebsites.net/meals/recommendMeal?lang=${lang}&ingredients=${ingredients}`,
{
headers: {
"Content-Type": "application/json",
+ token: token,
},
}
);
- return response;
+ return response.data.Recommendation;
} catch (error) {
return rejectWithValue(error.message);
}