From 85277f2767abe2570255096a80413a3e70ff9512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20L=C3=A1szl=C3=B3?= <rlacko99@gmail.com>
Date: Sun, 13 Dec 2020 19:50:55 +0100
Subject: [PATCH] Remove Group rentals page
---
client/src/components/admin/GroupAdminContent.tsx | 12 ++++--------
client/src/components/admin/group/GroupRentals.tsx | 12 ------------
2 files changed, 4 insertions(+), 20 deletions(-)
delete mode 100644 client/src/components/admin/group/GroupRentals.tsx
diff --git a/client/src/components/admin/GroupAdminContent.tsx b/client/src/components/admin/GroupAdminContent.tsx
index 3f08d57..5afbc64 100644
--- a/client/src/components/admin/GroupAdminContent.tsx
+++ b/client/src/components/admin/GroupAdminContent.tsx
@@ -7,7 +7,6 @@ import { GroupDocuments } from './group/GroupDocuments';
import { GroupItems } from './group/GroupItems';
import { GroupMembers } from './group/GroupMembers';
import { GroupNotExists } from '../utils/GroupNotExists';
-import { GroupRentals } from './group/GroupRentals';
import { GroupRole } from '../../types/graphqlSchema';
import { GroupStorages } from './group/GroupStorages';
import { Loader } from '../utils/Loader';
@@ -59,17 +58,14 @@ export const GroupAdminContent: React.FC<RouteComponentProps<TParams>> = ({ matc
<Route path={`${match.url}/members`}>
<GroupMembers group={groupData?.group} filterBy={urlQuery.get('f')} />
</Route>
- <Route path={`${match.url}/rentals`}>
- <GroupRentals group={groupData?.group} state={urlQuery.get('s')} />
- </Route>
- <Route path={`${match.url}/documents`}>
- <GroupDocuments group={groupData?.group} orderBy={urlQuery.get('o')} />
+ <Route path={`${match.url}/items`}>
+ <GroupItems group={groupData?.group} />
</Route>
<Route path={`${match.url}/storages`}>
<GroupStorages group={groupData?.group} />
</Route>
- <Route path={`${match.url}/items`}>
- <GroupItems group={groupData?.group} />
+ <Route path={`${match.url}/documents`}>
+ <GroupDocuments group={groupData?.group} orderBy={urlQuery.get('o')} />
</Route>
<Route path={`${match.url}`}>
<GroupAdminPanel group={groupData?.group} />
diff --git a/client/src/components/admin/group/GroupRentals.tsx b/client/src/components/admin/group/GroupRentals.tsx
deleted file mode 100644
index 16298be..0000000
--- a/client/src/components/admin/group/GroupRentals.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Group } from '../../../types/graphqlSchema';
-import React from 'react';
-
-interface TParams {
- group: Partial<Group> | undefined;
- state: string | null;
-}
-
-export const GroupRentals: React.FC<TParams> = ({ group, state }) => {
- console.log(group?.id);
- return <>filtered state = {state || 'none'}</>;
-};
--
GitLab