diff --git a/src/app/config/errorBoundary/errors/BackHome.tsx b/src/app/config/errorBoundary/errors/BackHome.tsx
index 49cfebe4..3d0d4f6f 100644
--- a/src/app/config/errorBoundary/errors/BackHome.tsx
+++ b/src/app/config/errorBoundary/errors/BackHome.tsx
@@ -12,7 +12,7 @@ export const BackHome = () => {
const handleClick = () => {
resetErrorBoundary();
if (isAuthenticated()) {
- return navigate('/users');
+ return navigate('/connections');
}
navigate('/login');
};
diff --git a/src/app/config/router/instance.tsx b/src/app/config/router/instance.tsx
index 0c6dfd52..d7492e03 100644
--- a/src/app/config/router/instance.tsx
+++ b/src/app/config/router/instance.tsx
@@ -1,6 +1,5 @@
import React from 'react';
import { createBrowserRouter, Navigate } from 'react-router-dom';
-import { UserDetailPage, UserListPage } from '@pages/user';
import { LoginPage } from '@pages/auth';
import { AuthLayout, ErrorLayout, PrivateLayout } from '@app/layouts';
import { CreateGroupPage, GroupDetailPage, GroupListPage, UpdateGroupPage } from '@pages/group';
@@ -47,15 +46,7 @@ export const router = createBrowserRouter([
children: [
{
path: '/',
- element: ,
- },
- {
- path: '/users',
- element: ,
- },
- {
- path: '/users/:id',
- element: ,
+ element: ,
},
{
path: '/groups',
diff --git a/src/app/config/router/permissions/authRoute.tsx b/src/app/config/router/permissions/authRoute.tsx
index 9b2dfbce..32f94806 100644
--- a/src/app/config/router/permissions/authRoute.tsx
+++ b/src/app/config/router/permissions/authRoute.tsx
@@ -4,5 +4,5 @@ import { Navigate } from 'react-router-dom';
import { isAuthenticated } from './utils';
export const AuthRoute = ({ children }: PropsWithChildren) => {
- return isAuthenticated() ? : children;
+ return isAuthenticated() ? : children;
};
diff --git a/src/entities/auth/hooks/useLogin/index.ts b/src/entities/auth/hooks/useLogin/index.ts
index a98f257b..f5982904 100644
--- a/src/entities/auth/hooks/useLogin/index.ts
+++ b/src/entities/auth/hooks/useLogin/index.ts
@@ -6,7 +6,7 @@ export const useLogin = () => {
const login = (token: string) => {
localStorage.setItem(Storage.ACCESS_TOKEN, token);
- navigate('/users');
+ navigate('/connections');
};
return login;
diff --git a/src/entities/user/index.ts b/src/entities/user/index.ts
index 1a554c55..b1c13e73 100644
--- a/src/entities/user/index.ts
+++ b/src/entities/user/index.ts
@@ -1,2 +1 @@
export * from './api';
-export * from './ui';
diff --git a/src/entities/user/ui/UserDetailInfo/index.tsx b/src/entities/user/ui/UserDetailInfo/index.tsx
deleted file mode 100644
index 96b792b2..00000000
--- a/src/entities/user/ui/UserDetailInfo/index.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import { Descriptions } from 'antd';
-
-import { UserDetailInfoProps } from './types';
-
-export const UserDetailInfo = ({ user }: UserDetailInfoProps) => {
- return (
-
-
- {user.id}
-
-
- {user.username}
-
-
- {user.is_superuser ? 'Yes' : 'Not'}
-
-
- );
-};
diff --git a/src/entities/user/ui/UserDetailInfo/types.ts b/src/entities/user/ui/UserDetailInfo/types.ts
deleted file mode 100644
index 586ec8d0..00000000
--- a/src/entities/user/ui/UserDetailInfo/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { User } from '@entities/user';
-
-export interface UserDetailInfoProps {
- user: User;
-}
diff --git a/src/entities/user/ui/index.ts b/src/entities/user/ui/index.ts
deleted file mode 100644
index 904007cc..00000000
--- a/src/entities/user/ui/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './UserDetailInfo';
diff --git a/src/features/group/GroupDetailInfo/index.tsx b/src/features/group/GroupDetailInfo/index.tsx
index c43fb91a..c16e4617 100644
--- a/src/features/group/GroupDetailInfo/index.tsx
+++ b/src/features/group/GroupDetailInfo/index.tsx
@@ -1,6 +1,5 @@
import React from 'react';
import { Descriptions } from 'antd';
-import { Link } from 'react-router-dom';
import { GroupDetailInfoProps } from './types';
@@ -17,7 +16,7 @@ export const GroupDetailInfo = ({ group, owner, ...props }: GroupDetailInfoProps
{group.description}
- {owner.username}
+ {owner.username}
);
diff --git a/src/features/user/UserList/constants.tsx b/src/features/user/UserList/constants.tsx
deleted file mode 100644
index bb96f282..00000000
--- a/src/features/user/UserList/constants.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { User } from '@entities/user';
-import { PaginationResponse } from '@shared/types';
-import { TableColumns } from '@shared/ui';
-import { Link } from 'react-router-dom';
-
-export const USER_LIST_COLUMNS: TableColumns> = [
- {
- title: 'Id',
- dataIndex: 'id',
- width: 150,
- },
- {
- title: 'Username',
- dataIndex: 'username',
- render: (username, record) => {username},
- },
- {
- title: 'Is superuser',
- dataIndex: 'is_superuser',
- render: (value) => (value ? 'Yes' : 'No'),
- width: 150,
- },
-];
diff --git a/src/features/user/UserList/index.tsx b/src/features/user/UserList/index.tsx
deleted file mode 100644
index 80c10391..00000000
--- a/src/features/user/UserList/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { ManagedTable } from '@shared/ui';
-import { userService, UserQueryKey } from '@entities/user';
-
-import { USER_LIST_COLUMNS } from './constants';
-
-export const UserList = () => {
- return (
-
- );
-};
diff --git a/src/features/user/index.ts b/src/features/user/index.ts
deleted file mode 100644
index 57453f13..00000000
--- a/src/features/user/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './UserList';
diff --git a/src/pages/user/UserDetailPage/index.tsx b/src/pages/user/UserDetailPage/index.tsx
deleted file mode 100644
index 900b75f9..00000000
--- a/src/pages/user/UserDetailPage/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { UserDetailInfo, useGetUser } from '@entities/user';
-import { PageDetailParams } from '@shared/types';
-import { PageContentWrapper } from '@shared/ui';
-import { Typography } from 'antd';
-import { useParams } from 'react-router-dom';
-
-const { Title } = Typography;
-
-export const UserDetailPage = () => {
- const params = useParams();
- const { data: user } = useGetUser({ id: Number(params.id) });
-
- if (!user) {
- return null;
- }
-
- return (
-
- User: {user.username}
-
-
- );
-};
diff --git a/src/pages/user/UserListPage/index.tsx b/src/pages/user/UserListPage/index.tsx
deleted file mode 100644
index 850c72b4..00000000
--- a/src/pages/user/UserListPage/index.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { UserList } from '@features/user';
-import { PageContentWrapper } from '@shared/ui';
-import { Typography } from 'antd';
-import React from 'react';
-
-const { Title } = Typography;
-
-export const UserListPage = () => {
- return (
-
- Users
-
-
- );
-};
diff --git a/src/pages/user/index.ts b/src/pages/user/index.ts
deleted file mode 100644
index 6158c018..00000000
--- a/src/pages/user/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './UserListPage';
-export * from './UserDetailPage';
diff --git a/src/widgets/layout/Sidebar/constants.tsx b/src/widgets/layout/Sidebar/constants.tsx
index e5d5a045..17390e3a 100644
--- a/src/widgets/layout/Sidebar/constants.tsx
+++ b/src/widgets/layout/Sidebar/constants.tsx
@@ -1,24 +1,18 @@
import React from 'react';
import { MenuProps } from 'antd';
-import {
- MergeCellsOutlined,
- OrderedListOutlined,
- PullRequestOutlined,
- UsergroupAddOutlined,
- UserOutlined,
-} from '@ant-design/icons';
+import { MergeCellsOutlined, OrderedListOutlined, PullRequestOutlined, UsergroupAddOutlined } from '@ant-design/icons';
import { Link } from 'react-router-dom';
export const SIDEBAR_ITEMS: MenuProps['items'] = [
{
- key: 'users',
- label: Users,
- icon: ,
+ key: 'connections',
+ label: Connections,
+ icon: ,
},
{
- key: 'groups',
- label: Groups,
- icon: ,
+ key: 'transfers',
+ label: Transfers,
+ icon: ,
},
{
key: 'queues',
@@ -26,13 +20,8 @@ export const SIDEBAR_ITEMS: MenuProps['items'] = [
icon: ,
},
{
- key: 'connections',
- label: Connections,
- icon: ,
- },
- {
- key: 'transfers',
- label: Transfers,
- icon: ,
+ key: 'groups',
+ label: Groups,
+ icon: ,
},
];