From 4d761a9b938eb7791523e47d799b2dc1d3e276cb Mon Sep 17 00:00:00 2001 From: Mahmoud khairy Date: Sat, 6 Jul 2024 06:27:44 +0300 Subject: [PATCH 1/4] recomendation is working ..! link with contact link with delete profile --- .../FoodIngreientSlider.jsx | 49 +++------ .../components/mealsSlider/mealsSlider.jsx | 9 +- wannameal/src/pages/contact/contact.jsx | 101 +++++++++++++----- .../src/pages/profile/edit/editProfile.jsx | 77 ++++++++----- .../src/redux/slices/recomendedMealsSlice.jsx | 5 +- 5 files changed, 147 insertions(+), 94 deletions(-) diff --git a/wannameal/src/components/FoodIngreientSlider/FoodIngreientSlider.jsx b/wannameal/src/components/FoodIngreientSlider/FoodIngreientSlider.jsx index 817d5c3..1665e72 100644 --- a/wannameal/src/components/FoodIngreientSlider/FoodIngreientSlider.jsx +++ b/wannameal/src/components/FoodIngreientSlider/FoodIngreientSlider.jsx @@ -44,8 +44,6 @@ function FoodIngreientSlider() { const ingredientsStatus = useSelector(getIngredientsStatus); const ingredientError = useSelector(getIngredientsError); const language = useSelector(getLanguage); - console.log("🚀 ~ FoodIngreientSlider ~ language:", language); - console.log("🚀 ~ FoodIngreientSlider ~ language:", language); const handleCheckboxChange = (ingredient) => { setCheckedIngredients((prevIngredients) => { @@ -89,7 +87,7 @@ function FoodIngreientSlider() { useEffect(() => { const fetchMeals = async () => { try { - let ingredientNames = "موز"; // Default value if no checked ingredients + let ingredientNames = ""; // Default value if no checked ingredients console.log("🚀 ~ fetchMeals ~ ingredientNames:", ingredientNames); if (checkedIngredients.length > 0) { ingredientNames = checkedIngredients @@ -101,37 +99,19 @@ function FoodIngreientSlider() { "🚀 ~ fetchMeals ~ checkedIngredients:", checkedIngredients ); - console.log( - "🚀🚀🚀🚀🚀 ~ fetchMeals ~ ingredientNames:", - ingredientNames - ); - - await dispatch( - recommendMeals({ - ingredients: ingredientNames, - lang: language, - token: availableUser?.token, - }) - ); - - // axios - // .get("https://tesst11.azurewebsites.net/meals/recommendMeal", { - // params: { - // lang: language, - // ingredients: ingredientNames, - // }, - // headers: { - // token: availableUser?.token, - // }, - // }) - // .then((response) => { - // console.log(response.data); - // }) - // .catch((error) => { - // console.error(error); - // }); - - // console.log("Recommendation response:", response); // Log the response or handle it as needed + console.log(ingredientNames); + console.log(typeof ingredientNames); + + if (ingredientNames !== "") { + const response = await dispatch( + recommendMeals({ + ingredients: ingredientNames, + lang: language, + token: availableUser?.token, + }) + ); + console.log("Recommendation response:", response); // Log the response or handle it as needed + } } catch (error) { console.error("Error fetching meals:", error); } @@ -230,6 +210,7 @@ function FoodIngreientSlider() { slidesPerView: 8.5, }, }} + style={{ direction: "ltr" }} > {filteredIngredients.map((ingredient, index) => ( diff --git a/wannameal/src/components/mealsSlider/mealsSlider.jsx b/wannameal/src/components/mealsSlider/mealsSlider.jsx index eeeec96..79653db 100644 --- a/wannameal/src/components/mealsSlider/mealsSlider.jsx +++ b/wannameal/src/components/mealsSlider/mealsSlider.jsx @@ -24,6 +24,7 @@ import { getRecommendMeals, } from "../../redux/slices/recomendedMealsSlice"; import Loading from "../loading/loading"; +import CommonMeals from "../commonMeals/commonMeals"; function MealsSlider() { const recomendedMeals = useSelector(getRecommendMeals); @@ -33,6 +34,9 @@ function MealsSlider() { const error = useSelector(getMealsError); console.log("🚀 ~ MealsSlider ~ error:", error); + if (recomendedMeals && recomendedMeals.length == 0) { + return ; + } if (mealsStatus == "loading") return (
@@ -74,12 +78,13 @@ function MealsSlider() { spaceBetween: 40, }, }} + style={{ direction: "ltr" }} > - {/* {recomendedMeals?.map((meal, index) => ( + {recomendedMeals?.map((meal, index) => ( - ))} */} + ))}
); 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 (
-
+
@@ -39,6 +98,9 @@ function ContactUs() { className={`form-control ${styles.input}`} id="exampleFormControlInput1" placeholder={Email} + value={formData.email} + onChange={handleChange} + required />
@@ -48,33 +110,14 @@ function ContactUs() { placeholder={msg} id="exampleFormControlTextarea1" rows={3} - defaultValue={""} + value={formData.message} + onChange={handleChange} + required />
- -
{send}
- {/* {message &&
{message}
} */} - {/* {!isLoading ? ( -
- send message -
- ) : ( -
- -
- )} */} +
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..9268a22 100644 --- a/wannameal/src/redux/slices/recomendedMealsSlice.jsx +++ b/wannameal/src/redux/slices/recomendedMealsSlice.jsx @@ -22,15 +22,14 @@ 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", }, } ); - return response; + return response.data.Recommendation; } catch (error) { return rejectWithValue(error.message); } From bd63274f3daa9baf08b47036302e569d9aef5aa2 Mon Sep 17 00:00:00 2001 From: Mahmoud khairy Date: Sat, 6 Jul 2024 07:13:15 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D8=B4=D9=88=D9=8A=D8=A9=20=D8=AD=D9=86?= =?UTF-8?q?=D9=83=D8=B4=D9=87=20=D9=83=D8=AF=D8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../postContent/postContent.module.css | 7 +-- .../src/components/savedMeals/SavedMeals.jsx | 46 ++++++++++-------- .../savedMeals/savedMeals.module.css | 7 +-- wannameal/src/pages/community/comunity.jsx | 4 +- wannameal/src/pages/profile.rar | Bin 7172 -> 0 bytes 5 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 wannameal/src/pages/profile.rar diff --git a/wannameal/src/components/postContent/postContent.module.css b/wannameal/src/components/postContent/postContent.module.css index 98a12fa..9b203ca 100644 --- a/wannameal/src/components/postContent/postContent.module.css +++ b/wannameal/src/components/postContent/postContent.module.css @@ -16,12 +16,13 @@ object-fit: cover; } -.userInfo { +.userInfo .text { display: flex; flex-direction: column; align-items: flex-start; justify-content: center; letter-spacing: -1px; + margin-left: 8px; } .userInfo .name { font-weight: 600; @@ -29,8 +30,8 @@ } .userInfo .email { color: var(--grayWritingColor); - font-size: 14px; - transform: scale(0.8) translate(-5px, -8px); + font-size: 12px; + /* transform: scale(0.8); */ } .postText { diff --git a/wannameal/src/components/savedMeals/SavedMeals.jsx b/wannameal/src/components/savedMeals/SavedMeals.jsx index c4d38f5..ec9ee3c 100644 --- a/wannameal/src/components/savedMeals/SavedMeals.jsx +++ b/wannameal/src/components/savedMeals/SavedMeals.jsx @@ -51,27 +51,33 @@ export default function SavedMeals() { ); return ( - <> -
- {savedMeals && savedMeals.length > 0 ? ( - savedMeals.map((meal) => { - 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/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/profile.rar b/wannameal/src/pages/profile.rar deleted file mode 100644 index d8253a86f86a2582f1bfc81b277c28c4d0aded9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7172 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 Date: Sat, 6 Jul 2024 18:32:02 +0300 Subject: [PATCH 3/4] del --- wannameal/src/components/navbar/navbar.jsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/wannameal/src/components/navbar/navbar.jsx b/wannameal/src/components/navbar/navbar.jsx index c4948a2..2e29a9c 100644 --- a/wannameal/src/components/navbar/navbar.jsx +++ b/wannameal/src/components/navbar/navbar.jsx @@ -1,7 +1,4 @@ // import { jwtDecode } from "jwt-decode"; -import { curve, menuSlide, slide } from "./Animate"; -import { AnimatePresence, motion } from "framer-motion"; -import userImage from "../../assets/man-user.svg"; import Swal from "sweetalert2"; import React, { useMemo, useState } from "react"; import style from "./page.module.css"; From 1f37853a9b2092c41356a29e57618bdf4a127d27 Mon Sep 17 00:00:00 2001 From: Mahmoud khairy Date: Sat, 6 Jul 2024 18:37:07 +0300 Subject: [PATCH 4/4] fix recommendation --- wannameal/src/redux/slices/recomendedMealsSlice.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wannameal/src/redux/slices/recomendedMealsSlice.jsx b/wannameal/src/redux/slices/recomendedMealsSlice.jsx index 9268a22..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, @@ -26,6 +26,7 @@ export const recommendMeals = createAsyncThunk( { headers: { "Content-Type": "application/json", + token: token, }, } );