diff --git a/.env b/.env index b559ed3..d8ea894 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ VITE_TOKEN_NAME = 'dzone_token' VITE_REFRESH_TOKEN_NAME = 'dzone_refresh_token' VITE_BASE_URL = 'https://api-dzone.danakcorp.com' +# VITE_BASE_URL = 'http://172.28.231.88:4000' # VITE_BASE_URL = 'https://nhrq9m1d-4000.eun1.devtunnels.ms' VITE_SLUG_ID = 'slug_id' \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 8b6a92b..20a7320 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5263,7 +5263,7 @@ "version": "5.6.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", diff --git a/src/pages/request/Request.tsx b/src/pages/request/Request.tsx index ade15eb..d01cc6b 100644 --- a/src/pages/request/Request.tsx +++ b/src/pages/request/Request.tsx @@ -59,6 +59,7 @@ const Request: FC = () => { coverImageUrl: '', industryId: '', chiefExecutiveOfficer: '', + metrage: undefined, products: [], services: [], }, @@ -73,6 +74,7 @@ const Request: FC = () => { description: Yup.string().required(t('errors.required')), websiteUrl: Yup.string().url(t('errors.invalid_url')).required(t('errors.required')), industryId: Yup.string().required(t('errors.required')), + metrage: Yup.number().optional(), }), onSubmit: async (values) => { values.dateOfEstablishment = moment(values.dateOfEstablishment, 'jYYYY-jMM-jDD').format('YYYY-MM-DD') @@ -213,6 +215,7 @@ const Request: FC = () => { coverImageUrl: companyData.coverImageUrl || '', industryId: companyData.industry?.id || '', chiefExecutiveOfficer: companyData.user?.fullName || '', + metrage: companyData.metrage ?? undefined, products: [], services: [], }) @@ -285,6 +288,15 @@ const Request: FC = () => { /> + formik.setFieldValue('metrage', e.target.value === '' ? undefined : Number(e.target.value))} + error_text={formik.touched.metrage && formik.errors.metrage ? formik.errors.metrage : ''} + /> +
{ items={industries?.data?.industries?.map((industry: IndustryItemType) => ({ label: industry.title, value: industry.id })) || []} onChange={formik.handleChange} error_text={formik.touched.industryId && formik.errors.industryId ? formik.errors.industryId : ''} + placeholder='انتخاب صنعت' />