fix: remove deprecated, fix styles errors

TomatoVan · Apr 27, 2024 · 103a031 · 103a031
1 parent f6db832
commit 103a031
Show file tree

Hide file tree

Showing 75 changed files with 175 additions and 1,903 deletions.
diff --git a/extractedTranslations/en/profile.json b/extractedTranslations/en/profile.json
@@ -1,30 +1,30 @@
 {
-    "": "",
-    "Age": "",
-    "Avatar": "",
-    "City": "",
-    "Edit": "",
-    "Error": "",
-    "Error with getting profile data": "",
-    "Error with profile ": "",
-    "Incorrect age": "",
-    "Incorrect country": "",
-    "Incorrect user data": "",
-    "Lastname": "",
-    "Name": "",
-    "No data": "",
-    "Profile": "",
-    "Server error": "",
-    "Try to reload page": "",
-    "Username": "",
-    "Username>": "",
-    "Your age": "",
-    "Your avatar": "",
-    "Your city": "",
-    "Your lastname": "",
-    "Your name": "",
-    "Your surname": "",
-    "Your username": "",
-    "Попробуйте обновить страницу": "",
-    "Произошла ошибка при загрузке профиля": ""
+  "": "",
+  "Age": "",
+  "Avatar": "",
+  "City": "",
+  "Edit": "",
+  "Error": "",
+  "Error with getting profile data": "",
+  "Error with profile ": "",
+  "Incorrect age": "",
+  "Incorrect country": "",
+  "Incorrect user data": "",
+  "Lastname": "",
+  "Name": "",
+  "No data": "",
+  "Profile": "",
+  "Server error": "",
+  "Try to reload page": "",
+  "Username": "",
+  "Username>": "",
+  "Your age": "",
+  "Your avatar": "",
+  "Your city": "",
+  "Your lastname": "",
+  "Your name": "",
+  "Your surname": "",
+  "Your username": "",
+  "Попробуйте обновить страницу": "",
+  "Произошла ошибка при загрузке профиля": ""
 }
diff --git a/extractedTranslations/en/translation.json b/extractedTranslations/en/translation.json
@@ -1,124 +1,124 @@
 {
-    "": "",
-    "123": "123",
-    "About site": "",
-    "Admin panel": "",
-    "All": "",
-    "Article ratings coming soon!": "",
-    "Articles": "",
-    "Articles app": "",
-    "Articles not found": "",
-    "Ascending": "",
-    "Back to list": "",
-    "Cancel": "",
-    "Choose ": "",
-    "Choose country": "",
-    "Choose currency": "",
-    "Close": "",
-    "Comments": "",
-    "Comments is loading": "",
-    "Create new article": "",
-    "Creation date": "",
-    "Descending": "",
-    "Design options": "",
-    "Economics": "",
-    "Edit": "",
-    "Enter ": "",
-    "Enter comment text": "",
-    "Enter cooment text": "",
-    "Error while loading articles": "",
-    "Error with getting article data": "",
-    "Error with getting profile data": "",
-    "Exit": "",
-    "Here you can search and view articles on various topics": "",
-    "IT": "",
-    "Incorrect age": "",
-    "Incorrect country": "",
-    "Incorrect user data": "",
-    "Leave your feedback on the article, it will help improve the quality": "",
-    "Main page": "",
-    "Main_page": "",
-    "Name": "",
-    "New": "",
-    "No data": "",
-    "Old": "",
-    "PROFILE PAGE": "",
-    "Profile": "",
-    "Rate the article": "",
-    "Read more": {
-        "": {
-            "": {
-                "": ""
-            }
-        }
-    },
-    "Recommend": "",
-    "Save": "",
-    "Science": "",
-    "Search": "",
-    "Send": "",
-    "Server error": "",
-    "Sort by": "",
-    "Sorting by": "",
-    "Thanks for review!": "",
-    "Try to reload page": "",
-    "User settings": "",
-    "Views": "",
-    "Welcome to the articles page!": "",
-    "You don`t have access to this page!": "",
-    "Your name": "",
-    "Your review": "",
-    "article_not_found": "",
-    "articles": "",
-    "articles page": "",
-    "articles_details": "",
-    "articles_details page": "",
-    "articles_detals": "",
-    "ascending": "",
-    "auth_form": "",
-    "auth_password": "",
-    "auth_username": "",
-    "by": "",
-    "comments": "",
-    "creation date": "",
-    "decrement": "",
-    "descending": "",
-    "exit": "",
-    "increment": "",
-    "login": "",
-    "login_error": "",
-    "name": "",
-    "no articles found": "",
-    "no comments": "",
-    "no profile found": "",
-    "read more": "",
-    "throw error": "throw error",
-    "views": "",
-    "{{count}} views": "",
-    "{{count}} views_plural": "",
-    "{{count}} просмотров": "",
-    "{{count}} просмотров_plural": "",
-    "Айти": "",
-    "Ваш отзыв": "",
-    "Все статьи": "",
-    "Главная страница": "",
-    "Закрыть": "",
-    "Наука": "",
-    "Обновить страницу": "",
-    "Отправить": "",
-    "Оценка статей скоро появится!": "",
-    "Поиск": "",
-    "Попробуйте обновить страницу": "",
-    "Произошла непредвиденная ошибка": "",
-    "Произошла ошибка при загрузке профиля": "",
-    "Редактировать": "",
-    "Сортировать ПО": "",
-    "Статьи не найдены": "",
-    "Экономика": "",
-    "возрастанию": "",
-    "дате создания": "",
-    "названию": "",
-    "по": "",
-    "просмотрам": "",
-    "убыванию": ""
+  "": "",
+  "123": "123",
+  "About site": "",
+  "Admin panel": "",
+  "All": "",
+  "Article ratings coming soon!": "",
+  "Articles": "",
+  "Articles app": "",
+  "Articles not found": "",
+  "Ascending": "",
+  "Back to list": "",
+  "Cancel": "",
+  "Choose ": "",
+  "Choose country": "",
+  "Choose currency": "",
+  "Close": "",
+  "Comments": "",
+  "Comments is loading": "",
+  "Create new article": "",
+  "Creation date": "",
+  "Descending": "",
+  "Design options": "",
+  "Economics": "",
+  "Edit": "",
+  "Enter ": "",
+  "Enter comment text": "",
+  "Enter cooment text": "",
+  "Error while loading articles": "",
+  "Error with getting article data": "",
+  "Error with getting profile data": "",
+  "Exit": "",
+  "Here you can search and view articles on various topics": "",
+  "IT": "",
+  "Incorrect age": "",
+  "Incorrect country": "",
+  "Incorrect user data": "",
+  "Leave your feedback on the article, it will help improve the quality": "",
+  "Main page": "",
+  "Main_page": "",
+  "Name": "",
+  "New": "",
+  "No data": "",
+  "Old": "",
+  "PROFILE PAGE": "",
+  "Profile": "",
+  "Rate the article": "",
+  "Read more": {
+    "": {
+      "": {
+        "": ""
+      }
+    }
+  },
+  "Recommend": "",
+  "Save": "",
+  "Science": "",
+  "Search": "",
+  "Send": "",
+  "Server error": "",
+  "Sort by": "",
+  "Sorting by": "",
+  "Thanks for review!": "",
+  "Try to reload page": "",
+  "User settings": "",
+  "Views": "",
+  "Welcome to the articles page!": "",
+  "You don`t have access to this page!": "",
+  "Your name": "",
+  "Your review": "",
+  "article_not_found": "",
+  "articles": "",
+  "articles page": "",
+  "articles_details": "",
+  "articles_details page": "",
+  "articles_detals": "",
+  "ascending": "",
+  "auth_form": "",
+  "auth_password": "",
+  "auth_username": "",
+  "by": "",
+  "comments": "",
+  "creation date": "",
+  "decrement": "",
+  "descending": "",
+  "exit": "",
+  "increment": "",
+  "login": "",
+  "login_error": "",
+  "name": "",
+  "no articles found": "",
+  "no comments": "",
+  "no profile found": "",
+  "read more": "",
+  "throw error": "throw error",
+  "views": "",
+  "{{count}} views": "",
+  "{{count}} views_plural": "",
+  "{{count}} просмотров": "",
+  "{{count}} просмотров_plural": "",
+  "Айти": "",
+  "Ваш отзыв": "",
+  "Все статьи": "",
+  "Главная страница": "",
+  "Закрыть": "",
+  "Наука": "",
+  "Обновить страницу": "",
+  "Отправить": "",
+  "Оценка статей скоро появится!": "",
+  "Поиск": "",
+  "Попробуйте обновить страницу": "",
+  "Произошла непредвиденная ошибка": "",
+  "Произошла ошибка при загрузке профиля": "",
+  "Редактировать": "",
+  "Сортировать ПО": "",
+  "Статьи не найдены": "",
+  "Экономика": "",
+  "возрастанию": "",
+  "дате создания": "",
+  "названию": "",
+  "по": "",
+  "просмотрам": "",
+  "убыванию": ""
 }
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
         "build:dev": "webpack  --env mode=development",
         "prettier": "npx prettier --write **/*.{ts,tsx,json}",
         "lint:ts": "eslint \"./src/**/*.{ts,tsx}\"",
-        "lint:ts:fix": "eslint \"**/*.{ts,tsx}\" --fix",
+        "lint:ts:fix": "eslint \"./src/**/*.{ts,tsx}\" --fix",
         "lint:scss": "npx stylelint \"**/*.scss\"",
         "lint:scss:fix": "npx stylelint \"**/*.scss\" --fix",
         "test:unit": "jest --config ./config/jest/jest.config.ts",

diff --git a/src/app/providers/ErrorBoundary/ui/BugButton.tsx b/src/app/providers/ErrorBoundary/ui/BugButton.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Button } from '@/shared/ui/deprecated/Button';
+import { Button } from '@/shared/ui/redesigned/Button';
 
 // Компонент для тестирования ErrorBoundary
 export const BugButton = () => {

diff --git a/src/entities/Comment/ui/CommentCard/CommentCard.tsx b/src/entities/Comment/ui/CommentCard/CommentCard.tsx
@@ -1,6 +1,5 @@
 import { memo } from 'react';
 import { HStack, VStack } from '@/shared/ui/redesigned/Stack';
-import { AppLink } from '@/shared/ui/deprecated/AppLink';
 import { classNames } from '@/shared/lib/classNames/classNames';
 import cls from './CommentCard.module.scss';
 import { Comment } from '../../model/types/comment';
@@ -9,6 +8,7 @@ import { Text } from '@/shared/ui/redesigned/Text';
 import { Skeleton } from '@/shared/ui/redesigned/Skeleton';
 import { getRouteProfile } from '@/shared/const/router';
 import { Card } from '@/shared/ui/redesigned/Card';
+import { AppLink } from '@/shared/ui/redesigned/AppLink';
 
 interface CommentCardProps {
     className?: string;

diff --git a/src/entities/Counter/ui/Counter.tsx b/src/entities/Counter/ui/Counter.tsx
@@ -1,8 +1,8 @@
 import { useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
-import { Button } from '@/shared/ui/deprecated/Button';
 import { getCounterValue } from '../model/selectors/getCounterValue/getCounterValue';
 import { counterActions } from '../model/slice/counterSlice';
+import { Button } from '@/shared/ui/redesigned/Button';
 
 export const Counter = () => {
     const dispatch = useDispatch();

diff --git a/src/features/ArticleTypeTabs/ui/ArticleTypeTabs.tsx b/src/features/ArticleTypeTabs/ui/ArticleTypeTabs.tsx
@@ -1,9 +1,8 @@
 import { useTranslation } from 'react-i18next';
 import { memo, useCallback, useMemo } from 'react';
 import { classNames } from '@/shared/lib/classNames/classNames';
-import { TabItem } from '@/shared/ui/deprecated/Tabs';
 import { ArticleType } from '@/entities/Article';
-import { Tabs } from '@/shared/ui/redesigned/Tabs';
+import { TabItem, Tabs } from '@/shared/ui/redesigned/Tabs';
 
 interface ArticleTypeTabsProps {
     className?: string;

diff --git a/src/features/ArtilcleSortSelector/ui/ArticleSortSelector.tsx b/src/features/ArtilcleSortSelector/ui/ArticleSortSelector.tsx
@@ -1,14 +1,18 @@
 import { useTranslation } from 'react-i18next';
 import { memo, useMemo } from 'react';
 import { classNames } from '@/shared/lib/classNames/classNames';
-import { SelectOption } from '@/shared/ui/deprecated/Select';
 import { SortOrder } from '@/shared/types/sort';
 import cls from './ArticleSortSelector.module.scss';
 import { ArticleSortField } from '@/entities/Article';
 import { ListBox } from '@/shared/ui/redesigned/Popups';
 import { VStack } from '@/shared/ui/redesigned/Stack';
 import { Text } from '@/shared/ui/redesigned/Text';
 
+export interface SelectOption<T extends string> {
+    value: T;
+    content: string;
+}
+
 interface ArticleSortSelectorProps {
     className?: string;
     sort: ArticleSortField;

diff --git a/src/features/PageLoader/ui/PageLoader/PageLoader.tsx b/src/features/PageLoader/ui/PageLoader/PageLoader.tsx
@@ -1,6 +1,6 @@
 import { classNames } from '@/shared/lib/classNames/classNames';
 import cls from './PageLoader.module.scss';
-import { Loader } from '@/shared/ui/deprecated/Loader';
+import { Loader } from '@/shared/ui/redesigned/Loader';
 
 interface PageLoaderProps {
     className?: string;

diff --git a/src/features/articlePageGreeting/ui/ArticlePageGreeting/ArticlePageGreeting.tsx b/src/features/articlePageGreeting/ui/ArticlePageGreeting/ArticlePageGreeting.tsx
@@ -3,7 +3,7 @@ import { memo, useEffect, useState } from 'react';
 import { isMobile } from 'react-device-detect';
 import { Drawer } from '@/shared/ui/redesigned/Drawer';
 import { Modal } from '@/shared/ui/redesigned/Modal';
-import { Text } from '@/shared/ui/deprecated/Text';
+import { Text } from '@/shared/ui/redesigned/Text';
 import { saveJsonSettings, useJsonSettings } from '@/entities/User';
 import { useAppDispatch } from '@/shared/lib/hook/useAppDispatch/useAppDispatch';