diff --git a/src/App.tsx b/src/App.tsx
index 3a2b434..2935dfa 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -11,7 +11,6 @@ import { RoleByType } from "./utils/RoleByType";
 const Page404 = lazy(() => import("./Layout/Ui/NotFoundPage"));
 const Auth = lazy(() => import("./Pages/Auth/Page"));
 const App = () => {
-
   return (
     <Routes>
       <Route
@@ -36,10 +35,10 @@ const App = () => {
       {renderRoutesRecursively(menuItems)}
 
       {CrudRoute.map((route) => {
-        const useAbility = hasAbility(route.abilities, route.abilities_value);        
-        if(!RoleByType(route)){
-          return false ;
-      }
+        const useAbility = hasAbility(route.abilities, route.abilities_value);
+        if (!RoleByType(route)) {
+          return false;
+        }
         if (!useAbility) {
           return false;
         }
diff --git a/src/Components/CustomFields/PdfUploader.tsx b/src/Components/CustomFields/PdfUploader.tsx
index e76460c..b0e2c98 100644
--- a/src/Components/CustomFields/PdfUploader.tsx
+++ b/src/Components/CustomFields/PdfUploader.tsx
@@ -16,7 +16,7 @@ const PdfUploader = ({
 }: any) => {
   const { formik, t, isError } = useFormField(name, props);
   let FormikName = formik.values[name];
-  const imageUrl = formik.values[name] ?   FormikName : "";
+  const imageUrl = formik.values[name] ? FormikName : "";
   const [Imageurl, setImageurl] = useState(null);
 
   const FilehandleChange = (value: any) => {
diff --git a/src/Components/CustomFields/SelectTag.tsx b/src/Components/CustomFields/SelectTag.tsx
index 5d3a902..eb4685b 100644
--- a/src/Components/CustomFields/SelectTag.tsx
+++ b/src/Components/CustomFields/SelectTag.tsx
@@ -7,7 +7,7 @@ import { useFormikContext } from "formik";
 
 const SelectTag: React.FC = () => {
   const [searchValue, setSearchValue] = useState<string>("");
-  
+
   const [fieldValue, setFieldValue] = useState<string>("");
   const formik = useFormikContext<any>();
   const handleChange = (value: string[]) => {
@@ -38,18 +38,16 @@ const SelectTag: React.FC = () => {
   const [t] = useTranslation();
 
   const options = data?.data ?? [];
-  const additionalData = 
-  options.length < 1 && searchValue.length > 1 && !isLoading
-    ? [{ id: searchValue, name: searchValue }]
-    : [];
+  const additionalData =
+    options.length < 1 && searchValue.length > 1 && !isLoading
+      ? [{ id: searchValue, name: searchValue }]
+      : [];
 
+  const value =
+    formik?.values?.tags?.map((item: any) => item?.id ?? item) ?? [];
 
+  const AllOptions = [...options, ...additionalData];
 
-const value = formik?.values?.tags?.map((item: any) => item?.id ?? item) ?? [];
-
-
-  const AllOptions = [...options, ...additionalData]
-  
   return (
     <div className="SelectTag">
       <label htmlFor="">{t("models.tag")}</label>
diff --git a/src/Components/DataTable/SearchField.tsx b/src/Components/DataTable/SearchField.tsx
index 51fb041..20d89e3 100644
--- a/src/Components/DataTable/SearchField.tsx
+++ b/src/Components/DataTable/SearchField.tsx
@@ -15,22 +15,17 @@ const SearchField: React.FC<Props> = ({ placeholder, searchBy }) => {
   const [searchQuery, setSearchQuery] = useState<string>("");
   const inputRef = useRef<HTMLInputElement>(null);
 
-
-
-  const {setFilter} = useFilterStateState()
+  const { setFilter } = useFilterStateState();
 
   const handleInputChange = (value: string) => {
     setSearchQuery(value);
-
   };
 
-  const handleInputChangeWithDebounce = useDebounce(
-    (value: string) => {
-      setFilter({
-        name:value
-      })
-    }
-  )
+  const handleInputChangeWithDebounce = useDebounce((value: string) => {
+    setFilter({
+      name: value,
+    });
+  });
 
   const handleToggleDropdown = () => {
     setIsOpen(!isOpen);
@@ -60,7 +55,10 @@ const SearchField: React.FC<Props> = ({ placeholder, searchBy }) => {
           className="search__input"
           placeholder={t(placeholder)}
           value={searchQuery}
-          onChange={(e) => {handleInputChange(e.target.value) ; handleInputChangeWithDebounce(e.target.value)}}
+          onChange={(e) => {
+            handleInputChange(e.target.value);
+            handleInputChangeWithDebounce(e.target.value);
+          }}
         />
       </div>
     </div>
diff --git a/src/Components/Filter/OrderBySelect.tsx b/src/Components/Filter/OrderBySelect.tsx
index 1689b38..d2dc85e 100644
--- a/src/Components/Filter/OrderBySelect.tsx
+++ b/src/Components/Filter/OrderBySelect.tsx
@@ -6,11 +6,11 @@ import { useFilterStateState } from "../../zustand/Filter";
 
 const OrderBySelect = () => {
   const { t } = useTranslation();
-  const {setFilter} = useFilterStateState()
+  const { setFilter } = useFilterStateState();
   const handleChange = (value: string) => {
     setFilter({
-      sort_by:value
-    })
+      sort_by: value,
+    });
   };
 
   return (
@@ -29,8 +29,14 @@ const OrderBySelect = () => {
         options={[
           { value: "ascending", label: t("select.array.order.ascending") },
           { value: "descending", label: t("select.array.order.descending") },
-          { value: "recently_viewed", label: t("select.array.order.recently_viewed") },
-          { value: "recently_arrived", label: t("select.array.order.recently_arrived") },
+          {
+            value: "recently_viewed",
+            label: t("select.array.order.recently_viewed"),
+          },
+          {
+            value: "recently_arrived",
+            label: t("select.array.order.recently_arrived"),
+          },
         ]}
       />
     </div>
diff --git a/src/Components/Filter/PaginationColumn.tsx b/src/Components/Filter/PaginationColumn.tsx
index 2006728..34b39ac 100644
--- a/src/Components/Filter/PaginationColumn.tsx
+++ b/src/Components/Filter/PaginationColumn.tsx
@@ -4,7 +4,6 @@ import { Divider, Select } from "antd";
 import usePagination from "../../Layout/Dashboard/usePagination";
 import { useNavigate } from "react-router-dom";
 
-
 const PaginationColumn = () => {
   const { t } = useTranslation();
   const navigate = useNavigate();
@@ -13,7 +12,6 @@ const PaginationColumn = () => {
     navigate(`?per_page=${value}`);
   };
 
- 
   return (
     <div className="pagination_column">
       <Select
diff --git a/src/Components/FilterField/components/useFilter.tsx b/src/Components/FilterField/components/useFilter.tsx
index 9811f4c..232a226 100644
--- a/src/Components/FilterField/components/useFilter.tsx
+++ b/src/Components/FilterField/components/useFilter.tsx
@@ -1,30 +1,20 @@
-import React from 'react'
-
-
+import React from "react";
 
 interface IFilterBody {
-  children:React.ReactNode
+  children: React.ReactNode;
 }
 const useFilter = () => {
+  const FilterButton = () => {
+    return <div>FilterButton</div>;
+  };
+  const FilterBody = ({ children }: IFilterBody) => {
+    return <div>FilterBody</div>;
+  };
 
-    const FilterButton = ()=>{
-      return (
-        <div>
-          FilterButton
-        </div>
-      )
-    } 
-    const FilterBody = ({children}:IFilterBody)=>{
-      return (
-        <div>
-          FilterBody
-        </div>
-      )
-    }
+  return {
+    FilterButton,
+    FilterBody,
+  };
+};
 
-    return {
-      FilterButton , FilterBody
-    }
-}
-
-export default useFilter
\ No newline at end of file
+export default useFilter;
diff --git a/src/Components/FilterField/enums/Filter.ts b/src/Components/FilterField/enums/Filter.ts
index 02e36ce..1bfcc26 100644
--- a/src/Components/FilterField/enums/Filter.ts
+++ b/src/Components/FilterField/enums/Filter.ts
@@ -1,5 +1,3 @@
 export enum FilterEnum {
-  FILTER="FILTER"
-
-  
+  FILTER = "FILTER",
 }
diff --git a/src/Components/Utils/Filter/FilterState.ts b/src/Components/Utils/Filter/FilterState.ts
index be93ae1..53d0bcd 100644
--- a/src/Components/Utils/Filter/FilterState.ts
+++ b/src/Components/Utils/Filter/FilterState.ts
@@ -21,14 +21,6 @@ export const useFilterState = create<FilterState>((set, get) => ({
   },
 }));
 
-
-
-
-
-
-
-
-
 // import { create } from "zustand";
 
 // interface FilterState {
@@ -66,7 +58,7 @@ export const useFilterState = create<FilterState>((set, get) => ({
 //       ...data,
 //       starting_date: formatDate(data.starting_date),
 //     };
-    
+
 //     set(() => ({ filterState: formattedData }));
 //   },
 // }));
diff --git a/src/Components/Utils/Filter/useFilter.tsx b/src/Components/Utils/Filter/useFilter.tsx
index b5f6022..7ae32fa 100644
--- a/src/Components/Utils/Filter/useFilter.tsx
+++ b/src/Components/Utils/Filter/useFilter.tsx
@@ -1,6 +1,12 @@
 import React, { ReactNode, useEffect, useState } from "react";
 import { FaFilter } from "react-icons/fa";
-import { Form, Formik, FormikConfig, FormikHelpers, useFormikContext } from "formik";
+import {
+  Form,
+  Formik,
+  FormikConfig,
+  FormikHelpers,
+  useFormikContext,
+} from "formik";
 import { Button, ButtonProps, Divider, Modal } from "antd";
 import { useTranslation } from "react-i18next";
 import { useModalState } from "./Modal";
@@ -38,12 +44,12 @@ const useFilter = () => {
   const { filterState, setFilterState, clearFilterState } = useFilterState();
   const [t] = useTranslation();
   const [formValues, setFormValues] = useState({});
-  const formik = useFormikContext()
+  const formik = useFormikContext();
   // Define the type for the callback
   type SubmitCallback = () => void;
   // console.log(formik?.values);
   // console.log(InitialValue);
-  
+
   const FilterButton = () => {
     const handleState = () => {
       if (isOpen === ModalEnum?.FILTER) {
@@ -61,15 +67,12 @@ const useFilter = () => {
         {t("Filter")}
       </span>
     );
-  };    
-    useEffect(() => {
-      setFormValues({})
-      setFilterState({})
-    }, [])
-    
+  };
+  useEffect(() => {
+    setFormValues({});
+    setFilterState({});
+  }, []);
 
-   
-    
   const FilterBody = ({
     onSubmit,
     children,
@@ -83,7 +86,7 @@ const useFilter = () => {
     isOpen,
     ...formikProps
   }: FormikFormProps) => {
-    const handleSubmit = (values: any) => {      
+    const handleSubmit = (values: any) => {
       setFilterState(values);
       setFormValues(values);
       if (onSubmit) {
@@ -93,76 +96,85 @@ const useFilter = () => {
       setIsOpen("");
     };
     const handleCancel = (isCancel = false) => {
-      
-      if(isCancel){
+      if (isCancel) {
         setIsOpen("");
-        return ;
+        return;
       }
-      
+
       setIsOpen("");
       clearFilterState();
       setFormValues({});
     };
-    
+
     const handleOpen = () => {
       setIsOpen(true);
       // setObjectToEdit({});
     };
-  
+
     const [t] = useTranslation();
     return (
       <>
-      <Modal
-        className={"ModalForm " + ModelClassName}
-        centered
-        width={width}
-        footer={null}
-        open={isOpen}
-        onOk={handleOpen}
-        onCancel={()=>{}}
-        mask={false}
-        style={{ position: "absolute", top: "31.4%", left: "16.7%" }}
-      >
-        <Formik
-          enableReinitialize={true}
-          onSubmit={handleSubmit}
-          initialValues={formValues}
-          onReset={()=>{handleCancel(false)}}
-          {...formikProps}
+        <Modal
+          className={"ModalForm " + ModelClassName}
+          centered
+          width={width}
+          footer={null}
+          open={isOpen}
+          onOk={handleOpen}
+          onCancel={() => {}}
+          mask={false}
+          style={{ position: "absolute", top: "31.4%", left: "16.7%" }}
         >
-          {(formik) => {
-  
-            return (
-              <Form>
-             
-              <div>
-                <header> {t("models.filter")}  <FaXmark onClick={()=>handleCancel(true)} /> </header>
-                <Divider />
-                <main className="main_modal">
-                  {isLoading ? <SpinContainer /> : children}
-                  <Divider />
-                </main>
-              </div>
-              </Form>
-         )
-          }}
-       
-        </Formik>
-      </Modal>
-    </>
+          <Formik
+            enableReinitialize={true}
+            onSubmit={handleSubmit}
+            initialValues={formValues}
+            onReset={() => {
+              handleCancel(false);
+            }}
+            {...formikProps}
+          >
+            {(formik) => {
+              return (
+                <Form>
+                  <div>
+                    <header>
+                      {" "}
+                      {t("models.filter")}{" "}
+                      <FaXmark onClick={() => handleCancel(true)} />{" "}
+                    </header>
+                    <Divider />
+                    <main className="main_modal">
+                      {isLoading ? <SpinContainer /> : children}
+                      <Divider />
+                    </main>
+                  </div>
+                </Form>
+              );
+            }}
+          </Formik>
+        </Modal>
+      </>
     );
   };
 
-  interface SubmitButtonProps extends Omit<ButtonProps, "loading"> {
-  }
+  interface SubmitButtonProps extends Omit<ButtonProps, "loading"> {}
   const FilterSubmit = ({ ...buttonProps }: SubmitButtonProps) => {
-
     return (
       <div className="filter-submit-buttons buttons">
-        <Button className="back_button filter_modal_add_button" type="default" htmlType="reset">
+        <Button
+          className="back_button filter_modal_add_button"
+          type="default"
+          htmlType="reset"
+        >
           {t("practical.reset")}
         </Button>
-        <Button className="add_button pointer filter_modal_add_button"  type="primary" {...buttonProps}  htmlType="submit">
+        <Button
+          className="add_button pointer filter_modal_add_button"
+          type="primary"
+          {...buttonProps}
+          htmlType="submit"
+        >
           {t(`practical.submit`)}
         </Button>
       </div>
@@ -186,5 +198,4 @@ const useFilter = () => {
   };
 };
 
-
 export default useFilter;
diff --git a/src/Components/ValidationField/View/Default.tsx b/src/Components/ValidationField/View/Default.tsx
index 6708b52..79f62f6 100644
--- a/src/Components/ValidationField/View/Default.tsx
+++ b/src/Components/ValidationField/View/Default.tsx
@@ -16,7 +16,7 @@ const Default = ({
   label_icon,
   ...props
 }: any) => {
-  const { errorMsg, isError, t,formik } = useFormField(name, props);
+  const { errorMsg, isError, t, formik } = useFormField(name, props);
 
   return (
     <div className="ValidationField w-100">
diff --git a/src/Components/ValidationField/View/SelectField.tsx b/src/Components/ValidationField/View/SelectField.tsx
index 5c5758f..ec957e3 100644
--- a/src/Components/ValidationField/View/SelectField.tsx
+++ b/src/Components/ValidationField/View/SelectField.tsx
@@ -29,7 +29,7 @@ const SelectField = ({
   };
   const options = translateOptions(option, t);
   console.log(options);
-  
+
   return (
     <div className="ValidationField w-100">
       <ValidationFieldLabel
diff --git a/src/Components/ValidationField/utils/translatedOptions.ts b/src/Components/ValidationField/utils/translatedOptions.ts
index 353184d..66c2619 100644
--- a/src/Components/ValidationField/utils/translatedOptions.ts
+++ b/src/Components/ValidationField/utils/translatedOptions.ts
@@ -1,6 +1,6 @@
 export const translateOptions = (options: any, t: any) => {
-    console.log(options);
-    
+  console.log(options);
+
   return options?.map((opt: any) => ({
     ...opt,
     label: t(`${opt?.label}`),
diff --git a/src/Components/exercise/Header.tsx b/src/Components/exercise/Header.tsx
index 9d38eda..2914ff1 100644
--- a/src/Components/exercise/Header.tsx
+++ b/src/Components/exercise/Header.tsx
@@ -26,23 +26,27 @@ const Header = () => {
     }
   };
 
-  
-const content = (
-  <div>
-    <p> (CTRL +  SHIFT +   {CombinationKeyEnum.CHOICE})  {t("header.add_choice")} </p>
-    <p> (CTRL +  SHIFT +  {CombinationKeyEnum.QUESTION})  {t("header.add_question")}    </p>
-  </div>
-);
+  const content = (
+    <div>
+      <p>
+        {" "}
+        (CTRL + SHIFT + {CombinationKeyEnum.CHOICE}) {t("header.add_choice")}{" "}
+      </p>
+      <p>
+        {" "}
+        (CTRL + SHIFT + {CombinationKeyEnum.QUESTION}){" "}
+        {t("header.add_question")}{" "}
+      </p>
+    </div>
+  );
 
   return (
     <header className="exercise_add_header mb-4">
       <article>
-       
-
         <Popover content={content} title={t("practical.Abbreviations")}>
-        <img src="/Icon/QuestionIcon.svg" alt="" />
-  </Popover>
-  
+          <img src="/Icon/QuestionIcon.svg" alt="" />
+        </Popover>
+
         <div>
           {t("practical.add")} {t("models.exercise")}{" "}
         </div>
diff --git a/src/Hooks/useKeyCombination.tsx b/src/Hooks/useKeyCombination.tsx
index c8b530b..ec418f5 100644
--- a/src/Hooks/useKeyCombination.tsx
+++ b/src/Hooks/useKeyCombination.tsx
@@ -1,30 +1,35 @@
-import { useEffect } from 'react';
+import { useEffect } from "react";
 
 type KeyCombination = {
   ctrlKey?: boolean;
   shiftKey?: boolean;
-  code: string;  // Use string here for flexibility
+  code: string; // Use string here for flexibility
 };
 
-const useKeyCombination = (keyCombination: KeyCombination, callback: () => void) => {
+const useKeyCombination = (
+  keyCombination: KeyCombination,
+  callback: () => void,
+) => {
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       const matches =
-        (keyCombination.ctrlKey === undefined || event.ctrlKey === keyCombination.ctrlKey) &&
-        (keyCombination.shiftKey === undefined || event.shiftKey === keyCombination.shiftKey) &&
+        (keyCombination.ctrlKey === undefined ||
+          event.ctrlKey === keyCombination.ctrlKey) &&
+        (keyCombination.shiftKey === undefined ||
+          event.shiftKey === keyCombination.shiftKey) &&
         event.code === keyCombination.code;
 
       if (matches) {
         callback();
-        event.preventDefault();  // Prevent the default action for the event
+        event.preventDefault(); // Prevent the default action for the event
         event.stopPropagation(); // Stop the event from propagating further
       }
     };
 
-    window.addEventListener('keydown', handleKeyDown);
+    window.addEventListener("keydown", handleKeyDown);
 
     return () => {
-      window.removeEventListener('keydown', handleKeyDown);
+      window.removeEventListener("keydown", handleKeyDown);
     };
   }, [keyCombination, callback]);
 };
diff --git a/src/Layout/Dashboard/DeleteModels.tsx b/src/Layout/Dashboard/DeleteModels.tsx
index ced2ba2..dc88705 100644
--- a/src/Layout/Dashboard/DeleteModels.tsx
+++ b/src/Layout/Dashboard/DeleteModels.tsx
@@ -10,14 +10,14 @@ interface ModalFormProps {
   deleteMutation: any;
   ModelEnum: any;
   isNavigate?: boolean;
-  idVerify?:boolean
+  idVerify?: boolean;
 }
 
 const DeleteModels: React.FC<ModalFormProps> = ({
   deleteMutation,
   ModelEnum,
   isNavigate = false,
-  idVerify = true
+  idVerify = true,
 }) => {
   const { isOpen, setIsOpen } = useModalState((state) => state);
   const [inputValue, setInputValue] = useState("");
@@ -27,10 +27,9 @@ const DeleteModels: React.FC<ModalFormProps> = ({
   console.log(objectToEdit?.key);
   console.log(inputValue);
 
-  const iaDisabled = 
-    idVerify ?
-    Number(objectToEdit?.id) !== Number(inputValue) || isLoading
-    : objectToEdit?.key !== inputValue  || isLoading;
+  const iaDisabled = idVerify
+    ? Number(objectToEdit?.id) !== Number(inputValue) || isLoading
+    : objectToEdit?.key !== inputValue || isLoading;
 
   const navigate = useNavigate();
   useEffect(() => {
@@ -44,13 +43,13 @@ const DeleteModels: React.FC<ModalFormProps> = ({
   }, [isSuccess, setIsOpen]);
 
   const handleSubmit = () => {
-    idVerify?
-    mutate({
-      id: Number(objectToEdit?.id),
-    })
-    : mutate({
-      id:objectToEdit?.key,
-    })
+    idVerify
+      ? mutate({
+          id: Number(objectToEdit?.id),
+        })
+      : mutate({
+          id: objectToEdit?.key,
+        });
   };
 
   const handleCancel = () => {
diff --git a/src/Layout/Dashboard/FilterLayout.tsx b/src/Layout/Dashboard/FilterLayout.tsx
index 51c47cf..045febf 100644
--- a/src/Layout/Dashboard/FilterLayout.tsx
+++ b/src/Layout/Dashboard/FilterLayout.tsx
@@ -25,10 +25,9 @@ const FilterLayout = ({
   //    type: type,
   //    page: currentPage,
 
-  const { FilterBody , FilterSubmit} = useFilter();  
+  const { FilterBody, FilterSubmit } = useFilter();
   return (
     <div className="filter_header">
-
       <div className="filter_header_top">
         <h4>{t(filterTitle)}</h4>
 
@@ -40,7 +39,7 @@ const FilterLayout = ({
               setIsOpen={setIsOpen}
             >
               <div className="model_sub_children">{sub_children}</div>
-              <FilterSubmit/>
+              <FilterSubmit />
             </FilterBody>
             <div className="filter_button" onClick={() => setIsOpen(true)}>
               <span>
@@ -55,7 +54,6 @@ const FilterLayout = ({
             <OrderBySelect />
           </span>
         </div>
-
       </div>
 
       <Divider />
@@ -70,7 +68,6 @@ const FilterLayout = ({
         <div className="header_search">
           <SearchField searchBy="" placeholder={t("practical.search_here")} />
         </div>
-        
       </div>
     </div>
   );
diff --git a/src/Layout/Dashboard/FormikFormModel.tsx b/src/Layout/Dashboard/FormikFormModel.tsx
index c12a9cc..6019065 100644
--- a/src/Layout/Dashboard/FormikFormModel.tsx
+++ b/src/Layout/Dashboard/FormikFormModel.tsx
@@ -29,7 +29,6 @@ const FormikFormModel: React.FC<FormikFormProps> = ({
       initialValues={initialValues}
       validationSchema={validationSchema}
       onSubmit={handleSubmit}
-      
     >
       {(formik) => {
         useEffect(() => {
diff --git a/src/Layout/Dashboard/PageHeader.tsx b/src/Layout/Dashboard/PageHeader.tsx
index ce95f02..7598977 100644
--- a/src/Layout/Dashboard/PageHeader.tsx
+++ b/src/Layout/Dashboard/PageHeader.tsx
@@ -39,7 +39,7 @@ const PageHeader = ({
     navigate(location);
   };
   console.log();
-  const {PageTitle} = usePageTitleState()
+  const { PageTitle } = usePageTitleState();
   return (
     <div className="page_header">
       <header className="d-flex justify-content-between">
diff --git a/src/Layout/Dashboard/Table/DataTable.tsx b/src/Layout/Dashboard/Table/DataTable.tsx
index 39ff6d1..108bd05 100644
--- a/src/Layout/Dashboard/Table/DataTable.tsx
+++ b/src/Layout/Dashboard/Table/DataTable.tsx
@@ -32,7 +32,7 @@ const DataTable: React.FC<DataTableProps> = ({
       rowClassName={(record, index) => getRowClassName(record, index)}
       className="DataTable"
       loading={{
-        spinning: isLoading || isRefetching ,
+        spinning: isLoading || isRefetching,
         indicator: (
           <Suspense fallback={<></>}>
             <LoadingLottie />
diff --git a/src/Layout/Ui/SideBar.tsx b/src/Layout/Ui/SideBar.tsx
index 4810cd9..6b9783f 100644
--- a/src/Layout/Ui/SideBar.tsx
+++ b/src/Layout/Ui/SideBar.tsx
@@ -50,10 +50,9 @@ const SideBar = ({
           if (!useAbility) {
             return <React.Fragment key={index}></React.Fragment>;
           }
-          if(!RoleByType(item)){
-          
-            return <React.Fragment key={index}></React.Fragment> ;
-        }
+          if (!RoleByType(item)) {
+            return <React.Fragment key={index}></React.Fragment>;
+          }
           return (
             <MenuItem
               key={index}
diff --git a/src/Pages/Admin/Grade/Model/FilterForm.tsx b/src/Pages/Admin/Grade/Model/FilterForm.tsx
index 7e39168..c870850 100644
--- a/src/Pages/Admin/Grade/Model/FilterForm.tsx
+++ b/src/Pages/Admin/Grade/Model/FilterForm.tsx
@@ -5,7 +5,7 @@ import { useFormikContext } from "formik";
 
 const FilterForm = () => {
   const formik = useFormikContext();
-  
+
   return (
     <div>
       <Row>
@@ -17,4 +17,4 @@ const FilterForm = () => {
   );
 };
 
-export default FilterForm;
\ No newline at end of file
+export default FilterForm;
diff --git a/src/Pages/Admin/Grade/Page.tsx b/src/Pages/Admin/Grade/Page.tsx
index a168a31..05bf248 100644
--- a/src/Pages/Admin/Grade/Page.tsx
+++ b/src/Pages/Admin/Grade/Page.tsx
@@ -19,7 +19,7 @@ const DeleteModalForm = lazy(
 const TableHeader = () => {
   const [t] = useTranslation();
   const deleteMutation = useDeleteGrade();
-    
+
   useSetPageTitle(t(`page_header.grade`));
 
   return (
@@ -30,10 +30,7 @@ const TableHeader = () => {
           ModelAbility={ModalEnum?.GRADE_ADD}
           canAdd={canAddGrade}
         />
-        <FilterLayout
-          sub_children={<FilterForm />}
-          filterTitle="table.grade"
-        />
+        <FilterLayout sub_children={<FilterForm />} filterTitle="table.grade" />
         <Table />
         <AddModalForm />
         <EditModalForm />
diff --git a/src/Pages/Admin/Grade/Table.tsx b/src/Pages/Admin/Grade/Table.tsx
index 3ebbec9..9f09f70 100644
--- a/src/Pages/Admin/Grade/Table.tsx
+++ b/src/Pages/Admin/Grade/Table.tsx
@@ -7,10 +7,10 @@ import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
 const App: React.FC = () => {
   const { filterState } = useFilterState();
 
-  const response = useGetAllGrade({ 
+  const response = useGetAllGrade({
     pagination: true,
     ...filterState,
-   });
+  });
 
   return <DataTable response={response} useColumns={useColumns} />;
 };
diff --git a/src/Pages/Admin/Grade/useTableColumns.tsx b/src/Pages/Admin/Grade/useTableColumns.tsx
index 0f057b2..c48ccef 100644
--- a/src/Pages/Admin/Grade/useTableColumns.tsx
+++ b/src/Pages/Admin/Grade/useTableColumns.tsx
@@ -22,7 +22,7 @@ export const useColumns = () => {
   const { setObjectToEdit } = useObjectToEdit((state) => state);
   const navigate = useNavigate();
 
-  const handelShow = (record: Grade) => {    
+  const handelShow = (record: Grade) => {
     navigate(`${record?.id}`);
   };
 
diff --git a/src/Pages/Admin/Param/Model/ModelForm.tsx b/src/Pages/Admin/Param/Model/ModelForm.tsx
index e0d3d24..343d4e5 100644
--- a/src/Pages/Admin/Param/Model/ModelForm.tsx
+++ b/src/Pages/Admin/Param/Model/ModelForm.tsx
@@ -1,11 +1,16 @@
 import { Col, Row } from "reactstrap";
 import ValidationField from "../../../../Components/ValidationField/ValidationField";
 
-const Form = ({isEdit}:{isEdit?:boolean}) => {
+const Form = ({ isEdit }: { isEdit?: boolean }) => {
   return (
     <Row className="w-100">
       <Col>
-        <ValidationField placeholder="key" label="key" name="key" disabled={isEdit? true : false} />
+        <ValidationField
+          placeholder="key"
+          label="key"
+          name="key"
+          disabled={isEdit ? true : false}
+        />
         <ValidationField placeholder="value" label="value" name="value" />
       </Col>
     </Row>
diff --git a/src/Pages/Admin/Param/Model/formUtil.ts b/src/Pages/Admin/Param/Model/formUtil.ts
index 440e36c..0da64c6 100644
--- a/src/Pages/Admin/Param/Model/formUtil.ts
+++ b/src/Pages/Admin/Param/Model/formUtil.ts
@@ -12,4 +12,4 @@ export const getValidationSchema = () => {
     key: Yup.mixed().required("validation.required"),
     value: Yup.mixed().required("validation.required"),
   });
-};
\ No newline at end of file
+};
diff --git a/src/Pages/Admin/Param/Page.tsx b/src/Pages/Admin/Param/Page.tsx
index 71c85a2..183af03 100644
--- a/src/Pages/Admin/Param/Page.tsx
+++ b/src/Pages/Admin/Param/Page.tsx
@@ -18,9 +18,7 @@ const DeleteModalForm = lazy(
 
 const TableHeader = () => {
   const [t] = useTranslation();
-  useSetPageTitle(
-    t(`page_header.param`),
-  );
+  useSetPageTitle(t(`page_header.param`));
   const deleteMutation = useDeleteParam();
   return (
     <div className="TableWithHeader">
diff --git a/src/Pages/Admin/Param/Table.tsx b/src/Pages/Admin/Param/Table.tsx
index 16e003d..a377458 100644
--- a/src/Pages/Admin/Param/Table.tsx
+++ b/src/Pages/Admin/Param/Table.tsx
@@ -15,21 +15,27 @@ const App: React.FC = () => {
     pagination: true,
     ...filterState,
   });
-  const [t] = useTranslation()
-  const transformedData = response?.data?.data && typeof response.data.data === 'object'
-  ? Object.entries(response.data.data).map(([key, value]) => ({
-      key: key,
-      value: value
-    }))
-  : [];
-    
-  return <DataTable response={response} useColumns={useColumns} dataSource={transformedData} 
-  pagination={{
-    nextIcon: <>{t("practical.next")}</>,
-    prevIcon: <> {t("practical.prev")} </>,
-    className: "pagination_antd",
-  }}
-  />;
+  const [t] = useTranslation();
+  const transformedData =
+    response?.data?.data && typeof response.data.data === "object"
+      ? Object.entries(response.data.data).map(([key, value]) => ({
+          key: key,
+          value: value,
+        }))
+      : [];
+
+  return (
+    <DataTable
+      response={response}
+      useColumns={useColumns}
+      dataSource={transformedData}
+      pagination={{
+        nextIcon: <>{t("practical.next")}</>,
+        prevIcon: <> {t("practical.prev")} </>,
+        className: "pagination_antd",
+      }}
+    />
+  );
 };
 
 export default App;
diff --git a/src/Pages/Admin/Param/useTableColumns.tsx b/src/Pages/Admin/Param/useTableColumns.tsx
index 86a931a..8f4c673 100644
--- a/src/Pages/Admin/Param/useTableColumns.tsx
+++ b/src/Pages/Admin/Param/useTableColumns.tsx
@@ -4,7 +4,12 @@ import { ModalEnum } from "../../../enums/Model";
 import { useObjectToEdit } from "../../../zustand/ObjectToEditState";
 import { useModalState } from "../../../zustand/Modal";
 import { useTranslation } from "react-i18next";
-import { canDeleteParam, canDeleteUser, canEditParam, canEditUser } from "../../../utils/hasAbilityFn";
+import {
+  canDeleteParam,
+  canDeleteUser,
+  canEditParam,
+  canEditUser,
+} from "../../../utils/hasAbilityFn";
 import ActionButtons from "../../../Components/Table/ActionButtons";
 
 export const useColumns = () => {
@@ -56,5 +61,3 @@ export const useColumns = () => {
 
   return columns;
 };
-
-
diff --git a/src/Pages/Admin/Reseller/Add/Page.tsx b/src/Pages/Admin/Reseller/Add/Page.tsx
index fb41ab6..19d6daa 100644
--- a/src/Pages/Admin/Reseller/Add/Page.tsx
+++ b/src/Pages/Admin/Reseller/Add/Page.tsx
@@ -6,20 +6,17 @@ import { Spin } from "antd";
 import { ModalEnum } from "../../../../enums/Model";
 import { canAddReSeller } from "../../../../utils/hasAbilityFn";
 import PersonalDetailsForm from "../Form/PersonalDetailsForm";
-import { Formik ,Form} from "formik";
+import { Formik, Form } from "formik";
 import { getInitialValues, getValidationSchema } from "../Form/formUtils";
 import TitleDetailsForm from "../Form/TitleDetailsForm";
 import AttachmentForm from "../Form/AttachmentForm";
 
-
-
 const TableHeader = () => {
   const [t] = useTranslation();
   useSetPageTitle(t(`page_header.add_reseller`));
-  const handelSubmit = (values:any)=>{
-      console.log(values,"values");
-      
-  } 
+  const handelSubmit = (values: any) => {
+    console.log(values, "values");
+  };
   return (
     <div className="TableWithHeader">
       <Suspense fallback={<Spin />}>
@@ -28,21 +25,22 @@ const TableHeader = () => {
           ModelAbility={ModalEnum?.RE_SELLER_ADD}
           canAdd={false}
         />
-        <div  className="bg2" >
-          <Formik initialValues={getInitialValues({})} validationSchema={getValidationSchema} onSubmit={handelSubmit} >
+        <div className="bg2">
+          <Formik
+            initialValues={getInitialValues({})}
+            validationSchema={getValidationSchema}
+            onSubmit={handelSubmit}
+          >
             <Form>
-          <PersonalDetailsForm/>
-          <TitleDetailsForm/>
-          <AttachmentForm/>
-            <div className="resellerButton">
-          <button type="button">
-            {t("practical.cancel")}
-            </button>
-            <button type="submit">
-            {t("practical.add")}  {t("models.reseller")}
-            </button>
-
-          </div>
+              <PersonalDetailsForm />
+              <TitleDetailsForm />
+              <AttachmentForm />
+              <div className="resellerButton">
+                <button type="button">{t("practical.cancel")}</button>
+                <button type="submit">
+                  {t("practical.add")} {t("models.reseller")}
+                </button>
+              </div>
             </Form>
           </Formik>
         </div>
diff --git a/src/Pages/Admin/Reseller/Edit/Page.tsx b/src/Pages/Admin/Reseller/Edit/Page.tsx
index 4c8f872..1d64aa0 100644
--- a/src/Pages/Admin/Reseller/Edit/Page.tsx
+++ b/src/Pages/Admin/Reseller/Edit/Page.tsx
@@ -1,9 +1,7 @@
-import React from 'react'
+import React from "react";
 
 const Page = () => {
-  return (
-    <div>Page</div>
-  )
-}
+  return <div>Page</div>;
+};
 
-export default Page
\ No newline at end of file
+export default Page;
diff --git a/src/Pages/Admin/Reseller/Form/AttachmentForm.tsx b/src/Pages/Admin/Reseller/Form/AttachmentForm.tsx
index 1d5fe60..a4f7a7a 100644
--- a/src/Pages/Admin/Reseller/Form/AttachmentForm.tsx
+++ b/src/Pages/Admin/Reseller/Form/AttachmentForm.tsx
@@ -1,24 +1,23 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { FaImage } from 'react-icons/fa'
-import ImageBoxField from './ImageBoxField/ImageBoxField';
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { FaImage } from "react-icons/fa";
+import ImageBoxField from "./ImageBoxField/ImageBoxField";
 
 const AttachmentForm = () => {
   const [t] = useTranslation();
 
   return (
-    <div className='AttachmentForm'>
-      <header className='header_form'>
+    <div className="AttachmentForm">
+      <header className="header_form">
         <FaImage />
         <h4>{t("header.attachment")}</h4>
       </header>
-      <main className='main_form_body'>
-
-        <ImageBoxField  name="personal_image" />
-        <ImageBoxField  name="id_image" />
+      <main className="main_form_body">
+        <ImageBoxField name="personal_image" />
+        <ImageBoxField name="id_image" />
       </main>
     </div>
-  )
-}
+  );
+};
 
-export default AttachmentForm
\ No newline at end of file
+export default AttachmentForm;
diff --git a/src/Pages/Admin/Reseller/Form/FilterForm.tsx b/src/Pages/Admin/Reseller/Form/FilterForm.tsx
index 925eba3..0857f55 100644
--- a/src/Pages/Admin/Reseller/Form/FilterForm.tsx
+++ b/src/Pages/Admin/Reseller/Form/FilterForm.tsx
@@ -7,7 +7,11 @@ const FilterForm = () => {
     <div>
       <Row>
         <Col>
-          <ValidationField placeholder="first_name" label="first_name" name="first_name" />
+          <ValidationField
+            placeholder="first_name"
+            label="first_name"
+            name="first_name"
+          />
           {/* <ValidationField placeholder="last_name" label="last_name" name="last_name" /> */}
         </Col>
         {/* <Col>
diff --git a/src/Pages/Admin/Reseller/Form/ImageBoxField/ImageBoxField.tsx b/src/Pages/Admin/Reseller/Form/ImageBoxField/ImageBoxField.tsx
index e647ca8..d163048 100644
--- a/src/Pages/Admin/Reseller/Form/ImageBoxField/ImageBoxField.tsx
+++ b/src/Pages/Admin/Reseller/Form/ImageBoxField/ImageBoxField.tsx
@@ -48,7 +48,7 @@ const ImageBoxField = ({ name }: any) => {
       fileInputRef.current.value = "";
     }
   };
-    const [t] = useTranslation()
+  const [t] = useTranslation();
   return (
     <div className="ImageBoxField">
       <header>{t(`input.${name}`)}</header>
diff --git a/src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx b/src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx
index 4fc3651..46381e4 100644
--- a/src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx
+++ b/src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx
@@ -1,35 +1,76 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { FaStore } from 'react-icons/fa'
-import ValidationField from '../../../../Components/ValidationField/ValidationField';
-import { convert_data_to_select } from '../../../../Layout/app/Const';
-import { userTypeOptions } from '../../../../config/userTypeOptions';
-import { statusType } from '../../../../config/statusType';
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { FaStore } from "react-icons/fa";
+import ValidationField from "../../../../Components/ValidationField/ValidationField";
+import { convert_data_to_select } from "../../../../Layout/app/Const";
+import { userTypeOptions } from "../../../../config/userTypeOptions";
+import { statusType } from "../../../../config/statusType";
 
 const PersonalDetailsForm = () => {
   const [t] = useTranslation();
   return (
-    <div className='PersonalDetailsForm'>
-      <header className='header_form'>
+    <div className="PersonalDetailsForm">
+      <header className="header_form">
         <FaStore />
         <h4>{t("header.personal_information")}</h4>
       </header>
-      <main className='main_form_body'>
-        <ValidationField name={"id_number"} placeholder={"_"} label={"ID Number"} />
-        <ValidationField name={"addition_date"} placeholder={"_"} type='Date' label={"Addition Date"} />
-        <ValidationField name={"status"} placeholder={"_"} label={"Status"} type='Select' option={statusType} />
+      <main className="main_form_body">
+        <ValidationField
+          name={"id_number"}
+          placeholder={"_"}
+          label={"ID Number"}
+        />
+        <ValidationField
+          name={"addition_date"}
+          placeholder={"_"}
+          type="Date"
+          label={"Addition Date"}
+        />
+        <ValidationField
+          name={"status"}
+          placeholder={"_"}
+          label={"Status"}
+          type="Select"
+          option={statusType}
+        />
 
-        <ValidationField name={"full_name"} placeholder={"_"} label={"Full Name"} />
-        <ValidationField name={"phone_number"} placeholder={"_"} label={"Phone Number"} type='text' />
-        <ValidationField name={"mobile_number"} placeholder={"_"} label={"Mobile Number"} />
-
-        <ValidationField name={"username"} placeholder={"_"} label={"Username"} />
-        <ValidationField name={"password"} placeholder={"_"} label={"Password"} type='text' />
-        <ValidationField name={"seller_percentage"} placeholder={"_"} label={"Seller Percentage"} type='text' />
+        <ValidationField
+          name={"full_name"}
+          placeholder={"_"}
+          label={"Full Name"}
+        />
+        <ValidationField
+          name={"phone_number"}
+          placeholder={"_"}
+          label={"Phone Number"}
+          type="text"
+        />
+        <ValidationField
+          name={"mobile_number"}
+          placeholder={"_"}
+          label={"Mobile Number"}
+        />
 
+        <ValidationField
+          name={"username"}
+          placeholder={"_"}
+          label={"Username"}
+        />
+        <ValidationField
+          name={"password"}
+          placeholder={"_"}
+          label={"Password"}
+          type="text"
+        />
+        <ValidationField
+          name={"seller_percentage"}
+          placeholder={"_"}
+          label={"Seller Percentage"}
+          type="text"
+        />
       </main>
     </div>
-  )
-}
+  );
+};
 
-export default PersonalDetailsForm
\ No newline at end of file
+export default PersonalDetailsForm;
diff --git a/src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx b/src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx
index b5c50db..e7faa2a 100644
--- a/src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx
+++ b/src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx
@@ -1,25 +1,30 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { FaRegAddressBook } from 'react-icons/fa'
-import ValidationField from '../../../../Components/ValidationField/ValidationField';
-import { nationalities } from '../../../../types/App';
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { FaRegAddressBook } from "react-icons/fa";
+import ValidationField from "../../../../Components/ValidationField/ValidationField";
+import { nationalities } from "../../../../types/App";
 
 const TitleDetailsForm = () => {
   const [t] = useTranslation();
 
   return (
-    <div className='TitleDetailsForm'>
-      <header className='header_form'>
+    <div className="TitleDetailsForm">
+      <header className="header_form">
         <FaRegAddressBook />
         <h4>{t("header.address")}</h4>
       </header>
-      <main className='main_form_body'>
-        <ValidationField name={"city_id"} placeholder={"_"} label={"city"}  type='Select' option={nationalities}  />
-        <ValidationField  name={"address"} placeholder={"_"} label={"address"} />
-
+      <main className="main_form_body">
+        <ValidationField
+          name={"city_id"}
+          placeholder={"_"}
+          label={"city"}
+          type="Select"
+          option={nationalities}
+        />
+        <ValidationField name={"address"} placeholder={"_"} label={"address"} />
       </main>
     </div>
-  )
-}
+  );
+};
 
-export default TitleDetailsForm
\ No newline at end of file
+export default TitleDetailsForm;
diff --git a/src/Pages/Admin/Reseller/Form/formUtils.ts b/src/Pages/Admin/Reseller/Form/formUtils.ts
index 8dc46f6..b14915a 100644
--- a/src/Pages/Admin/Reseller/Form/formUtils.ts
+++ b/src/Pages/Admin/Reseller/Form/formUtils.ts
@@ -1,17 +1,13 @@
 import * as Yup from "yup";
 
-export const getInitialValues = (
-  objectToEdit: Partial<any>,
-) => {
+export const getInitialValues = (objectToEdit: Partial<any>) => {
   return {
-    id: objectToEdit?.id ?? null ,
+    id: objectToEdit?.id ?? null,
     name: objectToEdit?.name ?? null,
   };
 };
 
 export const getValidationSchema = () => {
   // validate input
-  return Yup.object().shape({
- 
-  });
+  return Yup.object().shape({});
 };
diff --git a/src/Pages/Admin/Reseller/Page.tsx b/src/Pages/Admin/Reseller/Page.tsx
index e2aaea5..2f3b885 100644
--- a/src/Pages/Admin/Reseller/Page.tsx
+++ b/src/Pages/Admin/Reseller/Page.tsx
@@ -45,7 +45,6 @@ const TableHeader = () => {
           deleteMutation={deleteMutation}
           ModelEnum={ModalEnum?.RE_SELLER_DELETE}
         />
- 
       </Suspense>
     </div>
   );
diff --git a/src/Pages/Admin/Reseller/Table.tsx b/src/Pages/Admin/Reseller/Table.tsx
index 47488af..d539438 100644
--- a/src/Pages/Admin/Reseller/Table.tsx
+++ b/src/Pages/Admin/Reseller/Table.tsx
@@ -11,7 +11,7 @@ const App: React.FC = () => {
   const response = useGetAllReseller({
     name: searchQuery,
     pagination: true,
-    ...filterState
+    ...filterState,
   });
 
   return <DataTable response={response} useColumns={useColumns} />;
diff --git a/src/Pages/Admin/Reseller/useTableColumns.tsx b/src/Pages/Admin/Reseller/useTableColumns.tsx
index 33223e4..09a7394 100644
--- a/src/Pages/Admin/Reseller/useTableColumns.tsx
+++ b/src/Pages/Admin/Reseller/useTableColumns.tsx
@@ -21,7 +21,6 @@ export const useColumns = () => {
   const { setObjectToEdit } = useObjectToEdit((state) => state);
   const navigate = useNavigate();
 
-
   const handelDelete = (data: ReSeller) => {
     setObjectToEdit(data);
     handel_open_model(ModalEnum?.RE_SELLER_DELETE);
@@ -63,7 +62,7 @@ export const useColumns = () => {
       render: (_text, record) => record?.user?.username,
     },
     {
-      title:"",
+      title: "",
 
       key: "actions",
       align: "center",
@@ -72,11 +71,9 @@ export const useColumns = () => {
           <ActionButtons
             canDelete={canDeleteReSeller}
             canEdit={canEditReSeller}
-          
             index={index}
             onDelete={() => handelDelete(record)}
             onEdit={() => handleEdit(record)}
-          
           />
         );
       },
diff --git a/src/Pages/Admin/Student/Model/FilterForm.tsx b/src/Pages/Admin/Student/Model/FilterForm.tsx
index 9a6904c..7db83f6 100644
--- a/src/Pages/Admin/Student/Model/FilterForm.tsx
+++ b/src/Pages/Admin/Student/Model/FilterForm.tsx
@@ -7,8 +7,16 @@ const FilterForm = () => {
     <div>
       <Row>
         <Col>
-          <ValidationField placeholder="first_name" label="first_name" name="first_name" />
-          <ValidationField placeholder="last_name" label="last_name" name="last_name" />
+          <ValidationField
+            placeholder="first_name"
+            label="first_name"
+            name="first_name"
+          />
+          <ValidationField
+            placeholder="last_name"
+            label="last_name"
+            name="last_name"
+          />
         </Col>
       </Row>
     </div>
diff --git a/src/Pages/Admin/Student/Table.tsx b/src/Pages/Admin/Student/Table.tsx
index f5fac1b..35d08d5 100644
--- a/src/Pages/Admin/Student/Table.tsx
+++ b/src/Pages/Admin/Student/Table.tsx
@@ -7,10 +7,10 @@ import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
 const App: React.FC = () => {
   const { filterState } = useFilterState();
 
-  const response = useGetAllStudent({ 
+  const response = useGetAllStudent({
     pagination: true,
     ...filterState,
-   });
+  });
 
   return <DataTable response={response} useColumns={useColumns} />;
 };
diff --git a/src/Pages/Admin/Unit/DrapableTable.tsx b/src/Pages/Admin/Unit/DrapableTable.tsx
index 725b341..207d02d 100644
--- a/src/Pages/Admin/Unit/DrapableTable.tsx
+++ b/src/Pages/Admin/Unit/DrapableTable.tsx
@@ -94,7 +94,7 @@ const DrapableTable: React.FC = () => {
   const { subject_id } = useParams<ParamsEnum>();
   const { filterState } = useFilterState();
 
-  const response = useGetAllUnit({ 
+  const response = useGetAllUnit({
     subject_id: subject_id,
     pagination: false,
     ...filterState,
diff --git a/src/Pages/Admin/Unit/Model/ModelForm.tsx b/src/Pages/Admin/Unit/Model/ModelForm.tsx
index bd3d007..8502c77 100644
--- a/src/Pages/Admin/Unit/Model/ModelForm.tsx
+++ b/src/Pages/Admin/Unit/Model/ModelForm.tsx
@@ -19,7 +19,6 @@ const Form = () => {
           placeholder="term"
           label="term"
           option={termsArray}
-          
         />
       </Col>
     </Row>
diff --git a/src/Pages/Admin/Unit/Page.tsx b/src/Pages/Admin/Unit/Page.tsx
index dabb5a6..f1a312e 100644
--- a/src/Pages/Admin/Unit/Page.tsx
+++ b/src/Pages/Admin/Unit/Page.tsx
@@ -39,10 +39,10 @@ const TableHeader = () => {
   const SubjectName = Subject?.data?.name ?? "";
   useSetPageTitle(
     t(`page_header.grade`) +
-    " / " +
-    ` ${t("header.subject_of_class")} (${gradeName})`  +
       " / " +
-      SubjectName 
+      ` ${t("header.subject_of_class")} (${gradeName})` +
+      " / " +
+      SubjectName,
   );
 
   return (
@@ -56,7 +56,7 @@ const TableHeader = () => {
         <FilterLayout
           sub_children={<FilterForm />}
           filterTitle={` ${gradeName} (${SubjectName}) `}
-          />
+        />
         <Table />
         <AddModalForm />
         <EditModalForm />
diff --git a/src/Pages/Admin/Unit/Table.tsx b/src/Pages/Admin/Unit/Table.tsx
index 4040136..1e47790 100644
--- a/src/Pages/Admin/Unit/Table.tsx
+++ b/src/Pages/Admin/Unit/Table.tsx
@@ -9,11 +9,11 @@ import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
 
 const App: React.FC = () => {
   const { subject_id } = useParams<ParamsEnum>();
-  
-  const response = useGetAllUnit({ 
+
+  const response = useGetAllUnit({
     subject_id: subject_id,
     pagination: true,
-   });
+  });
   const { setOldObjectToEdit } = useObjectToEdit();
   // console.log(response?.data?.data, "response?.data");
   const data = response?.data?.data;
diff --git a/src/Pages/Admin/User/Model/FilterForm.tsx b/src/Pages/Admin/User/Model/FilterForm.tsx
index eb3b7a7..67e0161 100644
--- a/src/Pages/Admin/User/Model/FilterForm.tsx
+++ b/src/Pages/Admin/User/Model/FilterForm.tsx
@@ -8,11 +8,25 @@ const FilterForm = () => {
     <div>
       <Row>
         <Col>
-          <ValidationField placeholder="username" label="username" name="username" />
-          <ValidationField placeholder="phone_number" label="phone_number" name="phone_number" />
+          <ValidationField
+            placeholder="username"
+            label="username"
+            name="username"
+          />
+          <ValidationField
+            placeholder="phone_number"
+            label="phone_number"
+            name="phone_number"
+          />
         </Col>
         <Col>
-          <ValidationField type="Select" option={userTypeOptions} placeholder="type" label="type" name="type" />
+          <ValidationField
+            type="Select"
+            option={userTypeOptions}
+            placeholder="type"
+            label="type"
+            name="type"
+          />
         </Col>
       </Row>
     </div>
diff --git a/src/Pages/Admin/User/Model/ModelForm.tsx b/src/Pages/Admin/User/Model/ModelForm.tsx
index 0e0eda7..7729220 100644
--- a/src/Pages/Admin/User/Model/ModelForm.tsx
+++ b/src/Pages/Admin/User/Model/ModelForm.tsx
@@ -3,25 +3,59 @@ import ValidationField from "../../../../Components/ValidationField/ValidationFi
 import useFormatDataToSelect from "../../../../utils/useFormatDataToSelect";
 import { userTypeOptions } from "../../../../config/userTypeOptions";
 
-const Form = ({isEdit}:{isEdit?:boolean}) => {
-
-
-  
+const Form = ({ isEdit }: { isEdit?: boolean }) => {
   return (
     <Row className="w-100">
-        {isEdit ? "" : 
+      {isEdit ? (
+        ""
+      ) : (
         <Col>
-            <>
-              <ValidationField placeholder="username" label="username" name="username" />
-              <ValidationField placeholder="password" label="password" name="password" />
-              <ValidationField placeholder="phone_number" label="phone_number" name="phone_number" />
-            </>
-        </Col>}
+          <>
+            <ValidationField
+              placeholder="username"
+              label="username"
+              name="username"
+            />
+            <ValidationField
+              placeholder="password"
+              label="password"
+              name="password"
+            />
+            <ValidationField
+              placeholder="phone_number"
+              label="phone_number"
+              name="phone_number"
+            />
+          </>
+        </Col>
+      )}
       <Col>
-      {isEdit ? "":
-        <ValidationField type="Select" option={userTypeOptions} placeholder="type" label="type" name="type" />}
-        <ValidationField type="Select" option={userTypeOptions} placeholder="roles" label="roles" name="role_id" />
-        <ValidationField type="Select" option={userTypeOptions} placeholder="abilities" label="abilities" name="abilities" isMulti={true} />
+        {isEdit ? (
+          ""
+        ) : (
+          <ValidationField
+            type="Select"
+            option={userTypeOptions}
+            placeholder="type"
+            label="type"
+            name="type"
+          />
+        )}
+        <ValidationField
+          type="Select"
+          option={userTypeOptions}
+          placeholder="roles"
+          label="roles"
+          name="role_id"
+        />
+        <ValidationField
+          type="Select"
+          option={userTypeOptions}
+          placeholder="abilities"
+          label="abilities"
+          name="abilities"
+          isMulti={true}
+        />
       </Col>
     </Row>
   );
diff --git a/src/Pages/Admin/User/Model/formUtil.ts b/src/Pages/Admin/User/Model/formUtil.ts
index e279a35..87728eb 100644
--- a/src/Pages/Admin/User/Model/formUtil.ts
+++ b/src/Pages/Admin/User/Model/formUtil.ts
@@ -6,7 +6,6 @@ export const getInitialValues = (objectToEdit: any): any => {
     password: objectToEdit?.password ?? null,
     phone_number: objectToEdit?.phone_number ?? null,
     type: objectToEdit?.type ?? null,
-
   };
 };
 
@@ -16,7 +15,7 @@ export const getValidationSchema = () => {
     // password: Yup.string().required("validation.required"),
     phone_number: Yup.string()
       .required("validation.required")
-      .min(10, "Phone number must be at least 10 characters long"), 
+      .min(10, "Phone number must be at least 10 characters long"),
     type: Yup.string().required("validation.required"),
   });
-};
\ No newline at end of file
+};
diff --git a/src/Pages/Admin/User/Page.tsx b/src/Pages/Admin/User/Page.tsx
index 08f4a4c..fa14056 100644
--- a/src/Pages/Admin/User/Page.tsx
+++ b/src/Pages/Admin/User/Page.tsx
@@ -18,9 +18,7 @@ const DeleteModalForm = lazy(
 
 const TableHeader = () => {
   const [t] = useTranslation();
-  useSetPageTitle(
-    t(`page_header.user`),
-  );
+  useSetPageTitle(t(`page_header.user`));
   const deleteMutation = useDeleteUser();
   return (
     <div className="TableWithHeader">
diff --git a/src/Pages/Admin/User/Table.tsx b/src/Pages/Admin/User/Table.tsx
index b2f0a80..c7297a8 100644
--- a/src/Pages/Admin/User/Table.tsx
+++ b/src/Pages/Admin/User/Table.tsx
@@ -14,7 +14,7 @@ const App: React.FC = () => {
     pagination: true,
     ...filterState,
   });
-    
+
   return <DataTable response={response} useColumns={useColumns} />;
 };
 
diff --git a/src/Pages/Admin/lesson/Page.tsx b/src/Pages/Admin/lesson/Page.tsx
index 3726f5e..ffc67f3 100644
--- a/src/Pages/Admin/lesson/Page.tsx
+++ b/src/Pages/Admin/lesson/Page.tsx
@@ -37,22 +37,20 @@ const TableHeader = () => {
     show: grade_id,
   });
 
-
   const gradeName = grade?.data?.name ?? "";
   const SubjectName = Subject?.data?.name ?? "";
   const unitName = unit?.data?.name ?? "";
 
   useSetPageTitle(
     t(`page_header.grade`) +
-    " / " +
-    ` ${t("header.subject_of_class")} (${gradeName})`  +
+      " / " +
+      ` ${t("header.subject_of_class")} (${gradeName})` +
       " / " +
       SubjectName +
       " / " +
-      unitName 
+      unitName,
   );
 
-
   return (
     <div className="TableWithHeader">
       <Suspense fallback={<Spin />}>
diff --git a/src/Pages/Admin/lesson/Table.tsx b/src/Pages/Admin/lesson/Table.tsx
index 0b46f8c..eab91be 100644
--- a/src/Pages/Admin/lesson/Table.tsx
+++ b/src/Pages/Admin/lesson/Table.tsx
@@ -10,10 +10,10 @@ import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
 const App: React.FC = () => {
   const { unit_id } = useParams<ParamsEnum>();
 
-  const response = useGetAllLesson({ 
+  const response = useGetAllLesson({
     unit_id: unit_id,
     pagination: true,
-   });
+  });
 
   const { setOldObjectToEdit } = useObjectToEdit();
   // console.log(response?.data?.data, "response?.data");
diff --git a/src/Pages/Admin/question/AddPage.tsx b/src/Pages/Admin/question/AddPage.tsx
index 3adcb0f..604c5ba 100644
--- a/src/Pages/Admin/question/AddPage.tsx
+++ b/src/Pages/Admin/question/AddPage.tsx
@@ -1,5 +1,5 @@
 import React, { Suspense, lazy, useEffect } from "react";
-import {  Spin } from "antd";
+import { Spin } from "antd";
 import FormikForm from "../../../Layout/Dashboard/FormikFormModel";
 import {
   getInitialValues,
@@ -22,32 +22,24 @@ import { toast } from "react-toastify";
 const AcceptModal = lazy(() => import("./Model/AcceptModal"));
 
 const AddPage: React.FC = () => {
-
-  const {  mutateAsync } = useAddQuestionAsync();
-  const { mutate, isLoading ,isSuccess} = useAddQuestion();
-  const {
-    isBseQuestion,
-    setTagsSearch,
-    objectToEdit,
-    setSuccess
-  } = useObjectToEdit();
-
+  const { mutateAsync } = useAddQuestionAsync();
+  const { mutate, isLoading, isSuccess } = useAddQuestion();
+  const { isBseQuestion, setTagsSearch, objectToEdit, setSuccess } =
+    useObjectToEdit();
 
   const [t] = useTranslation();
-  const {  subject_id, lesson_id } =
-    useParams<ParamsEnum>();
-  
-console.log(objectToEdit,"objectToEdit");
+  const { subject_id, lesson_id } = useParams<ParamsEnum>();
+
+  console.log(objectToEdit, "objectToEdit");
 
   const handleSubmit = (
     values: any,
     { resetForm }: { resetForm: () => void },
   ) => {
-
     const DataToSend = structuredClone(values);
     setTagsSearch(null);
     console.log(1);
-    
+
     const canAnswersBeShuffled = DataToSend?.canAnswersBeShuffled ? 1 : 0;
 
     if (isBseQuestion || DataToSend?.isBase === 1) {
@@ -76,14 +68,18 @@ console.log(objectToEdit,"objectToEdit");
             };
           });
           console.log(answers);
-          if(answers?.length > 0){
-            const isValidAnswers =  answers?.some((answer:any) => answer?.isCorrect === 1)
-            
-            if(!isValidAnswers){
-              toast.error(t("validation.at_least_one_answer_should_be_correct"));
+          if (answers?.length > 0) {
+            const isValidAnswers = answers?.some(
+              (answer: any) => answer?.isCorrect === 1,
+            );
+
+            if (!isValidAnswers) {
+              toast.error(
+                t("validation.at_least_one_answer_should_be_correct"),
+              );
               return;
             }
-            }
+          }
           mutate({
             ...item,
             parent_id: newBseQuestionId,
@@ -97,27 +93,27 @@ console.log(objectToEdit,"objectToEdit");
       });
     } else {
       console.log(1);
-      
+
       const tags = processTags(DataToSend);
       const answers = values?.answers?.map((item: any, index: number) => {
-        
         return {
           order: index,
           ...item,
         };
       });
-      
-      if(answers?.length > 0){
-        
-      const isValidAnswers =  answers?.some((answer:any) => answer?.isCorrect === 1)
+
+      if (answers?.length > 0) {
+        const isValidAnswers = answers?.some(
+          (answer: any) => answer?.isCorrect === 1,
+        );
         console.log(!isValidAnswers);
-        
-      if(!isValidAnswers){
-        toast.error(t("validation.at_least_one_answer_should_be_correct"));
-        return;
+
+        if (!isValidAnswers) {
+          toast.error(t("validation.at_least_one_answer_should_be_correct"));
+          return;
+        }
       }
-      }
-   
+
       const NewQuestion = {
         ...values,
         subject_id: subject_id,
@@ -135,26 +131,16 @@ console.log(objectToEdit,"objectToEdit");
 
   const navigate = useNavigate();
 
-
   const handleCancel = () => {
     navigate(-1);
   };
 
-
-
-
-  
   useEffect(() => {
-
-    
     console.log("all api success");
-    if(isSuccess){
-
-      setSuccess(true )
+    if (isSuccess) {
+      setSuccess(true);
     }
-}, [isSuccess])
-
-
+  }, [isSuccess]);
 
   if (isBseQuestion) {
     return (
diff --git a/src/Pages/Admin/question/EditPage.tsx b/src/Pages/Admin/question/EditPage.tsx
index 782be67..d03abfc 100644
--- a/src/Pages/Admin/question/EditPage.tsx
+++ b/src/Pages/Admin/question/EditPage.tsx
@@ -25,13 +25,8 @@ import BaseForm from "./Model/Malty/Form";
 import { Question } from "../../../types/Item";
 import { toast } from "react-toastify";
 
-
 const EditPage: React.FC = () => {
-  const {
-    subject_id,
-    lesson_id,
-    question_id,
-  } = useParams<ParamsEnum>();
+  const { subject_id, lesson_id, question_id } = useParams<ParamsEnum>();
   const { isBseQuestion, setIsBseQuestion, setTagsSearch, DeletedQuestions } =
     useObjectToEdit();
 
@@ -58,8 +53,6 @@ const EditPage: React.FC = () => {
 
   const [t] = useTranslation();
 
-
-
   const handleSubmit = (values: any) => {
     const DataToSend = structuredClone(values);
     setTagsSearch(null);
@@ -100,21 +93,22 @@ const EditPage: React.FC = () => {
           const tags = processTags(updatedObject);
           const oldAnswers = [] as any;
           const newAnswers = [] as any;
-          
-          if(updatedObject?.answers?.length > 0){
-        
-            const isValidAnswers =  updatedObject?.answers?.some((answer:any) => answer?.isCorrect === 1)
-            
+
+          if (updatedObject?.answers?.length > 0) {
+            const isValidAnswers = updatedObject?.answers?.some(
+              (answer: any) => answer?.isCorrect === 1,
+            );
+
             // if(!isValidAnswers){
             //   toast.error(t("validation.at_least_one_answer_should_be_correct"));
             //   return;
             // }
-            }
+          }
           updatedObject?.answers?.forEach((item: any) => {
             if (item?.id) {
-              oldAnswers.push({...item,isCorrect:item?.isCorrect ? 1 : 0});
+              oldAnswers.push({ ...item, isCorrect: item?.isCorrect ? 1 : 0 });
             } else {
-              newAnswers.push({...item,isCorrect:item?.isCorrect ? 1 : 0});
+              newAnswers.push({ ...item, isCorrect: item?.isCorrect ? 1 : 0 });
             }
           });
           const answers = {
@@ -142,7 +136,6 @@ const EditPage: React.FC = () => {
         }
       });
     } else {
-      
       const keysToRemove = ["content_image"];
       console.log(DataToSend);
       const updatedObject = removeStringKeys(DataToSend, keysToRemove);
@@ -154,23 +147,21 @@ const EditPage: React.FC = () => {
 
       const oldAnswers = [] as any;
       const newAnswers = [] as any;
-      if(updatedObject?.answers?.length > 0){
-        
+      if (updatedObject?.answers?.length > 0) {
         // const isValidAnswers =  updatedObject?.answers?.some((answer:any) => answer?.isCorrect === 1 || answer?.isCorrect === true)
         // const isValidAnswers2 = updatedObject?.answers?.filter((answer: any) => answer?.isCorrect === 1 || answer?.isCorrect === true ).length > 1;
         // console.log(isValidAnswers2);
         //   console.log(isValidAnswers,"isValidAnswers");
-          
         // if(!isValidAnswers || isValidAnswers2){
         //   toast.error(t("validation.at_least_one_answer_should_be_correct"));
         //   return;
         // }
-        }
+      }
       updatedObject?.answers?.forEach((item: any) => {
         if (item?.id) {
-          oldAnswers.push({...item,isCorrect:item?.isCorrect ? 1 : 0});
+          oldAnswers.push({ ...item, isCorrect: item?.isCorrect ? 1 : 0 });
         } else {
-          newAnswers.push({...item,isCorrect:item?.isCorrect ? 1 : 0});
+          newAnswers.push({ ...item, isCorrect: item?.isCorrect ? 1 : 0 });
         }
       });
 
@@ -178,15 +169,12 @@ const EditPage: React.FC = () => {
         old: oldAnswers,
         new: newAnswers,
       };
-        console.log(tags,"tags");
-        if(tags?.new?.length < 1 && tags?.old?.length < 1){
-          mutate({ ...updatedObject, answers, tags:"" });
-
-        }else{
-
-          mutate({ ...updatedObject, answers, tags });
-        }
-        
+      console.log(tags, "tags");
+      if (tags?.new?.length < 1 && tags?.old?.length < 1) {
+        mutate({ ...updatedObject, answers, tags: "" });
+      } else {
+        mutate({ ...updatedObject, answers, tags });
+      }
     }
   };
 
diff --git a/src/Pages/Admin/question/FilterForm.tsx b/src/Pages/Admin/question/FilterForm.tsx
index f7be7b9..7aae982 100644
--- a/src/Pages/Admin/question/FilterForm.tsx
+++ b/src/Pages/Admin/question/FilterForm.tsx
@@ -4,15 +4,19 @@ import { Col, Row } from "reactstrap";
 import useFormatDataToSelect from "../../../utils/useFormatDataToSelect";
 
 const FilterForm = () => {
-  const yesNoArray = [ 
-    {id: "لا", name:"لا"},
-    {id: "نعم", name:"نعم"},
-  ]
+  const yesNoArray = [
+    { id: "لا", name: "لا" },
+    { id: "نعم", name: "نعم" },
+  ];
   return (
     <div>
       <Row>
         <Col>
-          <ValidationField placeholder="content" label="content" name="content" />
+          <ValidationField
+            placeholder="content"
+            label="content"
+            name="content"
+          />
           {/* <ValidationField type="Select" option={yesNoArray} placeholder="isBase" label="isBase" name="isBase" /> */}
         </Col>
         {/* <Col>
diff --git a/src/Pages/Admin/question/Model/AcceptModal.tsx b/src/Pages/Admin/question/Model/AcceptModal.tsx
index a73a490..43531b9 100644
--- a/src/Pages/Admin/question/Model/AcceptModal.tsx
+++ b/src/Pages/Admin/question/Model/AcceptModal.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {  Modal } from "antd";
+import { Modal } from "antd";
 import { useModalState } from "../../../../zustand/Modal";
 import { ModalEnum } from "../../../../enums/Model";
 import { useTranslation } from "react-i18next";
diff --git a/src/Pages/Admin/question/Model/Field/CheckboxField.tsx b/src/Pages/Admin/question/Model/Field/CheckboxField.tsx
index 1503497..4d81eee 100644
--- a/src/Pages/Admin/question/Model/Field/CheckboxField.tsx
+++ b/src/Pages/Admin/question/Model/Field/CheckboxField.tsx
@@ -35,7 +35,10 @@ const CheckboxField = ({
       <Checkbox
         onChange={onChange || CheckboxhandleChange}
         disabled={isDisabled}
-        checked={formik.values?.answers?.[name]?.isCorrect === 1 || formik.values?.answers?.[name]?.isCorrect === true}
+        checked={
+          formik.values?.answers?.[name]?.isCorrect === 1 ||
+          formik.values?.answers?.[name]?.isCorrect === true
+        }
         className={className}
       >
         {t(`input.${label ? label : name}`)}
diff --git a/src/Pages/Admin/question/Model/Field/ChoiceFields.tsx b/src/Pages/Admin/question/Model/Field/ChoiceFields.tsx
index 646e27e..19c7003 100644
--- a/src/Pages/Admin/question/Model/Field/ChoiceFields.tsx
+++ b/src/Pages/Admin/question/Model/Field/ChoiceFields.tsx
@@ -28,7 +28,6 @@ const ChoiceFields = ({ index, data }: { index: number; data: Choice }) => {
   return (
     <>
       <div className="ChoiceFields">
-        
         <TextField
           className="textarea_exercise"
           placeholder={"choice"}
diff --git a/src/Pages/Admin/question/Model/Field/Choices.tsx b/src/Pages/Admin/question/Model/Field/Choices.tsx
index eb2ca65..61f575c 100644
--- a/src/Pages/Admin/question/Model/Field/Choices.tsx
+++ b/src/Pages/Admin/question/Model/Field/Choices.tsx
@@ -59,7 +59,7 @@ const Choices = () => {
                       {...provided.dragHandleProps}
                     >
                       <div className="HolderQuestion">
-                      <HolderOutlined/>
+                        <HolderOutlined />
                       </div>
                       <ChoiceFields index={index} data={item} />
                     </div>
diff --git a/src/Pages/Admin/question/Model/Malty/ChoiceField/CheckboxField.tsx b/src/Pages/Admin/question/Model/Malty/ChoiceField/CheckboxField.tsx
index 2b13751..990bcdc 100644
--- a/src/Pages/Admin/question/Model/Malty/ChoiceField/CheckboxField.tsx
+++ b/src/Pages/Admin/question/Model/Malty/ChoiceField/CheckboxField.tsx
@@ -42,7 +42,8 @@ const CheckboxField = ({
         disabled={isDisabled}
         checked={
           formik.values?.Questions?.[parent_index]?.answers?.[name]
-            ?.isCorrect === 1 ||  formik.values?.Questions?.[parent_index]?.answers?.[name]
+            ?.isCorrect === 1 ||
+          formik.values?.Questions?.[parent_index]?.answers?.[name]
             ?.isCorrect === true
         }
         className={className}
diff --git a/src/Pages/Admin/question/Model/Malty/ChoiceField/ChoiceFields.tsx b/src/Pages/Admin/question/Model/Malty/ChoiceField/ChoiceFields.tsx
index d35a97e..eb18b2a 100644
--- a/src/Pages/Admin/question/Model/Malty/ChoiceField/ChoiceFields.tsx
+++ b/src/Pages/Admin/question/Model/Malty/ChoiceField/ChoiceFields.tsx
@@ -44,7 +44,6 @@ const ChoiceFields = ({
     formik.setFieldValue(`Questions[${parent_index}].answers`, updatedAnswers);
   };
 
-  
   return (
     <>
       <div className="ChoiceFields">
diff --git a/src/Pages/Admin/question/Model/Malty/ChoiceField/Choices.tsx b/src/Pages/Admin/question/Model/Malty/ChoiceField/Choices.tsx
index 9016ccc..d84cd7c 100644
--- a/src/Pages/Admin/question/Model/Malty/ChoiceField/Choices.tsx
+++ b/src/Pages/Admin/question/Model/Malty/ChoiceField/Choices.tsx
@@ -68,9 +68,9 @@ const Choices = ({ parent_index }: { parent_index: number }) => {
                         {...provided.draggableProps}
                         {...provided.dragHandleProps}
                       >
-                           <div className="HolderQuestion">
-                      <HolderOutlined/>
-                      </div>
+                        <div className="HolderQuestion">
+                          <HolderOutlined />
+                        </div>
                         <ChoiceFields
                           key={index}
                           parent_index={parent_index}
diff --git a/src/Pages/Admin/question/Model/Malty/Form.tsx b/src/Pages/Admin/question/Model/Malty/Form.tsx
index e42b0a0..bad59e2 100644
--- a/src/Pages/Admin/question/Model/Malty/Form.tsx
+++ b/src/Pages/Admin/question/Model/Malty/Form.tsx
@@ -18,18 +18,21 @@ const Form = () => {
   const formik = useFormikContext<any>();
   const { setSuccess, Success, setSavedQuestionData } = useObjectToEdit();
 
-
   useEffect(() => {
     setSavedQuestionData(formik.values);
   }, [formik?.values]);
 
   // console.log(formik?.errors);
 
-  const handleAddChoice = (parent_index: number,fromKeyCombination:boolean = false) => {
+  const handleAddChoice = (
+    parent_index: number,
+    fromKeyCombination: boolean = false,
+  ) => {
     console.log(parent_index);
 
     formik.setFieldValue(`Questions.[${parent_index}].answers`, [
-      ...((formik?.values as any)?.Questions?.[parent_index]?.answers as Choice[]),
+      ...((formik?.values as any)?.Questions?.[parent_index]
+        ?.answers as Choice[]),
 
       {
         answer: null,
@@ -38,12 +41,12 @@ const Form = () => {
       },
     ]);
 
-    if(fromKeyCombination){
-      toast.success(t("header.new_choice_have_been_added"))
+    if (fromKeyCombination) {
+      toast.success(t("header.new_choice_have_been_added"));
     }
   };
 
-  const handleAddQuestion = (fromKeyCombination:boolean = false) => {
+  const handleAddQuestion = (fromKeyCombination: boolean = false) => {
     formik.setFieldValue("Questions", [
       ...((formik?.values as any)?.Questions as Choice[]),
 
@@ -62,27 +65,28 @@ const Form = () => {
     const max_mark = formik?.values?.max_mark + 1;
 
     formik.setFieldValue("max_mark", max_mark);
-    if(fromKeyCombination){
-      toast.success(t("header.new_question_have_been_added"))
+    if (fromKeyCombination) {
+      toast.success(t("header.new_question_have_been_added"));
     }
   };
   const [t] = useTranslation();
 
+  const lastQuestions = formik?.values?.Questions?.length - 1;
+  useKeyCombination(
+    { ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.CHOICE },
+    () => {
+      handleAddChoice(lastQuestions, true);
+    },
+  );
 
-  const lastQuestions = formik?.values?.Questions?.length -1 ;
-  useKeyCombination({ ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.CHOICE }, () => {
-    handleAddChoice(lastQuestions,true)
-  });
-
-  useKeyCombination({ ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.QUESTION }, () => {
-    
-    handleAddQuestion(true)
-  });
-
-
+  useKeyCombination(
+    { ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.QUESTION },
+    () => {
+      handleAddQuestion(true);
+    },
+  );
 
   return (
-
     <Row className="w-100 exercise_form_container">
       <div className="exercise_form">
         <ValidationField
@@ -139,7 +143,7 @@ const Form = () => {
       )}
 
       <p className="add_new_button">
-        <FaCirclePlus onClick={()=>handleAddQuestion()} size={23} />{" "}
+        <FaCirclePlus onClick={() => handleAddQuestion()} size={23} />{" "}
         {t("header.add_new_question")}
       </p>
     </Row>
diff --git a/src/Pages/Admin/question/Model/Malty/Tags/MaltySelectTag.tsx b/src/Pages/Admin/question/Model/Malty/Tags/MaltySelectTag.tsx
index 1a4dfc0..18026d3 100644
--- a/src/Pages/Admin/question/Model/Malty/Tags/MaltySelectTag.tsx
+++ b/src/Pages/Admin/question/Model/Malty/Tags/MaltySelectTag.tsx
@@ -36,20 +36,22 @@ const MaltySelectTag = ({ parent_index }: { parent_index: number }) => {
   const [t] = useTranslation();
 
   const options = data?.data ?? [];
-  const additionalData = 
-  options.length < 1 && searchValue.length > 1 && !isLoading
-    ? [{ id: searchValue, name: searchValue }]
-    : [];
+  const additionalData =
+    options.length < 1 && searchValue.length > 1 && !isLoading
+      ? [{ id: searchValue, name: searchValue }]
+      : [];
 
-
-      console.log(options);
-const value = formik?.values?.Questions[parent_index]?.tags?.map((item: any) => item?.id ?? item) ?? [];
+  console.log(options);
+  const value =
+    formik?.values?.Questions[parent_index]?.tags?.map(
+      (item: any) => item?.id ?? item,
+    ) ?? [];
   console.log(formik?.values?.Questions[parent_index]);
-  
-    console.log(value);
-    
-  const AllOptions = [...options, ...additionalData]
-        
+
+  console.log(value);
+
+  const AllOptions = [...options, ...additionalData];
+
   return (
     <div className="SelectTag">
       <label htmlFor="">{t("models.tag")}</label>
@@ -59,7 +61,6 @@ const value = formik?.values?.Questions[parent_index]?.tags?.map((item: any) =>
         style={{ width: "100%", height: "40px" }}
         placeholder=""
         fieldNames={{ label: "name", value: "id" }}
-        
         onChange={handleChange}
         options={AllOptions}
         filterOption={false}
diff --git a/src/Pages/Admin/question/Model/ModelForm.tsx b/src/Pages/Admin/question/Model/ModelForm.tsx
index 0aeb273..483e1d8 100644
--- a/src/Pages/Admin/question/Model/ModelForm.tsx
+++ b/src/Pages/Admin/question/Model/ModelForm.tsx
@@ -18,11 +18,7 @@ const Form = () => {
   const formik = useFormikContext<any>();
   const { setSuccess, Success } = useObjectToEdit();
 
-
-
-
-  const handleAddChoice = (fromKeyCombination:boolean = false ) => {
-
+  const handleAddChoice = (fromKeyCombination: boolean = false) => {
     formik.setFieldValue("answers", [
       ...((formik?.values as any)?.answers as Choice[]),
       {
@@ -32,28 +28,26 @@ const Form = () => {
       },
     ]);
 
-    if(fromKeyCombination){
-      toast.success(t("header.new_choice_have_been_added"))
+    if (fromKeyCombination) {
+      toast.success(t("header.new_choice_have_been_added"));
     }
   };
 
-    
-  useKeyCombination({ ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.CHOICE }, () => {
-
-    handleAddChoice(true)
-   
-  });
+  useKeyCombination(
+    { ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.CHOICE },
+    () => {
+      handleAddChoice(true);
+    },
+  );
 
   useEffect(() => {
-    
-    if(Success){
-            formik?.setValues({})
-            formik.setErrors({})
-             setSuccess(false)
-             console.log(formik.errors);
-             
+    if (Success) {
+      formik?.setValues({});
+      formik.setErrors({});
+      setSuccess(false);
+      console.log(formik.errors);
     }
-}, [Success])
+  }, [Success]);
 
   return (
     <Row className="w-100 exercise_form_container">
@@ -70,7 +64,7 @@ const Form = () => {
       <Choices />
       {formik?.values?.answers?.length < 5 && (
         <p className="add_new_button">
-          <FaCirclePlus onClick={()=>handleAddChoice()} size={23} />{" "}
+          <FaCirclePlus onClick={() => handleAddChoice()} size={23} />{" "}
           {t("header.add_new_choice")}
         </p>
       )}
diff --git a/src/Pages/Admin/question/Model/formUtil.ts b/src/Pages/Admin/question/Model/formUtil.ts
index e019104..85d1cd9 100644
--- a/src/Pages/Admin/question/Model/formUtil.ts
+++ b/src/Pages/Admin/question/Model/formUtil.ts
@@ -2,12 +2,11 @@ import * as Yup from "yup";
 import { Question } from "../../../../types/Item";
 import { toast } from "react-toastify";
 
-
 export const getInitialValues = (objectToEdit: Question): any => {
   const tags = objectToEdit?.tags?.map((item: any, index: number) => {
     return { ...item };
   });
-  
+
   return {
     id: objectToEdit?.id ?? null,
     content: objectToEdit?.content ?? "",
@@ -27,15 +26,13 @@ export const getValidationSchema = () => {
   return Yup.object().shape({
     content_image: Yup.string().nullable(),
     content: Yup.string().required("validation.required"),
-    answers: Yup.array()
-      .of(
-        Yup.object().shape({
-          content: Yup.string().required("validation.required"),
-          content_image: Yup.string().nullable(),
-          isCorrect: Yup.boolean(),
-        }),
-      )
-    
+    answers: Yup.array().of(
+      Yup.object().shape({
+        content: Yup.string().required("validation.required"),
+        content_image: Yup.string().nullable(),
+        isCorrect: Yup.boolean(),
+      }),
+    ),
   });
 };
 
@@ -45,13 +42,13 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
       id: tag?.id,
       name: tag?.name,
     }));
-        console.log(item,"item");
-   
+    console.log(item, "item");
+
     return {
       ...item,
       canAnswersBeShuffled: objectToEdit?.canAnswersBeShuffled ? 1 : 0,
       hint: objectToEdit?.hint ?? "",
-      isBase:0,
+      isBase: 0,
       tags,
     };
   });
@@ -89,13 +86,16 @@ export const getValidationSchemaBase = () => {
             }),
           )
           .test(
-            'at-least-one-correct',
-            'At least one answer must be correct',
-            (answers:any) => {
-               console.log(answers,"answers");
-               
-                return answers.some((answer:any) => answer.isCorrect === true || answer.isCorrect === 1);
-            }
+            "at-least-one-correct",
+            "At least one answer must be correct",
+            (answers: any) => {
+              console.log(answers, "answers");
+
+              return answers.some(
+                (answer: any) =>
+                  answer.isCorrect === true || answer.isCorrect === 1,
+              );
+            },
           ),
       }),
     ),
@@ -108,7 +108,7 @@ export function processTags(DataToSend: any) {
   const oldTags = DataToSend?.tags
     ?.map((item: any, index: number) => {
       if (typeof item === "number" || typeof item?.id === "number") {
-        return item?.id ?? item  ;
+        return item?.id ?? item;
       }
     })
     .filter((item: any) => item !== undefined);
@@ -117,10 +117,13 @@ export function processTags(DataToSend: any) {
     ?.map((item: any, index: number) => {
       console.log(item);
 
-      if (typeof item === "string" && item !== "" || typeof item?.id === "string" && item?.id !== "" )  {
+      if (
+        (typeof item === "string" && item !== "") ||
+        (typeof item?.id === "string" && item?.id !== "")
+      ) {
         console.log(item);
 
-        return { name: item?.id ?? item  };
+        return { name: item?.id ?? item };
       }
     })
     .filter((item: any) => item !== undefined);
diff --git a/src/Pages/Admin/question/Page.tsx b/src/Pages/Admin/question/Page.tsx
index 905fd74..cc5d70f 100644
--- a/src/Pages/Admin/question/Page.tsx
+++ b/src/Pages/Admin/question/Page.tsx
@@ -24,8 +24,7 @@ const TableHeader = () => {
 
   const deleteMutation = useDeleteQuestion();
 
-  const { unit_id, grade_id, subject_id, lesson_id } =
-    useParams<ParamsEnum>();
+  const { unit_id, grade_id, subject_id, lesson_id } = useParams<ParamsEnum>();
   const { data: unit } = useGetAllUnit({ show: unit_id });
 
   const { data: Subject } = useGetAllSubject({
@@ -46,14 +45,14 @@ const TableHeader = () => {
 
   useSetPageTitle(
     t(`page_header.grade`) +
-    " / " +
-    ` ${t("header.subject_of_class")} (${gradeName})`  +
+      " / " +
+      ` ${t("header.subject_of_class")} (${gradeName})` +
       " / " +
       SubjectName +
       " / " +
-      unitName  + 
-      " / " + 
-      LessonName
+      unitName +
+      " / " +
+      LessonName,
   );
 
   return (
@@ -68,7 +67,8 @@ const TableHeader = () => {
         />
         <FilterLayout
           sub_children={<FilterForm />}
-          filterTitle={` ${unitName} (${LessonName}) `}        />
+          filterTitle={` ${unitName} (${LessonName}) `}
+        />
         <Table />
       </Suspense>
       <DeleteModels
diff --git a/src/Pages/Admin/subject/Table/Page.tsx b/src/Pages/Admin/subject/Table/Page.tsx
index db996dc..5eb9789 100644
--- a/src/Pages/Admin/subject/Table/Page.tsx
+++ b/src/Pages/Admin/subject/Table/Page.tsx
@@ -35,7 +35,7 @@ const TableWithHeader = () => {
   useSetPageTitle(
     t(`page_header.grade`) +
       " / " +
-      ` ${t("header.subject_of_class")} (${gradeName})` 
+      ` ${t("header.subject_of_class")} (${gradeName})`,
   );
 
   return (
diff --git a/src/Pages/Admin/subject/Table/TablePage.tsx b/src/Pages/Admin/subject/Table/TablePage.tsx
index 0e8a0c7..4be7b90 100644
--- a/src/Pages/Admin/subject/Table/TablePage.tsx
+++ b/src/Pages/Admin/subject/Table/TablePage.tsx
@@ -9,11 +9,11 @@ const TablePage: React.FC = () => {
   const { grade_id } = useParams<ParamsEnum>();
   const { filterState } = useFilterState();
 
-  const response = useGetAllSubject({ 
-    grade_id: grade_id, 
+  const response = useGetAllSubject({
+    grade_id: grade_id,
     pagination: true,
     ...filterState,
-   });
+  });
 
   return <DataTable response={response} useColumns={useColumns} />;
 };
diff --git a/src/Pages/Home/Dummy.tsx b/src/Pages/Home/Dummy.tsx
index 56c33ab..25ad488 100644
--- a/src/Pages/Home/Dummy.tsx
+++ b/src/Pages/Home/Dummy.tsx
@@ -7,14 +7,11 @@ import useFilter from "../../Components/FilterField/components/useFilter";
 const Dummy = () => {
   const [t] = useTranslation();
   useSetPageTitle(`${t(ABILITIES_ENUM?.MAIN_PAGE)}  / ${t("dashboard")}`);
-    const {FilterButton,FilterBody} = useFilter()
-  return(
-    <div className="DummyHomePage">   
-          <FilterButton/>
-          <FilterBody>
-            karim
-          </FilterBody>
-
+  const { FilterButton, FilterBody } = useFilter();
+  return (
+    <div className="DummyHomePage">
+      <FilterButton />
+      <FilterBody>karim</FilterBody>
     </div>
   );
 };
diff --git a/src/Pages/ReSeller/StudentPackage/Model/FilterForm.tsx b/src/Pages/ReSeller/StudentPackage/Model/FilterForm.tsx
index e3e11a9..d601efb 100644
--- a/src/Pages/ReSeller/StudentPackage/Model/FilterForm.tsx
+++ b/src/Pages/ReSeller/StudentPackage/Model/FilterForm.tsx
@@ -7,7 +7,11 @@ const FilterForm = () => {
     <div>
       <Row>
         <Col>
-          <ValidationField placeholder="activation_date" label="activation_date" name="activation_date" />
+          <ValidationField
+            placeholder="activation_date"
+            label="activation_date"
+            name="activation_date"
+          />
           {/* <ValidationField placeholder="name" label="name" name="name" /> */}
         </Col>
       </Row>
diff --git a/src/Pages/ReSeller/StudentPackage/Model/ModelForm.tsx b/src/Pages/ReSeller/StudentPackage/Model/ModelForm.tsx
index af21275..471c3b1 100644
--- a/src/Pages/ReSeller/StudentPackage/Model/ModelForm.tsx
+++ b/src/Pages/ReSeller/StudentPackage/Model/ModelForm.tsx
@@ -2,24 +2,41 @@ import { Col, Row } from "reactstrap";
 import ValidationField from "../../../../Components/ValidationField/ValidationField";
 import useFormatDataToSelect from "../../../../utils/useFormatDataToSelect";
 
-const Form = ({isEdit}:{isEdit?:boolean}) => {
-
+const Form = ({ isEdit }: { isEdit?: boolean }) => {
   const typeOptions = [
     { id: "student", name: "student" },
     { id: "reseller", name: "reseller" },
     { id: "admin", name: "admin" },
-  ]
-  const typeArray = useFormatDataToSelect(typeOptions)
-  
+  ];
+  const typeArray = useFormatDataToSelect(typeOptions);
+
   return (
     <Row className="w-100">
       <Col>
-        <ValidationField type="Date" placeholder="activation_date" label="activation_date" name="activation_date" />
-        <ValidationField type="Date" placeholder="expiration_date" label="expiration_date" name="expiration_date" />
-        <ValidationField  placeholder="student_id" label="student_id" name="student_id" />
+        <ValidationField
+          type="Date"
+          placeholder="activation_date"
+          label="activation_date"
+          name="activation_date"
+        />
+        <ValidationField
+          type="Date"
+          placeholder="expiration_date"
+          label="expiration_date"
+          name="expiration_date"
+        />
+        <ValidationField
+          placeholder="student_id"
+          label="student_id"
+          name="student_id"
+        />
       </Col>
       <Col>
-        <ValidationField  placeholder="package_id" label="package_id" name="package_id" />
+        <ValidationField
+          placeholder="package_id"
+          label="package_id"
+          name="package_id"
+        />
       </Col>
     </Row>
   );
diff --git a/src/Pages/ReSeller/StudentPackage/Model/formUtil.ts b/src/Pages/ReSeller/StudentPackage/Model/formUtil.ts
index a2084fe..ba9ca77 100644
--- a/src/Pages/ReSeller/StudentPackage/Model/formUtil.ts
+++ b/src/Pages/ReSeller/StudentPackage/Model/formUtil.ts
@@ -12,7 +12,6 @@ export const getInitialValues = (objectToEdit: any): any => {
       : null,
     student_id: objectToEdit?.student_id ?? null,
     package_id: objectToEdit?.package_id ?? null,
-
   };
 };
 export const getValidationSchema = () => {
@@ -22,4 +21,4 @@ export const getValidationSchema = () => {
     student_id: Yup.number().required("validation.required"),
     package_id: Yup.number().required("validation.required"),
   });
-};
\ No newline at end of file
+};
diff --git a/src/Pages/ReSeller/StudentPackage/Page.tsx b/src/Pages/ReSeller/StudentPackage/Page.tsx
index 825d5fc..c114cdb 100644
--- a/src/Pages/ReSeller/StudentPackage/Page.tsx
+++ b/src/Pages/ReSeller/StudentPackage/Page.tsx
@@ -18,9 +18,7 @@ const DeleteModalForm = lazy(
 
 const TableHeader = () => {
   const [t] = useTranslation();
-  useSetPageTitle(
-    t(`page_header.student_package`),
-  );
+  useSetPageTitle(t(`page_header.student_package`));
   // const deleteMutation = useDeleteUser();
   return (
     <div className="TableWithHeader">
diff --git a/src/Pages/ReSeller/StudentPackage/Table.tsx b/src/Pages/ReSeller/StudentPackage/Table.tsx
index fa34c92..c480b64 100644
--- a/src/Pages/ReSeller/StudentPackage/Table.tsx
+++ b/src/Pages/ReSeller/StudentPackage/Table.tsx
@@ -15,7 +15,7 @@ const App: React.FC = () => {
     pagination: true,
     ...filterState,
   });
-    
+
   return <DataTable response={response} useColumns={useColumns} />;
 };
 
diff --git a/src/Pages/ReSeller/StudentPackage/useTableColumns.tsx b/src/Pages/ReSeller/StudentPackage/useTableColumns.tsx
index 3a8f8cb..589bb54 100644
--- a/src/Pages/ReSeller/StudentPackage/useTableColumns.tsx
+++ b/src/Pages/ReSeller/StudentPackage/useTableColumns.tsx
@@ -46,24 +46,24 @@ export const useColumns = () => {
       key: "first_name",
       align: "center",
       render: (row) => {
-        return(row?.student?.first_name)
-      }
+        return row?.student?.first_name;
+      },
     },
     {
       title: t("columns.last_name"),
       key: "last_name",
       align: "center",
       render: (row) => {
-        return(row?.student?.last_name)
-      }
+        return row?.student?.last_name;
+      },
     },
     {
       title: t("columns.sex"),
       key: "sex",
       align: "center",
       render: (row) => {
-        return(row?.student?.sex)
-      }
+        return row?.student?.sex;
+      },
     },
     // {
     //   title: t("columns.procedure"),
@@ -78,7 +78,7 @@ export const useColumns = () => {
     //         index={index}
     //         onDelete={() => handelDelete(record)}
     //         onEdit={() => handleEdit(record)}
-            
+
     //       />
     //     );
     //   },
diff --git a/src/Routes.tsx b/src/Routes.tsx
index 78b4384..47489e7 100644
--- a/src/Routes.tsx
+++ b/src/Routes.tsx
@@ -23,14 +23,17 @@ const Report = React.lazy(() => import("./Pages/Admin/Report/Page"));
 const Student = React.lazy(() => import("./Pages/Admin/Student/Page"));
 const ReSeller = React.lazy(() => import("./Pages/Admin/Reseller/Page"));
 const AddReSeller = React.lazy(() => import("./Pages/Admin/Reseller/Add/Page"));
-const EditReSeller = React.lazy(() => import("./Pages/Admin/Reseller/Edit/Page"));
+const EditReSeller = React.lazy(
+  () => import("./Pages/Admin/Reseller/Edit/Page"),
+);
 
 const User = React.lazy(() => import("./Pages/Admin/User/Page"));
 const Param = React.lazy(() => import("./Pages/Admin/Param/Page"));
 
 /// RESELLER ///
-const Student_Package = React.lazy(() => import("./Pages/ReSeller/StudentPackage/Page"));
-
+const Student_Package = React.lazy(
+  () => import("./Pages/ReSeller/StudentPackage/Page"),
+);
 
 import { hasAbility } from "./utils/hasAbility";
 import { ABILITIES_ENUM, ABILITIES_VALUES_ENUM } from "./enums/abilities";
@@ -48,7 +51,7 @@ export const menuItems: TMenuItem[] = [
     abilities: ABILITIES_ENUM?.PASS,
     abilities_value: ABILITIES_VALUES_ENUM.INDEX,
     prevPath: 0,
-    type:UserTypeEnum?.PASS
+    type: UserTypeEnum?.PASS,
   },
   {
     header: "page_header.grade",
@@ -89,7 +92,6 @@ export const menuItems: TMenuItem[] = [
     abilities: ABILITIES_ENUM?.STUDENT,
     abilities_value: ABILITIES_VALUES_ENUM.INDEX,
     prevPath: 0,
-   
   },
   {
     header: "page_header.reSeller",
@@ -122,7 +124,6 @@ export const menuItems: TMenuItem[] = [
     prevPath: 0,
   },
 
-
   /// RESELLER /////
 
   {
@@ -134,12 +135,9 @@ export const menuItems: TMenuItem[] = [
     abilities: ABILITIES_ENUM?.Student_Package,
     abilities_value: ABILITIES_VALUES_ENUM.INDEX,
     prevPath: 0,
-    type:UserTypeEnum.RE_SELLER
+    type: UserTypeEnum.RE_SELLER,
   },
 
-
-
-
   // {
   //   header: "page_header.tags",
   //   element: <Tags />,
diff --git a/src/Styles/App/classNames.scss b/src/Styles/App/classNames.scss
index dd44031..9cfae0a 100644
--- a/src/Styles/App/classNames.scss
+++ b/src/Styles/App/classNames.scss
@@ -298,25 +298,21 @@ button:disabled {
   visibility: hidden;
 }
 
-
-
-.bg2{
+.bg2 {
   background: var(--bg2);
 }
-.header_form{
+.header_form {
   display: flex;
   align-items: center;
   gap: 20px;
   padding: 20px;
-  h4{
+  h4 {
     font-size: 20px;
-
   }
-  svg{
-   background: var(--bg);
-   padding: 10px;
-   width: 40px;
-   height: 40px;
+  svg {
+    background: var(--bg);
+    padding: 10px;
+    width: 40px;
+    height: 40px;
   }
 }
-
diff --git a/src/Styles/Auth/Auth.scss b/src/Styles/Auth/Auth.scss
index 521cdde..c0a9063 100644
--- a/src/Styles/Auth/Auth.scss
+++ b/src/Styles/Auth/Auth.scss
@@ -18,12 +18,10 @@
       align-items: center;
       justify-content: center;
       color: var(--white);
- 
     }
   }
 
   .AuthForm {
-  
     height: 440px;
     width: 600px;
     min-width: 300px;
diff --git a/src/Styles/DataTable/FillterNav.scss b/src/Styles/DataTable/FillterNav.scss
index c80e1d3..108604b 100644
--- a/src/Styles/DataTable/FillterNav.scss
+++ b/src/Styles/DataTable/FillterNav.scss
@@ -61,5 +61,3 @@
     font-size: 16px;
   }
 }
-
-
diff --git a/src/Styles/Layout/FilterLayout.scss b/src/Styles/Layout/FilterLayout.scss
index adfe679..c86cda1 100644
--- a/src/Styles/Layout/FilterLayout.scss
+++ b/src/Styles/Layout/FilterLayout.scss
@@ -74,13 +74,14 @@
   }
 }
 
-
-.filter_modal_add_button, .filter_modal_cancel_button{
+.filter_modal_add_button,
+.filter_modal_cancel_button {
   padding: 20px 10px !important;
-} 
+}
 
-@media screen and (max-width:800px) {
-  .filter_modal_add_button, .filter_modal_cancel_button{
+@media screen and (max-width: 800px) {
+  .filter_modal_add_button,
+  .filter_modal_cancel_button {
     font-size: 8px !important;
   }
-}
\ No newline at end of file
+}
diff --git a/src/Styles/Layout/SideBar.scss b/src/Styles/Layout/SideBar.scss
index bb42bf5..b0ef496 100644
--- a/src/Styles/Layout/SideBar.scss
+++ b/src/Styles/Layout/SideBar.scss
@@ -123,7 +123,7 @@
       border: none;
       color: var(--borderColor);
       font-size: 16px;
-      
+
       span {
         cursor: pointer;
       }
diff --git a/src/Styles/Pages/exercise.scss b/src/Styles/Pages/exercise.scss
index b4662fc..e26731e 100644
--- a/src/Styles/Pages/exercise.scss
+++ b/src/Styles/Pages/exercise.scss
@@ -133,7 +133,7 @@
   margin: 0 !important;
   box-shadow: 0px 0px 4px 2px rgba(0, 0, 0, 0.1);
 
-  img{
+  img {
     cursor: pointer;
   }
 }
@@ -197,21 +197,17 @@
   width: 100%;
 }
 
-
-
 .SelectTag {
   padding-inline: 20px;
 }
 
-.exercise_add{
-
-  .add_new_button{
+.exercise_add {
+  .add_new_button {
     padding-inline: 20px !important;
   }
 }
 
-
-.HolderQuestion{
+.HolderQuestion {
   transform: translateY(55px);
   z-index: -1;
-}
\ No newline at end of file
+}
diff --git a/src/Styles/Pages/index.scss b/src/Styles/Pages/index.scss
index 7c8444d..307e7ec 100644
--- a/src/Styles/Pages/index.scss
+++ b/src/Styles/Pages/index.scss
@@ -9,4 +9,4 @@
 @import "./subject.scss";
 @import "./Marks.scss";
 @import "./exercise.scss";
-@import './reSeller.scss';
\ No newline at end of file
+@import "./reSeller.scss";
diff --git a/src/Styles/Pages/reSeller.scss b/src/Styles/Pages/reSeller.scss
index 4bfdaa8..bcfd460 100644
--- a/src/Styles/Pages/reSeller.scss
+++ b/src/Styles/Pages/reSeller.scss
@@ -1,50 +1,43 @@
-    .main_form_body{
-        display: flex;
-        flex-wrap: wrap;
-        background: var(--bg);
-        padding: 40px 10px;
-        >*{
-            // max-width: 30%;
-            flex-basis: 33%;
-           
-            
-        }
+.main_form_body {
+  display: flex;
+  flex-wrap: wrap;
+  background: var(--bg);
+  padding: 40px 10px;
+  > * {
+    // max-width: 30%;
+    flex-basis: 33%;
+  }
+}
+
+.AttachmentForm {
+  .main_form_body {
+    padding: 30px 50px;
+    gap: 40px;
+    > * {
+      // max-width: 30%;
+      flex-basis: 10%;
     }
+  }
+}
 
-
-    .AttachmentForm{
-        .main_form_body{
-            padding: 30px 50px;
-            gap: 40px;
-            >*{
-                // max-width: 30%;
-                flex-basis: 10%;
-               
-                
-            }
-        }
+.resellerButton {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 20px;
+  padding: 20px;
+  button {
+    all: unset;
+    cursor: pointer;
+    padding: 8px 26px;
+    font-size: 15px;
+    border-radius: 5px;
+    background: var(--primary);
+    color: var(--white);
+    &:first-child {
+      background: #f2f4f8;
+      color: #515b73;
+      box-shadow: 0px 0px 4px rgb(0, 0, 0, 0.08);
     }
-
-    .resellerButton{
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-        gap: 20px;
-        padding: 20px;
-        button{
-            all: unset;
-            cursor: pointer;
-            padding: 8px 26px;        
-            font-size: 15px;
-            border-radius: 5px;
-            background: var(--primary);
-            color: var(--white);
-            &:first-child{
-                background: #F2F4F8;
-                color: #515B73;
-                box-shadow: 0px 0px 4px rgb(0, 0, 0,.08);
-            }
-
-        }
-        
-    }
\ No newline at end of file
+  }
+}
diff --git a/src/api/config.ts b/src/api/config.ts
index f5790b8..9bf6b5c 100644
--- a/src/api/config.ts
+++ b/src/api/config.ts
@@ -1,4 +1,4 @@
 export const BaseURL = "https://nerd-back.point-dev.net/api/";
 // export const BaseURL = "http://192.168.1.109:8000/api/";
 
-export const HEADER_KEY = "X-Custom-Query-Key";
\ No newline at end of file
+export const HEADER_KEY = "X-Custom-Query-Key";
diff --git a/src/api/helper/useDeleteMutation.ts b/src/api/helper/useDeleteMutation.ts
index ea9f0c2..d631b90 100644
--- a/src/api/helper/useDeleteMutation.ts
+++ b/src/api/helper/useDeleteMutation.ts
@@ -5,7 +5,7 @@ import { AxiosResponse } from "../../types/Axios";
 
 type DataToSend = {
   id?: number | string | any;
-  key?: string | any
+  key?: string | any;
 };
 
 function useDeleteMutation(
diff --git a/src/api/helper/useGetQuery.ts b/src/api/helper/useGetQuery.ts
index fedca51..18bf7a4 100644
--- a/src/api/helper/useGetQuery.ts
+++ b/src/api/helper/useGetQuery.ts
@@ -13,7 +13,7 @@ function useGetQuery(
   options: any = {},
 ) {
   const axios = useAxios();
-  const {Filter} = useFilterStateState()
+  const { Filter } = useFilterStateState();
   const sort_by = Filter?.sort_by ?? null;
   const name = Filter?.name ?? null;
   const { show, pagination, ...remainingParams } = params;
@@ -23,8 +23,8 @@ function useGetQuery(
   const { page, per_page } = PaginationParams(location);
 
   const paramToSend = pagination
-    ? { page: page, per_page: per_page, name,...remainingParams , sort_by }
-    : { name,...remainingParams ,sort_by};
+    ? { page: page, per_page: per_page, name, ...remainingParams, sort_by }
+    : { name, ...remainingParams, sort_by };
 
   const filteredParams = filterParams(paramToSend);
 
diff --git a/src/api/helper/useUpdateMutation.ts b/src/api/helper/useUpdateMutation.ts
index f24a1e7..cc8b081 100644
--- a/src/api/helper/useUpdateMutation.ts
+++ b/src/api/helper/useUpdateMutation.ts
@@ -19,7 +19,6 @@ const useUpdateMutation = (
       request = dataToSend;
       id = dataToSend.get("id");
       console.log(dataToSend);
-       
     } else {
       request = { ...dataToSend, _method: "PUT" };
       id = dataToSend?.id || dataToSend?.key;
diff --git a/src/config/statusType.ts b/src/config/statusType.ts
index 91548c5..38c3ad5 100644
--- a/src/config/statusType.ts
+++ b/src/config/statusType.ts
@@ -1,5 +1,5 @@
 export const statusType = [
-    { id: "upcoming", name: "select.upcoming" },
-    { id: "waiting", name: "select.waiting" },
-    { id: "done", name: "select.done" },
-  ]
\ No newline at end of file
+  { id: "upcoming", name: "select.upcoming" },
+  { id: "waiting", name: "select.waiting" },
+  { id: "done", name: "select.done" },
+];
diff --git a/src/config/userTypeOptions.ts b/src/config/userTypeOptions.ts
index 804aad6..e9cca02 100644
--- a/src/config/userTypeOptions.ts
+++ b/src/config/userTypeOptions.ts
@@ -1,5 +1,5 @@
 export const userTypeOptions = [
-    { id: "student", name: "student" },
-    { id: "reseller", name: "reseller" },
-    { id: "admin", name: "admin" },
-  ]
\ No newline at end of file
+  { id: "student", name: "student" },
+  { id: "reseller", name: "reseller" },
+  { id: "admin", name: "admin" },
+];
diff --git a/src/enums/CombinationKeyEnum.ts b/src/enums/CombinationKeyEnum.ts
index 2cff70e..1d0b756 100644
--- a/src/enums/CombinationKeyEnum.ts
+++ b/src/enums/CombinationKeyEnum.ts
@@ -1,6 +1,4 @@
-export enum CombinationKeyEnum  {
-
-            QUESTION = "KeyK",
-            CHOICE = "KeyJ"
-
-}
\ No newline at end of file
+export enum CombinationKeyEnum {
+  QUESTION = "KeyK",
+  CHOICE = "KeyJ",
+}
diff --git a/src/enums/Model.ts b/src/enums/Model.ts
index 4f721c3..5a95bef 100644
--- a/src/enums/Model.ts
+++ b/src/enums/Model.ts
@@ -186,6 +186,4 @@ export enum ModalEnum {
   Student_Package_EDIT = "Student_Package.edit",
   Student_Package_ADD = "Student_Package.add",
   Student_Package_DELETE = "Student_Package.delete",
-  
-
 }
diff --git a/src/enums/UserType.ts b/src/enums/UserType.ts
index f998e27..f988a6f 100644
--- a/src/enums/UserType.ts
+++ b/src/enums/UserType.ts
@@ -1,6 +1,5 @@
 export enum UserTypeEnum {
-    ADMIN = "admin",
-    RE_SELLER = "reseller",
-    PASS="pass"
-  }
-  
\ No newline at end of file
+  ADMIN = "admin",
+  RE_SELLER = "reseller",
+  PASS = "pass",
+}
diff --git a/src/enums/abilities.ts b/src/enums/abilities.ts
index 72a8e51..427f62a 100644
--- a/src/enums/abilities.ts
+++ b/src/enums/abilities.ts
@@ -46,7 +46,7 @@ export enum ABILITIES_ENUM {
   Report = "report",
   User = "user",
   RE_SELLER = "reseller",
-  Student_Package = "student_package"
+  Student_Package = "student_package",
 
   ////
 }
diff --git a/src/translate/ar.json b/src/translate/ar.json
index b9c32df..8bcac75 100644
--- a/src/translate/ar.json
+++ b/src/translate/ar.json
@@ -46,7 +46,7 @@
     "grade_to_pass_must_be_less_than_max_grade": "يجب أن تكون درجة النجاح أقل من الحد الأقصى للدرجة",
     "max_mark_must_be_greater_than_min_mark_to_pass": "يجب ان تكون اكبر من علامة النجاح",
     "Sorry, the question must have at least one option": "عذرًا، يجب أن يحتوي السؤال على خيار واحد على الأقل",
-    "at_least_one_answer_should_be_correct":"يجب أن تكون إجابة واحدة  صحيحة"
+    "at_least_one_answer_should_be_correct": "يجب أن تكون إجابة واحدة  صحيحة"
   },
   "header": {
     "register_students": "تسجيل الطلاب",
@@ -116,14 +116,14 @@
     "add_question": "اضافة سؤال",
     "new_choice_have_been_added": "تم إضافة خيار جديد",
     "new_question_have_been_added": "تم إضافة سؤال  جديد",
-    "sort_by":"ترتيب حسب",
-    "filter":"تصفية",
-    "per_page":"صف لكل صفحة",
-    "entries":"ادخالات",
-    "personal_information":"المعلومات الشخصية",
-    "address":"العنوان",
-    "attachment":"المرفق",
-    "subject_of_class":"مواد الصف"
+    "sort_by": "ترتيب حسب",
+    "filter": "تصفية",
+    "per_page": "صف لكل صفحة",
+    "entries": "ادخالات",
+    "personal_information": "المعلومات الشخصية",
+    "address": "العنوان",
+    "attachment": "المرفق",
+    "subject_of_class": "مواد الصف"
   },
   "columns": {
     "id": "الرقم التعريفي",
@@ -402,15 +402,15 @@
     "key": "المفتاح",
     "canAnswersBeShuffled": "يمكن خلط الإجابات",
     "ID Number": "رقم الهوية",
-  "Addition Date": "تاريخ الإضافة",
-  "Status": "الحالة",
-  "Full Name": "الاسم الثلاثي",
-  "Phone Number": "رقم الهاتف",
-  "Mobile Number": "رقم الموبايل",
-  "Seller Percentage": "نسبة البائع",
-  "city":"المحافظة",
-  "personal_image":"صورة شخصية",
-    "id_image":"صورة الهوية"
+    "Addition Date": "تاريخ الإضافة",
+    "Status": "الحالة",
+    "Full Name": "الاسم الثلاثي",
+    "Phone Number": "رقم الهاتف",
+    "Mobile Number": "رقم الموبايل",
+    "Seller Percentage": "نسبة البائع",
+    "city": "المحافظة",
+    "personal_image": "صورة شخصية",
+    "id_image": "صورة الهوية"
   },
   "select": {
     "enums": {
@@ -667,7 +667,7 @@
       "admin": "المسؤول",
       "branchAdmin": "مسؤول الفروع"
     },
-  
+
     "array": {
       "Period": {
         "Today": "اليوم",
@@ -704,11 +704,11 @@
         "recently_arrived": "وصلت مؤخرا"
       }
     },
-    "upcoming":"فعال",
-    "waiting":"قيد الانتظار",
-    "done":"انتهى"
+    "upcoming": "فعال",
+    "waiting": "قيد الانتظار",
+    "done": "انتهى"
   },
- 
+
   "sidebar": {
     "dashboard": "لوحة القيادة",
     "course": "الصفوف",
@@ -767,10 +767,10 @@
     "user": "مستخدم",
     "param": "معامل",
     "student_package": "حزمة الطالب",
-    "add_reseller":"إضافة بائع",
-    "grade":"الصفوف" ,
-    "report":"تقرير",
-    "tags":"كلمات مفتاحية"
+    "add_reseller": "إضافة بائع",
+    "grade": "الصفوف",
+    "report": "تقرير",
+    "tags": "كلمات مفتاحية"
   },
   "page_header": {
     "dashboard": "لوحة القيادة / الصفحة الرئيسية",
@@ -812,8 +812,8 @@
   "table": {
     "student": "قائمة الطلاب",
     "reseller": "البائعين",
-    "grade":"قائمة الصفوف",
-    "subjects":"مواد الصف"
+    "grade": "قائمة الصفوف",
+    "subjects": "مواد الصف"
   },
   "alphabet": {
     "A": "A",
@@ -843,5 +843,5 @@
     "Y": "Y",
     "Z": "Z"
   },
-  "upcoming":""
-}
\ No newline at end of file
+  "upcoming": ""
+}
diff --git a/src/translate/en.json b/src/translate/en.json
index 077404a..0967ef4 100644
--- a/src/translate/en.json
+++ b/src/translate/en.json
@@ -1,3 +1 @@
-{
-  
-}
\ No newline at end of file
+{}
diff --git a/src/types/App.ts b/src/types/App.ts
index 3df741e..c2f354f 100644
--- a/src/types/App.ts
+++ b/src/types/App.ts
@@ -16,7 +16,7 @@ type TMenuItemBase = {
   withOutLayout?: boolean;
   abilities: ABILITIES_ENUM;
   abilities_value: ABILITIES_VALUES_ENUM;
-  type?:UserTypeEnum 
+  type?: UserTypeEnum;
   prevPath: number;
 };
 
@@ -40,7 +40,7 @@ export type TCrudRoute = {
   element: ReactElement | LazyExoticComponent<any>;
   abilities: ABILITIES_ENUM;
   abilities_value: ABILITIES_VALUES_ENUM;
-  type?:UserTypeEnum
+  type?: UserTypeEnum;
   prevPath: number;
 };
 
diff --git a/src/types/Item.ts b/src/types/Item.ts
index 1b799de..c3a7613 100644
--- a/src/types/Item.ts
+++ b/src/types/Item.ts
@@ -342,7 +342,6 @@ export type param = {
   value: string;
 };
 
-
 export type Student_Package = {
   id: number;
   student: student;
@@ -351,7 +350,7 @@ export type Student_Package = {
 };
 
 type student = {
-  first_name:string;
-  last_name:string;
-  sex:string
-}
\ No newline at end of file
+  first_name: string;
+  last_name: string;
+  sex: string;
+};
diff --git a/src/types/ReSeller.ts b/src/types/ReSeller.ts
index dacee02..df8468c 100644
--- a/src/types/ReSeller.ts
+++ b/src/types/ReSeller.ts
@@ -2,12 +2,11 @@ import { Nullable } from "./App";
 
 // Define the Teacher interface
 
-
 interface ReSellerUser {
   id: number;
   username: string;
   phone_number: string | null;
-  type: 'reseller' | 'other'; // Specify other types if needed
+  type: "reseller" | "other"; // Specify other types if needed
 }
 
 interface ReSellerLocation {
@@ -21,7 +20,6 @@ interface ContactInfo {
   card_number: string | null;
 }
 
-
 export interface ReSeller {
   id: number;
   user: ReSellerUser;
@@ -29,8 +27,8 @@ export interface ReSeller {
   last_name: string;
   location: ReSellerLocation;
   contact_info: ContactInfo;
-  contact_number1 : string |  number 
-  contact_number2 : string |  number 
+  contact_number1: string | number;
+  contact_number2: string | number;
 }
 
 export interface InitialValues {
@@ -42,9 +40,9 @@ export interface InitialValues {
   lat: string | Number;
   lng: string | Number;
   contact_info: ContactInfo;
-  contact_number1 : string |  number 
-contact_number2 : string |  number 
-username : string
+  contact_number1: string | number;
+  contact_number2: string | number;
+  username: string;
 }
 
 export type ReSellerInitialValues = Partial<Nullable<InitialValues>>;
diff --git a/src/utils/RoleByType.ts b/src/utils/RoleByType.ts
index 603749e..51f384b 100644
--- a/src/utils/RoleByType.ts
+++ b/src/utils/RoleByType.ts
@@ -2,25 +2,27 @@ import { USER_KEY } from "../config/AppKey";
 import { UserTypeEnum } from "../enums/UserType";
 import { getLocalStorage } from "./LocalStorage";
 
-export const RoleByType = (item: { type?: string }):boolean=>{
-    const type =  item?.type ?? UserTypeEnum.ADMIN;
-    const LocalType = getLocalStorage(USER_KEY)?.type ?? undefined ;
-    const isAdmin =  LocalType === UserTypeEnum.ADMIN ;
-    const isReSeller =  LocalType === UserTypeEnum.RE_SELLER;
-    const isReSellerRoute =  type === UserTypeEnum.RE_SELLER;
-        
-    if(!LocalType){
-        return false
-    }
-    if(type === UserTypeEnum.PASS) { return true } ; 
-
-    if(isAdmin && isReSellerRoute ){
-            return false ;
-    }
-
-    if(isReSeller && !isReSellerRoute ){
-        return false ;
-}
+export const RoleByType = (item: { type?: string }): boolean => {
+  const type = item?.type ?? UserTypeEnum.ADMIN;
+  const LocalType = getLocalStorage(USER_KEY)?.type ?? undefined;
+  const isAdmin = LocalType === UserTypeEnum.ADMIN;
+  const isReSeller = LocalType === UserTypeEnum.RE_SELLER;
+  const isReSellerRoute = type === UserTypeEnum.RE_SELLER;
 
+  if (!LocalType) {
+    return false;
+  }
+  if (type === UserTypeEnum.PASS) {
     return true;
-}
\ No newline at end of file
+  }
+
+  if (isAdmin && isReSellerRoute) {
+    return false;
+  }
+
+  if (isReSeller && !isReSellerRoute) {
+    return false;
+  }
+
+  return true;
+};
diff --git a/src/utils/formatDate.ts b/src/utils/formatDate.ts
index 24255fb..3116eef 100644
--- a/src/utils/formatDate.ts
+++ b/src/utils/formatDate.ts
@@ -1,10 +1,10 @@
-export const formatDate = (dateString:any) => {
-    if (!dateString) return null; // Handle empty date string
-  
-    const date = new Date(dateString);
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, '0'); // Months are zero-based
-    const day = String(date.getDate()).padStart(2, '0');
-    
-    return `${year}-${month}-${day}`; // Return formatted date
-  };
\ No newline at end of file
+export const formatDate = (dateString: any) => {
+  if (!dateString) return null; // Handle empty date string
+
+  const date = new Date(dateString);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0"); // Months are zero-based
+  const day = String(date.getDate()).padStart(2, "0");
+
+  return `${year}-${month}-${day}`; // Return formatted date
+};
diff --git a/src/utils/hasAbilityFn.ts b/src/utils/hasAbilityFn.ts
index 1d1c1e0..a9fb380 100644
--- a/src/utils/hasAbilityFn.ts
+++ b/src/utils/hasAbilityFn.ts
@@ -620,7 +620,6 @@ export const canDeleteUser = hasAbility(
   ABILITIES_VALUES_ENUM.DELETE,
 );
 
-
 /// ReSeller
 
 export const canAddReSeller = hasAbility(
@@ -641,7 +640,6 @@ export const canShowReSeller = hasAbility(
   ABILITIES_VALUES_ENUM.SHOW,
 );
 
-
 /// Param
 
 export const canAddParam = hasAbility(
@@ -662,7 +660,6 @@ export const canShowParam = hasAbility(
   ABILITIES_VALUES_ENUM.SHOW,
 );
 
-
 /// User
 
 export const canAddStudent_Package = hasAbility(
diff --git a/src/utils/removeStringKeys.ts b/src/utils/removeStringKeys.ts
index c433b15..5564622 100644
--- a/src/utils/removeStringKeys.ts
+++ b/src/utils/removeStringKeys.ts
@@ -1,6 +1,6 @@
 export function removeStringKeys(obj: any, keysToRemove: string[]): any {
   // Check if the input is an object or array
-  if (obj && typeof obj === 'object') {
+  if (obj && typeof obj === "object") {
     // Handle arrays
     if (Array.isArray(obj)) {
       obj.forEach((item, index) => {
@@ -12,7 +12,10 @@ export function removeStringKeys(obj: any, keysToRemove: string[]): any {
         if (obj.hasOwnProperty(key)) {
           const value = obj[key];
           // Check if the value is a string or "null" and the key is in keysToRemove
-          if (keysToRemove.includes(key) && (typeof value === 'string' || value === 'null')) {
+          if (
+            keysToRemove.includes(key) &&
+            (typeof value === "string" || value === "null")
+          ) {
             delete obj[key];
           } else {
             // Recursively process nested objects or arrays
diff --git a/src/utils/useFormatDataToSelect.tsx b/src/utils/useFormatDataToSelect.tsx
index 0f19b87..9cccc79 100644
--- a/src/utils/useFormatDataToSelect.tsx
+++ b/src/utils/useFormatDataToSelect.tsx
@@ -2,7 +2,6 @@ const useFormatDataToSelect = (Data: any) => {
   const format = (data: any) => {
     if (!Array.isArray(data)) return []; // Check if data is an array
     return data?.map((item: any) => ({
-      
       value: item?.id,
       label: item?.name ?? item?.title,
     }));