Merge remote-tracking branch 'upstream/master' into feat/registration-flow

This commit is contained in:
Alex Holliday committed 2024-06-07 13:54:52 -07:00
commit 19b69f231e
26 files changed
+360 -140

No files matched your search

+9 -10
View File
@@ -1,11 +1,10 @@
.home-layout {
display: flex;
}
.main-content {
margin-left: 250px;
flex: 1;
padding: 20px;
overflow-y: auto;
}
display: flex;
}
.main-content {
margin-left: 250px;
flex: 1;
/* padding: 20px; */
overflow-y: auto;
}
+1
View File
@@ -22,6 +22,7 @@ const HomeLayout = () => {
{token && <p>Email: {decodedToken.email}</p>}
{/* I am a demo */}
</div>
<Outlet />
</div>
);
};