Merge pull request #95 from Short-Tracker/refactor/jsx-single-quote

refactor(components): jsx single quote prettier rule
Short-Tracker · Jan 29, 2024 · 8c2e063 · 8c2e063
2 parents 9b53012 + fce9391
commit 8c2e063
Show file tree

Hide file tree

Showing 58 changed files with 403 additions and 380 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -4,6 +4,7 @@
   "singleQuote": true,
   "printWidth": 90,
   "useTabs": false,
+  "jsxSingleQuote": true,
   "tabWidth": 2,
   "endOfLine": "lf"
 }
diff --git a/src/components/App/App.module.scss b/src/components/App/App.module.scss
@@ -1,11 +1,11 @@
 .App {
-    justify-content: center;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    max-width: 1440px;
-    min-width: 320px;
-    box-sizing: border-box;
-    margin: 0 auto;
-    text-rendering: optimizeLegibility;
-  }
+  justify-content: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  max-width: 1440px;
+  min-width: 320px;
+  box-sizing: border-box;
+  margin: 0 auto;
+  text-rendering: optimizeLegibility;
+}
diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx
@@ -22,11 +22,11 @@ const App = () => {
   return (
     <div className={styles.App}>
       <Routes>
-        <Route path="/" element={<Login />} />
-        <Route element={<PrivateRoute path="/" />}>
-          <Route element={<Main />} path="/main" />
+        <Route path='/' element={<Login />} />
+        <Route element={<PrivateRoute path='/' />}>
+          <Route element={<Main />} path='/main' />
         </Route>
-        <Route path="/error" element={<Error />} />
+        <Route path='/error' element={<Error />} />
       </Routes>
       <Toaster />
       <Popup onClose={closeModalState} isOpen={createTaskModal}>

diff --git a/src/components/Calendar/Calendar.tsx b/src/components/Calendar/Calendar.tsx
@@ -32,7 +32,7 @@ const Calendar: FC<TProps> = (props) => {
       <ReactСalendar {...props} onChange={onChange} value={value} locale={ru.code} />
       <div className={styles.buttonWrapper}>
         <UniversalButton
-          type="submit"
+          type='submit'
           onClick={() => handleSubmit(formattedValue)}
           fontSize={12}
           width={248}
@@ -42,7 +42,7 @@ const Calendar: FC<TProps> = (props) => {
         </UniversalButton>
         <UniversalButton
           onClick={handleClose}
-          type="button"
+          type='button'
           fontSize={12}
           width={248}
           isFilled={false}

diff --git a/src/components/Forms/AuthorizationForm/AuthorizationForm.module.scss b/src/components/Forms/AuthorizationForm/AuthorizationForm.module.scss
@@ -1,30 +1,30 @@
 @use '../../../globalStyles/variables.scss' as v;
 @use '../../../globalStyles/mixins.scss' as m;
 .AuthorizationForm {
-    max-width: 320px;
-    max-height: 285px;
+  max-width: 320px;
+  max-height: 285px;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background-color: v.$white-color;
+  border-radius: 12px;
+  margin-top: 60px;
+
+  &__container {
+    padding: 32px 32px 12px 32px;
     width: 100%;
     display: flex;
     flex-direction: column;
     align-items: center;
-    background-color: v.$white-color;
-    border-radius: 12px;
-    margin-top: 60px;
-
-    &__container{
-        padding: 32px 32px 12px 32px;
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-    }
-    &__question {
-        @include m.LinkS;
-        margin-bottom: 28px;
-        color: v.$name-task;
-        text-decoration: none;
-    }
-    &__marginAfterButton {
-        margin-bottom: 32px;
-    }
+  }
+  &__question {
+    @include m.LinkS;
+    margin-bottom: 28px;
+    color: v.$name-task;
+    text-decoration: none;
+  }
+  &__marginAfterButton {
+    margin-bottom: 32px;
+  }
 }
diff --git a/src/components/Forms/AuthorizationForm/AuthorizationForm.tsx b/src/components/Forms/AuthorizationForm/AuthorizationForm.tsx
@@ -23,14 +23,14 @@ const AuthorizationForm = () => {
   return (
     <form className={styles.AuthorizationForm} onSubmit={onSubmitLogin}>
       <div className={styles.AuthorizationForm__container}>
-        <EmailInput id="email" name="email" onChange={handleChange} />
-        <PasswordInput id="password" name="password" onChange={handleChange} />
+        <EmailInput id='email' name='email' onChange={handleChange} />
+        <PasswordInput id='password' name='password' onChange={handleChange} />
       </div>
-      <NavLink to="pass" className={styles.AuthorizationForm__question}>
+      <NavLink to='pass' className={styles.AuthorizationForm__question}>
         Забыли пароль?
       </NavLink>
       <div className={styles.AuthorizationForm__marginAfterButton}>
-        <UniversalButton type="submit">Войти</UniversalButton>
+        <UniversalButton type='submit'>Войти</UniversalButton>
       </div>
     </form>
   );

diff --git a/src/components/GroupTasks/GroupTasks.module.scss b/src/components/GroupTasks/GroupTasks.module.scss
@@ -1,12 +1,12 @@
 .groupTasks {
   border-radius: 8px;
-  border: 1px solid #DCE4F3;
+  border: 1px solid #dce4f3;
 }
 
 .header {
   width: 256px;
   display: flex;
-  background-color:#DCE4F3;
+  background-color: #dce4f3;
   display: flex;
   justify-content: center;
   align-items: center;

diff --git a/src/components/GroupTasks/GroupTasks.tsx b/src/components/GroupTasks/GroupTasks.tsx
@@ -45,7 +45,7 @@ const GroupTasks = () => {
   return (
     <div
       className={styles.groupTasks}
-      role="button"
+      role='button'
       tabIndex={0}
       onClick={handleToggleCollapse}
       onKeyDown={handleKeyDown}

diff --git a/src/components/Header/HeaderEmployer/HeaderEmployer.tsx b/src/components/Header/HeaderEmployer/HeaderEmployer.tsx
@@ -16,30 +16,30 @@ const HeaderEmployer: FC = () => {
       <div className={styles.container}>
         <div className={styles.user}>
           <button className={styles.user_button}>
-            <img className={styles.user_photo} src={avatar} alt="Аватар пользователя" />
+            <img className={styles.user_photo} src={avatar} alt='Аватар пользователя' />
             <h1 className={styles.user_name}>Маша Васильева</h1>
           </button>
         </div>
 
         <ul className={styles.linkWrapper}>
           <li className={styles.navLi}>
-            <Link className={handleClassName('/objectives')} to="/objectives">
+            <Link className={handleClassName('/objectives')} to='/objectives'>
               Поставленные задачи
             </Link>
           </li>
           <li className={styles.navLi}>
-            <Link className={handleClassName('/tasks')} to="/tasks">
+            <Link className={handleClassName('/tasks')} to='/tasks'>
               Мои Задачи
             </Link>
           </li>
           <li className={styles.navLi}>
-            <Link className={handleClassName('/requests')} to="/requests">
+            <Link className={handleClassName('/requests')} to='/requests'>
               Запросы
               <span className={styles.count}>3</span>
             </Link>
           </li>
           <li className={styles.navLi}>
-            <Link className={handleClassName('/archive')} to="/archive">
+            <Link className={handleClassName('/archive')} to='/archive'>
               Архив
             </Link>
           </li>

diff --git a/src/components/Logo/Logo.module.scss b/src/components/Logo/Logo.module.scss
@@ -1,6 +1,6 @@
 .Logo {
-    width: 88px;
-    height: 88px;
-    margin-top: 40px;
-    margin-left: 40px;
-}
+  width: 88px;
+  height: 88px;
+  margin-top: 40px;
+  margin-left: 40px;
+}
diff --git a/src/components/Logo/Logo.tsx b/src/components/Logo/Logo.tsx
@@ -5,7 +5,7 @@ import styles from './Logo.module.scss';
 const Logo = () => {
   return (
     <div className={styles.Logo}>
-      <img src={logo} alt="Логотип" />
+      <img src={logo} alt='Логотип' />
     </div>
   );
 };

diff --git a/src/components/Popup/CreateTask/CreateTask.module.scss b/src/components/Popup/CreateTask/CreateTask.module.scss
@@ -22,7 +22,7 @@
   margin-top: 24px;
   margin-bottom: 16px;
   &__button {
-    background: v.$white-color;;
+    background: v.$white-color;
     border: none;
     border-radius: 8px;
     width: 100%;
@@ -55,7 +55,7 @@
   }
   &__mesh {
     display: grid;
-    grid-template-columns:repeat(2, 1fr);
+    grid-template-columns: repeat(2, 1fr);
     grid-gap: 4px;
   }
   &__label {
@@ -129,10 +129,10 @@
     padding: 8px 16px;
     text-align: start;
     @include m.BodyLarge;
-    color: #2C2B2B;
+    color: #2c2b2b;
 
     &::placeholder {
-      color:  v.$disabled-color;
+      color: v.$disabled-color;
     }
   }
   &__open {
@@ -190,5 +190,3 @@
     }
   }
 }
-
-
diff --git a/src/components/Popup/CreateTask/CreateTask.tsx b/src/components/Popup/CreateTask/CreateTask.tsx
@@ -75,7 +75,7 @@ const CreateTask = () => {
           className={`${styles.checkboxes__container} ${
             !showCheckboxesMenu && styles.checkboxes__show
           }`}
-          id="checkboxes"
+          id='checkboxes'
         >
           <div className={styles.checkboxes__mesh}>
             {users.map((item, index) => (
@@ -93,7 +93,7 @@ const CreateTask = () => {
       </div>
       <div className={styles.textarea__container}>
         <UniversalTextarea
-          label="Содержание задачи"
+          label='Содержание задачи'
           value={textareaValue}
           onChange={setTextareaValue}
         />
@@ -122,25 +122,25 @@ const CreateTask = () => {
         </div>
         <div className={styles.timeContainer}>
           <p className={styles.form__label}>Время (по МСК)</p>
-          <input className={styles.time} placeholder="--/--" />
+          <input className={styles.time} placeholder='--/--' />
         </div>
       </div>
       <div className={styles.linkInput}>
-        <UniversalInput id="task" label="Ссылка (необязательное поле)" />
+        <UniversalInput id='task' label='Ссылка (необязательное поле)' />
       </div>
       <div className={styles.button}>
         <UniversalButton
-          width="250px"
-          height="40px"
-          type="submit"
+          width='250px'
+          height='40px'
+          type='submit'
           className={styles.button__button}
           disabled={!checkboxValues || !textareaValue || !dateValue}
         >
           Создать
         </UniversalButton>
         <UniversalButton
-          width="250px"
-          height="40px"
+          width='250px'
+          height='40px'
           onClick={closeModalState}
           isFilled={false}
           className={styles.button__button}

diff --git a/src/components/Popup/Popup.module.scss b/src/components/Popup/Popup.module.scss
@@ -17,7 +17,7 @@
     width: 100%;
     height: 100%;
     background-color: rgba(20, 20, 20, 0.2);
-    opacity: .5;
+    opacity: 0.5;
   }
 
   &__container {
@@ -31,7 +31,7 @@
     padding: 25px;
     border-radius: 10px;
     box-shadow: 0 4px 24px 0 rgba(0, 0, 0, 0.08);
-    background: #F6F7FB;
+    background: #f6f7fb;
     z-index: 99;
   }
 }
diff --git a/src/components/Popup/PopupWrapper/PopupWrapper.module.scss b/src/components/Popup/PopupWrapper/PopupWrapper.module.scss
@@ -16,6 +16,6 @@
     width: 100%;
     height: 100%;
     background: v.$black-color;
-    opacity: .5;
+    opacity: 0.5;
   }
 }
diff --git a/src/components/Search/Search.tsx b/src/components/Search/Search.tsx
@@ -12,11 +12,11 @@ const Search = () => {
       <form className={styles.search} onSubmit={handleSubmit}>
         <input
           className={styles.search__find}
-          placeholder="Ключевые слова, #, дата создания"
+          placeholder='Ключевые слова, #, дата создания'
         />
-        <SearchButtons type="submit" src={searchIcon} position="search" />
+        <SearchButtons type='submit' src={searchIcon} position='search' />
       </form>
-      <SearchButtons type="button" src={filterIcon} position="filter" />
+      <SearchButtons type='button' src={filterIcon} position='filter' />
     </>
   );
 };