Skip to content

Small Sidebar and Header Fix #126

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

Merged
wkim10 merged 1 commit into from
Apr 27, 2025
Merged

Small Sidebar and Header Fix #126

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
8 changes: 6 additions & 2 deletions src/components/SideNavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,15 @@ const SideNavBar = ({ user }: SideNavBarProps) => {
<ul className="w-full">
{tabs.map((tab) => {
const isLogout = tab.name === t("logout");
const isProfileTab = tab.href === "/private/profile";
const isActive =
!isLogout &&
(tab.href === "/private"
((tab.href === "/private"
? pathname === "/private"
: pathname === tab.href || pathname.startsWith(`${tab.href}/`));
: pathname === tab.href ||
pathname.startsWith(`${tab.href}/`)) ||
(isProfileTab && pathname.startsWith("/private/organization")));

return (
<li key={tab.name}>
<button
Expand Down
4 changes: 3 additions & 1 deletion src/components/TopHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ const TopHeader = ({ user }: TopHeaderProps) => {
)}
</>
) : (
<div className="text-gray-500 text-lg">{getTitle()}</div>
<div className="text-gray-500 text-lg">
{getTitle() === "Organization" ? "Profile" : getTitle()}
</div>
)}
<CustomizeEventModal
modalVisible={customizeModal}
Expand Down