From dcc8c34b051b04356c9d5dfece393a9598bef5fc Mon Sep 17 00:00:00 2001
From: Victoria Borovskaya
 <110840305+VictoriaBorovskaya@users.noreply.github.com>
Date: Wed, 27 Dec 2023 20:40:06 +0600
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=B8=20=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2=20(#91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/providers/router/router.paths.ts      |   5 ++++-
 .../notifications/DummyNotifications.tsx      |   4 ++--
 src/entities/dummy/position/DummyPosition.tsx |   4 ++--
 src/entities/notification/Notification.tsx    |   4 ++--
 src/entities/user/index.ts                    |   2 +-
 src/entities/user/info/index.ts               |   1 -
 .../profile-card/ProfileCard.desktop.tsx      |   6 +++---
 .../user}/profile-card/ProfileCard.tsx        |   2 +-
 .../user}/profile-card/ProfileCardNotAuth.tsx |   5 ++---
 .../user}/profile-card/ProfileCardUser.tsx    |   8 +++++---
 src/entities/user/profile-card/index.ts       |   3 +++
 .../user}/profile-card/notAuth.png            | Bin
 .../statistic/Statistic.tsx}                  |   4 ++--
 .../user/profile-card/statistic/index.ts      |   1 +
 src/features/chat/create/CreateMessage.tsx    |   9 ++-------
 .../NotificationButton.tsx}                   |   2 +-
 src/features/notifications/button/index.ts    |   1 +
 src/features/notifications/index.ts           |   2 +-
 .../notification-settings/SettingsList.tsx    |  18 +++++++++---------
 .../notifications/notification/index.ts       |   1 -
 src/features/project/search/SearchProject.tsx |   5 +++--
 src/pages/chats/ChatsPage.desktop.tsx         |   6 +++++-
 src/pages/chats/ChatsPageBase.tsx             |   4 ++--
 src/pages/profile/ProfileMePage.tsx           |   4 ++--
 src/pages/profile/ProfilePage.desktop.tsx     |   3 +--
 src/pages/profile/ProfileUserPageBase.tsx     |   2 +-
 src/pages/search/ui/SearchPage.desktop.tsx    |   2 +-
 src/pages/search/ui/SearchPage.tsx            |   2 +-
 src/pages/setting/settings/SettingsPage.tsx   |  18 +++++++++---------
 src/shared/ui/DummyImage/DummyImage.tsx       |   7 +++++++
 .../image.svg}                                |   0
 src/shared/ui/DummyImage/index.ts             |   1 +
 .../NotificationImage/NotificationImage.tsx   |   7 -------
 src/shared/ui/NotificationImage/index.ts      |   1 -
 src/shared/ui/STag/STag.tsx                   |   4 ++--
 src/shared/ui/STextarea/STextarea.tsx         |  13 ++++++++-----
 src/shared/ui/SearchInput/SearchInput.tsx     |   5 +++--
 src/shared/ui/SettingsItem/index.ts           |   1 -
 .../SettingItem.tsx => Switcher/Switcher.tsx} |   4 ++--
 src/shared/ui/Switcher/index.ts               |   1 +
 src/widgets/chats-list/ChatsList.tsx          |   4 ++--
 src/widgets/profile-card/index.ts             |   3 ---
 42 files changed, 93 insertions(+), 86 deletions(-)
 delete mode 100644 src/entities/user/info/index.ts
 rename src/{widgets => entities/user}/profile-card/ProfileCard.desktop.tsx (97%)
 rename src/{widgets => entities/user}/profile-card/ProfileCard.tsx (88%)
 rename src/{widgets => entities/user}/profile-card/ProfileCardNotAuth.tsx (89%)
 rename src/{widgets => entities/user}/profile-card/ProfileCardUser.tsx (88%)
 create mode 100644 src/entities/user/profile-card/index.ts
 rename src/{widgets => entities/user}/profile-card/notAuth.png (100%)
 rename src/entities/user/{info/Info.tsx => profile-card/statistic/Statistic.tsx} (91%)
 create mode 100644 src/entities/user/profile-card/statistic/index.ts
 rename src/features/notifications/{notification/Notification.tsx => button/NotificationButton.tsx} (95%)
 create mode 100644 src/features/notifications/button/index.ts
 delete mode 100644 src/features/notifications/notification/index.ts
 create mode 100644 src/shared/ui/DummyImage/DummyImage.tsx
 rename src/shared/ui/{NotificationImage/notifications.svg => DummyImage/image.svg} (100%)
 create mode 100644 src/shared/ui/DummyImage/index.ts
 delete mode 100644 src/shared/ui/NotificationImage/NotificationImage.tsx
 delete mode 100644 src/shared/ui/NotificationImage/index.ts
 delete mode 100644 src/shared/ui/SettingsItem/index.ts
 rename src/shared/ui/{SettingsItem/SettingItem.tsx => Switcher/Switcher.tsx} (90%)
 create mode 100644 src/shared/ui/Switcher/index.ts
 delete mode 100644 src/widgets/profile-card/index.ts

diff --git a/src/app/providers/router/router.paths.ts b/src/app/providers/router/router.paths.ts
index 34be13e6..7fa0e601 100644
--- a/src/app/providers/router/router.paths.ts
+++ b/src/app/providers/router/router.paths.ts
@@ -84,7 +84,10 @@ export const routerPaths = [
     path: PATHS.addProject,
     Component: AddProjectPage,
   },
-  // { path: PATHS.dialog, Component: DialogPage }
+  // {
+  //   path: PATHS.dialog,
+  //   Component: DialogPage,
+  // },
   {
     path: PATHS.dialog,
     Component: NotFoundPage,
diff --git a/src/entities/dummy/notifications/DummyNotifications.tsx b/src/entities/dummy/notifications/DummyNotifications.tsx
index 221132fd..ff52694d 100644
--- a/src/entities/dummy/notifications/DummyNotifications.tsx
+++ b/src/entities/dummy/notifications/DummyNotifications.tsx
@@ -1,13 +1,13 @@
 import { Text } from '@chakra-ui/react';
 
-import { NotificationImage } from '~/shared/ui/NotificationImage';
+import { DummyImage } from '~/shared/ui/DummyImage';
 
 import { DummyWrapper } from '../base';
 
 export function DummyNotifications() {
   return (
     <DummyWrapper>
-      <NotificationImage />
+      <DummyImage />
       <Text fontSize="md" fontWeight="medium" mt={1}>
         Нет уведомлений
       </Text>
diff --git a/src/entities/dummy/position/DummyPosition.tsx b/src/entities/dummy/position/DummyPosition.tsx
index 9c5b45b8..40a2b447 100644
--- a/src/entities/dummy/position/DummyPosition.tsx
+++ b/src/entities/dummy/position/DummyPosition.tsx
@@ -1,13 +1,13 @@
 import { Text } from '@chakra-ui/react';
 
-import { NotificationImage } from '~/shared/ui/NotificationImage';
+import { DummyImage } from '~/shared/ui/DummyImage';
 
 import { DummyWrapper } from '../base';
 
 export function DummyPosition() {
   return (
     <DummyWrapper>
-      <NotificationImage />
+      <DummyImage />
       <Text fontSize="md" fontWeight="medium" mt={1}>
         Нет заявок
       </Text>
diff --git a/src/entities/notification/Notification.tsx b/src/entities/notification/Notification.tsx
index a7b062fd..c6fef24f 100644
--- a/src/entities/notification/Notification.tsx
+++ b/src/entities/notification/Notification.tsx
@@ -6,7 +6,7 @@ import { generatePath, Link } from 'react-router-dom';
 import type { GetNotificationResponse } from '~/shared/api';
 import { useAuth, useIsMobile } from '~/shared/hooks';
 import { PATHS } from '~/shared/lib/router';
-import { NotificationImage } from '~/shared/ui/NotificationImage';
+import { DummyImage } from '~/shared/ui/DummyImage';
 
 import { useGetNotification } from './api';
 import { NOTIFICATIONS_MESSAGE, NOTIFICATIONS } from './Notification.constants';
@@ -50,7 +50,7 @@ export function Notification({ notificationId, read }: NotificationProps) {
       grow={1}
     >
       <VStack spacing={0} gap={3} textAlign="center">
-        <NotificationImage />
+        <DummyImage />
         {notification && (
           <React.Fragment>
             <Heading variant="h2" mb={0}>
diff --git a/src/entities/user/index.ts b/src/entities/user/index.ts
index 6d8a2f57..ffaa060e 100644
--- a/src/entities/user/index.ts
+++ b/src/entities/user/index.ts
@@ -1,4 +1,4 @@
 export * from './reviews';
 export * from './avatar';
-export * from './info';
 export * from './api';
+export * from './profile-card';
diff --git a/src/entities/user/info/index.ts b/src/entities/user/info/index.ts
deleted file mode 100644
index 3d93d87e..00000000
--- a/src/entities/user/info/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Info';
diff --git a/src/widgets/profile-card/ProfileCard.desktop.tsx b/src/entities/user/profile-card/ProfileCard.desktop.tsx
similarity index 97%
rename from src/widgets/profile-card/ProfileCard.desktop.tsx
rename to src/entities/user/profile-card/ProfileCard.desktop.tsx
index 87bb2fd3..52108f47 100644
--- a/src/widgets/profile-card/ProfileCard.desktop.tsx
+++ b/src/entities/user/profile-card/ProfileCard.desktop.tsx
@@ -9,11 +9,11 @@ import {
   CircularProgressLabel,
 } from '@chakra-ui/react';
 
-import { Info } from '~/entities/user';
-
 import { useIsMobile } from '~/shared/hooks';
 import { STag } from '~/shared/ui/STag';
 
+import { Statistic } from './statistic';
+
 export function ProfileCardDesktop() {
   const isMobile = useIsMobile();
   const dummyFillProfile = 60;
@@ -48,7 +48,7 @@ export function ProfileCardDesktop() {
           </Text>
         </Stack>
         <Flex direction="column" width="inherit">
-          <Info mb={6} />
+          <Statistic mb={6} />
           <Flex direction="column" mb={6}>
             <Heading variant="h2" mb={3}>
               Специализация и навыки
diff --git a/src/widgets/profile-card/ProfileCard.tsx b/src/entities/user/profile-card/ProfileCard.tsx
similarity index 88%
rename from src/widgets/profile-card/ProfileCard.tsx
rename to src/entities/user/profile-card/ProfileCard.tsx
index 836d5f24..5e873f2e 100644
--- a/src/widgets/profile-card/ProfileCard.tsx
+++ b/src/entities/user/profile-card/ProfileCard.tsx
@@ -1,6 +1,6 @@
 import { Skeleton } from '@chakra-ui/react';
 
-import { useGetProfile } from '~/entities/user';
+import { useGetProfile } from '../api';
 
 import { ProfileCardUser } from './ProfileCardUser';
 
diff --git a/src/widgets/profile-card/ProfileCardNotAuth.tsx b/src/entities/user/profile-card/ProfileCardNotAuth.tsx
similarity index 89%
rename from src/widgets/profile-card/ProfileCardNotAuth.tsx
rename to src/entities/user/profile-card/ProfileCardNotAuth.tsx
index 812250cc..f0f4fdee 100644
--- a/src/widgets/profile-card/ProfileCardNotAuth.tsx
+++ b/src/entities/user/profile-card/ProfileCardNotAuth.tsx
@@ -1,8 +1,7 @@
 import { Text, Flex, Image, Center } from '@chakra-ui/react';
 
-import { Info } from '~/entities/user';
-
 import NotAuth from './notAuth.png';
+import { Statistic } from './statistic';
 
 const defaultName = 'Гость';
 
@@ -32,7 +31,7 @@ export function ProfileCardNotAuth() {
       <Text align="center" fontWeight="bold" fontSize="2xl" pt={16} mb={4}>
         {defaultName}
       </Text>
-      <Info />
+      <Statistic />
     </Flex>
   );
 }
diff --git a/src/widgets/profile-card/ProfileCardUser.tsx b/src/entities/user/profile-card/ProfileCardUser.tsx
similarity index 88%
rename from src/widgets/profile-card/ProfileCardUser.tsx
rename to src/entities/user/profile-card/ProfileCardUser.tsx
index 2a6b691b..58a8a804 100644
--- a/src/widgets/profile-card/ProfileCardUser.tsx
+++ b/src/entities/user/profile-card/ProfileCardUser.tsx
@@ -1,12 +1,14 @@
 import { Text, Flex, Center, SkeletonText, Button, Avatar } from '@chakra-ui/react';
 import { Link } from 'react-router-dom';
 
-import { Info, useGetAvatar, useIsAvatarExist, useUserStatistic } from '~/entities/user';
-
 import type { GetUserResponse } from '~/shared/api/model';
 import { useAuth } from '~/shared/hooks';
 import { PATHS } from '~/shared/lib/router';
 
+import { useGetAvatar, useIsAvatarExist, useUserStatistic } from '../api';
+
+import { Statistic } from './statistic';
+
 interface ProfileCardProps {
   user: GetUserResponse;
 }
@@ -61,7 +63,7 @@ export function ProfileCardUser({ user }: ProfileCardProps) {
           {name}
         </Text>
       )}
-      <Info statistic={statistic} />
+      <Statistic statistic={statistic} />
       {userId === user.id && (
         <Flex px={4} pb={4} w="full">
           <Button as={Link} to={PATHS.profileSettings} variant="light" w="full">
diff --git a/src/entities/user/profile-card/index.ts b/src/entities/user/profile-card/index.ts
new file mode 100644
index 00000000..3f711365
--- /dev/null
+++ b/src/entities/user/profile-card/index.ts
@@ -0,0 +1,3 @@
+export * from './ProfileCard';
+export * from './ProfileCard.desktop';
+export * from './ProfileCardNotAuth';
diff --git a/src/widgets/profile-card/notAuth.png b/src/entities/user/profile-card/notAuth.png
similarity index 100%
rename from src/widgets/profile-card/notAuth.png
rename to src/entities/user/profile-card/notAuth.png
diff --git a/src/entities/user/info/Info.tsx b/src/entities/user/profile-card/statistic/Statistic.tsx
similarity index 91%
rename from src/entities/user/info/Info.tsx
rename to src/entities/user/profile-card/statistic/Statistic.tsx
index 241cdffc..95f42df5 100644
--- a/src/entities/user/info/Info.tsx
+++ b/src/entities/user/profile-card/statistic/Statistic.tsx
@@ -4,11 +4,11 @@ import type { GetStatistic } from '~/shared/api/model';
 import { useAuth } from '~/shared/hooks';
 import { SGroup } from '~/shared/ui/SGroup';
 
-interface InfoProps {
+interface StatisticProps {
   statistic?: GetStatistic;
 }
 
-export const Info = (props: FlexProps & InfoProps) => {
+export const Statistic = (props: FlexProps & StatisticProps) => {
   const { isAuth } = useAuth();
   const { statistic } = props;
 
diff --git a/src/entities/user/profile-card/statistic/index.ts b/src/entities/user/profile-card/statistic/index.ts
new file mode 100644
index 00000000..d31ad118
--- /dev/null
+++ b/src/entities/user/profile-card/statistic/index.ts
@@ -0,0 +1 @@
+export * from './Statistic';
diff --git a/src/features/chat/create/CreateMessage.tsx b/src/features/chat/create/CreateMessage.tsx
index 94306167..c5915b98 100644
--- a/src/features/chat/create/CreateMessage.tsx
+++ b/src/features/chat/create/CreateMessage.tsx
@@ -16,12 +16,7 @@ export function CreateMessage({ onSubmit }: CreateMessageProps) {
 
   return (
     <Flex px={isMobile ? 0 : 6} py={4} alignItems="center" gap={4} w="full">
-      <STextarea
-        maxLength={50}
-        value={value}
-        setValue={setValue}
-        placeholder="Введите сообщение..."
-      />
+      <STextarea value={value} setValue={setValue} placeholder="Сообщение" />
       <IconButton
         aria-label="create-message"
         variant="flat"
@@ -32,7 +27,7 @@ export function CreateMessage({ onSubmit }: CreateMessageProps) {
             messageRef.current.innerHTML = '';
           }
         }}
-        icon={<Icon as={IoSend} />}
+        icon={<Icon as={IoSend} fontSize="md" />}
       />
     </Flex>
   );
diff --git a/src/features/notifications/notification/Notification.tsx b/src/features/notifications/button/NotificationButton.tsx
similarity index 95%
rename from src/features/notifications/notification/Notification.tsx
rename to src/features/notifications/button/NotificationButton.tsx
index f4cef870..bd51d9b3 100644
--- a/src/features/notifications/notification/Notification.tsx
+++ b/src/features/notifications/button/NotificationButton.tsx
@@ -6,7 +6,7 @@ import { useAuth } from '~/shared/hooks';
 import { PATHS } from '~/shared/lib/router';
 import { Counter } from '~/shared/ui/Counter';
 
-export function Notification() {
+export function NotificationButton() {
   const { isAuth } = useAuth();
   const navigate = useNavigate();
 
diff --git a/src/features/notifications/button/index.ts b/src/features/notifications/button/index.ts
new file mode 100644
index 00000000..acef3777
--- /dev/null
+++ b/src/features/notifications/button/index.ts
@@ -0,0 +1 @@
+export * from './NotificationButton';
diff --git a/src/features/notifications/index.ts b/src/features/notifications/index.ts
index 88f80968..24c83bb2 100644
--- a/src/features/notifications/index.ts
+++ b/src/features/notifications/index.ts
@@ -1,4 +1,4 @@
-export * from './notification';
+export * from './button';
 export * from './notification-settings';
 export * from './notifications-filter';
 export * from './api';
diff --git a/src/features/notifications/notification-settings/SettingsList.tsx b/src/features/notifications/notification-settings/SettingsList.tsx
index dce8a07b..aaf5f91a 100644
--- a/src/features/notifications/notification-settings/SettingsList.tsx
+++ b/src/features/notifications/notification-settings/SettingsList.tsx
@@ -1,6 +1,6 @@
 import { Flex, Heading, VStack, Divider } from '@chakra-ui/react';
 
-import { SettingItem } from '~/shared/ui/SettingsItem';
+import { Switcher } from '~/shared/ui/Switcher';
 
 export function SettingsList() {
   return (
@@ -16,17 +16,17 @@ export function SettingsList() {
         borderRadius="2xl"
         spacing={0}
       >
-        <SettingItem>Одобрение отклика</SettingItem>
+        <Switcher>Одобрение отклика</Switcher>
         <Divider variant="light" />
-        <SettingItem>Отклонение отклика</SettingItem>
+        <Switcher>Отклонение отклика</Switcher>
         <Divider variant="light" />
-        <SettingItem>Проект закрыт</SettingItem>
+        <Switcher>Проект закрыт</Switcher>
         <Divider variant="light" />
-        <SettingItem>Возможность оставить отзыв</SettingItem>
+        <Switcher>Возможность оставить отзыв</Switcher>
         <Divider variant="light" />
-        <SettingItem>Одобрение публикации</SettingItem>
+        <Switcher>Одобрение публикации</Switcher>
         <Divider variant="light" />
-        <SettingItem>Правки в публикации</SettingItem>
+        <Switcher>Правки в публикации</Switcher>
       </VStack>
       <Heading variant="h3" mt={6} mb={4}>
         Push-уведомления
@@ -39,9 +39,9 @@ export function SettingsList() {
         borderRadius="2xl"
         spacing={0}
       >
-        <SettingItem>Личные сообщения</SettingItem>
+        <Switcher>Личные сообщения</Switcher>
         <Divider variant="light" />
-        <SettingItem>Вам оставили отзыв</SettingItem>
+        <Switcher>Вам оставили отзыв</Switcher>
       </VStack>
     </Flex>
   );
diff --git a/src/features/notifications/notification/index.ts b/src/features/notifications/notification/index.ts
deleted file mode 100644
index 2bb58113..00000000
--- a/src/features/notifications/notification/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Notification } from './Notification';
diff --git a/src/features/project/search/SearchProject.tsx b/src/features/project/search/SearchProject.tsx
index e1bd6cca..41de12fd 100644
--- a/src/features/project/search/SearchProject.tsx
+++ b/src/features/project/search/SearchProject.tsx
@@ -2,8 +2,9 @@ import { SearchInput } from '~/shared/ui/SearchInput';
 
 interface SearchProjectProps {
   onChange: (value: string) => void;
+  placeholder: string;
 }
 
-export const SearchProject = ({ onChange }: SearchProjectProps) => {
-  return <SearchInput onChange={onChange} placeholder="Найти проект" />;
+export const SearchProject = ({ onChange, placeholder }: SearchProjectProps) => {
+  return <SearchInput onChange={onChange} placeholder={placeholder} />;
 };
diff --git a/src/pages/chats/ChatsPage.desktop.tsx b/src/pages/chats/ChatsPage.desktop.tsx
index 2273e4cc..6176e737 100644
--- a/src/pages/chats/ChatsPage.desktop.tsx
+++ b/src/pages/chats/ChatsPage.desktop.tsx
@@ -30,7 +30,11 @@ export function ChatsPageDesktop() {
           flexShrink="0"
         >
           <Box py={4} px={5} position="relative">
-            <SearchInput placeholder="Найти в чатах" onChange={console.log} />
+            <SearchInput
+              placeholder="Найти в чатах"
+              onChange={console.log}
+              variant="gray"
+            />
             <Divider
               variant="light"
               position="absolute"
diff --git a/src/pages/chats/ChatsPageBase.tsx b/src/pages/chats/ChatsPageBase.tsx
index 59f3de73..47a9fc26 100644
--- a/src/pages/chats/ChatsPageBase.tsx
+++ b/src/pages/chats/ChatsPageBase.tsx
@@ -11,13 +11,13 @@ export function ChatsPageBase() {
   return (
     <Box w="full" bg="white">
       <Box bg="bg">
-        <Container maxW="md" py={4} pb={8}>
+        <Container maxW="md" py={4}>
           <Flex justifyContent="space-between" alignItems="center" h={42} mb={2}>
             <Heading variant="h1" as="h1">
               Чаты
             </Heading>
           </Flex>
-          <SearchInput placeholder="Найти в чатах" onChange={console.log} />
+          <SearchInput placeholder="Поиск" onChange={console.log} />
         </Container>
       </Box>
       <ChatsList value={value} />
diff --git a/src/pages/profile/ProfileMePage.tsx b/src/pages/profile/ProfileMePage.tsx
index 55b3abf2..9bc7f58f 100644
--- a/src/pages/profile/ProfileMePage.tsx
+++ b/src/pages/profile/ProfileMePage.tsx
@@ -11,10 +11,10 @@ import {
 import { useLayoutEffect } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
-import { ProfileCard, ProfileCardNotAuth } from '~/widgets/profile-card';
-
 import { Login, Settings } from '~/features/user';
 
+import { ProfileCard, ProfileCardNotAuth } from '~/entities/user';
+
 import { useAuth } from '~/shared/hooks';
 
 import { AboutMeTab } from './tabs/about-me';
diff --git a/src/pages/profile/ProfilePage.desktop.tsx b/src/pages/profile/ProfilePage.desktop.tsx
index 5bf411fd..fe50b265 100644
--- a/src/pages/profile/ProfilePage.desktop.tsx
+++ b/src/pages/profile/ProfilePage.desktop.tsx
@@ -2,11 +2,10 @@ import { Box, Flex, Heading, Text } from '@chakra-ui/react';
 import { useEffect } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
-import { ProfileCardDesktop } from '~/widgets/profile-card';
 import { ProjectCard } from '~/widgets/project-card';
 
 import { AvatarsGroup } from '~/entities/project';
-import { Reviews } from '~/entities/user';
+import { ProfileCardDesktop, Reviews } from '~/entities/user';
 
 import { Rating } from '~/shared/ui/Rating';
 import { STag } from '~/shared/ui/STag';
diff --git a/src/pages/profile/ProfileUserPageBase.tsx b/src/pages/profile/ProfileUserPageBase.tsx
index 1af382e2..224f6594 100644
--- a/src/pages/profile/ProfileUserPageBase.tsx
+++ b/src/pages/profile/ProfileUserPageBase.tsx
@@ -11,7 +11,7 @@ import {
 import { useLayoutEffect } from 'react';
 import { useParams, useSearchParams } from 'react-router-dom';
 
-import { ProfileCard, ProfileCardNotAuth } from '~/widgets/profile-card';
+import { ProfileCard, ProfileCardNotAuth } from '~/entities/user';
 
 import { GoBack } from '~/shared/ui/GoBack';
 
diff --git a/src/pages/search/ui/SearchPage.desktop.tsx b/src/pages/search/ui/SearchPage.desktop.tsx
index e3b49cb0..7d638d76 100644
--- a/src/pages/search/ui/SearchPage.desktop.tsx
+++ b/src/pages/search/ui/SearchPage.desktop.tsx
@@ -25,7 +25,7 @@ export const SearchPageDesktop = () => {
           </Heading>
         </Flex>
         <Flex gap="4" mb={4}>
-          <SearchProject onChange={handleSumbit} />
+          <SearchProject onChange={handleSumbit} placeholder="Поиск в проектах" />
           {/* <Filter  /> */}
         </Flex>
         <SimpleGrid columns={2} gap={6}>
diff --git a/src/pages/search/ui/SearchPage.tsx b/src/pages/search/ui/SearchPage.tsx
index 997646ab..5f890c94 100644
--- a/src/pages/search/ui/SearchPage.tsx
+++ b/src/pages/search/ui/SearchPage.tsx
@@ -98,7 +98,7 @@ export const SearchPage = () => {
             )}
           </Flex>
           <Flex gap="1" mb={4}>
-            <SearchProject onChange={handleSumbit} />
+            <SearchProject onChange={handleSumbit} placeholder="Найти проект" />
             <FilterUser
               totalItems={positions?.pages[0].total_items}
               isLoading={isLoading}
diff --git a/src/pages/setting/settings/SettingsPage.tsx b/src/pages/setting/settings/SettingsPage.tsx
index 577e5610..e9507c20 100644
--- a/src/pages/setting/settings/SettingsPage.tsx
+++ b/src/pages/setting/settings/SettingsPage.tsx
@@ -12,7 +12,7 @@ import { Link } from 'react-router-dom';
 import { useApi } from '~/shared/hooks';
 import { PATHS } from '~/shared/lib/router';
 import { GoBack } from '~/shared/ui/GoBack';
-import { SettingItem } from '~/shared/ui/SettingsItem';
+import { Switcher } from '~/shared/ui/Switcher';
 
 export function SettingsPage() {
   const { userApi } = useApi();
@@ -36,28 +36,28 @@ export function SettingsPage() {
           mt={8}
         >
           <Link to={PATHS.profileSettings}>
-            <SettingItem type="heading" variant="h3" icon={FiChevronRight}>
+            <Switcher type="heading" variant="h3" icon={FiChevronRight}>
               Профиль
-            </SettingItem>
+            </Switcher>
           </Link>
           <Divider variant="light" />
           {/* <Link to={PATHS.notificationsSettings}>
-            <SettingItem type="heading" variant="h3" icon={FiChevronRight}>
+            <Switcher type="heading" variant="h3" icon={FiChevronRight}>
               Уведомления
-            </SettingItem>
+            </Switcher>
           </Link> */}
           {/* <Divider variant="light" /> */}
           {/* TODO: вставить актуальную почту */}
           <ChakraLink href="mailto:">
-            <SettingItem type="heading" variant="h3" icon={FiChevronRight}>
+            <Switcher type="heading" variant="h3" icon={FiChevronRight}>
               Сообщить о проблеме
-            </SettingItem>
+            </Switcher>
           </ChakraLink>
           <Divider variant="light" />
           <Link to="#" onClick={() => userApi.logout()}>
-            <SettingItem type="heading" variant="h3" icon={FiChevronRight}>
+            <Switcher type="heading" variant="h3" icon={FiChevronRight}>
               Выйти
-            </SettingItem>
+            </Switcher>
           </Link>
         </VStack>
       </Container>
diff --git a/src/shared/ui/DummyImage/DummyImage.tsx b/src/shared/ui/DummyImage/DummyImage.tsx
new file mode 100644
index 00000000..383715ad
--- /dev/null
+++ b/src/shared/ui/DummyImage/DummyImage.tsx
@@ -0,0 +1,7 @@
+import { Image } from '@chakra-ui/react';
+
+import image from './image.svg';
+
+export function DummyImage() {
+  return <Image src={image} />;
+}
diff --git a/src/shared/ui/NotificationImage/notifications.svg b/src/shared/ui/DummyImage/image.svg
similarity index 100%
rename from src/shared/ui/NotificationImage/notifications.svg
rename to src/shared/ui/DummyImage/image.svg
diff --git a/src/shared/ui/DummyImage/index.ts b/src/shared/ui/DummyImage/index.ts
new file mode 100644
index 00000000..ef6037dd
--- /dev/null
+++ b/src/shared/ui/DummyImage/index.ts
@@ -0,0 +1 @@
+export * from './DummyImage';
diff --git a/src/shared/ui/NotificationImage/NotificationImage.tsx b/src/shared/ui/NotificationImage/NotificationImage.tsx
deleted file mode 100644
index ec3df4f4..00000000
--- a/src/shared/ui/NotificationImage/NotificationImage.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Image } from '@chakra-ui/react';
-
-import image from './notifications.svg';
-
-export function NotificationImage() {
-  return <Image src={image} />;
-}
diff --git a/src/shared/ui/NotificationImage/index.ts b/src/shared/ui/NotificationImage/index.ts
deleted file mode 100644
index 4bfb993a..00000000
--- a/src/shared/ui/NotificationImage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './NotificationImage';
diff --git a/src/shared/ui/STag/STag.tsx b/src/shared/ui/STag/STag.tsx
index 7a81b1c5..d764f8e4 100644
--- a/src/shared/ui/STag/STag.tsx
+++ b/src/shared/ui/STag/STag.tsx
@@ -33,7 +33,7 @@ export function STag(props: TagType) {
         </Tag>
       ))}
       {tags?.map((tag) => (
-        <Tag key={tag} bg={'gray.300'} py={1} px={2} borderRadius="lg">
+        <Tag key={tag} bg={'gray.100'} py={1} px={2} borderRadius="lg">
           {tag}
         </Tag>
       ))}
@@ -53,7 +53,7 @@ export function STag(props: TagType) {
         )}
         <AccordionPanel display="flex" gap={1} flexWrap="wrap">
           {tags?.map((tag) => (
-            <Tag key={tag} bg={'gray.300'} py={1} px={2} borderRadius="lg">
+            <Tag key={tag} bg={'gray.100'} py={1} px={2} borderRadius="lg">
               {tag}
             </Tag>
           ))}
diff --git a/src/shared/ui/STextarea/STextarea.tsx b/src/shared/ui/STextarea/STextarea.tsx
index be303fd6..09eac8b7 100644
--- a/src/shared/ui/STextarea/STextarea.tsx
+++ b/src/shared/ui/STextarea/STextarea.tsx
@@ -2,7 +2,7 @@ import { Flex, Text, Textarea } from '@chakra-ui/react';
 import type { ChangeEvent } from 'react';
 
 interface STextareaProps {
-  maxLength: number;
+  maxLength?: number;
   value: string;
   setValue: (value: string) => void;
   placeholder: string;
@@ -22,7 +22,7 @@ export function STextarea({
   };
 
   return (
-    <Flex flexDirection="column" alignItems="end">
+    <Flex flexDirection="column" alignItems="end" w="full">
       <Textarea
         background="white"
         borderRadius="2xl"
@@ -32,10 +32,13 @@ export function STextarea({
         onChange={handleInputChange}
         resize="none"
         mb={2}
+        minH={maxLength ? 20 : 9}
       />
-      <Text color="gray.500">
-        {value.length}/{maxLength}
-      </Text>
+      {maxLength && (
+        <Text color="gray.500">
+          {value.length}/{maxLength}
+        </Text>
+      )}
     </Flex>
   );
 }
diff --git a/src/shared/ui/SearchInput/SearchInput.tsx b/src/shared/ui/SearchInput/SearchInput.tsx
index 0bb7d051..fca6e3cc 100644
--- a/src/shared/ui/SearchInput/SearchInput.tsx
+++ b/src/shared/ui/SearchInput/SearchInput.tsx
@@ -12,10 +12,11 @@ interface SearchInputProps {
   placeholder?: string;
   value?: string;
   onChange: (value: string) => void;
+  variant?: string;
 }
 
 export const SearchInput = forwardRef<HTMLInputElement, SearchInputProps>(
-  ({ placeholder, onChange, value }: SearchInputProps, ref) => {
+  ({ placeholder, onChange, value, variant }: SearchInputProps, ref) => {
     return (
       <InputGroup>
         <InputLeftElement pointerEvents="none">
@@ -28,7 +29,7 @@ export const SearchInput = forwardRef<HTMLInputElement, SearchInputProps>(
             borderColor: 'blue.500',
           }}
           borderRadius="full"
-          _placeholder={{ color: 'gray.400' }}
+          _placeholder={{ color: 'gray.400', fontWeight: 400 }}
           background={'white'}
           placeholder={placeholder}
           value={value}
diff --git a/src/shared/ui/SettingsItem/index.ts b/src/shared/ui/SettingsItem/index.ts
deleted file mode 100644
index 3b5223d2..00000000
--- a/src/shared/ui/SettingsItem/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './SettingItem';
diff --git a/src/shared/ui/SettingsItem/SettingItem.tsx b/src/shared/ui/Switcher/Switcher.tsx
similarity index 90%
rename from src/shared/ui/SettingsItem/SettingItem.tsx
rename to src/shared/ui/Switcher/Switcher.tsx
index 5a3c8a73..a87c8a34 100644
--- a/src/shared/ui/SettingsItem/SettingItem.tsx
+++ b/src/shared/ui/Switcher/Switcher.tsx
@@ -1,13 +1,13 @@
 import { Flex, Heading, IconButton, Icon, Switch, Text, type As } from '@chakra-ui/react';
 
-interface SettingItemProp {
+interface SwitcherProp {
   type?: 'heading' | 'text';
   children: string;
   icon?: As;
   variant?: string;
 }
 
-export function SettingItem(props: SettingItemProp) {
+export function Switcher(props: SwitcherProp) {
   const { type, children, icon, variant } = props;
   return (
     <Flex alignItems="center" justifyContent="space-between" py={3}>
diff --git a/src/shared/ui/Switcher/index.ts b/src/shared/ui/Switcher/index.ts
new file mode 100644
index 00000000..e6d897eb
--- /dev/null
+++ b/src/shared/ui/Switcher/index.ts
@@ -0,0 +1 @@
+export * from './Switcher';
diff --git a/src/widgets/chats-list/ChatsList.tsx b/src/widgets/chats-list/ChatsList.tsx
index a89b34e9..a1556f46 100644
--- a/src/widgets/chats-list/ChatsList.tsx
+++ b/src/widgets/chats-list/ChatsList.tsx
@@ -36,10 +36,10 @@ export function ChatsList(props: SearchProps) {
               as={ReactLink}
               key={chat.id}
               borderBottom="1px"
-              borderColor="gray.300"
+              borderColor="gray.200"
               _hover={{
                 textDecoration: 'none',
-                bg: 'gray.300',
+                bg: 'gray.200',
               }}
               _last={{
                 border: 'none',
diff --git a/src/widgets/profile-card/index.ts b/src/widgets/profile-card/index.ts
deleted file mode 100644
index e032bee9..00000000
--- a/src/widgets/profile-card/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ProfileCard } from './ProfileCard';
-export { ProfileCardDesktop } from './ProfileCard.desktop';
-export * from './ProfileCardNotAuth';