diff --git a/public/Layout/body_background.png b/public/Layout/body_background.png deleted file mode 100644 index e8afd9e..0000000 Binary files a/public/Layout/body_background.png and /dev/null differ diff --git a/public/logo.png b/public/logo.png deleted file mode 100644 index 59dc75f..0000000 Binary files a/public/logo.png and /dev/null differ diff --git a/public/logo3.png b/public/logo3.png deleted file mode 100644 index e985fef..0000000 Binary files a/public/logo3.png and /dev/null differ diff --git a/src/Components/Karimalden/View/SelectField.tsx b/src/Components/Karimalden/View/SelectField.tsx deleted file mode 100644 index 7cc69ee..0000000 --- a/src/Components/Karimalden/View/SelectField.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import { Form, Select } from 'antd' -import React from 'react' -import useFormField from '../../../Hooks/useFormField'; - -const SelectField = ({ name, label, placeholder, isDisabled,option,isMulti,onChange, props}: any) => { - - const { errorMsg, isError, t ,formik} = useFormField(name, props) - const SelecthandleChange = (value: { value: string; label: React.ReactNode }) => { - formik.setFieldValue(name, value) - - }; - return ( -
- - - + +
+ ) +} + +export default SelectField \ No newline at end of file diff --git a/src/Components/Karimalden/View/Time.tsx b/src/Components/ValidationField/View/Time.tsx similarity index 66% rename from src/Components/Karimalden/View/Time.tsx rename to src/Components/ValidationField/View/Time.tsx index 3755818..08054e1 100644 --- a/src/Components/Karimalden/View/Time.tsx +++ b/src/Components/ValidationField/View/Time.tsx @@ -2,17 +2,17 @@ import { Form, TimePicker } from 'antd' import React from 'react' import useFormField from '../../../Hooks/useFormField'; -const Time = ({ name, label,props }: any) => { +const Time = ({ name, label, props }: any) => { const { errorMsg, isError, t, formik } = useFormField(name, props) const onCalendarChange = (value: any) => { - + formik.setFieldValue(name, value) }; return ( -
+
@@ -21,12 +21,12 @@ const Time = ({ name, label,props }: any) => { validateStatus={isError ? "error" : ""} help={isError ? errorMsg : ""} > - - + + diff --git a/src/Components/Karimalden/View/index.tsx b/src/Components/ValidationField/View/index.tsx similarity index 100% rename from src/Components/Karimalden/View/index.tsx rename to src/Components/ValidationField/View/index.tsx diff --git a/src/Components/Karimalden/index.tsx b/src/Components/ValidationField/index.tsx similarity index 100% rename from src/Components/Karimalden/index.tsx rename to src/Components/ValidationField/index.tsx diff --git a/src/Extensions/FileGenerator/generateForm.js b/src/Extensions/FileGenerator/generateForm.js index c2e74aa..5ad326f 100644 --- a/src/Extensions/FileGenerator/generateForm.js +++ b/src/Extensions/FileGenerator/generateForm.js @@ -12,7 +12,7 @@ if (!fileName) { let FileContiner = ` import React from 'react' import { Col, Row } from 'reactstrap'; -import KarimField from '../../Components/Karimalden/KarimField'; +import ValidationField from '../../Components/Karimalden/ValidationField'; import { FakeSelectData } from '../../Layout/app/Const'; import { useFormikContext } from 'formik'; @@ -27,7 +27,7 @@ function Form${capitalizeFirstLetter(fileName)}() { {/* name from form utils */} - + @@ -43,8 +43,8 @@ export default Form${capitalizeFirstLetter(fileName)} ` -fs.writeFileSync('src/Pages/'+fileName+'/Form'+ capitalizeFirstLetter(fileName)+".tsx", -FileContiner +fs.writeFileSync('src/Pages/' + fileName + '/Form' + capitalizeFirstLetter(fileName) + ".tsx", + FileContiner ); console.log(`File "${fileName}" generated successfully.`); diff --git a/src/Layout/app/Types.tsx b/src/Layout/app/Types.tsx index 315992f..3381cdc 100644 --- a/src/Layout/app/Types.tsx +++ b/src/Layout/app/Types.tsx @@ -1,19 +1,19 @@ -export interface FormTableState { - objectToEdit: any[]; - OpenEdit: boolean; - OpenAdd: boolean; - } +export interface FormTableState { + objectToEdit: any[]; + OpenEdit: boolean; + OpenAdd: boolean; +} - export type KarimFieldProps = { - name: string; - name2?: string; - type: string; - placeholder?: string; - label?: string; - className?: string; - option?: any; - isMulti?: boolean; - Disabled?: boolean; - group ? : boolean; - dir?:'rtl' | 'ltr' - }; \ No newline at end of file +export type ValidationFieldProps = { + name: string; + name2?: string; + type: string; + placeholder?: string; + label?: string; + className?: string; + option?: any; + isMulti?: boolean; + Disabled?: boolean; + group?: boolean; + dir?: 'rtl' | 'ltr' +}; \ No newline at end of file diff --git a/src/Pages/Auth/LoginForm.tsx b/src/Pages/Auth/LoginForm.tsx index 3cd4d7e..719e851 100644 --- a/src/Pages/Auth/LoginForm.tsx +++ b/src/Pages/Auth/LoginForm.tsx @@ -2,26 +2,22 @@ import React from 'react' import { Formik, Form, Field } from 'formik'; import Translate from '../../Components/Utils/Translate'; import { useTranslation } from 'react-i18next'; -import { useNavigate } from 'react-router-dom'; -import { TOKEN_KEY } from '../../config/AppKey'; import { useLoginAdmin } from '../../api/auth'; -import * as Yup from "yup"; import { getInitialValues, getValidationSchema } from './formUtil'; -import KarimField from '../../Components/Karimalden/KarimField'; -import { LoadingButton } from '../../Components/Ui/LoadingButton'; import useNavigateOnSuccess from '../../Hooks/useNavigateOnSuccess'; import useAuthState from '../../lib/state mangment/AuthState'; +import ValidationField from '../../Components/ValidationField/ValidationField'; const LoginForm = () => { const [t] = useTranslation(); - const {mutate , isLoading , isSuccess, data} = useLoginAdmin() - const {login} = useAuthState() + const { mutate, isLoading, isSuccess, data } = useLoginAdmin() + const { login } = useAuthState() - useNavigateOnSuccess(isSuccess , '/' , ()=>login(data as any )) + useNavigateOnSuccess(isSuccess, '/', () => login(data as any)) - const handelSubmit = (values:any)=>{ + const handelSubmit = (values: any) => { console.log(values); mutate(values) @@ -30,7 +26,7 @@ const LoginForm = () => { return (
- Logo + Logo
- { {/* */} - {/* */} diff --git a/src/Pages/Contact/FormContact.tsx b/src/Pages/Contact/FormContact.tsx index 84386c6..dee5c9a 100644 --- a/src/Pages/Contact/FormContact.tsx +++ b/src/Pages/Contact/FormContact.tsx @@ -1,45 +1,43 @@ import React from 'react' import { Col, Row } from 'reactstrap'; -import KarimField from '../../Components/Karimalden/KarimField'; import { FakeSelectData } from '../../Layout/app/Const'; import { useFormikContext } from 'formik'; import { DatePicker } from 'antd'; +import ValidationField from '../../Components/ValidationField/ValidationField'; function FormContact() { const formik = useFormikContext(); const directionArray = [ - {direction:"ltr",value:true}, - {direction:"rtl",value:false}, + { direction: "ltr", value: true }, + { direction: "rtl", value: false }, ]; - const directionOptions = directionArray?.map( (e:any) => ({ - label:e?.direction , - value:e?.value + const directionOptions = directionArray?.map((e: any) => ({ + label: e?.direction, + value: e?.value })) return ( - - {/* name from form utils */} - - - + + {/* name from form utils */} + + + + + + + + - - - - - - + - - - + ) } diff --git a/src/Pages/RecentWorks/FormRecentWorks.tsx b/src/Pages/RecentWorks/FormRecentWorks.tsx index 55a4670..c884b03 100644 --- a/src/Pages/RecentWorks/FormRecentWorks.tsx +++ b/src/Pages/RecentWorks/FormRecentWorks.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Col, Row } from 'reactstrap'; -import KarimField from '../../Components/Karimalden/KarimField'; import { FakeSelectData } from '../../Layout/app/Const'; import { useFormikContext } from 'formik'; import { DatePicker } from 'antd'; +import ValidationField from '../../Components/ValidationField/ValidationField'; function FormRecentWorks() { const formik = useFormikContext(); @@ -14,19 +14,19 @@ function FormRecentWorks() { return ( - - {/* name from form utils */} - - - - - - + + {/* name from form utils */} + + - + + + - - + + + + ) } diff --git a/src/Pages/Services/FormServices.tsx b/src/Pages/Services/FormServices.tsx index 37354b0..dfe7677 100644 --- a/src/Pages/Services/FormServices.tsx +++ b/src/Pages/Services/FormServices.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Col, Row } from 'reactstrap'; -import KarimField from '../../Components/Karimalden/KarimField'; import { FakeSelectData } from '../../Layout/app/Const'; import { useFormikContext } from 'formik'; import { DatePicker } from 'antd'; +import ValidationField from '../../Components/ValidationField/ValidationField'; function FormServices() { const formik = useFormikContext(); @@ -14,19 +14,19 @@ function FormServices() { return ( - - {/* name from form utils */} - - - - - - + + {/* name from form utils */} + + - + + + - - + + + + ) } diff --git a/src/Pages/SocialMedia/FormSocialMedia.tsx b/src/Pages/SocialMedia/FormSocialMedia.tsx index 9fd1d53..35e5028 100644 --- a/src/Pages/SocialMedia/FormSocialMedia.tsx +++ b/src/Pages/SocialMedia/FormSocialMedia.tsx @@ -1,8 +1,8 @@ import React from 'react' import { Col, Row } from 'reactstrap'; -import KarimField from '../../Components/Karimalden/KarimField'; import { useFormikContext } from 'formik'; +import ValidationField from '../../Components/ValidationField/ValidationField'; function FormSocialMedia() { const formik = useFormikContext(); @@ -11,18 +11,18 @@ function FormSocialMedia() { return ( - - - - - - - + + - + + + + - - + + + + ) } diff --git a/src/Pages/StaticInfo/FormStaticInfo.tsx b/src/Pages/StaticInfo/FormStaticInfo.tsx index 4db165f..76b87f6 100644 --- a/src/Pages/StaticInfo/FormStaticInfo.tsx +++ b/src/Pages/StaticInfo/FormStaticInfo.tsx @@ -1,41 +1,41 @@ import React from 'react' import { Col, Row } from 'reactstrap'; -import KarimField from '../../Components/Karimalden/KarimField'; import { FakeSelectData } from '../../Layout/app/Const'; import { useFormikContext } from 'formik'; import { DatePicker } from 'antd'; +import ValidationField from '../../Components/ValidationField/ValidationField'; -function FormStaticInfo({isDisable= false}:{isDisable?:boolean}) { +function FormStaticInfo({ isDisable = false }: { isDisable?: boolean }) { const formik = useFormikContext(); - + const valueTypeArray = [ - {valueType:"string",id:"string"}, - {valueType:"image",id:"image"}, + { valueType: "string", id: "string" }, + { valueType: "image", id: "image" }, ]; - const valueTypeOptions = valueTypeArray?.map( (e:any) => ({ - label:e?.valueType , - value:e?.id + const valueTypeOptions = valueTypeArray?.map((e: any) => ({ + label: e?.valueType, + value: e?.id })) return ( - - {/* name from form utils */} - - - - - + + {/* name from form utils */} + - + + + - + - - + + + + ) } diff --git a/src/Pages/projects/FormProjects.tsx b/src/Pages/projects/FormProjects.tsx index fe7a873..0f47888 100644 --- a/src/Pages/projects/FormProjects.tsx +++ b/src/Pages/projects/FormProjects.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Col, Row } from 'reactstrap'; -import KarimField from '../../Components/Karimalden/KarimField'; import { FakeSelectData } from '../../Layout/app/Const'; import { useFormikContext } from 'formik'; import { DatePicker } from 'antd'; +import ValidationField from '../../Components/ValidationField/ValidationField'; function FormProjects() { const formik = useFormikContext(); @@ -14,19 +14,19 @@ function FormProjects() { return ( - - {/* name from form utils */} - - - - - - + + {/* name from form utils */} + + + + + + - + - - + + ) } diff --git a/src/Pages/works/FormWorks.tsx b/src/Pages/works/FormWorks.tsx index 479d5fd..92a083f 100644 --- a/src/Pages/works/FormWorks.tsx +++ b/src/Pages/works/FormWorks.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Col, Row } from 'reactstrap'; -import KarimField from '../../Components/Karimalden/KarimField'; import { FakeSelectData } from '../../Layout/app/Const'; import { useFormikContext } from 'formik'; import { DatePicker } from 'antd'; +import ValidationField from '../../Components/ValidationField/ValidationField'; function FormWorks() { const formik = useFormikContext(); @@ -14,14 +14,14 @@ function FormWorks() { return ( - - {/* name from form utils */} - - - + + {/* name from form utils */} + - - + + + + ) } diff --git a/src/Styles/Layout/Layout.scss b/src/Styles/Layout/Layout.scss index 1c53573..88dca77 100644 --- a/src/Styles/Layout/Layout.scss +++ b/src/Styles/Layout/Layout.scss @@ -244,12 +244,12 @@ background: var(--bg); background-color:transparent; color:var(--text); } -.react-tabs__tab-panel--selected .KarimField .ant-input-affix-wrapper,.modal-body .KarimField .ant-input-affix-wrapper{ +.react-tabs__tab-panel--selected .ValidationField .ant-input-affix-wrapper,.modal-body .ValidationField .ant-input-affix-wrapper{ background-color:transparent; } /* Input */ -.react-tabs__tab-panel--selected .KarimField input[type=text],.modal-body .KarimField input{ +.react-tabs__tab-panel--selected .ValidationField input[type=text],.modal-body .ValidationField input{ background-color:transparent; color:var(--text)!important; &::placeholder{