From cdf06c79840c5631d16b1c5eeb8bf21e5e97bbe1 Mon Sep 17 00:00:00 2001
From: Victor Batischev <office@edoldnr.ru>
Date: Mon, 4 Dec 2023 19:28:40 +0300
Subject: [PATCH] fix mobile resolution

---
 package.json                                     |  2 +-
 src/components/AuthBlock/AuthBlock.js            | 12 ++++--------
 src/components/AuthBox/AuthBox.jsx               |  4 ++--
 src/components/AuthBox/authBox.scss              |  5 ++++-
 src/components/Form/Form.jsx                     |  4 ++--
 src/components/FreeDevelopers/FreeDevelopers.jsx |  2 +-
 src/components/Modal/ModalReset/ModalReset.js    |  2 +-
 .../ModalResetPassword/ModalResetPassword.jsx    |  8 ++++----
 .../Modal/Tracker/TrackerModal/TrackerModal.jsx  |  2 +-
 src/components/Navigation/Navigation.jsx         |  2 +-
 .../ProfileBreadcrumbs/profileBreadcrumbs.scss   | 10 +---------
 .../ProfileCalendar/ProfileCalendar.jsx          |  2 +-
 .../ProfileCalendar/profileCalendar.scss         |  1 -
 src/index.css                                    |  4 ----
 src/index.js                                     |  2 +-
 src/pages/PartnerSettings/PartnerSettings.jsx    |  4 ++--
 src/pages/Profile/Profile.js                     |  6 +++---
 src/pages/ProfileCandidate/ProfileCandidate.js   |  2 +-
 .../RegistrationForCandidate.js                  | 14 +++++++-------
 src/pages/Summary/Summary.js                     | 10 +++++-----
 src/pages/Summary/summary.scss                   | 16 ++++++----------
 .../TrackerRegistration/TrackerRegistration.js   | 10 +++++-----
 src/utils/helper.js                              |  2 +-
 23 files changed, 54 insertions(+), 72 deletions(-)

diff --git a/package.json b/package.json
index 00860ff1..af9978a4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "version": "0.1.0",
   "private": true,
-  "homepage": "https://html.craft-group.xyz/",
+  "homepage": "https://itguild.info/",
   "dependencies": {
     "@ckeditor/ckeditor5-build-classic": "^38.0.1",
     "@ckeditor/ckeditor5-react": "^6.0.0",
diff --git a/src/components/AuthBlock/AuthBlock.js b/src/components/AuthBlock/AuthBlock.js
index b3c0f862..6d1f55e8 100644
--- a/src/components/AuthBlock/AuthBlock.js
+++ b/src/components/AuthBlock/AuthBlock.js
@@ -13,10 +13,10 @@ export const AuthBlock = ({ title, description, img, resetModal }) => {
         <p>{description}</p>
       </div>
       <form className="auth__form">
-        <label htmlFor="login">Ваш email *</label>
-        <input id="login" type="text" name="username" placeholder="Email" />
+        <label htmlFor="login">Ваш e-mail</label>
+        <input id="login" type="text" name="username" placeholder="E-mail" />
 
-        <label htmlFor="password">Ваш пароль*</label>
+        <label htmlFor="password">Ваш пароль</label>
         <input
           id="password"
           type="password"
@@ -24,11 +24,7 @@ export const AuthBlock = ({ title, description, img, resetModal }) => {
           placeholder="Пароль"
         />
         <div className="auth__form__buttons">
-          <button
-            onClick={(e) => {
-              e.preventDefault();
-            }}
-          >
+          <button onClick={(e) => e.preventDefault()}>
             Войти
           </button>
           <span onClick={() => resetModal(true)}>Восстановить пароль</span>
diff --git a/src/components/AuthBox/AuthBox.jsx b/src/components/AuthBox/AuthBox.jsx
index ce1452bc..855d8cc8 100644
--- a/src/components/AuthBox/AuthBox.jsx
+++ b/src/components/AuthBox/AuthBox.jsx
@@ -85,10 +85,10 @@ export const AuthBox = ({ title }) => {
         </div>
       )}
       <form ref={ref} className="auth-box__form">
-        <label htmlFor="login">Ваш email *</label>
+        <label htmlFor="login">Ваш e-mail</label>
         <input id="login" type="text" name="username" placeholder="Логин" />
 
-        <label htmlFor="password">Ваш пароль*</label>
+        <label htmlFor="password">Ваш пароль</label>
         <div className="inputWrapper">
           <input
             id="password"
diff --git a/src/components/AuthBox/authBox.scss b/src/components/AuthBox/authBox.scss
index 519b3c09..f07d4837 100644
--- a/src/components/AuthBox/authBox.scss
+++ b/src/components/AuthBox/authBox.scss
@@ -102,6 +102,10 @@
         position: absolute;
         right: 20px;
         top: 15px;
+
+        @media (min-width: 576px) {
+          left: 330px;
+        }
       }
     }
 
@@ -153,7 +157,6 @@
       letter-spacing: normal;
       line-height: 32px;
       text-align: center;
-      border: 2px solid #6aaf5c;
       margin-right: 1.5rem;
       transition: 0.3s;
 
diff --git a/src/components/Form/Form.jsx b/src/components/Form/Form.jsx
index b3bc2524..ff3c8a52 100644
--- a/src/components/Form/Form.jsx
+++ b/src/components/Form/Form.jsx
@@ -85,13 +85,13 @@ const Form = () => {
     <div className="row">
       <div className="col-sm-12">
         <form className="form" id="test">
-          <label htmlFor="email">Емейл:</label>
+          <label htmlFor="email">E-mail:</label>
           <input
             onChange={handleChange}
             id="email"
             name="Email"
             type="email"
-            placeholder="Емейл"
+            placeholder="E-mail"
             value={data.email}
           />
 
diff --git a/src/components/FreeDevelopers/FreeDevelopers.jsx b/src/components/FreeDevelopers/FreeDevelopers.jsx
index 34798e78..39c82aa2 100644
--- a/src/components/FreeDevelopers/FreeDevelopers.jsx
+++ b/src/components/FreeDevelopers/FreeDevelopers.jsx
@@ -86,7 +86,7 @@ export const FreeDevelopers = () => {
           </div>
 
           <div className="login">
-            <h3>Для просмотра полного резюме разработчика авторизуйтесь</h3>
+            <h3>Для просмотра полного резюме разработчика, авторизуйтесь</h3>
             <BaseButton styles={"dev-code"}>
               <Link to={"/auth"}>Войти</Link>
             </BaseButton>
diff --git a/src/components/Modal/ModalReset/ModalReset.js b/src/components/Modal/ModalReset/ModalReset.js
index 693d1922..e3395543 100644
--- a/src/components/Modal/ModalReset/ModalReset.js
+++ b/src/components/Modal/ModalReset/ModalReset.js
@@ -10,7 +10,7 @@ export const ModalReset = ({ setModalReset }) => {
       <h3 className="modalReset__title">Восстановление доступа</h3>
       <div className="modalReset__input">
         <span>Укажите e-mail, для которого хотите восстановить пароль.</span>
-        <input placeholder="email" />
+        <input placeholder="e-mail" />
       </div>
       <button className="modalReset__submit">Восстановить</button>
       <img
diff --git a/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx b/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx
index 4fc87249..80fa5f29 100644
--- a/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx
+++ b/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx
@@ -50,7 +50,7 @@ export const ModalResetPassword = ({ active, setActive }) => {
       setInputsError((prevValue) => ({ ...prevValue, email: true }));
       return showNotification({
         show: true,
-        text: "Введите корректный email",
+        text: "Введите корректный e-mail",
         type: "error",
       });
     }
@@ -127,7 +127,7 @@ export const ModalResetPassword = ({ active, setActive }) => {
         <h3 className="resetPassword__title">Восстановление пароля</h3>
         {!step ? (
           <div className="resetPassword__email">
-            <h5>Введите email:</h5>
+            <h5>Введите e-mail:</h5>
             <input
               type="email"
               onChange={(e) => {
@@ -141,12 +141,12 @@ export const ModalResetPassword = ({ active, setActive }) => {
                   token: false,
                 });
               }}
-              placeholder="Email"
+              placeholder="E-mail"
               value={inputsValue.email}
               className={inputsError.email ? "error" : ""}
             />
             {inputsError.email && (
-              <span className="warningText">Введите корректный email</span>
+              <span className="warningText">Введите корректный e-mail</span>
             )}
             {loader ? (
               <Loader style={"green"} />
diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
index b295346e..560f2054 100644
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@@ -468,7 +468,7 @@ export const TrackerModal = ({
                   <div className="input-container invitePersonBlock__input">
                     <input
                       className="name-project"
-                      placeholder="email"
+                      placeholder="e-mail"
                       type="email"
                     />
                   </div>
diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx
index 855e36e0..4d0ec579 100644
--- a/src/components/Navigation/Navigation.jsx
+++ b/src/components/Navigation/Navigation.jsx
@@ -26,7 +26,7 @@ export const Navigation = () => {
       },
       {
         path: "/calendar",
-        name: "Отчетность",
+        name: "Отчеты",
       },
       {
         path: "/tracker",
diff --git a/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss b/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss
index 72d809cc..e7a1e744 100644
--- a/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss
+++ b/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss
@@ -9,7 +9,7 @@
   a {
     color: #5b6871;
     font-weight: 400;
-    font-size: 12px;
+    font-size: 13px;
     line-height: 16px;
     transition: 0.3s all ease;
     position: relative;
@@ -17,14 +17,6 @@
     display: flex;
     align-items: center;
 
-    @media (max-width: 525px) {
-      font-size: 10px;
-    }
-
-    @media (max-width: 455px) {
-      font-size: 9px;
-    }
-
     &:hover {
       text-decoration: none;
       color: #000000;
diff --git a/src/components/ProfileCalendar/ProfileCalendar.jsx b/src/components/ProfileCalendar/ProfileCalendar.jsx
index 005d0571..b609f821 100644
--- a/src/components/ProfileCalendar/ProfileCalendar.jsx
+++ b/src/components/ProfileCalendar/ProfileCalendar.jsx
@@ -89,7 +89,7 @@ export const ProfileCalendar = () => {
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/profile" },
-            { name: "Ваша отчетность", link: "/profile/calendar" },
+            { name: "Отчеты", link: "/profile/calendar" },
           ]}
         />
         <h2 className="summary__title">Ваши отчеты</h2>
diff --git a/src/components/ProfileCalendar/profileCalendar.scss b/src/components/ProfileCalendar/profileCalendar.scss
index 7c31ebac..89dfb84e 100644
--- a/src/components/ProfileCalendar/profileCalendar.scss
+++ b/src/components/ProfileCalendar/profileCalendar.scss
@@ -78,7 +78,6 @@
         margin: 0;
         max-width: 220px;
         overflow: hidden;
-        white-space: nowrap;
         text-overflow: ellipsis;
       }
     }
diff --git a/src/index.css b/src/index.css
index a143b554..53f994d4 100644
--- a/src/index.css
+++ b/src/index.css
@@ -18,10 +18,6 @@ code {
     monospace;
 }
 
-h1 {
-
-}
-
 .container {
   position: relative !important;
 }
diff --git a/src/index.js b/src/index.js
index cedc262f..d03a525d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,5 +9,5 @@ import { store } from "./store/store";
 ReactDOM.createRoot(document.getElementById("root")).render(
   <Provider store={store}>
     <App />
-  </Provider>,
+  </Provider>
 );
diff --git a/src/pages/PartnerSettings/PartnerSettings.jsx b/src/pages/PartnerSettings/PartnerSettings.jsx
index 0da8c847..b2a71677 100644
--- a/src/pages/PartnerSettings/PartnerSettings.jsx
+++ b/src/pages/PartnerSettings/PartnerSettings.jsx
@@ -88,11 +88,11 @@ export const PartnerSettings = () => {
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/profile" },
-            { name: "Настройка профиля", link: "/profile/settings" },
+            { name: "Настройки", link: "/profile/settings" },
           ]}
         />
         <div className="partner-settings">
-          <h2 className="infoPersonal__title">Настройки акаунта</h2>
+          <h2 className="infoPersonal__title">Настройки профиля</h2>
           <div className="partner-settings__body">
             <div className="partner-settings__login">
               <h3 className="settings__title">Вход в систему</h3>
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 11bf86e7..b9b82b05 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -36,7 +36,7 @@ export const Profile = () => {
       {
         path: "profile/summary",
         img: summaryIcon,
-        title: "Данные и резюме",
+        title: "Резюме",
         description: "Ваше резюме<br/><span>заполнено</span>",
       },
       {
@@ -54,7 +54,7 @@ export const Profile = () => {
       {
         path: "profile/settings",
         img: settingIcon,
-        title: "Настройки аккаунта",
+        title: "Настройки профиля",
         description: "Перейдите чтобы начать<br/> редактирование",
       },
     ],
@@ -87,7 +87,7 @@ export const Profile = () => {
       {
         path: "profile/settings",
         img: settingIcon,
-        title: "Настройки аккаунта",
+        title: "Настройки профиля",
         description: "Перейдите чтобы начать<br/> редактирование",
       },
     ],
diff --git a/src/pages/ProfileCandidate/ProfileCandidate.js b/src/pages/ProfileCandidate/ProfileCandidate.js
index 8fca2cbd..1402f82b 100644
--- a/src/pages/ProfileCandidate/ProfileCandidate.js
+++ b/src/pages/ProfileCandidate/ProfileCandidate.js
@@ -25,7 +25,7 @@ export const ProfileCandidate = () => {
     {
       path: "profile/settings",
       img: settingIcon,
-      title: "Настройки аккаунта",
+      title: "Настройки профиля",
       description: "Перейдите чтобы начать редактирование",
     },
   ]);
diff --git a/src/pages/RegistrationForCandidate/RegistrationForCandidate.js b/src/pages/RegistrationForCandidate/RegistrationForCandidate.js
index 1e609f0c..42dca947 100644
--- a/src/pages/RegistrationForCandidate/RegistrationForCandidate.js
+++ b/src/pages/RegistrationForCandidate/RegistrationForCandidate.js
@@ -41,7 +41,7 @@ export const RegistrationForCandidate = () => {
             </div>
             <form className="registrationCandidate__form">
               <div className="registrationCandidate__form__input">
-                <label htmlFor="name">Ваше имя *</label>
+                <label htmlFor="name">Ваше имя</label>
                 <input id="name" type="text" placeholder="Имя" />
               </div>
               <div className="registrationCandidate__form__input">
@@ -49,19 +49,19 @@ export const RegistrationForCandidate = () => {
                 <input id="summary" type="text" placeholder="Резюме" />
               </div>
               <div className="registrationCandidate__form__input">
-                <label htmlFor="email">Ваш email *</label>
-                <input id="email" type="text" placeholder="Email" />
+                <label htmlFor="email">Ваш e-mail</label>
+                <input id="email" type="text" placeholder="E-mail" />
               </div>
               <div className="registrationCandidate__form__input">
-                <label htmlFor="tg">Ваш телеграм*</label>
-                <input id="tg" type="text" placeholder="Телеграм" />
+                <label htmlFor="tg">Ваш telegram</label>
+                <input id="tg" type="text" placeholder="Telegram" />
               </div>
               <div className="registrationCandidate__form__input">
-                <label htmlFor="password">Придумайте пароль*</label>
+                <label htmlFor="password">Придумайте пароль</label>
                 <input id="password" type="text" placeholder="Пароль" />
               </div>
               <div className="registrationCandidate__form__input">
-                <label htmlFor="secondPassword">Повторите пароль*</label>
+                <label htmlFor="secondPassword">Повторите пароль</label>
                 <input id="secondPassword" type="text" placeholder="Пароль" />
               </div>
               <div className="registrationCandidate__form__submit">
diff --git a/src/pages/Summary/Summary.js b/src/pages/Summary/Summary.js
index 63e1acc3..64f64702 100644
--- a/src/pages/Summary/Summary.js
+++ b/src/pages/Summary/Summary.js
@@ -59,7 +59,7 @@ export const Summary = () => {
           <ProfileBreadcrumbs
             links={[
               { name: "Главная", link: "/profile" },
-              { name: "Данные и резюме", link: "/profile/summary" },
+              { name: "Резюме", link: "/profile/summary" },
             ]}
           />
           <h2 className="summary__title">
@@ -98,7 +98,7 @@ export const Summary = () => {
           <div className="summary__skills skills__section">
             <div className="summary__sections__head">
               <h3>Основной стек</h3>
-              <button>Редактировать раздел</button>
+              <button>Редактировать</button>
             </div>
             <div className="skills__section__items">
               <div className="skills__section__items__wrapper">
@@ -127,7 +127,7 @@ export const Summary = () => {
                     setEditSummeryOpen(!editSummeryOpen);
                   }}
                 >
-                  {editSummeryOpen ? "Сохранить" : "Редактировать раздел"}
+                  {editSummeryOpen ? "Сохранить" : "Редактировать"}
                 </button>
               </div>
               {editSummeryOpen ? (
@@ -165,8 +165,8 @@ export const Summary = () => {
         {openGit && (
           <div className="summary__sectionGit">
             <div className="summary__sections__head">
-              <h3>Страница портфолио кода разработчика</h3>
-              <button>Редактировать раздел</button>
+              <h3>Ваши репозитории</h3>
+              <button>Редактировать</button>
             </div>
             <div className="summary__sectionGitItems">
               {Boolean(gitInfo.length) &&
diff --git a/src/pages/Summary/summary.scss b/src/pages/Summary/summary.scss
index fd3bfc96..01c6a16e 100644
--- a/src/pages/Summary/summary.scss
+++ b/src/pages/Summary/summary.scss
@@ -110,14 +110,6 @@
     font-size: 16px;
     line-height: 32px;
     position: relative;
-    white-space: nowrap;
-
-    //@media (max-width: 915px) {
-    //  max-width: 220px;
-    //  overflow: hidden;
-    //  white-space: nowrap;
-    //  text-overflow: ellipsis;
-    //}
 
     @media (max-width: 690px) {
       font-size: 14px;
@@ -128,13 +120,12 @@
     @media (max-width: 550px) {
       max-width: 200px;
       overflow: hidden;
-      white-space: nowrap;
       text-overflow: ellipsis;
       margin: 0;
     }
 
     @media (max-width: 450px) {
-      max-width: 150px;
+      max-width: 160px;
     }
 
     &:after {
@@ -170,6 +161,11 @@
       width: 120px;
       height: 50px;
     }
+
+    @media (max-width: 450px) {
+      width: 80px;
+      height: 40px;
+    }
   }
 
   &__skills {
diff --git a/src/pages/TrackerRegistration/TrackerRegistration.js b/src/pages/TrackerRegistration/TrackerRegistration.js
index d7038d28..ee811877 100644
--- a/src/pages/TrackerRegistration/TrackerRegistration.js
+++ b/src/pages/TrackerRegistration/TrackerRegistration.js
@@ -31,19 +31,19 @@ export const TrackerRegistration = () => {
           <div className="trackerRegistration__form">
             <div className="trackerRegistration__form__inputs">
               <div className="trackerRegistration__inputContainer">
-                <span>Ваше имя *</span>
+                <span>Ваше имя</span>
                 <input placeholder="Имя" />
               </div>
               <div className="trackerRegistration__inputContainer">
-                <span>Ваш email *</span>
-                <input placeholder="Email" type="email" />
+                <span>Ваш e-mail</span>
+                <input placeholder="E-mail" type="email" />
               </div>
               <div className="trackerRegistration__inputContainer">
-                <span>Придумайте пароль*</span>
+                <span>Придумайте пароль</span>
                 <input placeholder="Пароль" />
               </div>
               <div className="trackerRegistration__inputContainer">
-                <span>Повторите пароль*</span>
+                <span>Повторите пароль</span>
                 <input placeholder="Повторите пароль" />
               </div>
             </div>
diff --git a/src/utils/helper.js b/src/utils/helper.js
index 70e9137e..ac0e0b6e 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -14,7 +14,7 @@ export function createMarkup(text) {
 //       `<div class='experience__block'>
 //         <div class="summary__sections__head">
 //             <h3>Описание опыта работы</h3>
-//             <button>Редактировать раздел</button>
+//             <button>Редактировать</button>
 //         </div>
 //         <div class="experience__content">${item.split("<h3>")[0]}</div>
 //        </div>`