Skip to content

fix(accounts): keep the sidebar on the accounts page #323

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
eastagiletracker wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(accounts): keep the sidebar on the accounts page #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 20 additions & 14 deletions apps/frontend/src/app/accounts/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
'use client';

import React from 'react';
import NavBar from '../components/Navbar';
import StaffCard from '../components/StaffCard';
import { facilitationTeam, teamMembers } from './mockUsers';

export default function AccountsPage() {
return (
<div className="!p-6">
<h1 className="![font-family:var(--font-heading)] !text-[length:var(--font-size-heading-1)] !font-semibold">Accounts</h1>
<h3 className="![font-family:var(--font-heading)] !text-[length:var(--font-size-heading-3)] !font-semibold">Core BRANCH Facilitation Team</h3>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3 !pt-3 !pb-7">
{facilitationTeam.map(user => (
<StaffCard key={user.user_id} name={user.name} email={user.email} />
))}
</div>
<h3 className="![font-family:var(--font-heading)] !text-[length:var(--font-size-heading-3)] !font-semibold">BRANCH Team Members</h3>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3 !pt-3 !pb-7">
{teamMembers.map(user => (
<StaffCard key={user.user_id} name={user.name} email={user.email} />
))}
</div>
<div style={{ display: 'flex', minHeight: '100vh' }}>
<NavBar />
<main style={{ flex: 1, backgroundColor: '#f9fafb' }}>
<div className="!p-6">
<h1 className="![font-family:var(--font-heading)] !text-[length:var(--font-size-heading-1)] !font-semibold">Accounts</h1>
<h3 className="![font-family:var(--font-heading)] !text-[length:var(--font-size-heading-3)] !font-semibold">Core BRANCH Facilitation Team</h3>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3 !pt-3 !pb-7">
{facilitationTeam.map(user => (
<StaffCard key={user.user_id} name={user.name} email={user.email} />
))}
</div>
<h3 className="![font-family:var(--font-heading)] !text-[length:var(--font-size-heading-3)] !font-semibold">BRANCH Team Members</h3>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3 !pt-3 !pb-7">
{teamMembers.map(user => (
<StaffCard key={user.user_id} name={user.name} email={user.email} />
))}
</div>
</div>
</main>
</div>
);
}
10 changes: 10 additions & 0 deletions apps/frontend/test/components/AccountsPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,14 @@ describe('AccountsPage', () => {
expect(cards?.length).toBeGreaterThan(0);
}
});

// Regression guard for #300: the accounts page is a signed-in app route, so
// it must keep the sidebar the way every other app page does. It used to
// render only its content with no NavBar, which stranded the user with no
// way to navigate away.
it('renders the sidebar so it persists on the accounts page', () => {
render(<AccountsPage />);
expect(screen.getByRole('navigation')).toBeInTheDocument();
expect(screen.getAllByText('BRANCH').length).toBeGreaterThan(0);
});
});