diff --git a/src/ADMIN/components/AddChapterForm.jsx b/src/APP/components/admin/AddChapterForm.jsx
similarity index 100%
rename from src/ADMIN/components/AddChapterForm.jsx
rename to src/APP/components/admin/AddChapterForm.jsx
diff --git a/src/ADMIN/components/AdminHeader.jsx b/src/APP/components/admin/AdminHeader.jsx
similarity index 93%
rename from src/ADMIN/components/AdminHeader.jsx
rename to src/APP/components/admin/AdminHeader.jsx
index 8b8de007..3b99ccae 100644
--- a/src/ADMIN/components/AdminHeader.jsx
+++ b/src/APP/components/admin/AdminHeader.jsx
@@ -1,8 +1,8 @@
/* eslint-disable react/react-in-jsx-scope */
import { Link } from "react-router-dom";
-import logo from "../../assets/images/sytLogo.png";
-import bell from "../../assets/images/icons/bell-icon.svg";
-import profile from "../../assets/images/adminPage/profile-pic.png";
+import logo from "../../../assets/images/sytLogo.png";
+import bell from "../../../assets/images/icons/bell-icon.svg";
+import profile from "../../../assets/images/adminPage/profile-pic.png";
function AdminHeader() {
return (
diff --git a/src/ADMIN/components/AdminLayout.jsx b/src/APP/components/admin/AdminLayout.jsx
similarity index 100%
rename from src/ADMIN/components/AdminLayout.jsx
rename to src/APP/components/admin/AdminLayout.jsx
diff --git a/src/ADMIN/components/BottomNavBar.jsx b/src/APP/components/admin/BottomNavBar.jsx
similarity index 100%
rename from src/ADMIN/components/BottomNavBar.jsx
rename to src/APP/components/admin/BottomNavBar.jsx
diff --git a/src/ADMIN/components/DropdownInput.jsx b/src/APP/components/admin/DropdownInput.jsx
similarity index 100%
rename from src/ADMIN/components/DropdownInput.jsx
rename to src/APP/components/admin/DropdownInput.jsx
diff --git a/src/ADMIN/components/GeneralInfo.jsx b/src/APP/components/admin/GeneralInfo.jsx
similarity index 100%
rename from src/ADMIN/components/GeneralInfo.jsx
rename to src/APP/components/admin/GeneralInfo.jsx
diff --git a/src/ADMIN/components/Organizers.jsx b/src/APP/components/admin/Organizers.jsx
similarity index 100%
rename from src/ADMIN/components/Organizers.jsx
rename to src/APP/components/admin/Organizers.jsx
diff --git a/src/ADMIN/components/SocialMediaLinks.jsx b/src/APP/components/admin/SocialMediaLinks.jsx
similarity index 100%
rename from src/ADMIN/components/SocialMediaLinks.jsx
rename to src/APP/components/admin/SocialMediaLinks.jsx
diff --git a/src/ADMIN/components/StepIndicator.jsx b/src/APP/components/admin/StepIndicator.jsx
similarity index 100%
rename from src/ADMIN/components/StepIndicator.jsx
rename to src/APP/components/admin/StepIndicator.jsx
diff --git a/src/ADMIN/components/events/Calendar.jsx b/src/APP/components/admin/events/Calendar.jsx
similarity index 100%
rename from src/ADMIN/components/events/Calendar.jsx
rename to src/APP/components/admin/events/Calendar.jsx
diff --git a/src/ADMIN/components/events/EventsTable.jsx b/src/APP/components/admin/events/EventsTable.jsx
similarity index 99%
rename from src/ADMIN/components/events/EventsTable.jsx
rename to src/APP/components/admin/events/EventsTable.jsx
index 8482c49f..e14a4899 100644
--- a/src/ADMIN/components/events/EventsTable.jsx
+++ b/src/APP/components/admin/events/EventsTable.jsx
@@ -1,5 +1,5 @@
import React, { useState } from "react";
-import SearchIcon from "../../../assets/images/icons/search-icon.svg";
+import SearchIcon from "../../../../assets/images/icons/search-icon.svg";
const initialData = [
{
diff --git a/src/APP/components/auth/NotificationModal.jsx b/src/APP/components/auth/NotificationModal.jsx
new file mode 100644
index 00000000..65ec351d
--- /dev/null
+++ b/src/APP/components/auth/NotificationModal.jsx
@@ -0,0 +1,83 @@
+import { Dialog, Transition } from "@headlessui/react";
+import PropTypes from "prop-types";
+import { Fragment } from "react";
+import { Link } from "react-router-dom";
+
+function NotificationModal({ isOpen, setIsOpen, message }) {
+ const closeModal = () => {
+ setIsOpen(false);
+ };
+
+ return (
+
+
+
+ );
+}
+
+export default NotificationModal;
+
+NotificationModal.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ setIsOpen: PropTypes.func.isRequired,
+ message: PropTypes.string.isRequired,
+};
diff --git a/src/APP/components/index.js b/src/APP/components/index.js
index 8447ce1d..34e49c51 100644
--- a/src/APP/components/index.js
+++ b/src/APP/components/index.js
@@ -4,7 +4,8 @@ import { default as Footer2 } from "./Footer2";
import { default as Header } from "./Header";
import { default as Header2 } from "./Header2";
import { default as Caroussel } from "./Caroussel";
-import { default as Counter } from "./Counter";
+import { default as Counter } from "./shop/Counter";
+import { default as CartDrawer } from "./shop/CartDrawer";
import { default as PodcastCard } from "./PodcastCard";
import { default as Loader } from "./Loader";
@@ -18,4 +19,5 @@ export {
Counter,
PodcastCard,
Loader,
+ CartDrawer,
};
diff --git a/src/APP/components/shop/CartDrawer.jsx b/src/APP/components/shop/CartDrawer.jsx
new file mode 100644
index 00000000..562b9ffd
--- /dev/null
+++ b/src/APP/components/shop/CartDrawer.jsx
@@ -0,0 +1,234 @@
+import { Dialog, Transition } from "@headlessui/react";
+import { Fragment, useState } from "react";
+import { useNavigate, Link } from "react-router-dom";
+import CloseIcon from "../../../assets/images/icons/close-icon.svg";
+import DeleteIcon from "../../../assets/images/icons/delete-icon.svg";
+import SampleImg from "../../../assets/images/shop-page/main-sample.png";
+import Sample3 from "../../../assets/images/shop-page/sample3.png";
+import { useDeleteSwag } from "../../../hooks/Mutations/shop/useCartSwagg";
+import useProductsInCart from "../../../hooks/Queries/shop/useCartProducts";
+import useAuth from "../../../hooks/useAuth";
+import Counter from "./Counter";
+
+function CartDrawer({ open, setOpen }) {
+ const { auth } = useAuth();
+ const navigate = useNavigate();
+ const [count, setCount] = useState(1);
+
+ const { data: cartProducts, isSuccess } = useProductsInCart();
+
+ const { mutate: deleteSwag } = useDeleteSwag();
+
+ const handleDeleteSwag = (cartItemId) => {
+ deleteSwag(cartItemId);
+ };
+
+ const handleCheckout = () => {
+ if (auth?.access) {
+ navigate("/shop/checkout");
+ }
+ };
+
+ return (
+
+
+
+ );
+}
+
+export default CartDrawer;
diff --git a/src/APP/components/Counter.jsx b/src/APP/components/shop/Counter.jsx
similarity index 65%
rename from src/APP/components/Counter.jsx
rename to src/APP/components/shop/Counter.jsx
index eafe0eba..e4252a23 100644
--- a/src/APP/components/Counter.jsx
+++ b/src/APP/components/shop/Counter.jsx
@@ -1,9 +1,13 @@
-function Counter({ className }) {
+import PropTypes from "prop-types";
+
+function Counter({ className, setCount, count }) {
return (
@@ -11,11 +15,13 @@ function Counter({ className }) {
className="outline-none focus:outline-none font-medium md:text-basecursor-default flex items-center justify-center border-y border-y-[#323433]"
name="custom-input-number"
>
- 1
+ {count}
@@ -24,3 +30,13 @@ function Counter({ className }) {
}
export default Counter;
+
+Counter.defaultProps = {
+ className: "",
+};
+
+Counter.propTypes = {
+ className: PropTypes.string,
+ setCount: PropTypes.func.isRequired,
+ count: PropTypes.number.isRequired,
+};
diff --git a/src/APP/index.js b/src/APP/index.js
index a971e167..7288a6ae 100644
--- a/src/APP/index.js
+++ b/src/APP/index.js
@@ -1,43 +1,55 @@
-import LandingPage from "./pages/landingPage/LandingPage";
-
-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/resources2/Resources";
-
-import Checkout from "./pages/shop/pages/OrderSummary";
-
import AboutUs from "./pages/aboutUs/AboutUs";
+import AllBlogsPage from "./pages/admin/blogs/AllBlogsPage";
+import AddChapterPage from "./pages/admin/chapters/AddChapterPage";
+import AllChaptersPage from "./pages/admin/chapters/AllChaptersPage";
+import AddEventPage from "./pages/admin/events/AddEventPage";
+import AllEventsPage from "./pages/admin/events/AllEventsPage";
+import UpdateEventPage from "./pages/admin/events/UpdateEventPage";
+import ForgotPassword from "./pages/auth/ForgotPassword";
+import LogIn from "./pages/auth/LogIn";
+import ResetPassword from "./pages/auth/ResetPassword";
+import SignUp from "./pages/auth/SignUp";
+import Blog from "./pages/blog/Blog";
+import Blogs from "./pages/blogs/Blogs";
+import IndividualChapter from "./pages/chapter/pages/IndividualChapter";
import CommunityPage from "./pages/community/CommunityPage";
-import DonatePage from "./pages/donate/DonatePage";
-import Categories from "./pages/shop/pages/Categories";
import SingleEvent from "./pages/community/sections/eventsSection/SingleEvents/SingleEvent";
-import EventsPage from "./pages/events/pages/EventsPage";
-import EventsSection from "./pages/events/sections/eventsSection/EventsSection";
-import Blogs from "./pages/blogs/Blogs";
-import Blog from "./pages/blog/Blog";
+import DonatePage from "./pages/donate/DonatePage";
import SingleProductDonation from "./pages/donate/pages/SingleProductDonatePage";
-import IndividualChapter from "./pages/chapter/pages/IndividualChapter";
import Error400 from "./pages/errorPages/Error400";
import Error403 from "./pages/errorPages/Error403";
import Error404 from "./pages/errorPages/Error404";
import Error500 from "./pages/errorPages/Error500";
-
-import ProductDisplay from "./pages/shop/pages/ProductDisplay";
+import ErrorBoundary from "./pages/errorPages/ErrorBoundary";
+import EventsPage from "./pages/events/pages/EventsPage";
+import EventsSection from "./pages/events/sections/eventsSection/EventsSection";
import GalleryPage from "./pages/gallery/GalleryPage";
+import LandingPage from "./pages/landingPage/LandingPage";
+import Layout from "./pages/Layout";
+import Products from "./pages/products2/Products";
+import Resources from "./pages/resources/Resources";
+import Homepage from "./pages/shop/Homepage";
+import Checkout from "./pages/shop/OrderSummaryPage";
+import ProductDisplay from "./pages/shop/ProductDisplayPage";
+import CategoriesProducts from "./pages/shop/sections/CategoriesProducts";
+import SingleItemPage from "./pages/shop/SingleItemPage";
export {
+ AddChapterPage,
+ AddEventPage,
+ AllBlogsPage,
+ AllChaptersPage,
+ AllEventsPage,
+ UpdateEventPage,
LandingPage,
Homepage,
Checkout,
+ CategoriesProducts,
SingleItemPage,
Layout,
Products,
Resources,
AboutUs,
- Categories,
CommunityPage,
DonatePage,
SingleEvent,
@@ -51,6 +63,11 @@ export {
Error403,
Error404,
Error500,
+ ErrorBoundary,
ProductDisplay,
+ ForgotPassword,
+ LogIn,
+ ResetPassword,
+ SignUp,
GalleryPage,
};
diff --git a/src/APP/pages/Layout.jsx b/src/APP/pages/Layout.jsx
index 93fedcf7..00392256 100644
--- a/src/APP/pages/Layout.jsx
+++ b/src/APP/pages/Layout.jsx
@@ -1,19 +1,18 @@
+import { useEffect } from "react";
import { Outlet, useLocation } from "react-router-dom";
-
import { Header2, Footer2 } from "../components";
-import { useEffect } from "react";
-const ScrollToTopOnLinkClick = () => {
- const{ pathname } = useLocation();
+function ScrollToTopOnLinkClick() {
+ const { pathname } = useLocation();
useEffect(() => {
window.scrollTo(0, 0);
}, [pathname]);
return null;
-};
+}
-const Layout = () => {
+function Layout() {
return (
@@ -22,6 +21,6 @@ const Layout = () => {
);
-};
+}
export default Layout;
diff --git a/src/APP/pages/aboutUs/sections/LeadershipSection.jsx b/src/APP/pages/aboutUs/sections/LeadershipSection.jsx
index 686548c0..296a6d13 100644
--- a/src/APP/pages/aboutUs/sections/LeadershipSection.jsx
+++ b/src/APP/pages/aboutUs/sections/LeadershipSection.jsx
@@ -187,8 +187,9 @@ function LeadershipSection() {
/>
{
+ if (currentStep < steps.length - 1) {
+ const updatedSteps = [...steps];
+ updatedSteps[currentStep].status = "completed";
+ updatedSteps[currentStep + 1].status = "active";
+ setSteps(updatedSteps);
+ setCurrentStep(currentStep + 1);
+ }
+ };
+
+ const handlePreviousStep = () => {
+ if (currentStep > 0) {
+ const updatedSteps = [...steps];
+ updatedSteps[currentStep].status = "inactive";
+ updatedSteps[currentStep - 1].status = "inactive";
+ setSteps(updatedSteps);
+ setCurrentStep(currentStep - 1);
+ }
+ };
+
+ const formComplete = (completeChapterData) => {
+ statusPostChapter === "error" && clearStatusPostChapter();
+ errorPostChapter && clearErrorPostChapter();
+ postChapter({ ...completeChapterData });
+ };
+
+ useEffect(() => {
+ if (statusPostChapter === "success") {
+ setSteps(initialSteps);
+ setCurrentStep(0);
+ setCollectedChapter(null);
+ }
+ }, [statusPostChapter]);
+
+ console.log(statusPostChapter);
+
+ return (
+
+
+
+
+
+ Chapters
+
+
+ New Chapter
+
+ {/* Success Display */}
+ {statusPostChapter === "success" && (
+
+
Chapter Added Successfully!
+
{
+ clearStatusPostChapter();
+ postChapter(null);
+ }}
+ >
+
+
+
+ )}
+ {/* Errors Display */}
+ {statusPostChapter === "error" && errorPostChapter?.axios && (
+
+
Cannot add the chapter:
+
{errorPostChapter.axios}
+
{
+ clearErrorPostChapter();
+ clearStatusPostChapter();
+ }}
+ >
+
+
+
+ )}
+ {statusPostChapter === "error" && errorPostChapter?.chapter && (
+
+
Cannot add the chapter:
+
+ {Object.keys(errorPostChapter.chapter).map((key) => (
+ -
+ {key}: {" "}
+ {errorPostChapter.chapter[key].toString()}
+
+ ))}
+
+
{
+ clearErrorPostChapter();
+ clearStatusPostChapter();
+ }}
+ >
+
+
+
+ )}
+
+ Add Chapter Details
+
+
+
+
+ );
+}
+
+export default AddChapterPage;
diff --git a/src/ADMIN/pages/chapters/AllChaptersPage.jsx b/src/APP/pages/admin/chapters/AllChaptersPage.jsx
similarity index 100%
rename from src/ADMIN/pages/chapters/AllChaptersPage.jsx
rename to src/APP/pages/admin/chapters/AllChaptersPage.jsx
diff --git a/src/ADMIN/pages/events/AddEventPage.jsx b/src/APP/pages/admin/events/AddEventPage.jsx
similarity index 98%
rename from src/ADMIN/pages/events/AddEventPage.jsx
rename to src/APP/pages/admin/events/AddEventPage.jsx
index 7206f5ce..d10fedca 100644
--- a/src/ADMIN/pages/events/AddEventPage.jsx
+++ b/src/APP/pages/admin/events/AddEventPage.jsx
@@ -1,4 +1,6 @@
+import { yupResolver } from "@hookform/resolvers/yup";
import React, { useEffect, useState } from "react";
+import { Controller, useForm } from "react-hook-form";
import {
BtnBold,
BtnBulletList,
@@ -15,13 +17,11 @@ import {
EditorProvider,
Toolbar,
} from "react-simple-wysiwyg";
-import { Controller, useForm } from "react-hook-form";
import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useEventsCategories } from "../../../hooks/Queries/eventsSection/useEventCategories";
-import useChaptersData from "../../../hooks/Queries/community/useChaptersData";
-import usePostEvents from "../../../hooks/Queries/eventsSection/usePostEvents";
+import useChaptersData from "../../../../hooks/Queries/community/useChaptersData";
+import { useEventsCategories } from "../../../../hooks/Queries/eventsSection/useEventCategories";
+import usePostEvents from "../../../../hooks/Queries/eventsSection/usePostEvents";
function AddEventPage() {
const [selectedEventCategory, setSelectedEventCategory] = useState("1");
@@ -316,7 +316,7 @@ function AddEventPage() {
{errors.category_name.message}
)}
-
-
)}
);
diff --git a/src/APP/pages/blogs/sections/BlogCard.jsx b/src/APP/pages/blogs/sections/BlogCard.jsx
index 6b9f1590..1717d63a 100644
--- a/src/APP/pages/blogs/sections/BlogCard.jsx
+++ b/src/APP/pages/blogs/sections/BlogCard.jsx
@@ -1,74 +1,75 @@
-import React from "react";
-import { useNavigate, Link } from "react-router-dom";
-import { formatDistanceToNow } from "date-fns";
-
-import { arrowRight } from "../../../../assets/images/blogs-page";
-import logo from "../../../../assets/images/sytLogo.png";
-import BlogStats from "./BlogStats";
-
-function BlogCard({ blog }) {
- const navigate = useNavigate();
- const timeAgo =
- blog?.created_at &&
- formatDistanceToNow(new Date(blog?.created_at), {
- addSuffix: true,
- });
-
- return (
-
-
-
-
-
-
{blog.title}
-
-
-
-
-
- {blog.description}
-
-
-
-
-
-
-
-
- {blog.author}
-
-
- {timeAgo}
-
-
-
-
-
-
-
- );
-}
-
-export default BlogCard;
+/* eslint-disable react/prop-types */
+import React from "react";
+import { useNavigate, Link } from "react-router-dom";
+import { formatDistanceToNow } from "date-fns";
+
+import { arrowRight } from "../../../../assets/images/blogs-page";
+import logo from "../../../../assets/images/sytLogo.png";
+import BlogStats from "./BlogStats";
+
+function BlogCard({ blog }) {
+ const navigate = useNavigate();
+
+ const timeAgo =
+ blog?.created_at &&
+ formatDistanceToNow(new Date(blog?.created_at), {
+ addSuffix: true,
+ });
+
+ return (
+
+
+
+
+
+
{blog.title}
+
+
+
+
+
+ {blog.description}
+
+
+
+
+
+
+
+
+ {blog.author}
+
+ {timeAgo}
+
+
+
+
+
+
+
+ );
+}
+
+export default BlogCard;
diff --git a/src/APP/pages/blogs/sections/BlogsWrapper.jsx b/src/APP/pages/blogs/sections/BlogsWrapper.jsx
index 41473eee..44c75acb 100644
--- a/src/APP/pages/blogs/sections/BlogsWrapper.jsx
+++ b/src/APP/pages/blogs/sections/BlogsWrapper.jsx
@@ -1,13 +1,9 @@
-/* eslint-disable operator-linebreak */
-/* eslint-disable react/jsx-indent */
import React, { useState, useEffect, useContext } from "react";
-// import { useNavigate } from "react-router-dom";
+
import BlogCard from "./BlogCard";
import BlogPagination from "./BlogPagination";
-
import { Loader } from "../../../components";
-
import { SearchBlogContext } from "../../../../context/searchBlog";
import {
useBlogsData,
@@ -29,7 +25,6 @@ function SearchResults({ searchText }) {
function BlogsWrapper() {
const { searchText, searchBlog } = useContext(SearchBlogContext);
-
const [selectedCat, setSelectedCat] = useState("");
const [page, setPage] = useState(1);
diff --git a/src/APP/pages/errorPages/Error400.jsx b/src/APP/pages/errorPages/Error400.jsx
index 753b451a..636558e3 100644
--- a/src/APP/pages/errorPages/Error400.jsx
+++ b/src/APP/pages/errorPages/Error400.jsx
@@ -1,5 +1,4 @@
import React from "react";
-import { Link } from "react-router-dom";
import { error400 } from "../../../assets/images/errorPages";
@@ -16,18 +15,18 @@ function Error400() {
There was a problem with your request. If you continue to see this
error, please{" "}
-
+
contact us.
-
+
.
-
Go Home
-
+
);
diff --git a/src/APP/pages/errorPages/Error403.jsx b/src/APP/pages/errorPages/Error403.jsx
index e40f22d5..800daec6 100644
--- a/src/APP/pages/errorPages/Error403.jsx
+++ b/src/APP/pages/errorPages/Error403.jsx
@@ -1,5 +1,4 @@
import React from "react";
-import { Link } from "react-router-dom";
import { error403 } from "../../../assets/images/errorPages";
@@ -16,18 +15,18 @@ function Error403() {
You don’t have permission to view this resource. If you believe there
has been a mistake, please{" "}
-
+
contact us.
-
+
.
-
Go Home
-
+
We’re experiencing an internal server problem. Please try again
after a few minutes or{" "}
-
+
contact us.
-
+
-
We’re experiencing an internal server problem. Please try again after
a few minutes or{" "}
-
+
contact us.
-
+
-