Merge pull request #889 from BinaryStudioAcademy/fix/bt-887-chat-layo…

…ut-fix bt-887: * layout-fixes
BinaryStudioAcademy · Sep 30, 2023 · 1e609bc · 1e609bc
2 parents 5f6771a + 19d935a
commit 1e609bc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/frontend/src/bundles/auth/components/auth-forms/sign-in-form/styles.module.scss b/frontend/src/bundles/auth/components/auth-forms/sign-in-form/styles.module.scss
@@ -20,6 +20,8 @@
 
     & .forgot {
         width: unset;
+        color: var(--st-tropaz);
         font-size: var(--font-size-body);
+        text-decoration: none;
     }
 }
diff --git a/frontend/src/bundles/chat/components/company-info/company-employer/company-employer.tsx b/frontend/src/bundles/chat/components/company-info/company-employer/company-employer.tsx
@@ -93,8 +93,11 @@ const CompanyEmployer: React.FC<Properties> = ({
                 <FormControl className={styles.hireCandidates}>
                     {!talentIsHired && (
                         <>
-                            <Typography variant="label">
-                                Have the company hired you?
+                            <Typography
+                                variant="label"
+                                className={styles.hireRadioLabel}
+                            >
+                                Has the company hired you?
                             </Typography>
                             <RadioGroup
                                 control={control}

diff --git a/frontend/src/bundles/chat/components/company-info/styles.module.scss b/frontend/src/bundles/chat/components/company-info/styles.module.scss
@@ -136,3 +136,16 @@
     padding: 5px;
     text-align: center;
 }
+
+.radio {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 10px;
+}
+
+.hireRadioLabel {
+    margin-top: 20px;
+    text-align: center;
+}
diff --git a/frontend/src/helpers/parse-messages.helper.tsx b/frontend/src/helpers/parse-messages.helper.tsx
@@ -3,13 +3,17 @@ import { Tooltip } from '~/bundles/common/components/components.js';
 const URL_REGEX =
     /^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/|www\.|localhost:)?(localhost|[\da-z]+([.-][\da-z]+)*\.[a-z]{2,5}(:\d{1,5})?(\/.*)?)$/gm;
 
+const GENERAL_LINK_REGEX = /^http:\/\/.*$/gm;
+
 const parseMessage = (message: string): JSX.Element => {
     const words = message.split(' ');
     return (
         <span>
             {words.map((word) => {
                 const [link, specialPrefix] = word.split('_&_').reverse();
-                const isLink = URL_REGEX.test(link);
+                const isLink =
+                    URL_REGEX.test(link) || GENERAL_LINK_REGEX.test(link);
+
                 const isCVLink = isLink && specialPrefix === 'CV';
                 const isProfileLink = isLink && specialPrefix === 'Profile';
                 const isVacancyPosition =