From 8d156cf3c4e4545f4944f44466e755255b96e794 Mon Sep 17 00:00:00 2001 From: ulyasaur Date: Sat, 3 Aug 2024 13:55:04 +0300 Subject: [PATCH 1/3] fix styles for sources component --- .../SourcesBlock/Sources.styles.scss | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/src/features/StreetcodePage/SourcesBlock/Sources.styles.scss b/src/features/StreetcodePage/SourcesBlock/Sources.styles.scss index cf1691c84..5f5067f9a 100644 --- a/src/features/StreetcodePage/SourcesBlock/Sources.styles.scss +++ b/src/features/StreetcodePage/SourcesBlock/Sources.styles.scss @@ -111,25 +111,53 @@ } } @media screen and (max-width: 1024px) { - @include mut.sized($width: 755px); + @include mut.sized(100%, auto); + .slick-list { + margin-left: 0; + margin-right: 0; + } } @media screen and (max-width: 940px) { - @include mut.sized($width: 655px); + @include mut.sized(100%, auto); + .slick-list { + margin-left: 0; + margin-right: 0; + } } @media screen and (max-width: 829px) { - @include mut.sized($width: 530px); + @include mut.sized(100%, auto); + .slick-list { + margin-left: 0; + margin-right: 0; + } } @media screen and (max-width: 715px) { - @include mut.sized($width: 450px); + @include mut.sized(100%, auto); + .slick-list { + margin-left: 0; + margin-right: 0; + } } @media screen and (max-width: 630px) { - @include mut.sized($width: 380px); + @include mut.sized(100%, auto); + .slick-list { + margin-left: 0; + margin-right: 0; + } } @media screen and (max-width: 560px) { - @include mut.sized($width: 265px); + @include mut.sized(100%, auto); + .slick-list { + margin-left: 0; + margin-right: 0; + } } @media screen and (max-width: 455px) { - @include mut.sized($width: 205px); + @include mut.sized(100%, auto); + .slick-list { + margin-left: 0; + margin-right: 0; + } } } From 9509155991ba0c72198a1e22a34260172ed5c8b3 Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 1 Aug 2024 23:33:01 +0300 Subject: [PATCH 2/3] feat: added sorting for team positions on admin panel --- .../TeamPositionsPage/TeamPositionsMainPage.component.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/features/AdminPage/TeamPositionsPage/TeamPositionsMainPage.component.tsx b/src/features/AdminPage/TeamPositionsPage/TeamPositionsMainPage.component.tsx index 6870983f1..84197e82e 100644 --- a/src/features/AdminPage/TeamPositionsPage/TeamPositionsMainPage.component.tsx +++ b/src/features/AdminPage/TeamPositionsPage/TeamPositionsMainPage.component.tsx @@ -39,6 +39,9 @@ const TeamPositionsMainPage: React.FC = observer(() => { ); }, + sorter: (a, b) => a.position.localeCompare(b.position), + sortDirections: ['ascend', 'descend', 'ascend'], + defaultSortOrder: 'ascend', }, { title: 'Дії', From 52ea820c5331c01f7913b85a09a7709f50c3fc08 Mon Sep 17 00:00:00 2001 From: DDeviak <117632082+DDeviak@users.noreply.github.com> Date: Wed, 11 Sep 2024 23:11:07 +0300 Subject: [PATCH 3/3] chore: Added the `hl` prop with the value 'uk' to the ReCAPTCHA to display it in Ukrainian language --- .../common/components/ContactForm/ContactForm.component.tsx | 3 ++- .../components/modals/Partners/PartnersModal.component.tsx | 3 ++- src/features/AdminPage/Login/AdminLogin.component.tsx | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/common/components/ContactForm/ContactForm.component.tsx b/src/app/common/components/ContactForm/ContactForm.component.tsx index 25a584515..30c6ccf7c 100644 --- a/src/app/common/components/ContactForm/ContactForm.component.tsx +++ b/src/app/common/components/ContactForm/ContactForm.component.tsx @@ -18,7 +18,7 @@ interface Props { const ContactForm = forwardRef((customClass: Props, ref) => { const [formData, setFormData] = useState({ email: '', message: '' }); const [isVerified, setIsVerified] = useState(false); - const [messageApi, messageContextHolder] = message.useMessage({maxCount: 3}); + const [messageApi, messageContextHolder] = message.useMessage({ maxCount: 3 }); const [form] = Form.useForm(); const recaptchaRef = useRef(null); const siteKey = window._env_.RECAPTCHA_SITE_KEY; @@ -139,6 +139,7 @@ const ContactForm = forwardRef((customClass: Props, ref) => { onChange={handleVerify} onExpired={handleExpiration} ref={recaptchaRef} + hl='uk' /> diff --git a/src/app/common/components/modals/Partners/PartnersModal.component.tsx b/src/app/common/components/modals/Partners/PartnersModal.component.tsx index 7380f2e32..3259ce363 100644 --- a/src/app/common/components/modals/Partners/PartnersModal.component.tsx +++ b/src/app/common/components/modals/Partners/PartnersModal.component.tsx @@ -25,7 +25,7 @@ const PartnersModal = () => { const { setModal, modalsState: { partners } } = modalStore; const [form] = Form.useForm(); const [formData, setFormData] = useState({ email: '', message: '' }); - const [messageApi, messageContextHolder] = message.useMessage({maxCount: 3}); + const [messageApi, messageContextHolder] = message.useMessage({ maxCount: 3 }); const [isVerified, setIsVerified] = useState(false); const recaptchaRef = useRef(null); const siteKey = window._env_.RECAPTCHA_SITE_KEY; @@ -181,6 +181,7 @@ const PartnersModal = () => { onChange={handleVerify} onExpired={handleExpiration} ref={recaptchaRef} + hl='uk' /> diff --git a/src/features/AdminPage/Login/AdminLogin.component.tsx b/src/features/AdminPage/Login/AdminLogin.component.tsx index e1944ec21..5f16c2838 100644 --- a/src/features/AdminPage/Login/AdminLogin.component.tsx +++ b/src/features/AdminPage/Login/AdminLogin.component.tsx @@ -13,7 +13,7 @@ import { ERROR_MESSAGES, INVALID_LOGIN_ATTEMPT } from '@/app/common/constants/er import FRONTEND_ROUTES from '@/app/common/constants/frontend-routes.constants'; import AuthService from '@/app/common/services/auth-service/AuthService'; -const AdminLogin:React.FC = () => { +const AdminLogin: React.FC = () => { const navigate = useNavigate(); const [form] = Form.useForm(); const [isVerified, setIsVerified] = useState(false); @@ -70,6 +70,7 @@ const AdminLogin:React.FC = () => { onChange={handleVerify} onExpired={handleExpiration} ref={recaptchaRef} + hl='uk' />