From 74d2da78d698c8481ec825746bed699c8d88826a Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Tue, 20 Aug 2024 12:57:23 +0200 Subject: [PATCH] : --- src/assets/scss/components/appForm.scss | 8 + src/assets/scss/components/appPage.scss | 1 + .../components/DatepickerRange/index.js | 23 +- .../FormField/components/Fileupload/index.js | 5 +- .../FormFieldRepeaterCriteria/index.js | 69 ++-- src/pages/Bando/index.js | 254 -------------- src/pages/BandoEdit/index.js | 318 ++++++++++++++++++ src/pages/BandoEditForms/index.js | 34 ++ src/pages/BandoView/index.js | 97 ++++++ src/routes.js | 9 +- 10 files changed, 519 insertions(+), 299 deletions(-) delete mode 100644 src/pages/Bando/index.js create mode 100644 src/pages/BandoEdit/index.js create mode 100644 src/pages/BandoEditForms/index.js create mode 100644 src/pages/BandoView/index.js diff --git a/src/assets/scss/components/appForm.scss b/src/assets/scss/components/appForm.scss index 4a55012..60f0dd4 100644 --- a/src/assets/scss/components/appForm.scss +++ b/src/assets/scss/components/appForm.scss @@ -40,6 +40,14 @@ } } } +.appForm__oneCol { + display: flex; + flex-direction: column; + + label { + font-weight: 400; + } +} .appForm__twoCols { display: flex; gap: 1rem; diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index e0844b0..588ee27 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -14,6 +14,7 @@ .appPageSection { display: flex; flex-direction: column; + align-items: flex-start; h2 { color: var(--Black); diff --git a/src/components/FormField/components/DatepickerRange/index.js b/src/components/FormField/components/DatepickerRange/index.js index 2868e2b..ac53c09 100644 --- a/src/components/FormField/components/DatepickerRange/index.js +++ b/src/components/FormField/components/DatepickerRange/index.js @@ -1,7 +1,9 @@ import React from 'react'; import { classNames } from 'primereact/utils'; +import { isEmpty, isNil } from 'ramda'; + +// components import { Controller } from 'react-hook-form'; -import { isNil } from 'ramda'; import { Calendar } from 'primereact/calendar'; const DatepickerRange = ({ @@ -15,6 +17,7 @@ const DatepickerRange = ({ minDate = null, maxDate = null }) => { + const datesDefaultValue = !isNil(defaultValue) && !isEmpty(defaultValue) && defaultValue.length ? defaultValue.map(v => new Date(v)) : []; return ( <>