Skip to content

feat: add sidebar and topbar UI components #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
a-kashish wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: add sidebar and topbar UI components #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b188d2
feat: add sidebar and topbar UI components
a-kashish Jan 25, 2026
39a5373
fix: resolve duplicate dependency in package.json
a-kashish Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions app/(root)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,46 @@
"use client";

import styled from "styled-components";
import GlobalBlackBar from "../components/GlobalBlackBar";
import Sidebar from "../components/Sidebar";
import TopBar from "../components/TopBar";

export default function BethesourceLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<>
<GlobalBlackBar />
<LayoutContainer>
<Sidebar
// TODO: Implement all of these
isCollapsed={false}
setIsCollapsed={() => {}}
isLoggedIn={false}
setIsLoggedIn={() => {}}
cartItemCount={0}
/>
{children}
</LayoutContainer>
</>
<Container>
{/* The Sidebar sits on the left. It no longer needs props */}
<Sidebar />

{/* The MainContent column sits on the right */}
<MainContent>
<TopBar />
<ContentArea>{children}</ContentArea>
</MainContent>
</Container>
);
}

const LayoutContainer = styled.div`
// --- Layout Styles ---

const Container = styled.div`
display: flex;
width: 100vw;
height: 100vh;
overflow: hidden; /* Prevents the whole page from scrolling */
`;

const MainContent = styled.div`
display: flex;
flex-direction: row;
width: 100%;
height: 100%;
flex-direction: column;
flex: 1; /* Takes up all width not used by Sidebar */
min-width: 0; /* Prevents flexbox overflow issues */
`;

const ContentArea = styled.main`
flex: 1; /* Takes up all height not used by TopBar */
overflow-y: auto; /* Allows only this area to scroll */
background-color: #f9fafb; /* Light gray background for content */
`;
Loading