binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved merge conflict

Browse source
This commit is contained in:
Dakshesh Jain 2022-12-08 20:35:27 +05:30
commit 9c33c3c87f
32 changed files with 939 additions and 1323 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/app/pages/projects/[projectId]/members.tsx
View file

@ -17,7 +17,7 @@ import { PROJECT_MEMBERS, PROJECT_INVITATIONS } from "constants/fetch-keys";
// hoc
import withAuth from "lib/hoc/withAuthWrapper";
// layouts
import AdminLayout from "layouts/AdminLayout";
import AppLayout from "layouts/AppLayout";
// components
import SendProjectInvitationModal from "components/project/SendProjectInvitationModal";
import ConfirmProjectMemberRemove from "components/project/ConfirmProjectMemberRemove";
@ -92,7 +92,7 @@ const ProjectMembers: NextPage = () => {
];
return (
<AdminLayout>
<AppLayout>
<ConfirmProjectMemberRemove
isOpen={Boolean(selectedRemoveMember) || Boolean(selectedInviteRemoveMember)}
onClose={() => {
@ -311,7 +311,7 @@ const ProjectMembers: NextPage = () => {
)}
</div>
)}
</AdminLayout>
</AppLayout>
);
};