рефакторинг и правка багов (#91)

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,

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>

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>

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}>

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';

src/widgets/profile-card/ProfileCard.desktop.tsx → 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}>
               Специализация и навыки

src/widgets/profile-card/ProfileCard.tsx → 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';
 

src/widgets/profile-card/ProfileCardNotAuth.tsx → 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>
   );
 }

src/widgets/profile-card/ProfileCardUser.tsx → 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">

src/entities/user/profile-card/index.ts

@@ -0,0 +1,3 @@
+export * from './ProfileCard';
+export * from './ProfileCard.desktop';
+export * from './ProfileCardNotAuth';

src/entities/user/info/Info.tsx → 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;
 

src/entities/user/profile-card/statistic/index.ts

@@ -0,0 +1 @@
+export * from './Statistic';

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>
   );

src/features/notifications/notification/Notification.tsx → 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();
 

src/features/notifications/button/index.ts

@@ -0,0 +1 @@
+export * from './NotificationButton';

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';

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>
   );

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} />;
 };

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"

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} />

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';

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';

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';
 

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}>

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}

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>

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} />;
+}