Merge branch 'Dev' into inventory_admin

Author: CodedVeli

pnpm-lock.yaml

@@ -227,8 +227,11 @@ function EventsTable() {
                   <td
                     aria-label="events"
                     className="hidden sm:table-cell py-4 "
+                    className="hidden sm:table-cell py-4"
+                    id={`checkbox-${row.id}`}
                   >
                     <input
+                      aria-labelledby={`checkbox-${row.id}`}
                       type="checkbox"
                       className="cursor-pointer"
                       onChange={(event) => handleSelectRow(event, row.id)}
@@ -237,7 +240,7 @@ function EventsTable() {
                   </td>
                   <td className="whitespace-wrap px-2 py-4">{row.eventName}</td>
                   <td>{row.city}</td>
-                  <td className="hidden sm:table-cell">{row.date}</td>
+                  <td className="hidden sm:table-cell">{row.date}</td>∏
                   <td className="hidden sm:table-cell">{row.from}</td>
                   <td className="hidden sm:table-cell">{row.to}</td>
                   <td className="hidden sm:table-cell">{row.chapter}</td>

src/components/admin/events/EventsTable.jsx

@@ -1,16 +1,15 @@
-import React from "react";
 import AdminReportCard, {
-  HighDemandCard,
-  TotalVisitsCustomCard,
-  ChartComponent,
   BigChartComponent,
+  ChartComponent,
+  HighDemandCard,
   InvenOrderCard,
   InvenOrderCardTwo,
-  totalSalesData,
   totalOrdersData,
-  totalVisitsData,
+  totalSalesData,
   totalVisitInnerCardData,
   totalVisitInnerCardDataTwo,
+  TotalVisitsCustomCard,
+  totalVisitsData,
 } from "../../../../components/admin/AdminReportCard";
 
 function AdminMain() {

src/pages/admin/shop/dashboard/AdminMain.jsx

@@ -1,7 +1,7 @@
 /* eslint-disable react/prop-types */
 
 import React from "react";
-
+import PropTypes from "prop-types";
 import {
   FacebookIcon,
   FacebookShareButton,
@@ -56,3 +56,8 @@ function ShareBlog({ url, title }) {
 }
 
 export default ShareBlog;
+
+ShareBlog.propTypes = {
+  url: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+};

src/pages/blog/sections/ShareBlog.jsx

@@ -1,5 +1,3 @@
-import React from "react";
-
 import { LazyLoadImage } from "react-lazy-load-image-component";
 import { error403 } from "../../assets/images/errorPages";
 

src/pages/errorPages/Error403.jsx

@@ -14,21 +14,11 @@ import { EventCard } from "../../../community/sections/eventsPreview/SingleEvent
 //   calendar,
 //   globe,
 // } from "../../../../../assets/images/icons";
+import { EventCard } from "../../../community/sections/eventsPreview/SingleEvents/sections";
 
 function Events({ events }) {
-  // const formattedDate = format(parseISO(start_date), "do, MMMM");
-  // import formatEventDates from "../../../../../utilities/formatEventDate";
-  // import { LazyLoadImage } from "react-lazy-load-image-component";
-
   return (
-    <div
-      // className="my-4 md:my-8 grid grid-cols-1 gap-8 sm:grid-cols-2 md:grid-cols-3 max-w-1216 mx-auto md:pb-10"
-      className="mx-auto my-6 max-w-1216 w-full grid grid-cols-1 sm:grid-cols-2 place-content-center lg:grid-cols-3 gap-8 justify-between px-4 xl:px-0"
-      // style={{
-      //   gridAutoColumns: "max-content",
-      //   gridTemplateRows: "minmax(550px, 400px)",
-      // }}
-    >
+    <div className="mx-auto my-6 max-w-1216 w-full grid grid-cols-1 sm:grid-cols-2 place-content-center lg:grid-cols-3 gap-8 justify-between px-4 xl:px-0">
       {events &&
         Array.isArray(events) &&
         events.map((event) => (
@@ -133,6 +123,7 @@ function Events({ events }) {
           //   </div>
           // </Link>
         ))}
+        events.map((event) => <EventCard key={event.id} event={event} />)}
     </div>
   );
 }

src/pages/events/sections/eventsSection/Events.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
+import { useState } from "react";
 import { bannerImg } from "../../../assets/images/hero-section";
 import JoinSYTModal from "../../community/sections/JoinSYTModal";
-// import { bannerImg } from "../assets/images/hero-section";
 
 function CTASection() {
   const [isOpen, setIsOpen] = useState(false);

src/pages/landingPage/sections/CTASection.jsx

@@ -1,5 +1,4 @@
 /* eslint-disable react/prop-types */
-import React from "react";
 import { LazyLoadImage } from "react-lazy-load-image-component";
 import { Button } from "../../../components";
 import { whatWeDoData } from "../data";

src/pages/landingPage/sections/WhatWeDo.jsx

@@ -1,8 +1,6 @@
 import { Tab } from "@headlessui/react";
-import React from "react";
 import { LazyLoadImage } from "react-lazy-load-image-component";
 import { Link, useNavigate } from "react-router-dom";
-
 import { upleftGreen } from "../../../assets/images/icons";
 import { Loader } from "../../../components";
 import useStackData from "../../../hooks/Queries/stack/useStackData";