diff --git a/client/src/app/(main)/layout.tsx b/client/src/app/(main)/layout.tsx index b3028cea5..cd71f7d04 100644 --- a/client/src/app/(main)/layout.tsx +++ b/client/src/app/(main)/layout.tsx @@ -1,5 +1,5 @@ import styles from './Layout.module.scss'; -import { Sidebar } from 'widgets/Sidebar'; +import { Sidebar } from '@/widgets/Sidebar'; export default function AuthLayout({ children }: { children: React.ReactNode }) { return ( diff --git a/client/src/entities/notification/types/notification.ts b/client/src/entities/notification/types/notification.ts index e2c6af8f8..503b4d53a 100644 --- a/client/src/entities/notification/types/notification.ts +++ b/client/src/entities/notification/types/notification.ts @@ -1,5 +1,5 @@ -import { User } from 'entities/user'; -import { Team } from 'entities/team'; +import { User } from '@/entities/user'; +import { Team } from '@/entities/team'; export type NotificationType = 'SystemNotification' | 'TeamInvitationNotification'; diff --git a/client/src/entities/team/types/team.ts b/client/src/entities/team/types/team.ts index 551fcad31..fae2f3645 100644 --- a/client/src/entities/team/types/team.ts +++ b/client/src/entities/team/types/team.ts @@ -1,4 +1,4 @@ -import type { User } from 'entities/user'; +import type { User } from '@/entities/user'; export interface Team { _id: string; diff --git a/client/src/entities/user/types/user.ts b/client/src/entities/user/types/user.ts index f534ce7e9..defd705db 100644 --- a/client/src/entities/user/types/user.ts +++ b/client/src/entities/user/types/user.ts @@ -1,6 +1,6 @@ -import { Notification } from 'entities/notification'; -import { Role } from 'entities/role'; -import { Team } from 'entities/team'; +import { Notification } from '@/entities/notification'; +import { Role } from '@/entities/role'; +import { Team } from '@/entities/team'; export interface User { _id: string; diff --git a/client/src/widgets/Sidebar/config/getSidebarItems.tsx b/client/src/widgets/Sidebar/config/getSidebarItems.tsx index 10c2d24c3..8ea117fda 100644 --- a/client/src/widgets/Sidebar/config/getSidebarItems.tsx +++ b/client/src/widgets/Sidebar/config/getSidebarItems.tsx @@ -1,13 +1,13 @@ import React from 'react'; -import { User } from 'entities/user'; -import { HOME_PATH, PROFILE_PATH, TEAM_PATH, TOURNAMENTS_PATH } from 'shared/constant'; +import { User } from '@/entities/user'; +import { HOME_PATH, PROFILE_PATH, TEAM_PATH, TOURNAMENTS_PATH } from '@/shared/constant'; import { SidebarSearchIcon, SidebarTeamIcon, SidebarTrophyIcon, SidebarUserIcon, -} from 'shared/assets'; +} from '@/shared/assets'; export const getSidebarItems = (user: User) => { const data = [ diff --git a/client/src/widgets/Sidebar/index.ts b/client/src/widgets/Sidebar/index.ts index f5d26c75e..2fa54f4c0 100644 --- a/client/src/widgets/Sidebar/index.ts +++ b/client/src/widgets/Sidebar/index.ts @@ -1 +1 @@ -export { Sidebar } from 'widgets/Sidebar/ui/sidebar/sidebar'; +export { Sidebar } from './ui/sidebar/sidebar'; diff --git a/client/src/widgets/Sidebar/mock.ts b/client/src/widgets/Sidebar/mock.ts index d89953ac6..d76dfc14d 100644 --- a/client/src/widgets/Sidebar/mock.ts +++ b/client/src/widgets/Sidebar/mock.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ -import { User } from 'entities/user'; +import { User } from '@/entities/user'; // @ts-ignore export const mockUser: User = { diff --git a/client/src/widgets/Sidebar/ui/notification-content/notification-content.tsx b/client/src/widgets/Sidebar/ui/notification-content/notification-content.tsx index a44f07fde..b100550d3 100644 --- a/client/src/widgets/Sidebar/ui/notification-content/notification-content.tsx +++ b/client/src/widgets/Sidebar/ui/notification-content/notification-content.tsx @@ -1,9 +1,9 @@ import React, { Dispatch, SetStateAction } from 'react'; import clsx from 'clsx'; -import { IconWrapper } from 'shared/ui'; -import { SidebarNotificationIcon } from 'shared/assets'; -import { Notification } from 'entities/notification'; +import { IconWrapper } from '@/shared/ui'; +import { SidebarNotificationIcon } from '@/shared/assets'; +import { Notification } from '@/entities/notification'; import { SidebarNotificationsModal } from '../notification-modal/notification-modal'; import { SidebarNotificationsCount } from './notifications-count'; diff --git a/client/src/widgets/Sidebar/ui/notification-item/notification-item.tsx b/client/src/widgets/Sidebar/ui/notification-item/notification-item.tsx index 960cbc15e..934b8fc8a 100644 --- a/client/src/widgets/Sidebar/ui/notification-item/notification-item.tsx +++ b/client/src/widgets/Sidebar/ui/notification-item/notification-item.tsx @@ -3,9 +3,8 @@ // import { LOCAL_PATH } from '../../../http' import React from 'react'; -import { Loader } from 'shared/ui'; - -import { Notification } from 'entities/notification'; +import { Loader } from '@/shared/ui'; +import { Notification } from '@/entities/notification'; import { SidebarTeamInvatitionNotification } from './team-invatition-notification'; import { SidebarSystemNotification } from './system-notification'; diff --git a/client/src/widgets/Sidebar/ui/notification-item/system-notification.tsx b/client/src/widgets/Sidebar/ui/notification-item/system-notification.tsx index 7b53a60a7..91b8a2565 100644 --- a/client/src/widgets/Sidebar/ui/notification-item/system-notification.tsx +++ b/client/src/widgets/Sidebar/ui/notification-item/system-notification.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import { FlexWrapper } from 'shared/ui'; -import { SidebarLightningIcon } from 'shared/assets'; -import { getPastTime } from 'shared/lib'; -import { SystemNotification } from 'entities/notification'; +import { FlexWrapper } from '@/shared/ui'; +import { SidebarLightningIcon } from '@/shared/assets'; +import { getPastTime } from '@/shared/lib'; +import { SystemNotification } from '@/entities/notification'; import styles from './notification-item.module.scss'; diff --git a/client/src/widgets/Sidebar/ui/notification-item/team-invatition-notification.tsx b/client/src/widgets/Sidebar/ui/notification-item/team-invatition-notification.tsx index fb06e856a..8bf66e99c 100644 --- a/client/src/widgets/Sidebar/ui/notification-item/team-invatition-notification.tsx +++ b/client/src/widgets/Sidebar/ui/notification-item/team-invatition-notification.tsx @@ -1,9 +1,9 @@ import React from 'react'; import Image from 'next/image'; -import { FlexWrapper } from 'shared/ui'; -import { getPastTime } from 'shared/lib'; -import { TeamInvitationNotification } from 'entities/notification'; +import { FlexWrapper } from '@/shared/ui'; +import { getPastTime } from '@/shared/lib'; +import { TeamInvitationNotification } from '@/entities/notification'; import styles from './notification-item.module.scss'; diff --git a/client/src/widgets/Sidebar/ui/notification-list/lib/sort-notifications.ts b/client/src/widgets/Sidebar/ui/notification-list/lib/sort-notifications.ts index 85bf3b5a3..764d9bf38 100644 --- a/client/src/widgets/Sidebar/ui/notification-list/lib/sort-notifications.ts +++ b/client/src/widgets/Sidebar/ui/notification-list/lib/sort-notifications.ts @@ -1,4 +1,4 @@ -import { Notification } from 'entities/notification'; +import { Notification } from '@/entities/notification'; export const sortNotifications = (notifications: Notification[]) => { return [...notifications].sort( diff --git a/client/src/widgets/Sidebar/ui/notification-list/notification-list.tsx b/client/src/widgets/Sidebar/ui/notification-list/notification-list.tsx index e175b36e6..d6c3bea5b 100644 --- a/client/src/widgets/Sidebar/ui/notification-list/notification-list.tsx +++ b/client/src/widgets/Sidebar/ui/notification-list/notification-list.tsx @@ -1,6 +1,6 @@ import React, { useRef } from 'react'; -import { Notification } from 'entities/notification'; +import { Notification } from '@/entities/notification'; import styles from './notification-list.module.scss'; import { SidebarNotificationsItem } from '../notification-item/notification-item'; diff --git a/client/src/widgets/Sidebar/ui/notification-modal/desktop-modal-content.tsx b/client/src/widgets/Sidebar/ui/notification-modal/desktop-modal-content.tsx index b8eaba57a..4479d5e4b 100644 --- a/client/src/widgets/Sidebar/ui/notification-modal/desktop-modal-content.tsx +++ b/client/src/widgets/Sidebar/ui/notification-modal/desktop-modal-content.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { clsx } from 'clsx'; -import { IconWrapper } from 'shared/ui'; -import { SidebarChecksIcon, SidebarNotificationClose } from 'shared/assets'; +import { IconWrapper } from '@/shared/ui'; +import { SidebarChecksIcon, SidebarNotificationClose } from '@/shared/assets'; import { SidebarNotificationsList } from '../notification-list/notification-list'; import { NotificationsModalProps } from './notification-modal'; diff --git a/client/src/widgets/Sidebar/ui/notification-modal/mobile-modal-content.tsx b/client/src/widgets/Sidebar/ui/notification-modal/mobile-modal-content.tsx index 58246afa2..df479a96d 100644 --- a/client/src/widgets/Sidebar/ui/notification-modal/mobile-modal-content.tsx +++ b/client/src/widgets/Sidebar/ui/notification-modal/mobile-modal-content.tsx @@ -1,8 +1,8 @@ import { clsx } from 'clsx'; import React from 'react'; -import { SidebarChecksIcon, SidebarNotificationClose } from 'shared/assets'; -import { IconWrapper } from 'shared/ui'; +import { SidebarChecksIcon, SidebarNotificationClose } from '@/shared/assets'; +import { IconWrapper } from '@/shared/ui'; import { SidebarNotificationsList } from '../notification-list/notification-list'; import { NotificationsModalProps } from './notification-modal'; diff --git a/client/src/widgets/Sidebar/ui/notification-modal/notification-modal.tsx b/client/src/widgets/Sidebar/ui/notification-modal/notification-modal.tsx index 26d61eb26..147381ddf 100644 --- a/client/src/widgets/Sidebar/ui/notification-modal/notification-modal.tsx +++ b/client/src/widgets/Sidebar/ui/notification-modal/notification-modal.tsx @@ -1,8 +1,8 @@ import React, { useCallback, useEffect, useState } from 'react'; import { createPortal } from 'react-dom'; -import { useClickOutside, useGetScreenWidth } from 'shared/lib'; -import { Notification } from 'entities/notification'; +import { useClickOutside, useGetScreenWidth } from '@/shared/lib'; +import { Notification } from '@/entities/notification'; import { SidebarDesktopModalContent } from './desktop-modal-content'; import { SidebarMobileModalContent } from './mobile-modal-content'; diff --git a/client/src/widgets/Sidebar/ui/sidebar-item/sidebar-item.stories.tsx b/client/src/widgets/Sidebar/ui/sidebar-item/sidebar-item.stories.tsx index f2e9114ce..a35a6e207 100644 --- a/client/src/widgets/Sidebar/ui/sidebar-item/sidebar-item.stories.tsx +++ b/client/src/widgets/Sidebar/ui/sidebar-item/sidebar-item.stories.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Meta, StoryObj } from '@storybook/react'; import { SidebarItem, SidebarItemProps } from './sidebar-item'; -import { SidebarLightningIcon, SidebarSearchIcon } from 'shared/assets'; +import { SidebarLightningIcon, SidebarSearchIcon } from '@/shared/assets'; const sidebarItemProps: SidebarItemProps = { active: false, diff --git a/client/src/widgets/Sidebar/ui/sidebar-profile/sidebar-profile.stories.tsx b/client/src/widgets/Sidebar/ui/sidebar-profile/sidebar-profile.stories.tsx index 68d53763d..c8cec4e32 100644 --- a/client/src/widgets/Sidebar/ui/sidebar-profile/sidebar-profile.stories.tsx +++ b/client/src/widgets/Sidebar/ui/sidebar-profile/sidebar-profile.stories.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Meta, StoryObj } from '@storybook/react'; import { SidebarProfile, SidebarProfileProps } from './sidebar-profile'; -import { User } from 'entities/user'; +import { User } from '@/entities/user'; const defaultUser: User = { _id: '123123312', diff --git a/client/src/widgets/Sidebar/ui/sidebar-profile/sidebar-profile.tsx b/client/src/widgets/Sidebar/ui/sidebar-profile/sidebar-profile.tsx index da293c74c..ba4b69140 100644 --- a/client/src/widgets/Sidebar/ui/sidebar-profile/sidebar-profile.tsx +++ b/client/src/widgets/Sidebar/ui/sidebar-profile/sidebar-profile.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import clsx from 'clsx'; import Image from 'next/image'; -import { User } from 'entities/user'; +import { User } from '@/entities/user'; import styles from './sidebar-profile.module.scss'; diff --git a/client/src/widgets/Sidebar/ui/sidebar/sidebar.tsx b/client/src/widgets/Sidebar/ui/sidebar/sidebar.tsx index 9da7d41b1..9d87cb4c0 100644 --- a/client/src/widgets/Sidebar/ui/sidebar/sidebar.tsx +++ b/client/src/widgets/Sidebar/ui/sidebar/sidebar.tsx @@ -4,10 +4,10 @@ import React, { useState } from 'react'; import clsx from 'clsx'; import { usePathname, useRouter } from 'next/navigation'; -import { IconWrapper } from 'shared/ui'; -import { SidebarCloseIcon, SidebarExitIcon, SidebarShortLogo } from 'shared/assets'; -import { useClickOutside } from 'shared/lib'; -import { REGISTRATION_PATH } from 'shared/constant'; +import { IconWrapper } from '@/shared/ui'; +import { SidebarCloseIcon, SidebarExitIcon, SidebarShortLogo } from '@/shared/assets'; +import { useClickOutside } from '@/shared/lib'; +import { REGISTRATION_PATH } from '@/shared/constant'; import { mockUser } from '../../mock'; import { getSidebarItems } from '../../config/getSidebarItems';