Merge branch 'release/1.1.0' into feature/issue-1692

ita-social-projects · Sep 18, 2024 · ed5688b · ed5688b
2 parents 5ddee61 + 56746ef
commit ed5688b
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 10 deletions.
diff --git 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<ReCAPTCHA>(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'
                     />
                 </div>
                 <Form.Item>

diff --git 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<ReCAPTCHA>(null);
     const siteKey = window._env_.RECAPTCHA_SITE_KEY;
@@ -181,6 +181,7 @@ const PartnersModal = () => {
                                 onChange={handleVerify}
                                 onExpired={handleExpiration}
                                 ref={recaptchaRef}
+                                hl='uk'
                             />
                         </div>
                         <Form.Item>

diff --git 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'
                 />
             </div>
             <Form.Item>

diff --git 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(() => {
                     </div>
                 );
             },
+            sorter: (a, b) => a.position.localeCompare(b.position),
+            sortDirections: ['ascend', 'descend', 'ascend'],
+            defaultSortOrder: 'ascend',
         },
         {
             title: 'Дії',

diff --git 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;
+        }
     }
 }