Merge branch 'dev' of into dev

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

src/Components/CustomFields/SelectTag.tsx

@@ -43,12 +43,10 @@ const SelectTag: React.FC = () => {
       ? [{ 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">

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(
+  const handleInputChangeWithDebounce = useDebounce((value: string) => {
-    (value: string) => {
     setFilter({
-        name:value
+      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>

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>

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

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 (
+    return <div>FilterButton</div>;
-        <div>
+  };
-          FilterButton
-        </div>
-      )
-    } 
   const FilterBody = ({ children }: IFilterBody) => {
-      return (
+    return <div>FilterBody</div>;
-        <div>
+  };
-          FilterBody
-        </div>
-      )
-    }
 
   return {
-      FilterButton , FilterBody
+    FilterButton,
-    }
+    FilterBody,
-}
+  };
+};
 
-export default useFilter
+export default useFilter;

src/Components/FilterField/enums/Filter.ts

@@ -1,5 +1,3 @@
 export enum FilterEnum {
-  FILTER="FILTER"
+  FILTER = "FILTER",
-
-  
 }

src/Components/Utils/Filter/FilterState.ts

@@ -21,14 +21,6 @@ export const useFilterState = create<FilterState>((set, get) => ({
   },
 }));
 
-
-
-
-
-
-
-
-
 // import { create } from "zustand";
 
 // interface FilterState {

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,7 +44,7 @@ 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);
@@ -63,12 +69,9 @@ const useFilter = () => {
     );
   };
   useEffect(() => {
-      setFormValues({})
+    setFormValues({});
-      setFilterState({})
+    setFilterState({});
-    }, [])
+  }, []);
-    
-
-   
 
   const FilterBody = ({
     onSubmit,
@@ -93,7 +96,6 @@ const useFilter = () => {
       setIsOpen("");
     };
     const handleCancel = (isCancel = false) => {
-      
       if (isCancel) {
         setIsOpen("");
         return;
@@ -127,16 +129,20 @@ const useFilter = () => {
             enableReinitialize={true}
             onSubmit={handleSubmit}
             initialValues={formValues}
-          onReset={()=>{handleCancel(false)}}
+            onReset={() => {
+              handleCancel(false);
+            }}
             {...formikProps}
           >
             {(formik) => {
-  
               return (
                 <Form>
-             
                   <div>
-                <header> {t("models.filter")}  <FaXmark onClick={()=>handleCancel(true)} /> </header>
+                    <header>
+                      {" "}
+                      {t("models.filter")}{" "}
+                      <FaXmark onClick={() => handleCancel(true)} />{" "}
+                    </header>
                     <Divider />
                     <main className="main_modal">
                       {isLoading ? <SpinContainer /> : children}
@@ -144,25 +150,31 @@ const useFilter = () => {
                     </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;

src/Components/ValidationField/utils/ValidationField.scss

@@ -28,7 +28,7 @@
 
 .ant-btn-default {
   padding: 7px 11px;
-  height: var(--fieldHeight);
+  min-height: var(--fieldHeight);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -45,12 +45,12 @@
 
 /// input hight
 .ant-form-item-control-input-content {
-  height: var(--fieldHeight);
+  min-height: var(--fieldHeight);
 }
 
 //// date picker
 .ant-picker-large {
-  height: var(--fieldHeight);
+  min-height: var(--fieldHeight);
 }
 
 /// text area

src/Components/exercise/Header.tsx

@@ -26,19 +26,23 @@ const Header = () => {
     }
   };
 
-  
   const content = (
     <div>
-    <p> (CTRL +  SHIFT +   {CombinationKeyEnum.CHOICE})  {t("header.add_choice")} </p>
+      <p>
-    <p> (CTRL +  SHIFT +  {CombinationKeyEnum.QUESTION})  {t("header.add_question")}    </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>

src/Hooks/useKeyCombination.tsx

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useEffect } from "react";
 
 type KeyCombination = {
   ctrlKey?: boolean;
@@ -6,12 +6,17 @@ type KeyCombination = {
   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.ctrlKey === undefined ||
-        (keyCombination.shiftKey === undefined || event.shiftKey === keyCombination.shiftKey) &&
+          event.ctrlKey === keyCombination.ctrlKey) &&
+        (keyCombination.shiftKey === undefined ||
+          event.shiftKey === keyCombination.shiftKey) &&
         event.code === keyCombination.code;
 
       if (matches) {
@@ -21,10 +26,10 @@ const useKeyCombination = (keyCombination: KeyCombination, callback: () => void)
       }
     };
 
-    window.addEventListener('keydown', handleKeyDown);
+    window.addEventListener("keydown", handleKeyDown);
 
     return () => {
-      window.removeEventListener('keydown', handleKeyDown);
+      window.removeEventListener("keydown", handleKeyDown);
     };
   }, [keyCombination, callback]);
 };

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,9 +27,8 @@ const DeleteModels: React.FC<ModalFormProps> = ({
   console.log(objectToEdit?.key);
   console.log(inputValue);
 
-  const iaDisabled = 
+  const iaDisabled = idVerify
-    idVerify ?
+    ? Number(objectToEdit?.id) !== Number(inputValue) || isLoading
-    Number(objectToEdit?.id) !== Number(inputValue) || isLoading
     : objectToEdit?.key !== inputValue || isLoading;
 
   const navigate = useNavigate();
@@ -44,13 +43,13 @@ const DeleteModels: React.FC<ModalFormProps> = ({
   }, [isSuccess, setIsOpen]);
 
   const handleSubmit = () => {
-    idVerify?
+    idVerify
-    mutate({
+      ? mutate({
           id: Number(objectToEdit?.id),
         })
       : mutate({
           id: objectToEdit?.key,
-    })
+        });
   };
 
   const handleCancel = () => {

src/Layout/Dashboard/FilterLayout.tsx

@@ -28,7 +28,6 @@ const FilterLayout = ({
   const { FilterBody, FilterSubmit } = useFilter();
   return (
     <div className="filter_header">
-
       <div className="filter_header_top">
         <h4>{t(filterTitle)}</h4>
 
@@ -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>
   );

src/Layout/Dashboard/FormikFormModel.tsx

@@ -29,7 +29,6 @@ const FormikFormModel: React.FC<FormikFormProps> = ({
       initialValues={initialValues}
       validationSchema={validationSchema}
       onSubmit={handleSubmit}
-      
     >
       {(formik) => {
         useEffect(() => {

src/Layout/Dashboard/PageHeader.tsx

@@ -41,7 +41,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">

src/Layout/Dashboard/Table/DataTable.tsx

@@ -56,7 +56,10 @@ const DataTable: React.FC<DataTableProps> = ({
         nextIcon: <>{t("practical.next")}</>,
         prevIcon: <> {t("practical.prev")} </>,
         className: "pagination_antd",
+        showSizeChanger:false
+        
       }}
+      
       {...props}
     />
   );

src/Layout/Dashboard/usePagination.ts

@@ -14,6 +14,7 @@ const usePagination = (data: Data) => {
     current: data?.meta?.current_page || 1,
     pageSize: data?.meta?.per_page || 2,
     total: data?.meta?.total || 0,
+    
   });
 
   useEffect(() => {
@@ -21,6 +22,7 @@ const usePagination = (data: Data) => {
       current: data?.meta?.current_page || 1,
       pageSize: data?.meta?.per_page || 2,
       total: data?.meta?.total || 0,
+      
     });
   }, [data]);
 

src/Layout/Ui/SideBar.tsx

@@ -51,7 +51,6 @@ const SideBar = ({
             return <React.Fragment key={index}></React.Fragment>;
           }
           if (!RoleByType(item)) {
-          
             return <React.Fragment key={index}></React.Fragment>;
           }
           return (

src/Pages/Admin/Grade/Page.tsx

@@ -30,10 +30,7 @@ const TableHeader = () => {
           ModelAbility={ModalEnum?.GRADE_ADD}
           canAdd={canAddGrade}
         />
-        <FilterLayout
+        <FilterLayout sub_children={<FilterForm />} filterTitle="table.grade" />
-          sub_children={<FilterForm />}
-          filterTitle="table.grade"
-        />
         <Table />
         <AddModalForm />
         <EditModalForm />

src/Pages/Admin/Param/Model/ModelForm.tsx

@@ -5,7 +5,12 @@ 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>

src/Pages/Admin/Param/Page.tsx

@@ -18,9 +18,7 @@ const DeleteModalForm = lazy(
 
 const TableHeader = () => {
   const [t] = useTranslation();
-  useSetPageTitle(
+  useSetPageTitle(t(`page_header.param`));
-    t(`page_header.param`),
-  );
   const deleteMutation = useDeleteParam();
   return (
     <div className="TableWithHeader">

src/Pages/Admin/Param/Table.tsx

@@ -15,21 +15,27 @@ const App: React.FC = () => {
     pagination: true,
     ...filterState,
   });
-  const [t] = useTranslation()
+  const [t] = useTranslation();
-  const transformedData = response?.data?.data && typeof response.data.data === 'object'
+  const transformedData =
+    response?.data?.data && typeof response.data.data === "object"
       ? Object.entries(response.data.data).map(([key, value]) => ({
           key: key,
-      value: value
+          value: value,
         }))
       : [];
 
-  return <DataTable response={response} useColumns={useColumns} dataSource={transformedData} 
+  return (
+    <DataTable
+      response={response}
+      useColumns={useColumns}
+      dataSource={transformedData}
       pagination={{
         nextIcon: <>{t("practical.next")}</>,
         prevIcon: <> {t("practical.prev")} </>,
         className: "pagination_antd",
       }}
-  />;
+    />
+  );
 };
 
 export default App;

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;
 };
-
-

src/Pages/Admin/Reseller/Add/Page.tsx

@@ -11,15 +11,12 @@ 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");
-      
+  };
-  } 
   return (
     <div className="TableWithHeader">
       <Suspense fallback={<Spin />}>
@@ -29,19 +26,20 @@ const TableHeader = () => {
           canAdd={false}
         />
         <div className="bg2">
-          <Formik initialValues={getInitialValues({})} validationSchema={getValidationSchema} onSubmit={handelSubmit} >
+          <Formik
+            initialValues={getInitialValues({})}
+            validationSchema={getValidationSchema}
+            onSubmit={handelSubmit}
+          >
             <Form>
               <PersonalDetailsForm />
               <TitleDetailsForm />
               <AttachmentForm />
               <div className="resellerButton">
-          <button type="button">
+                <button type="button">{t("practical.cancel")}</button>
-            {t("practical.cancel")}
-            </button>
                 <button type="submit">
                   {t("practical.add")} {t("models.reseller")}
                 </button>
-
               </div>
             </Form>
           </Formik>

src/Pages/Admin/Reseller/Edit/Page.tsx

@@ -1,9 +1,7 @@
-import React from 'react'
+import React from "react";
 
 const Page = () => {
-  return (
+  return <div>Page</div>;
-    <div>Page</div>
+};
-  )
-}
 
-export default Page
+export default Page;

src/Pages/Admin/Reseller/Form/AttachmentForm.tsx

@@ -1,24 +1,23 @@
-import React from 'react'
+import React from "react";
-import { useTranslation } from 'react-i18next'
+import { useTranslation } from "react-i18next";
-import { FaImage } from 'react-icons/fa'
+import { FaImage } from "react-icons/fa";
-import ImageBoxField from './ImageBoxField/ImageBoxField';
+import ImageBoxField from "./ImageBoxField/ImageBoxField";
 
 const AttachmentForm = () => {
   const [t] = useTranslation();
 
   return (
-    <div className='AttachmentForm'>
+    <div className="AttachmentForm">
-      <header className='header_form'>
+      <header className="header_form">
         <FaImage />
         <h4>{t("header.attachment")}</h4>
       </header>
-      <main className='main_form_body'>
+      <main className="main_form_body">
-
         <ImageBoxField name="personal_image" />
         <ImageBoxField name="id_image" />
       </main>
     </div>
-  )
+  );
-}
+};
 
-export default AttachmentForm
+export default AttachmentForm;

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>

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>

src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx

@@ -1,35 +1,76 @@
-import React from 'react'
+import React from "react";
-import { useTranslation } from 'react-i18next'
+import { useTranslation } from "react-i18next";
-import { FaStore } from 'react-icons/fa'
+import { FaStore } from "react-icons/fa";
-import ValidationField from '../../../../Components/ValidationField/ValidationField';
+import ValidationField from "../../../../Components/ValidationField/ValidationField";
-import { convert_data_to_select } from '../../../../Layout/app/Const';
+import { convert_data_to_select } from "../../../../Layout/app/Const";
-import { userTypeOptions } from '../../../../config/userTypeOptions';
+import { userTypeOptions } from "../../../../config/userTypeOptions";
-import { statusType } from '../../../../config/statusType';
+import { statusType } from "../../../../config/statusType";
 
 const PersonalDetailsForm = () => {
   const [t] = useTranslation();
   return (
-    <div className='PersonalDetailsForm'>
+    <div className="PersonalDetailsForm">
-      <header className='header_form'>
+      <header className="header_form">
         <FaStore />
         <h4>{t("header.personal_information")}</h4>
       </header>
-      <main className='main_form_body'>
+      <main className="main_form_body">
-        <ValidationField name={"id_number"} placeholder={"_"} label={"ID Number"} />
+        <ValidationField
-        <ValidationField name={"addition_date"} placeholder={"_"} type='Date' label={"Addition Date"} />
+          name={"id_number"}
-        <ValidationField name={"status"} placeholder={"_"} label={"Status"} type='Select' option={statusType} />
+          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
-        <ValidationField name={"phone_number"} placeholder={"_"} label={"Phone Number"} type='text' />
+          name={"full_name"}
-        <ValidationField name={"mobile_number"} placeholder={"_"} label={"Mobile Number"} />
+          placeholder={"_"}
-
+          label={"Full Name"}
-        <ValidationField name={"username"} placeholder={"_"} label={"Username"} />
+        />
-        <ValidationField name={"password"} placeholder={"_"} label={"Password"} type='text' />
+        <ValidationField
-        <ValidationField name={"seller_percentage"} placeholder={"_"} label={"Seller Percentage"} type='text' />
+          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
+export default PersonalDetailsForm;

src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx

@@ -1,25 +1,30 @@
-import React from 'react'
+import React from "react";
-import { useTranslation } from 'react-i18next'
+import { useTranslation } from "react-i18next";
-import { FaRegAddressBook } from 'react-icons/fa'
+import { FaRegAddressBook } from "react-icons/fa";
-import ValidationField from '../../../../Components/ValidationField/ValidationField';
+import ValidationField from "../../../../Components/ValidationField/ValidationField";
-import { nationalities } from '../../../../types/App';
+import { nationalities } from "../../../../types/App";
 
 const TitleDetailsForm = () => {
   const [t] = useTranslation();
 
   return (
-    <div className='TitleDetailsForm'>
+    <div className="TitleDetailsForm">
-      <header className='header_form'>
+      <header className="header_form">
         <FaRegAddressBook />
         <h4>{t("header.address")}</h4>
       </header>
-      <main className='main_form_body'>
+      <main className="main_form_body">
-        <ValidationField name={"city_id"} placeholder={"_"} label={"city"}  type='Select' option={nationalities}  />
+        <ValidationField
+          name={"city_id"}
+          placeholder={"_"}
+          label={"city"}
+          type="Select"
+          option={nationalities}
+        />
         <ValidationField name={"address"} placeholder={"_"} label={"address"} />
-
       </main>
     </div>
-  )
+  );
-}
+};
 
-export default TitleDetailsForm
+export default TitleDetailsForm;

src/Pages/Admin/Reseller/Form/formUtils.ts

@@ -1,8 +1,6 @@
 import * as Yup from "yup";
 
-export const getInitialValues = (
+export const getInitialValues = (objectToEdit: Partial<any>) => {
-  objectToEdit: Partial<any>,
-) => {
   return {
     id: objectToEdit?.id ?? null,
     name: objectToEdit?.name ?? null,
@@ -11,7 +9,5 @@ export const getInitialValues = (
 
 export const getValidationSchema = () => {
   // validate input
-  return Yup.object().shape({
+  return Yup.object().shape({});
- 
-  });
 };

src/Pages/Admin/Reseller/Page.tsx

@@ -45,7 +45,6 @@ const TableHeader = () => {
           deleteMutation={deleteMutation}
           ModelEnum={ModalEnum?.RE_SELLER_DELETE}
         />
- 
       </Suspense>
     </div>
   );

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} />;

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);
@@ -72,11 +71,9 @@ export const useColumns = () => {
           <ActionButtons
             canDelete={canDeleteReSeller}
             canEdit={canEditReSeller}
-          
             index={index}
             onDelete={() => handelDelete(record)}
             onEdit={() => handleEdit(record)}
-          
           />
         );
       },

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
-          <ValidationField placeholder="last_name" label="last_name" name="last_name" />
+            placeholder="first_name"
+            label="first_name"
+            name="first_name"
+          />
+          <ValidationField
+            placeholder="last_name"
+            label="last_name"
+            name="last_name"
+          />
         </Col>
       </Row>
     </div>

src/Pages/Admin/Unit/Model/ModelForm.tsx

@@ -19,7 +19,6 @@ const Form = () => {
           placeholder="term"
           label="term"
           option={termsArray}
-          
         />
       </Col>
     </Row>

src/Pages/Admin/Unit/Page.tsx

@@ -42,7 +42,7 @@ const TableHeader = () => {
       " / " +
       ` ${t("header.subject_of_class")} (${gradeName})` +
       " / " +
-      SubjectName 
+      SubjectName,
   );
 
   return (

src/Pages/Admin/User/Model/FilterForm.tsx

@@ -8,11 +8,25 @@ const FilterForm = () => {
     <div>
       <Row>
         <Col>
-          <ValidationField placeholder="username" label="username" name="username" />
+          <ValidationField
-          <ValidationField placeholder="phone_number" label="phone_number" name="phone_number" />
+            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>

src/Pages/Admin/User/Model/ModelForm.tsx

@@ -4,24 +4,58 @@ import useFormatDataToSelect from "../../../../utils/useFormatDataToSelect";
 import { userTypeOptions } from "../../../../config/userTypeOptions";
 
 const Form = ({ isEdit }: { isEdit?: boolean }) => {
-
-
-  
   return (
     <Row className="w-100">
-        {isEdit ? "" : 
+      {isEdit ? (
+        ""
+      ) : (
         <Col>
           <>
-              <ValidationField placeholder="username" label="username" name="username" />
+            <ValidationField
-              <ValidationField placeholder="password" label="password" name="password" />
+              placeholder="username"
-              <ValidationField placeholder="phone_number" label="phone_number" name="phone_number" />
+              label="username"
+              name="username"
+            />
+            <ValidationField
+              placeholder="password"
+              label="password"
+              name="password"
+            />
+            <ValidationField
+              placeholder="phone_number"
+              label="phone_number"
+              name="phone_number"
+            />
           </>
-        </Col>}
+        </Col>
+      )}
       <Col>
-      {isEdit ? "":
+        {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} />
+          <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>
   );

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,
-
   };
 };
 

src/Pages/Admin/User/Page.tsx

@@ -18,9 +18,7 @@ const DeleteModalForm = lazy(
 
 const TableHeader = () => {
   const [t] = useTranslation();
-  useSetPageTitle(
+  useSetPageTitle(t(`page_header.user`));
-    t(`page_header.user`),
-  );
   const deleteMutation = useDeleteUser();
   return (
     <div className="TableWithHeader">

src/Pages/Admin/lesson/Page.tsx

@@ -37,7 +37,6 @@ const TableHeader = () => {
     show: grade_id,
   });
 
-
   const gradeName = grade?.data?.name ?? "";
   const SubjectName = Subject?.data?.name ?? "";
   const unitName = unit?.data?.name ?? "";
@@ -49,10 +48,9 @@ const TableHeader = () => {
       " / " +
       SubjectName +
       " / " +
-      unitName 
+      unitName,
   );
 
-
   return (
     <div className="TableWithHeader">
       <Suspense fallback={<Spin />}>

src/Pages/Admin/lesson/useTableColumns.tsx

@@ -71,8 +71,7 @@ export const useColumns = () => {
       // ),
       title: t("columns.procedure"),
       key: "actions",
-      align: "end",
+      align: "center",
-      width: "25vw",
       render: (_text, record, index) => {
         return (
           <ActionButtons

src/Pages/Admin/question/AddPage.tsx

@@ -22,20 +22,13 @@ import { toast } from "react-toastify";
 const AcceptModal = lazy(() => import("./Model/AcceptModal"));
 
 const AddPage: React.FC = () => {
-
+  const { mutateAsync,isLoading:LoadingAsync } = useAddQuestionAsync();
-  const {  mutateAsync } = useAddQuestionAsync();
   const { mutate, isLoading, isSuccess } = useAddQuestion();
-  const {
+  const { isBseQuestion, setTagsSearch, objectToEdit, setSuccess } =
-    isBseQuestion,
+    useObjectToEdit();
-    setTagsSearch,
-    objectToEdit,
-    setSuccess
-  } = useObjectToEdit();
-
 
   const [t] = useTranslation();
-  const {  subject_id, lesson_id } =
+  const { subject_id, lesson_id } = useParams<ParamsEnum>();
-    useParams<ParamsEnum>();
 
   console.log(objectToEdit, "objectToEdit");
 
@@ -43,9 +36,9 @@ console.log(objectToEdit,"objectToEdit");
     values: any,
     { resetForm }: { resetForm: () => void },
   ) => {
-
     const DataToSend = structuredClone(values);
     setTagsSearch(null);
+    console.log(1);
 
     const canAnswersBeShuffled = DataToSend?.canAnswersBeShuffled ? 1 : 0;
 
@@ -76,12 +69,9 @@ console.log(objectToEdit,"objectToEdit");
           });
           console.log(answers);
           if (answers?.length > 0) {
-            const isValidAnswers =  answers?.some((answer:any) => answer?.isCorrect === 1)
+            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,
@@ -95,10 +85,10 @@ console.log(objectToEdit,"objectToEdit");
         console.log(newBseQuestionId, "newBseQuestionId");
       });
     } else {
+      console.log(1);
+
       const tags = processTags(DataToSend);
       const answers = values?.answers?.map((item: any, index: number) => {
-        console.log(item,"item");
-        
         return {
           order: index,
           ...item,
@@ -106,8 +96,10 @@ console.log(objectToEdit,"objectToEdit");
       });
 
       if (answers?.length > 0) {
-        
+        const isValidAnswers = answers?.some(
-      const isValidAnswers =  answers?.some((answer:any) => answer?.isCorrect === 1)
+          (answer: any) => answer?.isCorrect === 1,
+        );
+        console.log(!isValidAnswers);
 
         if (!isValidAnswers) {
           toast.error(t("validation.at_least_one_answer_should_be_correct"));
@@ -132,26 +124,16 @@ console.log(objectToEdit,"objectToEdit");
 
   const navigate = useNavigate();
 
-
   const handleCancel = () => {
     navigate(-1);
   };
-
+  const Loading = LoadingAsync || isLoading
-
-
-
-  
   useEffect(() => {
-
-    
     console.log("all api success");
     if (isSuccess) {
-
+      setSuccess(true);
-      setSuccess(true )
     }
-}, [isSuccess])
+  }, [isSuccess]);
-
-
 
   if (isBseQuestion) {
     return (
@@ -167,10 +149,10 @@ console.log(objectToEdit,"objectToEdit");
 
             <div className="exercise_add_buttons">
               <div onClick={handleCancel}>{t("practical.back")}</div>
-              <button disabled={isLoading} className="relative" type="submit">
+              <button disabled={Loading} className="relative" type="submit">
                 {t("practical.add")}
 
-                {isLoading && (
+                {Loading && (
                   <span className="Spinier_Div">
                     <Spin />
                   </span>
@@ -198,10 +180,10 @@ console.log(objectToEdit,"objectToEdit");
 
           <div className="exercise_add_buttons">
             <div onClick={handleCancel}>{t("practical.back")}</div>
-            <button disabled={isLoading} className="relative" type="submit">
+            <button disabled={Loading} className="relative" type="submit">
               {t("practical.add")}
 
-              {isLoading && (
+              {Loading && (
                 <span className="Spinier_Div">
                   <Spin />
                 </span>

src/Pages/Admin/question/EditPage.tsx

@@ -15,7 +15,7 @@ import {
   useUpdateQuestion,
 } from "../../../api/Question";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useParams } from "react-router-dom";
 import { ParamsEnum } from "../../../enums/params";
 import { useObjectToEdit } from "../../../zustand/ObjectToEditState";
 import { removeStringKeys } from "../../../utils/removeStringKeys";
@@ -24,20 +24,16 @@ import ModelForm from "./Model/ModelForm";
 import BaseForm from "./Model/Malty/Form";
 import { Question } from "../../../types/Item";
 import { toast } from "react-toastify";
-
+import { deletePathSegments } from "../../../utils/deletePathSegments";
 
 const EditPage: React.FC = () => {
-  const {
+  const { subject_id, lesson_id, question_id } = useParams<ParamsEnum>();
-    subject_id,
-    lesson_id,
-    question_id,
-  } = useParams<ParamsEnum>();
   const { isBseQuestion, setIsBseQuestion, setTagsSearch, DeletedQuestions } =
     useObjectToEdit();
 
   const { mutate, isSuccess, isLoading } = useUpdateQuestion();
   const { mutate: DeleteQuestion } = useDeleteQuestion();
-  const { mutate: mutateAdd } = useAddQuestion();
+  const { mutate: mutateAdd , isLoading:LoadingAsync } = useAddQuestion();
 
   const { data, isLoading: dataLoading } = useGetAllQuestion({
     show: question_id,
@@ -58,8 +54,6 @@ const EditPage: React.FC = () => {
 
   const [t] = useTranslation();
 
-
-
   const handleSubmit = (values: any) => {
     const DataToSend = structuredClone(values);
     setTagsSearch(null);
@@ -102,13 +96,14 @@ const EditPage: React.FC = () => {
           const newAnswers = [] as any;
 
           if (updatedObject?.answers?.length > 0) {
+            const isValidAnswers = updatedObject?.answers?.some(
+              (answer: any) => answer?.isCorrect === 1,
+            );
 
-            const isValidAnswers =  updatedObject?.answers?.some((answer:any) => answer?.isCorrect === 1)
+            // if(!isValidAnswers){
-            
+            //   toast.error(t("validation.at_least_one_answer_should_be_correct"));
-            if(!isValidAnswers){
+            //   return;
-              toast.error(t("validation.at_least_one_answer_should_be_correct"));
+            // }
-              return;
-            }
           }
           updatedObject?.answers?.forEach((item: any) => {
             if (item?.id) {
@@ -142,7 +137,6 @@ const EditPage: React.FC = () => {
         }
       });
     } else {
-      
       const keysToRemove = ["content_image"];
       console.log(DataToSend);
       const updatedObject = removeStringKeys(DataToSend, keysToRemove);
@@ -155,15 +149,14 @@ const EditPage: React.FC = () => {
       const oldAnswers = [] as any;
       const newAnswers = [] as any;
       if (updatedObject?.answers?.length > 0) {
-        
+        // const isValidAnswers =  updatedObject?.answers?.some((answer:any) => answer?.isCorrect === 1 || answer?.isCorrect === true)
-        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;
-        const isValidAnswers2 = updatedObject?.answers?.filter((answer: any) => answer?.isCorrect === 1 || answer?.isCorrect === true ).length > 1;
+        // console.log(isValidAnswers2);
-        console.log(isValidAnswers2);
+        //   console.log(isValidAnswers,"isValidAnswers");
-        
+        // if(!isValidAnswers || isValidAnswers2){
-        if(!isValidAnswers || isValidAnswers2){
+        //   toast.error(t("validation.at_least_one_answer_should_be_correct"));
-          toast.error(t("validation.at_least_one_answer_should_be_correct"));
+        //   return;
-          return;
+        // }
-        }
       }
       updatedObject?.answers?.forEach((item: any) => {
         if (item?.id) {
@@ -177,22 +170,31 @@ 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 });
       }
+    }
   };
 
+  const location = useLocation();
+  
   const navigate = useNavigate();
   const handleCancel = () => {
     navigate(-1);
   };
 
-  // useEffect(() => {
+
-  //   if (isSuccess) {
+  useEffect(() => {
-  //     toast.success(t("validation.the_possess_done_successful"));
+    if (isSuccess) {
-  //     navigate(-1);
+      toast.success(t("validation.the_possess_done_successful"));
-  //   }
+      navigate(deletePathSegments(location.pathname, 2));
-  // }, [isSuccess]);
+    }
+  }, [isSuccess]);
+
+  const Loading = LoadingAsync || isLoading
 
   if (dataLoading || QuestionsDataLoading) {
     return <SpinContainer />;
@@ -216,10 +218,10 @@ const EditPage: React.FC = () => {
             <BaseForm />
             <div className="exercise_add_buttons">
               <div onClick={handleCancel}>{t("practical.back")}</div>
-              <button disabled={isLoading} className="relative" type="submit">
+              <button disabled={Loading} className="relative" type="submit">
                 {t("practical.edit")}
 
-                {isLoading && (
+                {Loading && (
                   <span className="Spinier_Div">
                     <Spin />
                   </span>
@@ -250,10 +252,10 @@ const EditPage: React.FC = () => {
           <ModelForm />
           <div className="exercise_add_buttons">
             <div onClick={handleCancel}>{t("practical.back")}</div>
-            <button disabled={isLoading} className="relative" type="submit">
+            <button disabled={Loading} className="relative" type="submit">
               {t("practical.edit")}
 
-              {isLoading && (
+              {Loading && (
                 <span className="Spinier_Div">
                   <Spin />
                 </span>

src/Pages/Admin/question/FilterForm.tsx

@@ -7,12 +7,16 @@ const FilterForm = () => {
   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>

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}`)}

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"}

src/Pages/Admin/question/Model/Malty/ChoiceField/CheckboxField.tsx

@@ -42,7 +42,9 @@ const CheckboxField = ({
         disabled={isDisabled}
         checked={
           formik.values?.Questions?.[parent_index]?.answers?.[name]
-            ?.isCorrect === 1
+            ?.isCorrect === 1 ||
+          formik.values?.Questions?.[parent_index]?.answers?.[name]
+            ?.isCorrect === true
         }
         className={className}
       >

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">

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,
@@ -39,7 +42,7 @@ const Form = () => {
     ]);
 
     if (fromKeyCombination) {
-      toast.success(t("header.new_choice_have_been_added"))
+      toast.success(t("header.new_choice_have_been_added"));
     }
   };
 
@@ -63,26 +66,27 @@ const Form = () => {
 
     formik.setFieldValue("max_mark", max_mark);
     if (fromKeyCombination) {
-      toast.success(t("header.new_question_have_been_added"))
+      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 }, () => {
+  useKeyCombination(
-    handleAddChoice(lastQuestions,true)
+    { 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

src/Pages/Admin/question/Model/Malty/Tags/MaltySelectTag.tsx

@@ -41,14 +41,16 @@ const MaltySelectTag = ({ parent_index }: { parent_index: number }) => {
       ? [{ id: searchValue, name: searchValue }]
       : [];
 
-
   console.log(options);
-const value = formik?.values?.Questions[parent_index]?.tags?.map((item: any) => item?.id ?? item) ?? [];
+  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]
+  const AllOptions = [...options, ...additionalData];
 
   return (
     <div className="SelectTag">
@@ -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}

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) => {
-
     formik.setFieldValue("answers", [
       ...((formik?.values as any)?.answers as Choice[]),
       {
@@ -33,30 +29,25 @@ const Form = () => {
     ]);
 
     if (fromKeyCombination) {
-      toast.success(t("header.new_choice_have_been_added"))
+      toast.success(t("header.new_choice_have_been_added"));
     }
   };
 
-    
+  useKeyCombination(
-  useKeyCombination({ ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.CHOICE }, () => {
+    { ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.CHOICE },
-
+    () => {
-    handleAddChoice(true)
+      handleAddChoice(true);
-   
+    },
-  });
+  );
-console.log(Success);
-
 
   useEffect(() => {
-    console.log(Success);
-    
     if (Success) {
-            formik?.setValues({})
+      formik?.setValues({});
-            formik.setErrors({})
+      formik.setErrors({});
-             setSuccess(false)
+      setSuccess(false);
       console.log(formik.errors);
-             
     }
-}, [Success])
+  }, [Success]);
 
   return (
     <Row className="w-100 exercise_form_container">

src/Pages/Admin/question/Model/formUtil.ts

@@ -2,7 +2,6 @@ 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 };
@@ -27,21 +26,13 @@ export const getValidationSchema = () => {
   return Yup.object().shape({
     content_image: Yup.string().nullable(),
     content: Yup.string().required("validation.required"),
-    answers: Yup.array()
+    answers: Yup.array().of(
-      .of(
       Yup.object().shape({
         content: Yup.string().required("validation.required"),
         content_image: Yup.string().nullable(),
         isCorrect: Yup.boolean(),
       }),
-      ).test(
-        'at-least-one-correct',
-        'At least one answer must be correct',
-        (answers:any) => {
-            return answers.some((answer:any) => answer.isCorrect === true);
-        }
     ),
-    
   });
 };
 
@@ -95,13 +86,16 @@ export const getValidationSchemaBase = () => {
             }),
           )
           .test(
-            'at-least-one-correct',
+            "at-least-one-correct",
-            'At least one answer must be correct',
+            "At least one answer must be correct",
             (answers: any) => {
               console.log(answers, "answers");
 
-                return answers.some((answer:any) => answer.isCorrect === true);
+              return answers.some(
-            }
+                (answer: any) =>
+                  answer.isCorrect === true || answer.isCorrect === 1,
+              );
+            },
           ),
       }),
     ),
@@ -113,8 +107,8 @@ export function processTags(DataToSend: any) {
 
   const oldTags = DataToSend?.tags
     ?.map((item: any, index: number) => {
-      if (typeof item === "number") {
+      if (typeof item === "number" || typeof item?.id === "number") {
-        return item;
+        return item?.id ?? item;
       }
     })
     .filter((item: any) => item !== undefined);
@@ -123,10 +117,13 @@ export function processTags(DataToSend: any) {
     ?.map((item: any, index: number) => {
       console.log(item);
 
-      if (typeof item === "string" && item !== "") {
+      if (
+        (typeof item === "string" && item !== "") ||
+        (typeof item?.id === "string" && item?.id !== "")
+      ) {
         console.log(item);
 
-        return { name: item };
+        return { name: item?.id ?? item };
       }
     })
     .filter((item: any) => item !== undefined);

src/Pages/Admin/question/Page.tsx

@@ -24,8 +24,7 @@ const TableHeader = () => {
 
   const deleteMutation = useDeleteQuestion();
 
-  const { unit_id, grade_id, subject_id, lesson_id } =
+  const { unit_id, grade_id, subject_id, lesson_id } = useParams<ParamsEnum>();
-    useParams<ParamsEnum>();
   const { data: unit } = useGetAllUnit({ show: unit_id });
 
   const { data: Subject } = useGetAllSubject({
@@ -53,7 +52,7 @@ const TableHeader = () => {
       " / " +
       unitName +
       " / " +
-      LessonName
+      LessonName,
   );
 
   return (
@@ -68,7 +67,8 @@ const TableHeader = () => {
         />
         <FilterLayout
           sub_children={<FilterForm />}
-          filterTitle={` ${unitName} (${LessonName}) `}        />
+          filterTitle={` ${unitName} (${LessonName}) `}
+        />
         <Table />
       </Suspense>
       <DeleteModels

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 (

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()
+  const { FilterButton, FilterBody } = useFilter();
   return (
     <div className="DummyHomePage">
-          <FilterButton/>
+      {/* <FilterButton />
-          <FilterBody>
+      <FilterBody>karim</FilterBody> */}
-            karim
-          </FilterBody>
-
     </div>
   );
 };

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>

src/Pages/ReSeller/StudentPackage/Model/ModelForm.tsx

@@ -3,23 +3,40 @@ import ValidationField from "../../../../Components/ValidationField/ValidationFi
 import useFormatDataToSelect from "../../../../utils/useFormatDataToSelect";
 
 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
-        <ValidationField type="Date" placeholder="expiration_date" label="expiration_date" name="expiration_date" />
+          type="Date"
-        <ValidationField  placeholder="student_id" label="student_id" name="student_id" />
+          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>
   );

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 = () => {

src/Pages/ReSeller/StudentPackage/Page.tsx

@@ -18,9 +18,7 @@ const DeleteModalForm = lazy(
 
 const TableHeader = () => {
   const [t] = useTranslation();
-  useSetPageTitle(
+  useSetPageTitle(t(`page_header.student_package`));
-    t(`page_header.student_package`),
-  );
   // const deleteMutation = useDeleteUser();
   return (
     <div className="TableWithHeader">

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"),

src/Routes.tsx

@@ -25,15 +25,18 @@ const ShowStudent = React.lazy(() => import("./Pages/Admin/Student/show/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";
@@ -51,7 +54,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",
@@ -92,7 +95,6 @@ export const menuItems: TMenuItem[] = [
     abilities: ABILITIES_ENUM?.STUDENT,
     abilities_value: ABILITIES_VALUES_ENUM.INDEX,
     prevPath: 0,
-   
   },
   {
     header: "page_header.reSeller",
@@ -125,7 +127,6 @@ export const menuItems: TMenuItem[] = [
     prevPath: 0,
   },
 
-
   /// RESELLER /////
 
   {
@@ -137,7 +138,7 @@ 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,
   },
 
 ];

src/Styles/App/classNames.scss

@@ -298,8 +298,6 @@ button:disabled {
   visibility: hidden;
 }
 
-
-
 .bg2 {
   background: var(--bg2);
 }
@@ -310,7 +308,6 @@ button:disabled {
   padding: 20px;
   h4 {
     font-size: 20px;
-
   }
   svg {
     background: var(--bg);
@@ -319,4 +316,3 @@ button:disabled {
     height: 40px;
   }
 }
-

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;

src/Styles/DataTable/FillterNav.scss

@@ -61,5 +61,3 @@
     font-size: 16px;
   }
 }
-
-

src/Styles/Layout/FilterLayout.scss

@@ -74,13 +74,14 @@
   }
 }
 
-
+.filter_modal_add_button,
-.filter_modal_add_button, .filter_modal_cancel_button{
+.filter_modal_cancel_button {
   padding: 20px 10px !important;
 }
 
 @media screen and (max-width: 800px) {
-  .filter_modal_add_button, .filter_modal_cancel_button{
+  .filter_modal_add_button,
+  .filter_modal_cancel_button {
     font-size: 8px !important;
   }
 }

src/Styles/Pages/exercise.scss

@@ -197,20 +197,16 @@
   width: 100%;
 }
 
-
-
 .SelectTag {
   padding-inline: 20px;
 }
 
 .exercise_add {
-
   .add_new_button {
     padding-inline: 20px !important;
   }
 }
 
-
 .HolderQuestion {
   transform: translateY(55px);
   z-index: -1;

src/Styles/Pages/reSeller.scss

@@ -6,12 +6,9 @@
   > * {
     // max-width: 30%;
     flex-basis: 33%;
-           
-            
   }
 }
 
-
 .AttachmentForm {
   .main_form_body {
     padding: 30px 50px;
@@ -19,8 +16,6 @@
     > * {
       // max-width: 30%;
       flex-basis: 10%;
-               
-                
     }
   }
 }
@@ -40,11 +35,9 @@
     background: var(--primary);
     color: var(--white);
     &:first-child {
-                background: #F2F4F8;
+      background: #f2f4f8;
-                color: #515B73;
+      color: #515b73;
-                box-shadow: 0px 0px 4px rgb(0, 0, 0,.08);
+      box-shadow: 0px 0px 4px rgb(0, 0, 0, 0.08);
     }
-
   }
-        
 }

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(

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;

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;

src/config/statusType.ts

@@ -2,4 +2,4 @@ export const statusType = [
   { id: "upcoming", name: "select.upcoming" },
   { id: "waiting", name: "select.waiting" },
   { id: "done", name: "select.done" },
-  ]
+];

src/config/userTypeOptions.ts

@@ -2,4 +2,4 @@ export const userTypeOptions = [
   { id: "student", name: "student" },
   { id: "reseller", name: "reseller" },
   { id: "admin", name: "admin" },
-  ]
+];

src/enums/CombinationKeyEnum.ts

@@ -1,6 +1,4 @@
 export enum CombinationKeyEnum {
-
   QUESTION = "KeyK",
-            CHOICE = "KeyJ"
+  CHOICE = "KeyJ",
-
 }

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",
-  
-
 }

src/enums/UserType.ts

@@ -1,6 +1,5 @@
 export enum UserTypeEnum {
   ADMIN = "admin",
   RE_SELLER = "reseller",
-    PASS="pass"
+  PASS = "pass",
 }
-  

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",
 
   ////
 }

src/translate/ar.json

@@ -777,14 +777,14 @@
     "user": "مستخدم",
     "param": "معامل",
     "student_package": "حزمة الطالب",
+    "users":"المستخدمون",
+    "students":"الطلاب",
+    "students_details":"تفاصيل الطلاب",
     "add_reseller": "إضافة بائع",
     "grade": "الصفوف",
     "report": "تقرير",
     "tags": "كلمات مفتاحية",
-    "users":"المستخدمون",
+    "reseller":"البائعين"
-    "reseller":"البائعين",
-    "students":"الطلاب",
-    "students_details":"تفاصيل الطلاب"
   },
   "page_header": {
     "dashboard": "لوحة القيادة / الصفحة الرئيسية",

src/translate/en.json

@@ -1,3 +1 @@
-{
+{}
-  
-}

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;
 };
 

src/types/Item.ts

@@ -342,7 +342,6 @@ export type param = {
   value: string;
 };
 
-
 export type Student_Package = {
   id: number;
   student: student;
@@ -355,10 +354,3 @@ type student = {
   last_name:string;
   sex:string
 }
-
-export type single_user = {
-  id: number;
-  type: student;
-  expiration_date: string;
-  activation_date: string;
-};

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_number1: string | number;
-  contact_number2 : 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_number1: string | number;
-contact_number2 : string |  number 
+  contact_number2: string | number;
-username : string
+  username: string;
 }
 
 export type ReSellerInitialValues = Partial<Nullable<InitialValues>>;

src/utils/RoleByType.ts

@@ -10,9 +10,11 @@ export const RoleByType = (item: { type?: string }):boolean=>{
   const isReSellerRoute = type === UserTypeEnum.RE_SELLER;
 
   if (!LocalType) {
-        return false
+    return false;
+  }
+  if (type === UserTypeEnum.PASS) {
+    return true;
   }
-    if(type === UserTypeEnum.PASS) { return true } ; 
 
   if (isAdmin && isReSellerRoute) {
     return false;
@@ -23,4 +25,4 @@ export const RoleByType = (item: { type?: string }):boolean=>{
   }
 
   return true;
-}
+};

src/utils/deletePathSegments copy.ts

@@ -0,0 +1,15 @@
+export const deletePathSegments = (path: string, num: number): string => {
+  // Split the path by '/'
+  const segments = path.split("/");
+
+  // Handle cases where the number of segments to delete is greater than available segments
+  if (num >= segments.length - 1) {
+    return "/";
+  }
+
+  // Remove the specified number of segments from the end
+  const newSegments = segments.slice(0, -num);
+
+  // Join the remaining segments back into a path
+  return newSegments.join("/");
+};

src/utils/formatDate.ts

@@ -3,8 +3,8 @@ export const formatDate = (dateString:any) => {
 
   const date = new Date(dateString);
   const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, '0'); // Months are zero-based
+  const month = String(date.getMonth() + 1).padStart(2, "0"); // Months are zero-based
-    const day = String(date.getDate()).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, "0");
 
   return `${year}-${month}-${day}`; // Return formatted date
 };

src/utils/hasAbilityFn.ts

@@ -640,7 +640,6 @@ export const canShowReSeller = hasAbility(
   ABILITIES_VALUES_ENUM.SHOW,
 );
 
-
 /// Param
 
 export const canAddParam = hasAbility(
@@ -661,7 +660,6 @@ export const canShowParam = hasAbility(
   ABILITIES_VALUES_ENUM.SHOW,
 );
 
-
 /// User
 
 export const canAddStudent_Package = hasAbility(

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

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,
     }));