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/index.tsx
View file

@ -6,7 +6,7 @@ import useUser from "lib/hooks/useUser";
// hoc
import withAuth from "lib/hoc/withAuthWrapper";
// layouts
import AdminLayout from "layouts/AdminLayout";
import AppLayout from "layouts/AppLayout";
// components
import CreateProjectModal from "components/project/CreateProjectModal";
import ConfirmProjectDeletion from "components/project/ConfirmProjectDeletion";
@ -63,7 +63,7 @@ const Projects: NextPage = () => {
}, [isOpen]);
return (
<AdminLayout>
<AppLayout>
<CreateProjectModal isOpen={isOpen && !deleteProject} setIsOpen={setIsOpen} />
<ConfirmProjectDeletion
isOpen={isOpen && !!deleteProject}
@ -127,7 +127,7 @@ const Projects: NextPage = () => {
<Spinner />
</div>
)}
</AdminLayout>
</AppLayout>
);
};