Updates

vijay-murugeasan · Jan 5, 2024 · f0478cf · f0478cf
1 parent e5c3b0a
commit f0478cf
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 35 deletions.
diff --git a/src/assets/js/isotope.pkgd.min.js b/src/assets/js/isotope.pkgd.min.js
diff --git a/src/assets/js/jquery-3.2.1.slim.min.js b/src/assets/js/jquery-3.2.1.slim.min.js
diff --git a/src/features/home/DeliveryBanner.jsx b/src/features/home/DeliveryBanner.jsx
@@ -13,8 +13,8 @@ function DeliveryBanner() {
       >
         <div>
           <small>FooYes Delivery </small>
-          <h3>We Deliver to your ______</h3>
-          <p>Enjoy a tasty food __ minutes!</p>
+          <h3>We Deliver to your home </h3>
+          <p>Enjoy a tasty food few minutes!</p>
           <Link to="/restaurant" className="btn_1 gradient">
             Start Now!
           </Link>

diff --git a/src/features/home/StartOrder.jsx b/src/features/home/StartOrder.jsx
@@ -24,8 +24,8 @@ function StartOrder() {
                   </figure>
                   <h3>Easly Order</h3>
                   <p>
-                    Faucibus ante, in porttitor ______ blandit et. Phasellus
-                    tincidunt _____ lectus sollicitudin.
+                    Order in for yourself or for the group, with no restrictions
+                    on order value
                   </p>
                 </div>
                 <div className="box_how">
@@ -40,8 +40,8 @@ function StartOrder() {
                   </figure>
                   <h3>Quick Delivery</h3>
                   <p>
-                    Maecenas pulvinar, risus in _________ dignissim, quam nisi
-                    hendrerit _____, id vestibulum.
+                    Experience Fooyes's superfast delivery for food delivered
+                    fresh & on time
                   </p>
                 </div>
               </div>
@@ -58,8 +58,8 @@ function StartOrder() {
                   </figure>
                   <h3>Enjoy Food</h3>
                   <p>
-                    Morbi convallis bibendum urna __ viverra. Maecenas quis
-                    consequat ______, a feugiat eros.
+                    Morbi convallis bibendum urna viverra. Maecenas quis
+                    consequat , a feugiat eros.
                   </p>
                 </div>
               </div>
@@ -82,13 +82,12 @@ function StartOrder() {
                 <h2>Start Ordering Now</h2>
               </div>
               <p className="lead">
-                Lorem ipsum dolor sit ____, consectetur adipiscing elit. Sed
-                _________ libero id nisi euismod, ___ porta est consectetur
-                deserunt.
+                Lorem ipsum dolor sit , consectetur adipiscing elit. Sed libero
+                id nisi euismod, porta est consectetur deserunt.
               </p>
               <p>
-                Duis aute irure dolor __ reprehenderit in voluptate velit ____
-                cillum dolore eu fugiat _____ pariatur.
+                Duis aute irure dolor reprehenderit in voluptate velit cillum
+                dolore eu fugiat pariatur.
               </p>
               <p>
                 <Link

diff --git a/src/features/order/OrderForm.jsx b/src/features/order/OrderForm.jsx
@@ -225,7 +225,7 @@ function OrderForm({ isSubmitted, setIsSubmitted }) {
             </label>
             <i className="icon_wallet"></i>
           </div>
-          <button className="btn_1 gradient full-width mb_5" ref={ref}>
+          <button className="btn_1 gradient full-width mb_5 d-none" ref={ref}>
             submit
           </button>
         </div>

diff --git a/src/services/redux/CartSlice.js b/src/services/redux/CartSlice.js
@@ -5,7 +5,7 @@ const items =
         ? JSON.parse(window.sessionStorage.getItem("cartList"))
         : [];
 
-console.log(items)
+
 // adding this function to prevent repeat code 
 const setCartListFunc = (items) => {
     window.sessionStorage.setItem("cartList", JSON.stringify(items));

diff --git a/src/ui/Footer.jsx b/src/ui/Footer.jsx
@@ -2,12 +2,14 @@ import { useLocation } from "react-router-dom";
 
 function Footer() {
   const { pathname } = useLocation();
-  const pageIncludes = ["/home", "/contact"];
+  const pageIncludes = ["/home", "/", "/contact"];
+
+  console.log(pageIncludes.includes(pathname));
   return (
     <footer>
       <div
         className={`wave footer  ${
-          !pageIncludes.includes(pathname) ? "gray" : ""
+          pageIncludes.includes(pathname) ? "" : "gray"
         }`}
       ></div>
       <div className="container margin_60_40 fix_mobile">
@@ -19,10 +21,7 @@ function Footer() {
             <div className="collapse dont-collapse-sm links" id="collapse_1">
               <ul>
                 <li>
-                  <a href="help.html">Terms and Conditions </a>
-                </li>
-                <li>
-                  <a href="contacts.html">Privacy </a>
+                  <a href="/contact">Privacy </a>
                 </li>
               </ul>
             </div>
@@ -33,18 +32,15 @@ function Footer() {
             <div className="collapse dont-collapse-sm links" id="collapse_1">
               <ul>
                 <li>
-                  <a href="help.html">Help </a>
-                </li>
-                <li>
-                  <a href="contacts.html">Contacts </a>
+                  <a href="/contact">Contacts </a>
                 </li>
               </ul>
             </div>
             <h3 data-bs-target="#collapse_2">Categories</h3>
             <div className="collapse dont-collapse-sm links" id="collapse_2">
               <ul>
                 <li>
-                  <a href="listing-map.html">Top Categories </a>
+                  <a href="/restaurant">Top Categories </a>
                 </li>
               </ul>
             </div>

diff --git a/src/ui/Header.jsx b/src/ui/Header.jsx
@@ -8,9 +8,11 @@ function Header() {
   const [scrollTopData, setScrollTopData] = useState("");
   const { pathname } = useLocation();
   const headerClass =
-    pathname === "/"
-      ? `header black_nav clearfix element_to_stick ${scrollTopData}`
+    pathname === "/" || pathname === "/contact"
+      ? `header clearfix element_to_stick ${scrollTopData}`
       : "header_in clearfix";
+  const homeClass = pathname === "/" || pathname === "/home" ? "black_nav" : "";
+  const logoClass = pathname === "/contact";
 
   useEffect(() => {
     window.addEventListener("scroll", () => {
@@ -21,15 +23,14 @@ function Header() {
       }
     });
   }, []);
-
   const [mobileNav, setMobileNav] = useState(false);
 
   return (
-    <header className={headerClass}>
+    <header className={`${headerClass} ${homeClass}`}>
       <div className="container">
         <div id="logo">
           <Link to="/">
-            <Logo />
+            <Logo className={logoClass} sticky={scrollTopData} />
           </Link>
         </div>
         <div className={`layer ${mobileNav ? "layer-is-visible" : ""}`}></div>

diff --git a/src/ui/Logo.jsx b/src/ui/Logo.jsx
@@ -1,7 +1,6 @@
-import LogoImg from "/img/logo_sticky.svg";
-
-function Logo() {
-  return <img src={LogoImg} alt="" />;
+function Logo({ className, sticky }) {
+  const logo = className && !sticky ? "logo" : "logo_sticky";
+  return <img src={`/img/${logo}.svg`} alt="" />;
 }
 
 export default Logo;