Compare commits
No commits in common. "a9aa5cbcefd9eb1ae8717f02762c60e20a47bbe3" and "9f05382d6cc1d9a75debc7856c5c7abd6e5664e0" have entirely different histories.
a9aa5cbcef
...
9f05382d6c
|
|
@ -1,8 +1,11 @@
|
||||||
import React, { lazy, Suspense } from "react";
|
import React, { lazy, Suspense } from "react";
|
||||||
|
|
||||||
|
import { usePageTitleState } from "../../zustand/PageTitleState";
|
||||||
|
import { MdOutlineArrowForwardIos } from "react-icons/md";
|
||||||
import { useLocation, useNavigate } from "react-router-dom";
|
import { useLocation, useNavigate } from "react-router-dom";
|
||||||
import { getPrevPathRoute } from "../../utils/getPrevPathRoute";
|
import { getPrevPathRoute } from "../../utils/getPrevPathRoute";
|
||||||
import { deletePathSegments } from "../../utils/deletePathSegments";
|
import { deletePathSegments } from "../../utils/deletePathSegments";
|
||||||
|
import SpinContainer from "../../Components/Layout/SpinContainer";
|
||||||
import NavBarRightSide from "../../Components/Layout/Navbar/NavBarRightSide";
|
import NavBarRightSide from "../../Components/Layout/Navbar/NavBarRightSide";
|
||||||
import SearchFieldWithSelect from "../../Components/DataTable/SearchFieldWithSelect";
|
import SearchFieldWithSelect from "../../Components/DataTable/SearchFieldWithSelect";
|
||||||
import { search_array } from "../../Routes";
|
import { search_array } from "../../Routes";
|
||||||
|
|
@ -13,6 +16,7 @@ import { useTranslation } from "react-i18next";
|
||||||
const ChangePasswordModel = lazy(() => import("./model/AddModel"));
|
const ChangePasswordModel = lazy(() => import("./model/AddModel"));
|
||||||
|
|
||||||
const NavBar = ({ isOpen }: { isOpen: boolean }) => {
|
const NavBar = ({ isOpen }: { isOpen: boolean }) => {
|
||||||
|
const { PageTitle } = usePageTitleState((state) => state);
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const PrevPath = getPrevPathRoute(location.pathname);
|
const PrevPath = getPrevPathRoute(location.pathname);
|
||||||
|
|
@ -29,6 +33,9 @@ const NavBar = ({ isOpen }: { isOpen: boolean }) => {
|
||||||
return (
|
return (
|
||||||
<div className="NavBar">
|
<div className="NavBar">
|
||||||
<Suspense fallback={<></>}>
|
<Suspense fallback={<></>}>
|
||||||
|
{/* <span className="navbar_link" onClick={handelNavigate}>
|
||||||
|
<MdOutlineArrowForwardIos /> {PageTitle}
|
||||||
|
</span> */}
|
||||||
<div className="header_search">
|
<div className="header_search">
|
||||||
<SearchFieldWithSelect
|
<SearchFieldWithSelect
|
||||||
options={translateArray}
|
options={translateArray}
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ const App: React.FC = () => {
|
||||||
...filterState,
|
...filterState,
|
||||||
city_id,
|
city_id,
|
||||||
name,
|
name,
|
||||||
|
|
||||||
sort_by
|
sort_by
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@ export const useColumns = () => {
|
||||||
ellipsis:true
|
ellipsis:true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
||||||
title: t("columns.procedure"),
|
title: t("columns.procedure"),
|
||||||
key: "actions",
|
key: "actions",
|
||||||
align: "center",
|
align: "center",
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import { Form, Formik } from 'formik'
|
import { Form, Formik, useFormikContext } from 'formik'
|
||||||
|
import React from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { MdOutlineArrowForwardIos } from 'react-icons/md'
|
import { MdOutlineArrowForwardIos } from 'react-icons/md'
|
||||||
import { getInitialValuesBase, getValidationSchemaBase } from '../../formUtil'
|
import { getInitialValuesBase, getValidationSchemaBase } from '../../formUtil'
|
||||||
|
|
@ -19,6 +20,9 @@ const BaseFormContainer = ({handleFormSubmit,Loading,handleValidateBaseQuestion}
|
||||||
navigate(-1);
|
navigate(-1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="QuestionPractical">
|
<div className="QuestionPractical">
|
||||||
<header>
|
<header>
|
||||||
|
|
@ -31,10 +35,11 @@ const BaseFormContainer = ({handleFormSubmit,Loading,handleValidateBaseQuestion}
|
||||||
initialValues={getInitialValuesBase({} as any)}
|
initialValues={getInitialValuesBase({} as any)}
|
||||||
validationSchema={getValidationSchemaBase}
|
validationSchema={getValidationSchemaBase}
|
||||||
enableReinitialize
|
enableReinitialize
|
||||||
|
|
||||||
>
|
>
|
||||||
{({ values,isValid,handleSubmit ,dirty}) => (
|
{({ values,isValid,handleSubmit ,dirty}) => (
|
||||||
|
|
||||||
<Form className="w-100">
|
<Form className="w-100">
|
||||||
<main className="w-100 exercise_add_main">
|
<main className="w-100 exercise_add_main">
|
||||||
<Header />
|
<Header />
|
||||||
<BaseForm />
|
<BaseForm />
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ const Dummy = () => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="DummyHomePage">
|
<div className="DummyHomePage">
|
||||||
{/* <div>mohammed karim -_- </div> */}
|
<div>mohammed karim -_- </div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user