Merge pull request #117 from 202306-NEA-DZ-FEW/116-fix-newsletter-font

feat(project): fix newsletter font and "read more" button
202306-NEA-DZ-FEW · Nov 25, 2023 · d7c53f8 · d7c53f8
2 parents 7e6aede + 49a148f
commit d7c53f8
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 24 deletions.
diff --git a/public/locales/en/addItem.json b/public/locales/en/addItem.json
@@ -11,7 +11,7 @@
   "descriptionPlaceHolder": "Add a description",
   "imageLabel": "Image",
   "imageRequired": "You need to provide an image",
-  "locationLabel": "Province",
+  "locationLabel": "Wilaya",
   "locationRequired": "Location is required",
   "listingType": "Listing type",
   "itemTagRequired": "Item type is required",

diff --git a/src/components/BlogCard/HorizontalCard.jsx b/src/components/BlogCard/HorizontalCard.jsx
@@ -43,13 +43,11 @@ function HorizontalCard({ description, imageUrl, id, blogKey }) {
             className='text-secondary font-bold flex items-center gap-2'
           >
             {t("common:buttons:readMore")}
-
             {i18n.language !== "ar" ? (
               <IoIosArrowDropright className='text-xl' />
-            ) : null}
-            {i18n.language === "ar" ? (
+            ) : (
               <IoIosArrowDropleft className='text-xl' />
-            ) : null}
+            )}
           </Link>
         </div>
       </div>

diff --git a/src/components/BlogCard/index.jsx b/src/components/BlogCard/index.jsx
@@ -33,10 +33,9 @@ function BlogCard({ id, imageUrl, blogKey }) {
             {t("common:buttons:readMore")}
             {i18n.language !== "ar" ? (
               <IoIosArrowDropright className='text-xl' />
-            ) : null}
-            {i18n.language === "ar" ? (
+            ) : (
               <IoIosArrowDropleft className='text-xl' />
-            ) : null}
+            )}
           </Link>
         </div>
       </div>

diff --git a/src/components/BlogsCard/index.jsx b/src/components/BlogsCard/index.jsx
@@ -1,7 +1,7 @@
 import Image from "next/image";
 import Link from "next/link";
 import { useTranslation } from "next-i18next";
-import { IoIosArrowDropright } from "react-icons/io";
+import { IoIosArrowDropleft, IoIosArrowDropright } from "react-icons/io";
 
 export default function BlogsCard({
   title,
@@ -47,8 +47,11 @@ export default function BlogsCard({
               className='text-secondary font-bold flex items-center gap-2'
             >
               {t("common:buttons:readMore")}
-
-              <IoIosArrowDropright className='text-xl' />
+              {i18n.language !== "ar" ? (
+                <IoIosArrowDropright className='text-xl' />
+              ) : (
+                <IoIosArrowDropleft className='text-xl' />
+              )}
             </Link>
           </div>
         </div>

diff --git a/src/components/Footer/__test__/__snapshots__/Footer.test.js.snap b/src/components/Footer/__test__/__snapshots__/Footer.test.js.snap
@@ -25,6 +25,7 @@ exports[`renders correctly 1`] = `
     </div>
     <div
       className="col-span-1 "
+      dir="ltr"
     >
       <ul
         className="flex flex-col items-center md:items-start gap-4"
@@ -194,6 +195,7 @@ exports[`renders correctly 1`] = `
     </div>
     <div
       className="col-span-1"
+      dir="ltr"
     >
       <ul
         className="flex flex-col items-center md:items-start"

diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx
@@ -10,7 +10,7 @@ import { FaInstagram } from "react-icons/fa";
 import LanguageMenu from "../LanguageMenu";
 
 function Footer() {
-  const { t } = useTranslation();
+  const { i18n, t } = useTranslation();
   const router = useRouter();
   const [currentPath, setCurrentPath] = useState("/");
   useEffect(() => {
@@ -29,7 +29,10 @@ function Footer() {
             </h2>
           </Link>
         </div>
-        <div className='col-span-1 '>
+        <div
+          dir={i18n?.language === "ar" ? "rtl" : "ltr"}
+          className='col-span-1 '
+        >
           <ul className='flex flex-col items-center md:items-start gap-4'>
             <Link href='/about'>
               <li className='hover:underline'>{t("common:buttons:about")}</li>
@@ -63,7 +66,10 @@ function Footer() {
             </div>
           </ul>
         </div>
-        <div className='col-span-1'>
+        <div
+          dir={i18n?.language === "ar" ? "rtl" : "ltr"}
+          className='col-span-1'
+        >
           <ul className='flex flex-col items-center md:items-start'>
             <li className=''>{t("common:footer:address")}</li>
             <li className=''>{t("common:footer:street")}</li>

diff --git a/src/components/LandingPage/BlogsSection/index.jsx b/src/components/LandingPage/BlogsSection/index.jsx
@@ -30,10 +30,9 @@ function BlogsSection({ blogs }) {
           {t("common:buttons:readMore")}
           {i18n.language !== "ar" ? (
             <IoIosArrowDropright className='text-xl' />
-          ) : null}
-          {i18n.language === "ar" ? (
+          ) : (
             <IoIosArrowDropleft className='text-xl' />
-          ) : null}
+          )}
         </Link>
       </motion.div>
       {/* Cards Section */}

diff --git a/src/components/Newsletter/NewsletterForm.jsx b/src/components/Newsletter/NewsletterForm.jsx
@@ -39,7 +39,7 @@ function NewsletterForm({ onValidated }) {
           <h2 className='text-2xl md:text-3xl tracking-wider font-extrabold '>
             {t("newsletter:newsletterTitle")}
           </h2>
-          <p className='my-4 max-w-xl font-light text-xl text-gray-800'>
+          <p className='my-4 max-w-xl font-light text-xl'>
             {t("newsletter:newsletterDescription")}
             <br />
             {t("newsletter:newsletterJoin")}

diff --git a/src/components/Newsletter/__test__/__snapshots__/Newsletter.test.js.snap b/src/components/Newsletter/__test__/__snapshots__/Newsletter.test.js.snap
@@ -16,7 +16,7 @@ Array [
         newsletterTitle
       </h2>
       <p
-        className="my-4 max-w-xl font-light text-xl text-gray-800"
+        className="my-4 max-w-xl font-light text-xl"
       >
         newsletterDescription
         <br />

diff --git a/src/components/Newsletter/__test__/__snapshots__/NewsletterForm.test.js.snap b/src/components/Newsletter/__test__/__snapshots__/NewsletterForm.test.js.snap
@@ -16,7 +16,7 @@ Array [
         newsletterTitle
       </h2>
       <p
-        className="my-4 max-w-xl font-light text-xl text-gray-800"
+        className="my-4 max-w-xl font-light text-xl"
       >
         newsletterDescription
         <br />

diff --git a/src/context/AuthProvider.jsx b/src/context/AuthProvider.jsx
@@ -76,7 +76,7 @@ export function AuthContextProvider({ children }) {
         date: serverTimestamp(),
       });
       setUser(user.user);
-      toast.success(`Hi ${userInfo.name}, Thank you for joing in us! 😍`, {
+      toast.success(`Hi ${userInfo.name}, Thank you for joining us! 😍`, {
         position: toast.POSITION.TOP_CENTER,
         autoClose: 1500,
       });
@@ -144,7 +144,7 @@ export function AuthContextProvider({ children }) {
         });
         setUser(user);
         toast.success(
-          `Hi ${user.user.displayName}, Thank you for joing in us! 😍`,
+          `Hi ${user.user.displayName}, Thank you for joining us! 😍`,
           {
             position: toast.POSITION.TOP_CENTER,
             autoClose: 1500,
@@ -208,7 +208,7 @@ export function AuthContextProvider({ children }) {
         });
         setUser(user);
         toast.success(
-          `Hi ${user.user.displayName}, Thank you for joing in us! 😍`,
+          `Hi ${user.user.displayName}, Thank you for joining us! 😍`,
           {
             position: toast.POSITION.TOP_CENTER,
             autoClose: 1500,
@@ -273,7 +273,7 @@ export function AuthContextProvider({ children }) {
         });
         setUser(user);
         toast.success(
-          `Hi ${user.user.displayName}, Thank you for joing in us! 😍`,
+          `Hi ${user.user.displayName}, Thank you for joining us! 😍`,
           {
             position: toast.POSITION.TOP_CENTER,
             autoClose: 1500,