.vscode/settings.json

@@ -24,7 +24,6 @@
     "toastify",
     "Viewelement",
     "webp",
-    "Xmark",
     "zustand",
     "مطلوب"
   ],

package.json

@@ -3,40 +3,53 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@ant-design/icons": "^5.5.1",
+    "@ant-design/icons": "^5.3.7",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/modifiers": "^7.0.0",
     "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@types/katex": "^0.16.7",
     "@uiw/react-markdown-preview": "^5.1.3",
-    "antd": "^5.21.1",
+    "antd": "^5.17.4",
-    "axios": "^1.7.7",
+    "axios": "^1.7.2",
+    "better-react-mathjax": "^2.0.3",
     "bootstrap": "^5.3.3",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.11",
     "formik": "^2.4.6",
-    "i18next": "^23.15.1",
+    "i18next": "^23.11.5",
+    "install": "^0.13.0",
     "katex": "^0.16.11",
     "leaflet": "^1.9.4",
     "lottie-react": "^2.4.0",
+    "mathjax": "^3.2.2",
+    "mathjax-full": "^3.2.2",
     "mathjs": "^13.1.1",
     "mathml-to-latex": "^1.4.1",
+    "mathml2latex": "^1.1.3",
+    "mml2tex": "^0.0.2",
     "npm": "^10.8.3",
     "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",
     "react-dom": "^18.3.1",
     "react-i18next": "^13.5.0",
     "react-icons": "^4.12.0",
+    "react-intersection-observer": "^9.13.1",
     "react-katex": "^3.0.1",
+    "react-latex": "^2.0.0",
+    "react-latex-next": "^3.0.0",
     "react-leaflet": "^4.2.1",
+    "react-mathjax": "^1.0.1",
+    "react-mathjax-preview": "^2.2.6",
+    "react-mathjax2": "^0.0.2",
     "react-query": "^3.39.3",
-    "react-router-dom": "^6.26.2",
+    "react-router-dom": "^6.23.1",
     "react-toastify": "^9.1.3",
     "react-window": "^1.8.10",
-    "reactstrap": "^9.2.3",
+    "react-window-dynamic": "^1.8.0-alpha.2",
-    "sass": "^1.79.4",
+    "reactstrap": "^9.2.2",
+    "sass": "^1.77.4",
     "yup": "^1.4.0",
-    "zustand": "^4.5.5"
+    "zustand": "^4.5.2"
   },
   "scripts": {
     "start": "vite --port=3000",
@@ -68,26 +81,26 @@
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
-    "@types/node": "^20.16.10",
+    "@types/node": "^20.14.0",
-    "@types/react": "^18.3.10",
+    "@types/react": "^18.3.3",
     "@types/react-beautiful-dnd": "^13.1.8",
     "@types/react-dom": "^18.3.0",
     "@types/react-helmet": "^6.1.11",
     "@types/react-katex": "^3.0.4",
     "@types/react-latex": "^2.0.3",
     "@types/react-window": "^1.8.8",
-    "@vitejs/plugin-legacy": "^5.4.2",
+    "@vitejs/plugin-legacy": "^5.4.1",
-    "@vitejs/plugin-react": "^4.3.1",
+    "@vitejs/plugin-react": "^4.3.0",
     "jest": "^29.7.0",
-    "jsdom": "^24.1.3",
+    "jsdom": "^24.1.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.3.0",
     "rollup-plugin-visualizer": "^5.12.0",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.1.4",
     "ts-loader": "^9.5.1",
     "typescript": "^4.9.5",
-    "vite": "^5.4.8",
+    "vite": "^5.2.12",
     "vite-plugin-compression": "^0.5.1",
-    "webpack": "^5.95.0",
+    "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4"
   }
 }

src/Components/CustomFields/MathComponent.tsx

@@ -2,18 +2,16 @@ import React from 'react';
 import { BlockMath } from 'react-katex';
 import 'katex/dist/katex.min.css';
 
-
 const LatexPreview = ({ latex }: { latex: string }) => {
-  // console.log(latex);
+  console.log(latex);
-  
-    // const sanitizedLatex = latex.replace(/\\_/g, '_');
   
+    const sanitizedLatex = latex.replace(/\\_/g, '_');
   return (
     <div>
 
 
         <BlockMath>
-      {latex} 
+      {sanitizedLatex} 
         </BlockMath>  
      
       

src/Components/CustomFields/SelectTagV2.tsx

@@ -22,15 +22,13 @@ const SelectTagV2: React.FC = () => {
   const NewShapeTags = CurrentTags?.map((item:any)=> {return item?.name ?? item })
   
   const handleChange = (_value: any[],option:any) => {
-    // console.log(option,"option");
+    console.log(option,"option");
-    console.log(_value);
+    const NewShapeOption = option?.map((item:any)=> {return ({name:item?.name,id:item?.id})})    
+    console.log(NewShapeOption);
     
-    // const NewShapeOption = option?.map((item:any)=> {return ({name:item?.name,id:item?.id})})    
+    formik.setFieldValue("tags", NewShapeOption);
-    // console.log(NewShapeOption);
+    setSearchValue("");
-    
+    setFieldValue("");
-    // formik.setFieldValue("tags", NewShapeOption);
-    // setSearchValue("");
-    // setFieldValue("");
   };
 
   const handleSearch = useDebounce((value: string) => {

src/Components/LatextInput/AddLaTexModal.tsx

@@ -29,10 +29,8 @@ const AddLaTexModal = ({name,setLatex,Latex,setIsModalOpen,isModalOpen,setCurren
       setLatex("")
       setIsModalOpen(false);
     }else{
-      setFieldValue(name, oldValue + " $$ " +Latex +" $$ ");
+        setLatex("")
-      setCurrentValue(oldValue + " $$ " +Latex +" $$ ")
+        toast.error(t("validation.that_is_not_a_valid_mml"))
-      setLatex("")
-      setIsModalOpen(false);
     }
     };
   

src/Components/Utils/Filter/useFilter.tsx

@@ -13,7 +13,10 @@ import { useModalState } from "./Modal";
 import { useFilterState } from "./FilterState";
 import { ModalEnum } from "../../../enums/Model";
 import { QueryStatusEnum } from "../../../enums/QueryStatus";
+import { useObjectToEdit } from "../../../zustand/ObjectToEditState";
 import SpinContainer from "../../Layout/SpinContainer";
+import { TbFlagCancel } from "react-icons/tb";
+import { XFilled } from "@ant-design/icons";
 import { FaXmark } from "react-icons/fa6";
 
 type OmitFormikProps = "children" | "initialValues" | "onSubmit";
@@ -155,8 +158,8 @@ const useFilter = () => {
     return (
       <div className="filter-submit-buttons buttons">
         <Button
-          type="primary"
           className="back_button filter_modal_cancel_button"
+          type="default"
           htmlType="reset"
         >
           {t("practical.reset")}

src/Components/ValidationField/View/Date.tsx

@@ -12,12 +12,12 @@ const Date = ({
   label,
   picker = "date",
   isDisabled,
+  props,
   onChange,
   placeholder,
   className,
   no_label,
   label_icon,
-  ...props
 }: any) => {
   const { errorMsg, isError, t, formik } = useFormField(name, props);
 
@@ -25,7 +25,6 @@ const Date = ({
   const onCalendarChange = (value: any) => {
     formik.setFieldValue(name, value);
   };
-  console.log(props);
   console.log(FormikValue);
   
   const Formatter = [DateEnum?.FORMATE];
@@ -50,10 +49,8 @@ const Date = ({
           size="large"
           onChange={onChange || onCalendarChange}
           disabled={isDisabled}
-          format={props?.Format ?? Formatter}
+          format={Formatter}
           id={name}
-          needConfirm={false}
-          {...props}
         />
         {/* <DatePicker onChange={onChange} /> */}
       </ValidationFieldContainer>

src/Components/ValidationField/utils/types.ts

@@ -40,9 +40,8 @@ export type SearchFieldProps = BaseFieldProps &
 
 type DateFieldProps = BaseFieldProps & {
   type: "DataRange" | "Date" | "Time";
-  Format?: "YYYY/MM/DD" | "MM/DD" | "YYYY/MM" | "YYYY-MM-DD HH:mm:ss.SSS" | "YYYY-MM-DD HH:mm:ss";
+  Format?: "YYYY/MM/DD" | "MM/DD" | "YYYY/MM" | "YYYY-MM-DD HH:mm:ss.SSS";
   picker?: "data" | "week" | "month" | "quarter" | "year";
-  showTime?:boolean
 };
 
 type FileFieldProps = BaseFieldProps & {

src/Pages/Admin/City/Page.tsx

@@ -33,7 +33,7 @@ const TableHeader = () => {
           ModelAbility={ModalEnum?.CITY_ADD}
           canAdd={canAddCity}
         />
-        <FilterLayout sub_children={<FilterForm />} haveFilter={false} filterTitle="table.City" />
+        <FilterLayout sub_children={<FilterForm />} filterTitle="table.City" />
         <Table />
         <AddModalForm />
         <EditModalForm />

src/Pages/Admin/Coupon/Model/AddModel.tsx

@@ -1,38 +0,0 @@
-import React from "react";
-import { getInitialValues, getValidationSchema } from "./formUtil";
-import { ModalEnum } from "../../../../enums/Model";
-import LayoutModel from "../../../../Layout/Dashboard/LayoutModel";
-import { QueryStatusEnum } from "../../../../enums/QueryStatus";
-import ModelForm from "./ModelForm";
-import { useAddCoupon } from "../../../../api/Coupon";
-import dayjs from "dayjs";
-
-const AddModel: React.FC = () => {
-  const { mutate, status } = useAddCoupon();
-
-  const handleSubmit = (values: any) => {
-    console.log(values?.due_to,"values?.due_to");
-    const due_to = values?.due_to.format("YYYY-MM-DD HH:mm:ss")
-      console.log(due_to);
-    mutate({
-      ...values,
-      due_to
-    });
-  };
-  return (
-    <>
-      <LayoutModel
-        status={status as QueryStatusEnum}
-        ModelEnum={ModalEnum.COUPON_ADD}
-        modelTitle="Coupon"
-        handleSubmit={handleSubmit}
-        getInitialValues={getInitialValues({})}
-        getValidationSchema={getValidationSchema}
-      >
-        <ModelForm />
-      </LayoutModel>
-    </>
-  );
-};
-
-export default AddModel;

src/Pages/Admin/Coupon/Model/EditModel.tsx

@@ -1,38 +0,0 @@
-import React from "react";
-import { getInitialValues, getValidationSchema } from "./formUtil";
-import { ModalEnum } from "../../../../enums/Model";
-import LayoutModel from "../../../../Layout/Dashboard/LayoutModel";
-import ModelForm from "./ModelForm";
-import { QueryStatusEnum } from "../../../../enums/QueryStatus";
-import { useObjectToEdit } from "../../../../zustand/ObjectToEditState";
-import { useUpdateCoupon } from "../../../../api/Coupon";
-import { handelImageState } from "../../../../utils/DataToSendImageState";
-
-const EditModel: React.FC = () => {
-  const { mutate, status } = useUpdateCoupon();
-  const { objectToEdit } = useObjectToEdit((state) => state);
-
-  const handleSubmit = (values: any) => {
-    const due_to = typeof values?.due_to === "string" ? values?.due_to : values?.due_to.format("YYYY-MM-DD HH:mm:ss")
-    const Data_to_send = { ...values , due_to };
-    mutate(Data_to_send);
-  };
-
-  return (
-    <>
-      <LayoutModel
-        status={status as QueryStatusEnum}
-        ModelEnum={ModalEnum.COUPON_EDIT}
-        modelTitle="Coupon"
-        handleSubmit={handleSubmit}
-        getInitialValues={getInitialValues(objectToEdit)}
-        getValidationSchema={getValidationSchema}
-        isAddModal={false}
-      >
-        <ModelForm Hide={true} />
-      </LayoutModel>
-    </>
-  );
-};
-
-export default EditModel;

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

@@ -1,20 +0,0 @@
-import React from "react";
-import ValidationField from "../../../../Components/ValidationField/ValidationField";
-import { Col, Row } from "reactstrap";
-import { useFormikContext } from "formik";
-
-const FilterForm = () => {
-  const formik = useFormikContext();
-
-  return (
-    <div>
-      <Row>
-        <Col>
-          <ValidationField placeholder="name" label="name" name="name" />
-        </Col>
-      </Row>
-    </div>
-  );
-};
-
-export default FilterForm;

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

@@ -1,62 +0,0 @@
-import { Col, Row } from "reactstrap";
-import ValidationField from "../../../../Components/ValidationField/ValidationField";
-import { useValidationValidationParamState } from "../../../../Components/ValidationField/state/ValidationValidationParamState";
-import { useGetAllGrade } from "../../../../api/grade";
-
-const Form = ({Hide = false}:{Hide?:boolean }) => {
-  const { ValidationParamState } = useValidationValidationParamState();
-
-  const {
-    GradeName, GradeCurrentPage,
-  } = ValidationParamState;
-
-
-
-  const { data: Grade, isLoading: isLoadingGrade } = useGetAllGrade({
-    name: GradeName,
-    page: GradeCurrentPage
-  });
-  const GradeOption = Grade?.data ?? []
-  const canChangeGradePage = !!Grade?.links?.next;
-  const GradePage = Grade?.meta?.currentPage;
-  return (
-    <Row className="w-100">
-      <Col>
-        <ValidationField name="name" placeholder="name" label="name" />
-        <ValidationField name="amount" type="number" placeholder="amount" label="amount" />
-      
-      </Col>
-      <Col>
-      <ValidationField
-         name="due_to" type="Date" 
-         Format="YYYY-MM-DD HH:mm:ss" 
-         placeholder="due_to" label="due_to" 
-         showTime
-      
-         />
-      <ValidationField name="code" placeholder="code" label="code" />
-      {/* 
-              grade_id
-        */}
-        {!Hide && 
-        
-        <ValidationField
-          searchBy="GradeName"
-          name="grade_id"
-          label="grade"
-           placeholder="grade"
-          type="Search"
-          option={GradeOption}
-          isLoading={isLoadingGrade}
-          canChangePage={canChangeGradePage}
-          PageName={"GradeCurrentPage"}
-          page={GradePage}
-
-        />
-        }
-      </Col>
-    </Row>
-  );
-};
-
-export default Form;

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

@@ -1,27 +0,0 @@
-import * as Yup from "yup";
-import { Coupon, CouponInitialValues } from "../../../../types/Coupon";
-import dayjs from "dayjs";
-
-export const getInitialValues = (
-  objectToEdit: Partial<Coupon>,
-): CouponInitialValues => {
-  return {
-    id: objectToEdit?.id,
-    name: objectToEdit?.name ?? "",
-    amount: objectToEdit?.amount ?? "",
-    code: objectToEdit?.code ?? "",
-    due_to: objectToEdit?.due_to ? dayjs(objectToEdit?.due_to,"YYYY-MM-DD HH:mm:ss") :  "",
-    grade_id: objectToEdit?.grade_id ?? "",
-  };
-};
-
-export const getValidationSchema = () => {
-  // validate input
-  return Yup.object().shape({
-    name: Yup.string().required("validation.required"),
-    due_to: Yup.string().required("validation.required"),
-    code: Yup.string().required("validation.required").min(6,"validation.must_be_at_least_6_characters_long").max(6,"validation.must_be_at_least_6_characters_long"),
-    amount: Yup.number().required("validation.required").typeError("validation.Must_be_a_number"),
-
-  });
-};

src/Pages/Admin/Coupon/Page.tsx

@@ -1,49 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { lazy, Suspense } from "react";
-import { Spin } from "antd";
-import useSetPageTitle from "../../../Hooks/useSetPageTitle";
-import { ModalEnum } from "../../../enums/Model";
-import { useDeleteCoupon } from "../../../api/Coupon";
-import PageHeader from "../../../Layout/Dashboard/PageHeader";
-import FilterLayout from "../../../Layout/Dashboard/FilterLayout";
-import FilterForm from "./Model/FilterForm";
-import { canAddCoupon } from "../../../utils/hasAbilityFn";
-
-const Table = lazy(() => import("./Table"));
-const AddModalForm = lazy(() => import("./Model/AddModel"));
-const EditModalForm = lazy(() => import("./Model/EditModel"));
-const DeleteModalForm = lazy(
-  () => import("../../../Layout/Dashboard/DeleteModels"),
-);
-
-const TableHeader = () => {
-  const [t] = useTranslation();
-  const deleteMutation = useDeleteCoupon();
-
-  useSetPageTitle([
-    {name:`${t(`page_header.home`)}`, path:"/"},
-    {name:`${t(`page_header.Coupon`)}`, path:"Coupon"}
-  ]);
-
-  return (
-    <div className="TableWithHeader">
-      <Suspense fallback={<Spin />}>
-        <PageHeader
-          pageTitle="Coupon"
-          ModelAbility={ModalEnum?.COUPON_ADD}
-          canAdd={canAddCoupon}
-        />
-        <FilterLayout sub_children={<FilterForm />} haveFilter={false} filterTitle="table.Coupon" />
-        <Table />
-        <AddModalForm />
-        <EditModalForm />
-        <DeleteModalForm
-          deleteMutation={deleteMutation}
-          ModelEnum={ModalEnum?.COUPON_DELETE}
-        />
-      </Suspense>
-    </div>
-  );
-};
-
-export default TableHeader;

src/Pages/Admin/Coupon/Table.tsx

@@ -1,23 +0,0 @@
-import { useColumns } from "./useTableColumns";
-import React from "react";
-import DataTable from "../../../Layout/Dashboard/Table/DataTable";
-import { useGetAllCoupon } from "../../../api/Coupon";
-import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
-import { useFilterStateState } from "../../../zustand/Filter";
-
-const App: React.FC = () => {
-  const { filterState } = useFilterState();
-  const { Filter } = useFilterStateState();
-  const name = Filter?.name ; 
-  const sort_by = Filter?.sort_by ; 
-  const response = useGetAllCoupon({
-    pagination: true,
-    ...filterState,
-    name,
-    sort_by
-  });
-
-  return <DataTable response={response} useColumns={useColumns}  />;
-};
-
-export default App;

src/Pages/Admin/Coupon/useTableColumns.tsx

@@ -1,92 +0,0 @@
-import { TableColumnsType } from "antd";
-import useModalHandler from "../../../utils/useModalHandler";
-import { ModalEnum } from "../../../enums/Model";
-import { useObjectToEdit } from "../../../zustand/ObjectToEditState";
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-import {
-  canDeleteCoupon,
-  canEditCoupon,
-  canShowCoupon,
-} from "../../../utils/hasAbilityFn";
-import ActionButtons from "../../../Components/Table/ActionButtons";
-import ColumnsImage from "../../../Components/Columns/ColumnsImage";
-import { Coupon } from "../../../types/Coupon";
-import { useFilterStateState } from "../../../zustand/Filter";
-
-export const useColumns = () => {
-  const { handel_open_model } = useModalHandler();
-
-  const { setObjectToEdit } = useObjectToEdit((state) => state);
-  const navigate = useNavigate();
-  const { setFilter } = useFilterStateState();
-
-
-  
-  const handelShow = (record: Coupon) => {
-    setFilter({})
-    navigate(`${record?.id}`);
-  };
-
-  const handelDelete = (data: Coupon) => {
-    setObjectToEdit(data);
-    handel_open_model(ModalEnum?.COUPON_DELETE);
-  };
-
-  const handleEdit = (record: Coupon) => {
-    setObjectToEdit(record);
-    handel_open_model(ModalEnum?.COUPON_EDIT);
-  };
-  const [t] = useTranslation();
-
-  const columns: TableColumnsType<Coupon> = [
-    {
-      title: t("columns.id"),
-      dataIndex: "id",
-      key: "id",
-      align: "center",
-      render: (_text, record) => record?.id,
-    },
-    {
-      title: `${t("columns.name")}`,
-      dataIndex: "name",
-      key: "name",
-      align: "center",
-      render: (_text, record) => record?.name,
-      ellipsis:true
-    },
-    {
-      title: t("columns.image"),
-      dataIndex: "image",
-      key: "image",
-      align: "center",
-      render: (_text: any, record: Coupon) => {
-        let str = record?.amount;
-
-        return  <ColumnsImage src={str}/>  ;
-      },
-    },
-    {
-
-      title: t("columns.procedure"),
-      key: "actions",
-      align: "center",
-      width: "25vw",
-      render: (_text, record, index) => {
-        return (
-          <ActionButtons
-            canDelete={canDeleteCoupon}
-            canEdit={canEditCoupon}
-            canShow={canShowCoupon}
-            index={index}
-            onDelete={() => handelDelete(record)}
-            onEdit={() => handleEdit(record)}
-            onShow={() => handelShow(record)}
-          />
-        );
-      },
-    },
-  ];
-
-  return columns;
-};

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

@@ -7,7 +7,6 @@ import { useValidationValidationParamState } from "../../../../Components/Valida
 import { useGetAllUnit } from "../../../../api/unit";
 import { useGetAllSubject } from "../../../../api/subject";
 import { useGetAllLesson } from "../../../../api/lesson";
-import { useGetAllTag } from "../../../../api/tags";
 
 const FilterForm = () => {
 
@@ -16,8 +15,7 @@ const FilterForm = () => {
     GradeName, GradeCurrentPage,
     SubjectName, SubjectCurrentPage,
     UnitName, UnitCurrentPage,
-    LessonName, LessonCurrentPage,
+    LessonName, LessonCurrentPage
-    TagName , TagCurrentPage
 
 
   } = ValidationParamState;
@@ -60,17 +58,6 @@ const FilterForm = () => {
   const canChangeLessonPage = !!Lesson?.links?.next;
   const LessonPage = Lesson?.meta?.currentPage;
 
-
-     /// TagsIds 
-     const { data: Tag, isLoading: isLoadingTag } = useGetAllTag({
-      name: TagName,
-      page: TagCurrentPage
-    });
-    const TagOption = Tag?.data ?? []
-    const canChangeTagPage = !!Tag?.links?.next;
-    const TagPage = Tag?.meta?.currentPage;
-  
-
   return (
     <div>
       <Row>
@@ -110,23 +97,7 @@ const FilterForm = () => {
         />
 
 
-    {/* 
-              TagsIds
-        */}
 
-<ValidationField
-          searchBy="TagName"
-          name="tagsIds"
-          label="tag"
-          type="Search"
-          option={TagOption}
-          isMulti
-          isLoading={isLoadingTag}
-          canChangePage={canChangeTagPage}
-          PageName={"TagCurrentPage"}
-          page={TagPage}
-          
-        />
 
 
         </Col>
@@ -166,9 +137,6 @@ const FilterForm = () => {
           page={LessonPage}
 
         />
-
-       
-
         </Col>
       </Row>
     </div>

src/Pages/Admin/QuestionBank/Page.tsx

@@ -29,7 +29,7 @@ const TableHeader = () => {
         <PageHeader
           pageTitle="QuestionBank"
           ModelAbility={ModalEnum?.QUESTION_BANK_ADD}
-          canAdd={false}
+          canAdd={canAddQuestionBank}
         />
         <FilterLayout width="700px" search_by="content" sub_children={<FilterForm />} filterTitle="table.QuestionBank" />
         <Table />

src/Pages/Admin/QuestionBank/useTableColumns.tsx

@@ -76,8 +76,9 @@ export const useColumns = () => {
       key: "hint",
       align: "center",
       render: (text, record) => {
+        
         return (
-          <>{record?.hint ?? "_"}</>
+          <>{record?.hint ?? "karim"}</>
         );
       },
       ellipsis: true,

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

@@ -54,7 +54,7 @@ const PersonalDetailsForm = ({isEdit}:{isEdit?:boolean}) => {
           placeholder={"_"}
           label={"ID Number"}
         />
-        {/* <ValidationField
+        <ValidationField
           name={"location_lat"}
           placeholder={"_"}
           label={"lat"}
@@ -63,7 +63,7 @@ const PersonalDetailsForm = ({isEdit}:{isEdit?:boolean}) => {
           name={"location_lng"}
           placeholder={"_"}
           label={"lng"}
-        /> */}
+        />
         {/* <ValidationField
           name={"id_number"}
           placeholder={"_"}

src/Pages/Admin/Tags/Page.tsx

@@ -37,7 +37,6 @@ const TableHeader = () => {
         <FilterLayout
           sub_children={<FilterForm />}
           filterTitle="sidebar.tags"
-          haveFilter={false}
         />
         <Table />
         <DeleteModalForm

src/Pages/Admin/Unit/DrapableTable.tsx

@@ -99,7 +99,7 @@ const DrapableTable: React.FC = () => {
   const sort_by = Filter?.sort_by ; 
   const response = useGetAllUnit({
     subject_id: subject_id,
-    isPaginated: false,
+    pagination: false,
     name,
     sort_by,
     ...filterState,

src/Pages/Admin/lesson/DrapableTable.tsx

@@ -101,7 +101,7 @@ const DrapableTable: React.FC = () => {
 
   const response = useGetAllLesson({
     unit_id: unit_id,
-    isPaginated: false,
+    pagination: false,
     name,
     sort_by,
     ...filterState,

src/Pages/Admin/question/EditPage.tsx

@@ -278,13 +278,9 @@ const EditPage: React.FC = () => {
   };
 
   useEffect(() => {
-    console.log(location.pathname);
-      console.log(deletePathSegments(location.pathname, 2));
-      
     if (isSuccess) {
       toast.success(t("validation.the_possess_done_successful"));
-      navigate(-1);
+      navigate(deletePathSegments(location.pathname, 2));
-      
     }
   }, [isSuccess]);
 

src/Pages/Admin/question/Model/Malty/QuestionFIeld/QuestionFIeld.tsx

@@ -1,9 +1,14 @@
 import React, { useEffect } from "react";
+import { Choice } from "../../../../../../types/Item";
 import { Field, useFormikContext } from "formik";
 import { useTranslation } from "react-i18next";
+import { getCharFromNumber } from "../../../../../../utils/getCharFromNumber";
+import TextField from "./TextField";
 import { useObjectToEdit } from "../../../../../../zustand/ObjectToEditState";
+import ImageBoxField from "../../../../../../Components/CustomFields/ImageBoxField/ImageBoxField";
 import { GoTrash } from "react-icons/go";
 import { Popconfirm } from "antd";
+import LaTeXInput from "../../../../../../Components/LatextInput/LaTeXInput";
 import LaTeXInputMemo from "../../../../../../Components/LatextInput/LaTeXInputMemo";
 import ImageBoxFieldMemo from "../../../../../../Components/CustomFields/ImageBoxField/ImageBoxFieldMemo";
 

src/Pages/Admin/question/Model/Malty/components/Question.tsx

@@ -6,7 +6,6 @@ import { FaCirclePlus } from "react-icons/fa6";
 import ValidationField from "../../../../../../Components/ValidationField/ValidationField";
 import MaltySelectTag from "../Tags/MaltySelectTag";
 import { toast } from "react-toastify";
-import SelectTagV2 from "../../../../../../Components/CustomFields/SelectTagV2";
 
 export  const Question: React.FC<any> = React.memo(({ index, data }) => {
   const { values, setFieldValue, ShowHint, t } = data;
@@ -62,7 +61,6 @@ export  const Question: React.FC<any> = React.memo(({ index, data }) => {
           />
         )}
         <MaltySelectTag parent_index={index} />
-       
       </div>
     </div>
   );

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

@@ -95,7 +95,6 @@ const Form = () => {
         />
         }
         <SelectTag />
-        
       </div>
     </Row>
   );

src/Pages/Home/Dummy.tsx

@@ -1,8 +1,23 @@
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import MathMLPreview from "./MathMLPreview";
+import { Field, Form, Formik } from "formik";
+import Test from "./Test";
+import MarkdownPreview from '@uiw/react-markdown-preview';
+import { BlockMath } from "react-katex";
 
 const Dummy = () => {
+  const [t] = useTranslation();
+  const [markdown, setMarkdown] = useState<string>(' \nV_{sphere} = \\frac{4}{3}\\pi r^3\n');
+
+
   return (
     <div className="DummyHomePage">
-      karim is op
+       
+       <MarkdownPreview style={{background:"transparent" ,color:"black"}} source={"This is an <u>underlined</u> text."} />
+       <BlockMath>
+      {markdown} 
+        </BlockMath> 
     </div>
   );
 };

src/Pages/Home/MathMLPreview.tsx

@@ -0,0 +1,31 @@
+import React, { useState, useEffect } from 'react';
+import { MathJax, MathJaxContext } from 'better-react-mathjax';
+
+const MathMLPreview = () => {
+  const [mathML, setMathML] = useState('<math xmlns="http://www.w3.org/1998/Math/MathML"><mi>x</mi><mo>=</mo><mn>5</mn></math>');
+
+  useEffect(() => {
+    // Any logic to handle input updates and preview refresh can be added here
+  }, [mathML]);
+
+  return (
+    <div>
+      <textarea
+        value={mathML}
+        onChange={(e) => setMathML(e.target.value)}
+        rows={5}
+        style={{ width: '100%' }}
+      />
+      <MathJaxContext>
+        <div>
+          <h3>Preview:</h3>
+          <MathJax dynamic>
+            <div dangerouslySetInnerHTML={{ __html: mathML }} />
+          </MathJax>
+        </div>
+      </MathJaxContext>
+    </div>
+  );
+};
+
+export default MathMLPreview;

src/Routes.tsx

@@ -1,5 +1,5 @@
 import { TCrudRoute, TMenuItem } from "./types/App";
-import { FaCashRegister, FaCity, FaHome, FaMonero, FaMoneyBill, FaPaperclip, FaSellcast, FaTag, FaUser, FaUserShield } from "react-icons/fa";
+import { FaCashRegister, FaCity, FaHome, FaMoneyBill, FaPaperclip, FaSellcast, FaTag, FaUser, FaUserShield } from "react-icons/fa";
 import { GoDotFill } from "react-icons/go";
 import { MdOutlineSell } from "react-icons/md";
 import { CgProfile } from "react-icons/cg";
@@ -48,8 +48,6 @@ const Setting = React.lazy(() => import("./Pages/Admin/Setting/Page"));
 
 const Permissions = React.lazy(() => import("./Pages/Admin/Roles/Permissions/Page"));
 const Roles = React.lazy(() => import("./Pages/Admin/Roles/Page"));
-const Coupon = React.lazy(() => import("./Pages/Admin/Coupon/Page"));
-
 const Report = React.lazy(() => import("./Pages/Admin/Report/Page"));
 const Param = React.lazy(() => import("./Pages/Admin/Param/Page"));
 
@@ -68,7 +66,6 @@ import { ParamsEnum } from "./enums/params";
 import { TbCategory } from "react-icons/tb";
 import { UserTypeEnum } from "./enums/UserType";
 import { FaTags } from "react-icons/fa6";
-import { CiSquareQuestion } from "react-icons/ci";
 
 export const menuItems: TMenuItem[] = [
   {
@@ -178,16 +175,16 @@ export const menuItems: TMenuItem[] = [
   //   prevPath: 0,
   // },
 
-  {
+  // {
-    header: "page_header.questionBank",
+  //   header: "page_header.questionBank",
-    element: <QuestionBank />,
+  //   element: <QuestionBank />,
-    icon: <CiSquareQuestion />,
+  //   icon: <CiSquareQuestion />,
-    text: "sidebar.questionBank",
+  //   text: "sidebar.questionBank",
-    path: `/${ABILITIES_ENUM?.QUESTION}`,
+  //   path: `/${ABILITIES_ENUM?.QUESTION}`,
-    abilities: ABILITIES_ENUM?.QUESTION,
+  //   abilities: ABILITIES_ENUM?.QUESTION,
-    abilities_value: ABILITIES_VALUES_ENUM.INDEX,
+  //   abilities_value: ABILITIES_VALUES_ENUM.INDEX,
-    prevPath: 0,
+  //   prevPath: 0,
-  },
+  // },
   {
     header: "page_header.roles",
     element: <Roles />,
@@ -199,17 +196,6 @@ export const menuItems: TMenuItem[] = [
     prevPath: 0,
   },
   {
-    header: "page_header.coupon",
-    element: <Coupon />,
-    icon: <FaMoneyBill />,
-    text: "sidebar.coupon",
-    path: `/${ABILITIES_ENUM?.COUPON}`,
-    abilities: ABILITIES_ENUM?.COUPON,
-    abilities_value: ABILITIES_VALUES_ENUM.INDEX,
-    prevPath: 0,
-  },
-  {
-
     header: "page_header.financial_collection",
     element: <FinancialCollection />,
     icon: <FaMoneyBill />,

src/Styles/Layout/FilterLayout.scss

@@ -2,9 +2,7 @@
   padding: 20px 20px;
   border-radius: 10px 10px 0 0;
   box-shadow: 0px 0px 32px 2px #080F3414;
-  // max-width: 85vw;
+
-  overflow-x: hidden;
-  min-height: fit-content;
   >div {
     display: flex;
     align-items: center;

src/Styles/Layout/PageHeader.scss

@@ -31,14 +31,11 @@
 .PageTitle {
   display: flex;
   gap: 10px;
-  flex-wrap: wrap;
   margin-block: 10px;
 
   .PageTitleItems {
     cursor: pointer;
     color: var(--value);
-    max-width: 65vw;
-    overflow: hidden;
   }
 }
 

src/Styles/components/LaTeXInput.scss

@@ -8,17 +8,7 @@
     position: relative;
     margin-bottom: 10px;
    
-    // &::after{
+
-    //     position: absolute;
-    //     content: "";
-    //     top: 40%;
-    //     left: 59%;
-    //     transform: translate(-50%,-50%);
-    //     width: 3px;
-    //     height: 78%;
-    //     background-color: red;
-    //     z-index: 99999;
-    // }
 }
 .showPreviewInput{
     background-color: var(--bg);
@@ -29,7 +19,7 @@
     height: calc(100% - 44px);
     word-wrap: break-word;
     display: flex;
-    gap: 5px;
+    gap: 20px;
     align-items: baseline;
     align-content: flex-start;
     flex-wrap: wrap;
@@ -83,13 +73,13 @@
   }
 }
 
-    // .katex .msupsub{
+.katex .msupsub{
-    //     text-align: end !important;
+    text-align: end !important;
-    // }
+}
-    // .mtight{
+.mtight{
     
-    //     font-size: 10px !important;
+    font-size: 10px !important;
-    // }
+}
-// .katex .delimcenter, .katex .op-symbol{
+.katex .delimcenter, .katex .op-symbol{
-//     display: none;
+    display: none;
-// }
+}

src/api/Coupon.ts

@@ -1,20 +0,0 @@
-import useAddMutation from "./helper/useAddMutation";
-import useDeleteMutation from "./helper/useDeleteMutation";
-import useGetQuery from "./helper/useGetQuery";
-import useUpdateMutation from "./helper/useUpdateMutation";
-
-const API = {
-  GET: "/coupon",
-  ADD: "/coupon",
-  DELETE: "/coupon",
-  UPDATE: "/coupon",
-};
-
-const KEY = "Coupon";
-
-export const useGetAllCoupon = (params?: any, options?: any) =>
-  useGetQuery(KEY, API.GET, params, options);
-export const useAddCoupon = () => useAddMutation(KEY, API.ADD);
-export const useUpdateCoupon = (params?: any) => useUpdateMutation(KEY, API.GET);
-export const useDeleteCoupon = (params?: any) =>
-  useDeleteMutation(KEY, API.DELETE);

src/enums/Model.ts

@@ -74,12 +74,6 @@ export enum ModalEnum {
   HOME_WORK_ADD = "homework.add",
   HOME_WORK_DELETE = "homework.delete",
 
-    //// Coupon
-
-    COUPON_EDIT = "Coupon.edit",
-    COUPON_ADD = "Coupon.add",
-    COUPON_DELETE = "Coupon.delete",
-    
   ///// note
 
   NOTES_EDIT = "notes.edit",

src/enums/abilities.ts

@@ -59,7 +59,6 @@ export enum ABILITIES_ENUM {
   SETTING = "setting",
   Email = "email",
   Phone = "phone",
-    COUPON = "coupon",
   CITY = "city",
   AREA = "area",
   Financial_Collection = "financial_collection"

src/translate/ar.json

@@ -12,8 +12,6 @@
     "Email_is_required": "البريد الإلكتروني مطلوب",
     "Password_is_required": "كلمة المرور مطلوبة",
     "Password_must_be_at_least_8_characters_long": "يجب أن تكون كلمة المرور مكونة من 8 أحرف على الأقل",
-    "must_be_at_least_6_characters_long": "يجب أن تكون  مكونة من 6 أحرف على الأقل",
-
     "Nationality_is_required": "الجنسية مطلوبة",
     "Address_is_required": "العنوان مطلوب",
     "Place_of_birth_is_required": "مكان الميلاد مطلوب",
@@ -411,7 +409,6 @@
     "City":"مدينة",
     "add_sales":"إضافة عملية بيع",
     "are_you_sure_about_sale":"هل أنت متأكد من عملية البيع ؟",
-    "Coupon":"قسيمة",
     "financial_collection":"التحصيلات",
     "show_collection":"حصيلة"
   },
@@ -548,10 +545,7 @@
     "lat":"الطول",
     "lng":"العرض",
     "choose":"حدد",
-    "tag":"كلمات مفتاحية",
+    "amount":"مبلغ",
-    "code":"رمز",
-    "amount":"كمية",
-    "due_to":"صالح الى",
     "reseller":"البائعين",
     "activation_date":"تاريخ التنشيط",
     "expiration_date":"تاريخ الالغاء"
@@ -892,7 +886,6 @@
     "collections": "التحصيلات",
     "Area":"المنطقة",
     "city":"مدينة",
-    "coupon":"قسيمة",
     "financial_collection":"التحصيلات"
   },
   "message": {
@@ -943,7 +936,6 @@
     "Area":"المنطقة",
     "setting":"الإعدادات",
     "edit_reseller":"تعديل البائع",
-    "Coupon":"قسيمة",
     "financial_collection":"التحصيلات",
     "show_collection":"حصيلة"
   },
@@ -995,7 +987,6 @@
     "setting":"الإعدادات",
     "City":"مدينة",
     "Area":"المنطقة",
-    "Coupon":"قسيمة",
     "financial_collection":"التحصيلات",
     "show_collection":"حصيلة"
   },
@@ -1014,7 +1005,6 @@
     "security_setting":"إعدادات الأمان",
     "Area":"المنطقة",
     "City":"مدينة",
-    "Coupon":"قسيمة",
     "notification":"الاشعارات",
     "upload_your_photo_and_personal_data_here":"قم بتحميل صورتك وبياناتك الشخصية هنا",
     "get_notified_of_whats_happening_now_you_can_turn_it_off_at_any_time":"احصل على إشعار بما يحدث الآن ، يمكنك إيقاف تشغيله في أي وقت",

src/types/Coupon.ts

@@ -1,21 +0,0 @@
-import { Nullable } from "./App";
-
-// Define the Teacher interface
-
-export interface InitialValues {
-  id: number; // Unique identifier for the user
-  name: string; // Name of the user
-  amount: string; // URL of the user's amount
-  due_to: any; // URL of the user's amount
-  code: string; // URL of the user's amount
-  grade_id: string; // URL of the user's amount
-}
-export type Coupon = {
-  id: number; // Unique identifier for the user
-  name: string; // Name of the user
-  amount: string; // URL of the user's amount
-  due_to: string; // URL of the user's amount
-  code: string; // URL of the user's amount
-  grade_id: string; // URL of the user's amount
-};
-export type CouponInitialValues = Partial<Nullable<InitialValues>>;

src/utils/hasAbilityFn.ts

@@ -24,31 +24,6 @@ export const canIndexEduClass = hasAbility(
   ABILITIES_VALUES_ENUM.INDEX,
 );
 
-///// Coupon
-
-export const canAddCoupon = hasAbility(
-  ABILITIES_ENUM.EDUCATION_CLASS,
-  ABILITIES_VALUES_ENUM.STORE,
-);
-export const canEditCoupon = hasAbility(
-  ABILITIES_ENUM.EDUCATION_CLASS,
-  ABILITIES_VALUES_ENUM.UPDATE,
-);
-export const canDeleteCoupon = hasAbility(
-  ABILITIES_ENUM.EDUCATION_CLASS,
-  ABILITIES_VALUES_ENUM.DELETE,
-);
-export const canShowCoupon = hasAbility(
-  ABILITIES_ENUM.EDUCATION_CLASS,
-  ABILITIES_VALUES_ENUM.SHOW,
-);
-export const canIndexCoupon = hasAbility(
-  ABILITIES_ENUM.EDUCATION_CLASS,
-  ABILITIES_VALUES_ENUM.INDEX,
-);
-
-
-
 ///// City
 
 export const canAddCity = hasAbility(

vite.config.mjs

@@ -7,13 +7,6 @@ export default defineConfig(() => {
   return {
     build: {
       outDir: "build",
-      rollupOptions: {
-        output: {
-            entryFileNames: '[name].[hash].js',
-            chunkFileNames: '[name].[hash].js',
-            assetFileNames: '[name].[hash][extname]',
-        },
-    },
     },
 
     plugins: [