refactor sending requests based on new end points of server .

Mohamed-Ramadan1 · Jun 4, 2024 · dc66267 · dc66267
1 parent d70ad4e
commit dc66267
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 49 deletions.
diff --git a/src/components/dashboard/BlogELement.jsx b/src/components/dashboard/BlogELement.jsx
@@ -27,7 +27,7 @@ const BlogELement = ({ blog, setIsChanged }) => {
             onClick={() => {
               deleteOperationRequests(
                 "Are you sure you want to delete?",
-                `admin/deleteBlog/${_id}`,
+                `blogs/blogsPosts/${_id}`,
                 "Blog deleted successfully",
                 "Error deleting blog",
                 setIsChanged
@@ -42,7 +42,7 @@ const BlogELement = ({ blog, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to publish?",
-                `admin/unPublishBlog/${_id}`,
+                `/blogs/${_id}/notPublished`,
                 "Blog un-published successfully",
                 "Error un-publishing blog",
                 setIsChanged
@@ -57,7 +57,7 @@ const BlogELement = ({ blog, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to un-publish?",
-                `admin/publishBlog/${_id}`,
+                `/blogs/${_id}/published`,
                 "Blog published successfully",
                 "Error publishing blog",
                 setIsChanged

diff --git a/src/components/dashboard/EnrollmentElement.jsx b/src/components/dashboard/EnrollmentElement.jsx
@@ -57,7 +57,7 @@ const EnrollmentElement = ({ enrollment, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to cancel?",
-                `admin/cancelEnrollment/${_id}`,
+                `/enrolls/${_id}/cancel`,
                 "Enrollment cancelled successfully",
                 "Error cancelling enrollment",
                 setIsChanged
@@ -72,7 +72,7 @@ const EnrollmentElement = ({ enrollment, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to approve?",
-                `admin/approveEnrollment/${_id}`,
+                `/enrolls/${_id}/approve`,
                 "Enrollment approved successfully",
                 "Error approving enrollment",
                 setIsChanged

diff --git a/src/components/dashboard/FinancialAidRequestElement.jsx b/src/components/dashboard/FinancialAidRequestElement.jsx
@@ -37,7 +37,7 @@ const FinancialAidRequestElement = ({ request, token, setIsChanged }) => {
             onClick={() => {
               deleteOperationRequests(
                 "Are you sure you want to delete?",
-                `admin/deleteFinancialAidRequest/${_id}`,
+                `financialAidRequests/deleteRequest/${_id}`,
                 "Financial Aid request deleted successfully",
                 "Error deleting financial aid request",
                 setIsChanged
@@ -52,7 +52,7 @@ const FinancialAidRequestElement = ({ request, token, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to reject this financial aid request?",
-                `admin/rejectFinancialAidRequest/${_id}`,
+                `/financialAidRequests/${_id}/reject`,
                 "Financial Aid application rejected successfully",
                 "Error rejecting financial aid request",
                 setIsChanged
@@ -67,7 +67,7 @@ const FinancialAidRequestElement = ({ request, token, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to approve this financial aid request?",
-                `admin/approveFinancialAidRequest/${_id}`,
+                `/financialAidRequests/${_id}/approve`,
                 "Financial application approved successfully",
                 "Error approving financial aid request",
                 setIsChanged

diff --git a/src/components/dashboard/InstructorElement.jsx b/src/components/dashboard/InstructorElement.jsx
@@ -35,7 +35,7 @@ const InstructorElement = ({ instructor, setIsChanged }) => {
             onClick={() => {
               deleteOperationRequests(
                 "Are you sure you want to delete?",
-                `admin/deleteInstructor/${_id}`,
+                `/instructors/${_id}`,
                 "Instructor deleted successfully",
                 "Error deleting instructor",
                 setIsChanged
@@ -49,9 +49,9 @@ const InstructorElement = ({ instructor, setIsChanged }) => {
           <ActionButton
             onClick={() => {
               handelOperationRequest(
-                "Are you sure you want to unactivate this instructor?",
-                `admin/deactivateInstructor/${_id}`,
-                "Instructor unactivated successfully",
+                "Are you sure you want to un-activate this instructor?",
+                `/instructors/${_id}/inactive`,
+                "Instructor un-activated successfully",
                 "Error unactivating instructor",
                 setIsChanged
               );
@@ -65,7 +65,7 @@ const InstructorElement = ({ instructor, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to activate this instructor?",
-                `admin/activateInstructor/${_id}`,
+                `/instructors/${_id}/active`,
                 "Instructor activated successfully",
                 "Error activating instructor",
                 setIsChanged

diff --git a/src/components/dashboard/UserELement.jsx b/src/components/dashboard/UserELement.jsx
@@ -30,7 +30,7 @@ const UserELement = ({ user, setIsChanged }) => {
             onClick={() => {
               deleteOperationRequests(
                 "Are you sure you want to delete?",
-                `admin/deleteUser/${_id}`,
+                `/users/${_id}`,
                 "User deleted successfully",
                 "Error deleting user",
                 setIsChanged
@@ -45,7 +45,7 @@ const UserELement = ({ user, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to unActivate?",
-                `admin/unActivateUser/${_id}`,
+                `/users/${_id}/inactive`,
                 "User unActivated successfully",
                 "Error unActivated user",
                 setIsChanged
@@ -59,7 +59,7 @@ const UserELement = ({ user, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to activate?",
-                `admin/activateUser/${_id}`,
+                `/users/${_id}/active`,
                 "User activated successfully",
                 "Error activating user",
                 setIsChanged
@@ -74,7 +74,7 @@ const UserELement = ({ user, setIsChanged }) => {
             onClick={() => {
               handelOperationRequest(
                 "Are you sure you want to verify?",
-                `admin/verifyUser/${_id}`,
+                `/users/${_id}/verify`,
                 "User email verified successfully",
                 "Error verified email ",
                 setIsChanged

diff --git a/src/layout/header/HeaderPhone.jsx b/src/layout/header/HeaderPhone.jsx
@@ -55,35 +55,26 @@ export default function HeaderPhone() {
           className="fixed menuList overflow-y-scroll w-full h-full transition ease-out top-0 flex gap-7 flex-col items-start bg-[#fff] p-[20px] z-10"
           style={{ left: `${menuListLeft}px` }}
         >
-          <div className="w-full flex items-center gap-[10px] ">
+          <div className="w-full flex items-center gap-[10px] justify-between ">
             {user && (
               <div className="w-[200px]">
                 <div className="profile w-full flex flex-row-reverse justify-between items-center gap-[15px]">
+                  <div> </div>
                   <div className="flex gap-3 items-center justify-center">
                     <Link
-                      to={"/profile/wishlist"}
+                      to={"/profile"}
                       onClick={() => setMenuListLeft(-1000)}
                     >
-                      <div className="mt-2 ml-3 w-[40px]">
-                        <HeartHeader />
-                      </div>
+                      <img
+                        src={user?.photo}
+                        alt=""
+                        className="w-[80px] h-[80px] rounded-[12px] ml-5"
+                      />
                     </Link>
                   </div>
-
-                  <img src={user?.photo} alt="" className="w-[80px] h-[80px]" />
                 </div>
               </div>
             )}
-            <div className="inputSearch relative w-full h-[45px]">
-              <SearchIcon />
-              <input
-                type="search"
-                name=""
-                id=""
-                placeholder="What do you want learn..."
-                className="w-full h-full py-[10px] px-[40px] outline-none border-[1px] border-[#E9EAF0] "
-              />
-            </div>
 
             <div
               className="exit cursor-pointer w-[45px] h-[45px] flex items-center justify-center bg-red-500"

diff --git a/src/pages/dashboard/CreateCourses.jsx b/src/pages/dashboard/CreateCourses.jsx
@@ -25,6 +25,7 @@ export const action = async ({ request }) => {
     });
 
     toast.success("Course created Successfully");
+
     return res;
   } catch (error) {
     toast.error(error?.response?.data?.message);

diff --git a/src/pages/dashboard/CreateInstructorAccount.jsx b/src/pages/dashboard/CreateInstructorAccount.jsx
@@ -24,7 +24,7 @@ const CreateInstructorAccount = () => {
           validationSchema={createInstructorsSchema}
           onSubmit={(values, actions) => {
             sendPostRequest(
-              "admin/createInstructor",
+              "instructors",
               values,
               "Instructor Account Created Successfully",
               "Instructor Account Created  Failed",

diff --git a/src/pages/dashboard/CreateUserAccount.jsx b/src/pages/dashboard/CreateUserAccount.jsx
@@ -23,7 +23,7 @@ const CreateUserAccount = () => {
           validationSchema={createUsersSchema}
           onSubmit={(values, actions) => {
             sendPostRequest(
-              "admin/createUser",
+              "users",
               values,
               "User Account Created Successfully",
               "Error Creating User Account",

diff --git a/src/pages/dashboard/FreeCourses.jsx b/src/pages/dashboard/FreeCourses.jsx
@@ -19,7 +19,7 @@ function FreeCourses() {
   const [currentPage, setCurrentPage] = useState(1);
   const [isChanged, setIsChanged] = useState(false);
   const { data, loading, error, isMorePages, fetchData } = useFetchData(
-    "/admin/freeCourses",
+    "/courses/free",
     {
       headers: {
         Authorization: `Bearer ${token}`,
@@ -48,6 +48,7 @@ function FreeCourses() {
         {loading && <LoadingWhile />}
 
         {!loading &&
+          !error &&
           data.length > 0 &&
           data.map((course, index) => (
             <CourseElement

diff --git a/src/pages/dashboard/Instructors.jsx b/src/pages/dashboard/Instructors.jsx
@@ -1,6 +1,5 @@
 import { useState, useEffect } from "react";
 import { useSelector } from "react-redux";
-import { customFetch } from "../../utils/customFetch";
 
 import {
   PageIntro,
@@ -20,7 +19,7 @@ const Instructors = () => {
   const [currentPage, setCurrentPage] = useState(1);
   const [isChanged, setIsChanged] = useState(false);
   const { data, loading, error, isMorePages, fetchData } = useFetchData(
-    "/admin/getAllInstructors",
+    "/instructors",
     {
       headers: {
         Authorization: `Bearer ${token}`,
@@ -46,8 +45,9 @@ const Instructors = () => {
         {loading && <LoadingWhile />}
 
         {!loading &&
+          !error &&
           data.length > 0 &&
-          data.map((instructor, index) => (
+          data.map((instructor) => (
             <InstructorElement
               key={instructor._id}
               instructor={instructor}

diff --git a/src/pages/dashboard/ManageBlogs.jsx b/src/pages/dashboard/ManageBlogs.jsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
-import { customFetch } from "../../utils/customFetch";
 
 import {
   PageIntro,
@@ -20,7 +19,7 @@ const ManageBlogs = () => {
   const [currentPage, setCurrentPage] = useState(1);
   const [isChanged, setIsChanged] = useState(false);
   const { data, loading, error, isMorePages, fetchData } = useFetchData(
-    "/admin/getAllBlogs",
+    "/blogs/allBlogsPosts",
     {
       headers: {
         Authorization: `Bearer ${token}`,
@@ -45,6 +44,7 @@ const ManageBlogs = () => {
         <BlogsTableHeader />
         {loading && <LoadingWhile />}
         {!loading &&
+          !error &&
           data.length > 0 &&
           data.map((blog, index) => (
             <BlogELement

diff --git a/src/pages/dashboard/ManageInstructorsRequests.jsx b/src/pages/dashboard/ManageInstructorsRequests.jsx
@@ -44,6 +44,7 @@ const ManageInstructorsRequests = () => {
         {loading && <LoadingWhile />}
 
         {!loading &&
+          !error &&
           data.length > 0 &&
           data.map((instructor, index) => (
             <InstructorsApplicationElement

diff --git a/src/pages/dashboard/ManagePayments.jsx b/src/pages/dashboard/ManagePayments.jsx
@@ -1,6 +1,5 @@
 import { useState, useEffect } from "react";
 import { useSelector } from "react-redux";
-import { customFetch } from "../../utils/customFetch";
 
 import {
   PageIntro,
@@ -45,6 +44,7 @@ const ManagePayments = () => {
         {loading && <LoadingWhile />}
 
         {!loading &&
+          !error &&
           data.length > 0 &&
           data.map((payment, index) => (
             <PaymentRecordELements

diff --git a/src/pages/dashboard/MangeFinancialAidRequests.jsx b/src/pages/dashboard/MangeFinancialAidRequests.jsx
@@ -19,7 +19,7 @@ const MangeFinancialAidRequests = () => {
   const [currentPage, setCurrentPage] = useState(1);
   const [isChanged, setIsChanged] = useState(false);
   const { data, loading, error, isMorePages, fetchData } = useFetchData(
-    "admin/getAllFinancialAidRequests",
+    "/financialAidRequests/allRequests",
     {
       headers: {
         Authorization: `Bearer ${token}`,
@@ -45,6 +45,7 @@ const MangeFinancialAidRequests = () => {
         {loading && <LoadingWhile />}
 
         {!loading &&
+          !error &&
           data &&
           data.map((request) => (
             <FinancialAidRequestElement

diff --git a/src/pages/dashboard/PaiedCourses.jsx b/src/pages/dashboard/PaiedCourses.jsx
@@ -20,7 +20,7 @@ function PaiedCourses() {
   const [isChanged, setIsChanged] = useState(false);
 
   const { data, loading, error, isMorePages, fetchData } = useFetchData(
-    "/admin/paidCourses",
+    "/courses/paid",
     {
       headers: {
         Authorization: `Bearer ${token}`,
@@ -44,8 +44,10 @@ function PaiedCourses() {
       {/* table manage table courses table  */}
       <PageContainer tableHeader={"Paid Courses"}>
         <CoursesHeader />
-        {data &&
-          data.map((course, index) => (
+        {!loading &&
+          !error &&
+          data &&
+          data.map((course) => (
             <CourseElement
               key={course._id}
               course={course}

diff --git a/src/pages/dashboard/Reservations.jsx b/src/pages/dashboard/Reservations.jsx
@@ -48,6 +48,7 @@ const Reservations = () => {
         {loading && <LoadingWhile />}
 
         {!loading &&
+          !error &&
           data.length > 0 &&
           data.map((enrollment, index) => (
             <EnrollmentElement

diff --git a/src/pages/dashboard/Users.jsx b/src/pages/dashboard/Users.jsx
@@ -19,7 +19,7 @@ const Users = () => {
   const [currentPage, setCurrentPage] = useState(1);
   const [isChanged, setIsChanged] = useState(false);
   const { data, loading, error, isMorePages, fetchData } = useFetchData(
-    "/admin/getAllUsers",
+    "/users",
     {
       headers: {
         Authorization: `Bearer ${token}`,
@@ -44,6 +44,7 @@ const Users = () => {
         <UserTableHeader />
         {loading && <LoadingWhile />}
         {!loading &&
+          !error &&
           data &&
           data.map((user, index) => (
             <UserElement

diff --git a/src/pages/userProfile/MyEnrolledCourses.jsx b/src/pages/userProfile/MyEnrolledCourses.jsx
@@ -34,7 +34,6 @@ const MyEnrolledCourses = () => {
     fetchData();
   }, [currentPage, itemsPerPage, token]);
 
-  console.log(data);
   return (
     <>
       <ProfilePageContainer>