refactor(merge): merge develop

#141
202306-NEA-DZ-FEW · Nov 26, 2023 · e824349 · e824349
2 parents 5f2c456 + e01c06e
commit e824349
Show file tree

Hide file tree

Showing 35 changed files with 337 additions and 114 deletions.
diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json
diff --git a/src/components/BlogsCard/BlogsCard.jsx b/src/components/BlogsCard/BlogsCard.jsx
@@ -24,17 +24,17 @@ const BlogCard = ({ image, title, subtitle, author, blogId, body }) => {
             <div className='flex flex-col my-2 lg:px-6 text-poppins'>
                 <Link href={`/blogs/${blogId}`}>
                     <h2 className='text-sm lg:text-xl font-semibold text-NeutralBlack dark:text-NeutralWhite'>
-                        {title}
+                        {t(title)}
                     </h2>
                 </Link>
                 <p className='text-gray-500 dark:text-gray-400 font-light text-xs lg:text-sm'>
-                    {t("Written by")} {author}
+                    {t("Written by")} {t(author)}
                 </p>
                 <p
                     dangerouslySetInnerHTML={{
                         __html:
                             body && typeof body === "string"
-                                ? body.split("</p")[0]
+                                ? t(body).split("</p")[0]
                                 : "",
                     }}
                     className='text-NeutralBlack dark:text-NeutralWhite font-light text-xs lg:text-base py-2'

diff --git a/src/components/Booking/1TypeOfCounseling.jsx b/src/components/Booking/1TypeOfCounseling.jsx
@@ -5,12 +5,14 @@ import React from "react";
 import { Slide, toast } from "react-toastify";
 
 import { useAppcontext } from "@/context/state";
+import TotalTickets from "../StripePayment/TotalTickets";
 
-export default function TypeOfCounseling({ OnNext }) {
+export default function TypeOfCounseling({ OnNext, user }) {
     const { t } = useTranslation("common");
     const [typesOfCounceling, setTypesOfCounceling] = useState(""); // You can initialize it with a default value if needed
 
     const { bookingInfos, setBookingInfos } = useAppcontext();
+    const [totalTickets, setTotalTickets] = useState(); // Track total tickets
 
     const SelectCouncelingType = (text) => {
         setTypesOfCounceling(text);
@@ -39,7 +41,7 @@ export default function TypeOfCounseling({ OnNext }) {
     return (
         <div className='bg-NeutralWhite dark:bg-Dark_Accent min-w-screen mb-12'>
             <Head>
-                <title>Type Of Counseling</title>
+                <title>{t("Type Of Counseling")}</title>
             </Head>
             <div className='w-full h-full px-8 lg:px-20 bg-NeutralWhite dark:bg-Dark_Accent mb-16'>
                 <div className='mb-3 pt-6 font-poppins font-semibold tracking-wider text-NeutralBlack dark:text-NeutralWhite capitalize text-2xl lg:text-4xl leading-normal'>
@@ -57,7 +59,7 @@ export default function TypeOfCounseling({ OnNext }) {
 
                     <div className='px-3 mx-5 mt-1 lg:px-6  group '>
                         <h3
-                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] pl-2 lg:px-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite group-hover:text-NeutralWhite dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
+                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] px-2 lg:px-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite group-hover:text-NeutralWhite dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
                             ${
                                 typesOfCounceling === "Individual counseling"
                                     ? "bg-Accent dark:bg-[#3E4E68]"
@@ -72,7 +74,7 @@ export default function TypeOfCounseling({ OnNext }) {
                     </div>
                     <div className='px-3 mx-5 lg:px-6 mt-1 lg:mt-2 group'>
                         <h3
-                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] pl-2 lg:pl-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite group-hover:text-NeutralWhite group-hover:bg-Accent dark:hover:bg-[#3E4E68] group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
+                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] px-2 lg:px-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite group-hover:text-NeutralWhite group-hover:bg-Accent dark:hover:bg-[#3E4E68] group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
                                 ${
                                     typesOfCounceling ===
                                     "Teen counseling (for my child)"
@@ -88,14 +90,20 @@ export default function TypeOfCounseling({ OnNext }) {
                             {t("Teen counseling (for my child)")}
                         </h3>
                     </div>
-                    <div className='self-end pr-6 py-10 lg:py-10 lg:pr-11 group '>
+                    <div className='self-end px-6 py-10 lg:py-10 lg:px-11 group '>
                         <button
                             className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                             onClick={handleNextClick}
                         >
                             {t("Next")}
                         </button>
                     </div>
+                    <div className='hidden'>
+                        <TotalTickets
+                            user={user}
+                            setTotalTickets={setTotalTickets}
+                        />
+                    </div>
                 </div>
             </div>
         </div>

diff --git a/src/components/Booking/2RelationshipStatus.jsx b/src/components/Booking/2RelationshipStatus.jsx
@@ -39,7 +39,7 @@ export default function RelationshipStatus({ OnNext, OnPrevious }) {
     return (
         <div className='bg-NeutralWhite  dark:bg-Dark_Accent min-w-screen mb-12'>
             <Head>
-                <title>Relationship Status</title>
+                <title>{t("Relationship Status")}</title>
             </Head>
             <div className='w-full h-full px-8 lg:px-20 bg-NeutralWhite dark:bg-Dark_Accent'>
                 <div className='mb-3 pt-6 font-ogg font-bold text-NeutralBlack dark:text-NeutralWhite capitalize text-2xl lg:text-4xl leading-normal'>
@@ -62,7 +62,7 @@ export default function RelationshipStatus({ OnNext, OnPrevious }) {
 
                     <div className=' px-3 mx-5  mt-1 lg:px-6 group'>
                         <h3
-                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] pl-2 lg:pl-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
+                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] px-2 lg:px-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
                                 ${
                                     relationshipStatus === "Single"
                                         ? "bg-Accent"
@@ -75,7 +75,7 @@ export default function RelationshipStatus({ OnNext, OnPrevious }) {
                     </div>
                     <div className=' px-3 mx-5  lg:px-6 mt-1 lg:mt-2  group'>
                         <h3
-                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] pl-2 lg:pl-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
+                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] px-2 lg:px-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
                             ${
                                 relationshipStatus === "Married"
                                     ? "bg-Accent dark:bg-[#3E4E68]"
@@ -88,7 +88,7 @@ export default function RelationshipStatus({ OnNext, OnPrevious }) {
                     </div>
                     <div className='px-3 mx-5  lg:px-6 mt-1 lg:mt-2  group'>
                         <h3
-                            className={` rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] pl-2 lg:pl-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
+                            className={` rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] px-2 lg:px-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
                             ${
                                 relationshipStatus === "Divorced"
                                     ? "bg-Accent dark:bg-[#3E4E68]"
@@ -100,15 +100,15 @@ export default function RelationshipStatus({ OnNext, OnPrevious }) {
                         </h3>
                     </div>
                     <div className='flex justify-between '>
-                        <div className=' pl-6 py-10 lg:py-10 lg:pl-11 group '>
+                        <div className=' px-6 py-10 lg:py-10 lg:px-11 group '>
                             <button
                                 className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                                 onClick={OnPrevious}
                             >
                                 {t("Previous")}
                             </button>
                         </div>
-                        <div className=' pr-6 py-10 lg:py-10 lg:pr-11 group '>
+                        <div className=' px-6 py-10 lg:py-10 lg:px-11 group '>
                             <button
                                 className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                                 onClick={handleNextClick}

diff --git a/src/components/Booking/3Therapy.jsx b/src/components/Booking/3Therapy.jsx
@@ -38,7 +38,7 @@ export default function Therapy({ OnNext, OnPrevious }) {
     return (
         <div className='bg-NeutralWhite dark:bg-Dark_Accent min-w-screen mb-12'>
             <Head>
-                <title>Therapy</title>
+                <title>{"Therapy"}</title>
             </Head>
             <div className='w-full h-full px-8 lg:px-20 bg-NeutralWhite dark:bg-Dark_Accent '>
                 <div className='mb-3 pt-12 font-ogg font-bold text-NeutralBlack dark:text-NeutralWhite capitalize text-2xl lg:text-4xl leading-normal'>
@@ -61,7 +61,7 @@ export default function Therapy({ OnNext, OnPrevious }) {
 
                     <div className='px-3 mx-5 mt-1 lg:px-6 group'>
                         <h3
-                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] pl-2 lg:pl-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite  dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
+                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] px-2 lg:px-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite  dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
                                 ${
                                     therapy === "Yes"
                                         ? "bg-Accent dark:bg-[#3E4E68]"
@@ -74,7 +74,7 @@ export default function Therapy({ OnNext, OnPrevious }) {
                     </div>
                     <div className='px-3 mx-5 mt-1 lg:px-6  group'>
                         <h3
-                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] pl-2 lg:pl-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite  dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
+                            className={`rounded-md py-4 shadow-[rgba(0,_0,_0,_0.24)_0px_3px_8px] px-2 lg:px-5 lg:py-5 cursor-pointer text-NeutralBlack dark:text-NeutralWhite  group-hover:text-NeutralWhite  dark:hover:bg-[#3E4E68] group-hover:bg-Accent group-hover:scale-105 duration-300 text-lg lg:text-xl font-regular font-poppins capitalize
                                 ${
                                     therapy === "No"
                                         ? "bg-Accent dark:bg-[#3E4E68]"
@@ -87,15 +87,15 @@ export default function Therapy({ OnNext, OnPrevious }) {
                     </div>
 
                     <div className='flex justify-between '>
-                        <div className=' pl-6 py-10 lg:py-10 lg:pl-11 group '>
+                        <div className=' px-6 py-10 lg:py-10 lg:px-11 group '>
                             <button
                                 className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                                 onClick={OnPrevious}
                             >
                                 {t("Previous")}
                             </button>
                         </div>
-                        <div className=' pr-6 py-10 lg:py-10 lg:pr-11 group '>
+                        <div className=' px-6 py-10 lg:py-10 lg:px-11 group '>
                             <button
                                 className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                                 onClick={handleNextClick}

diff --git a/src/components/Booking/4CounseQualities.jsx b/src/components/Booking/4CounseQualities.jsx
@@ -58,7 +58,7 @@ export default function CounseQualities({ OnNext, OnPrevious }) {
     return (
         <div className='bg-NeutralWhite dark:bg-Dark_Accent min-w-screen mb-12'>
             <Head>
-                <title>Counselor Qualities</title>
+                <title>{t("Counselor Qualities")}</title>
             </Head>
             <div className='w-full h-full px-8 lg:px-20 bg-NeutralWhite dark:bg-Dark_Accent'>
                 <div className='mb-3 pt-6 font-ogg font-bold text-NeutralBlack dark:text-NeutralWhite uppercase text-2xl lg:text-4xl leading-normal'>
@@ -118,15 +118,15 @@ export default function CounseQualities({ OnNext, OnPrevious }) {
                         </div>
 
                         <div className='flex justify-between '>
-                            <div className=' pl-6 py-10 lg:py-10 lg:pl-11 group '>
+                            <div className=' px-6 py-10 lg:py-10 lg:px-11 group '>
                                 <button
                                     className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                                     onClick={OnPrevious}
                                 >
                                     {t("Previous")}
                                 </button>
                             </div>
-                            <div className=' pr-6 py-10 lg:py-10 lg:pr-11 group '>
+                            <div className=' px-6 py-10 lg:py-10 lg:px-11 group '>
                                 <button
                                     className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                                     onClick={handleNextClick}

diff --git a/src/components/Booking/5Issues.jsx b/src/components/Booking/5Issues.jsx
@@ -48,7 +48,7 @@ export default function Issues({ OnNext, OnPrevious }) {
     return (
         <div className='bg-NeutralWhite dark:bg-Dark_Accent min-w-screen mb-12'>
             <Head>
-                <title>Issues</title>
+                <title>{t("Issues")}</title>
             </Head>
             <div className='w-full h-full px-8 lg:px-20 bg-NeutralWhite dark:bg-Dark_Accent'>
                 <div className='mb-3 pt-6 font-ogg font-bold text-NeutralBlack dark:text-NeutralWhite uppercase text-2xl lg:text-4xl leading-normal'>
@@ -146,15 +146,15 @@ export default function Issues({ OnNext, OnPrevious }) {
                         </div>
                     </div>
                     <div className='flex justify-between '>
-                        <div className=' pl-6 py-10 lg:py-10 lg:pl-11 group '>
+                        <div className=' px-6 py-10 lg:py-10 lg:px-11 group '>
                             <button
                                 className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                                 onClick={OnPrevious}
                             >
                                 {t("Previous")}
                             </button>
                         </div>
-                        <div className=' pr-6 py-10 lg:py-10 lg:pr-11 group '>
+                        <div className=' px-6 py-10 lg:py-10 lg:px-11 group '>
                             <button
                                 className='w-28 h-10 rounded-md text-base font-poppins font-regular bg-Accent text-NeutralBlack dark:text-NeutralWhite dark:bg-Dark_Primary dark:hover:bg-[#3E4E68]  hover:bg-[#879AB8] hover:text-NeutralWhite hover:scale-105 duration-500'
                                 onClick={handleNextClick}

diff --git a/src/components/Booking/6Description.jsx b/src/components/Booking/6Description.jsx
@@ -41,7 +41,7 @@ export default function Description({ OnNext, OnPrevious }) {
     return (
         <div className='bg-NeutralWhite dark:bg-Dark_Accent min-w-screen min-h-screen'>
             <Head>
-                <title>Description</title>
+                <title>{t("Description")}</title>
             </Head>
             <div className='w-full h-full px-8 lg:px-20 bg-NeutralWhite dark:bg-Dark_Accent flex flex-col '>
                 <div className='mb-3 pt-6 font-poppins font-bold text-NeutralBlack dark:text-NeutralWhite  capitalize text-2xl lg:text-4xl leading-normal'>