Update 31-01-2024

src/APP/components/Header2.jsx

@@ -1,117 +1,117 @@
-import { useState } from "react";
-import { Link, useLocation } from "react-router-dom";
-
-import logo from "../../assets/images/sytLogo.png";
-import menu from "../../assets/images/hamburger-menu.svg";
-
-const navLinks = [
-  {
-    id: 1,
-    link: "Home",
-    route: "/",
-  },
-  {
-    id: 2,
-    link: "About Us",
-    route: "/about-us",
-  },
-  {
-    id: 3,
-    link: "Community",
-    route: "/community",
-  },
-  {
-    id: 4,
-    link: "Products",
-    route: "/products",
-  },
-  {
-    id: 5,
-    link: "Blogs",
-    route: "/blogs",
-  },
-  // {
-  //   id: 6,
-  //   link: "Resources",
-  //   route: "/resources",
-  // },
-  // {
-  //   id: 7,
-  //   link: "Shop",
-  //   route: "/shop",
-  // },
-  // {
-  //   id: 8,
-  //   link: "Donate",
-  //   route: "/donate",
-  // },
-];
-
-const Header2 = () => {
-  const [showNavlinks, setShowNavlinks] = useState(false);
-
-  const { pathname } = useLocation();
-
-  return (
-    <header className="py-5 md:px-10 px-5 flex items-center justify-between md:shadow-none shadow-md relative max-w-[1440px] md:mx-auto">
-      {/* logo */}
-      <Link to="/">
-        <img src={logo} alt="logo" className="md:w-16 w-12" />
-      </Link>
-
-      {/* mobile menu */}
-      <img
-        src={menu}
-        alt="logo"
-        className="md:hidden"
-        onClick={() => setShowNavlinks((prev) => !prev)}
-      />
-
-      {/* mobile navlinks */}
-      <nav
-        className="flex flex-col items-start justify-start gap-6 text-base absolute top-[90px] left-0 bg-white border-b w-full h-fit z-[1] p-5 pl-12"
-        style={
-          showNavlinks
-            ? { display: "flex", height: "calc(100vh - 90px)" }
-            : { display: "none" }
-        }
-      >
-        {navLinks.map(({ link, id, route }) => {
-          const isActive = pathname === route;
-          return (
-            <Link
-              key={id}
-              className={`${
-                isActive ? "text-primary underline" : "text-gray-900"
-              } hover:text-primary hover:underline transition-all duration-300 cursor-pointer`}
-              to={`${route}`}
-              onClick={() => setShowNavlinks(false)}
-            >
-              {link}
-            </Link>
-          );
-        })}
-      </nav>
-
-      {/* navlinks */}
-      <nav className="md:flex hidden items-center gap-5 text-base">
-        {navLinks.map(({ id, link, route }) => {
-          const isActive = pathname === route;
-          return (
-            <Link
-              key={id}
-              className={`${
-                isActive ? "text-primary underline" : "text-gray-900"
-              } hover:text-primary hover:underline transition-all duration-300 cursor-pointer`}
-              to={`${route}`}
-            >
-              {link}
-            </Link>
-          );
-        })}
-      </nav>
-    </header>
-  );
-};
-
-export default Header2;
+import { useState } from "react";
+import { Link, useLocation } from "react-router-dom";
+
+import logo from "../../assets/images/sytLogo.png";
+import menu from "../../assets/images/hamburger-menu.svg";
+
+const navLinks = [
+  {
+    id: 1,
+    link: "Home",
+    route: "/",
+  },
+  {
+    id: 2,
+    link: "About Us",
+    route: "/about-us",
+  },
+  {
+    id: 3,
+    link: "Community",
+    route: "/community",
+  },
+  {
+    id: 4,
+    link: "Products",
+    route: "/products",
+  },
+  {
+    id: 5,
+    link: "Blogs",
+    route: "/blogs",
+  },
+  // {
+  //   id: 6,
+  //   link: "Resources",
+  //   route: "/resources",
+  // },
+  // {
+  //   id: 7,
+  //   link: "Shop",
+  //   route: "/shop",
+  // },
+  // {
+  //   id: 8,
+  //   link: "Donate",
+  //   route: "/donate",
+  // },
+];
+
+const Header2 = () => {
+  const [showNavlinks, setShowNavlinks] = useState(false);
+
+  const { pathname } = useLocation();
+
+  return (
+    <header className="py-5 md:px-10 px-5 flex items-center justify-between md:shadow-none shadow-md relative max-w-[1440px] md:mx-auto">
+      {/* logo */}
+      <Link to="/">
+        <img src={logo} alt="logo" className="md:w-16 w-12" />
+      </Link>
+
+      {/* mobile menu */}
+      <img
+        src={menu}
+        alt="logo"
+        className="md:hidden"
+        onClick={() => setShowNavlinks((prev) => !prev)}
+      />
+
+      {/* mobile navlinks */}
+      <nav
+        className="flex flex-col items-start justify-start gap-6 text-base absolute top-[90px] left-0 bg-white border-b w-full h-fit z-[1] p-5 pl-12"
+        style={
+          showNavlinks
+            ? { display: "flex", height: "calc(100vh - 90px)" }
+            : { display: "none" }
+        }
+      >
+        {navLinks.map(({ link, id, route }) => {
+          const isActive = pathname === route;
+          return (
+            <Link
+              key={id}
+              className={`${
+                isActive ? "text-primary underline" : "text-gray-900"
+              } hover:text-primary hover:underline transition-all duration-300 cursor-pointer`}
+              to={`${route}`}
+              onClick={() => setShowNavlinks(false)}
+            >
+              {link}
+            </Link>
+          );
+        })}
+      </nav>
+
+      {/* navlinks */}
+      <nav className="md:flex hidden items-center gap-5 text-base">
+        {navLinks.map(({ id, link, route }) => {
+          const isActive = pathname === route;
+          return (
+            <Link
+              key={id}
+              className={`${
+                isActive ? "text-primary underline" : "text-gray-900"
+              } hover:text-primary hover:underline transition-all duration-300 cursor-pointer`}
+              to={`${route}`}
+            >
+              {link}
+            </Link>
+          );
+        })}
+      </nav>
+    </header>
+  );
+};
+
+export default Header2;

src/APP/index.js

@@ -5,7 +5,7 @@ import Homepage from "./pages/shop/Homepage";
 import SingleItemPage from "./pages/shop/pages/SingleItemPage";
 import Layout from "./pages/Layout";
 import Products from "./pages/products2/Products";
-import Resources from "./pages/resources/Resources";
+import Resources from "./pages/resources2/Resources";
 
 import Checkout from "./pages/shop/pages/OrderSummary";
 
@@ -26,10 +26,10 @@ import Error404 from "./pages/errorPages/Error404";
 import Error500 from "./pages/errorPages/Error500";
 
 import ErrorBoundary from "./pages/errorPages/ErrorBoundary";
+
 import ProductDisplay from "./pages/shop/pages/ProductDisplay";
 import GalleryPage from "./pages/gallery/GalleryPage";
 
-
 export {
   LandingPage,
   Homepage,
@@ -56,5 +56,4 @@ export {
   ErrorBoundary,
   ProductDisplay,
   GalleryPage,
-
 };

src/APP/pages/aboutUs/sections/LeadershipSection.jsx

@@ -187,8 +187,9 @@ function LeadershipSection() {
                           />
 
                           <input
-                            type="telephone"
+                            type="tel"
                             placeholder="Phone number"
+                            pattern="[0-9\s]{10,13}"
                             required
                             className="w-full outline-none text-base font-normal placeholder:text-gray-600 border border-[#79747E] rounded-[4px] pl-4 py-2"
                             value={phoneNumber}

src/APP/pages/aboutUs/sections/PartnerCTA.jsx

@@ -56,7 +56,6 @@ function PartnerCTA() {
           <p>
             <a
               href="/src/assets/reports/spaceyatech-internship-program.pdf"
-              download="SpaceYaTech_Internship_Program_2023.pdf"
               target="_blank"
               rel="noopener noreferrer"
               className="text-primary text-sm sm:text-base"

src/APP/pages/blog/Blog.jsx

@@ -1,8 +1,5 @@
-
-import React from "react";
+import React, { useEffect } from "react";
 import { useParams, useNavigate } from "react-router-dom";
-
-
 import BlogWrapper from "./sections/BlogWrapper";
 import RelatedBlogs from "./sections/RelatedBlogs";
 import { Loader } from "../../components";
@@ -14,7 +11,7 @@ function Blog() {
   const navigate = useNavigate();
   const {
     data: blogData,
-
+    refetch: refetchBlogData,
     isLoading,
     isError,
     isSuccess,