Skip to content

642/toolbar-touchup#645

Merged
TheAbubakrAbu merged 9 commits intodevfrom
642/toolbar-touchup
Apr 9, 2026
Merged

642/toolbar-touchup#645
TheAbubakrAbu merged 9 commits intodevfrom
642/toolbar-touchup

Conversation

@samikabhatkar-web
Copy link
Copy Markdown
Contributor

…route

Summary

  • Revised the toolbar to have conditional styling based on the current page, matching Figma styles
  • As per the figma, the restaurant pages (Brandywine, Anteatery) and the About Us page have the original transparent look with white text. All other pages use a white background with the blue PeterPlate title and black nav links.
  • Should be dark mode compatible

Changes

  • Added conditional styling to Toolbar based on current route using usePathname
Screenshot 2026-02-21 at 4 47 53 PM Screenshot 2026-02-21 at 4 47 46 PM

@samikabhatkar-web samikabhatkar-web temporarily deployed to staging-645 February 22, 2026 00:48 — with GitHub Actions Inactive
@github-actions github-actions Bot temporarily deployed to staging-645 February 22, 2026 00:48 Inactive
@LexTruong LexTruong self-requested a review February 24, 2026 21:33
Copy link
Copy Markdown
Collaborator

@LexTruong LexTruong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! Just a couple of minor fixes needed to further align with the Figma:

  • When users are not logged in, there should only be a sign in button, not a menu icon as well.
  • The menu button is not visible (white on white) on the about page when in light mode.

@samikabhatkar-web samikabhatkar-web changed the title feat(frontend): ✨ added conditional toolbar styling based on current … 642/toolbar-touchup Feb 26, 2026
@LexTruong LexTruong temporarily deployed to staging-645 March 5, 2026 00:40 — with GitHub Actions Inactive
@github-actions github-actions Bot temporarily deployed to staging-645 March 5, 2026 00:41 Inactive
@LexTruong LexTruong temporarily deployed to staging-645 March 5, 2026 01:21 — with GitHub Actions Inactive
@github-actions github-actions Bot temporarily deployed to staging-645 March 5, 2026 01:21 Inactive
Copy link
Copy Markdown
Collaborator

@LexTruong LexTruong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey Samika! I helped merge your changes with dev to resolve the conflicts. This merge brought a new MobileToolbar in toolbar.tsx. Please make the top bar of the mobile toolbar transparent, similar to how you did for the desktop toolbar. Also, please add the thin grey line at the bottom of the the desktop toolbar on non-transparent pages.

@samikabhatkar-web samikabhatkar-web temporarily deployed to staging-645 March 5, 2026 18:56 — with GitHub Actions Inactive
@github-actions github-actions Bot temporarily deployed to staging-645 March 5, 2026 18:57 Inactive
@samikabhatkar-web samikabhatkar-web temporarily deployed to staging-645 March 5, 2026 18:58 — with GitHub Actions Inactive
@samikabhatkar-web
Copy link
Copy Markdown
Contributor Author

Hey Samika! I helped merge your changes with dev to resolve the conflicts. This merge brought a new MobileToolbar in toolbar.tsx. Please make the top bar of the mobile toolbar transparent, similar to how you did for the desktop toolbar. Also, please add the thin grey line at the bottom of the the desktop toolbar on non-transparent pages.

Got it, just addressed those changes!

@github-actions github-actions Bot temporarily deployed to staging-645 March 5, 2026 18:59 Inactive
@samikabhatkar-web samikabhatkar-web temporarily deployed to staging-645 March 10, 2026 21:20 — with GitHub Actions Inactive
@github-actions github-actions Bot temporarily deployed to staging-645 March 10, 2026 21:21 Inactive
@samikabhatkar-web samikabhatkar-web temporarily deployed to staging-645 March 10, 2026 21:40 — with GitHub Actions Inactive
@github-actions github-actions Bot temporarily deployed to staging-645 March 10, 2026 21:41 Inactive
Copy link
Copy Markdown
Collaborator

@LexTruong LexTruong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey Samika, those changes you made look great! 2 other things I noticed though (sorry if I missed them the first time):

  • Missing a link to the Meal tracker page in the toolbar
  • Let's disable the Food Courts button for now since it's not implemented

@LexTruong LexTruong requested a review from TheAbubakrAbu April 2, 2026 02:36
@LexTruong LexTruong requested a review from TheAbubakrAbu April 2, 2026 02:36
Copy link
Copy Markdown
Collaborator

@TheAbubakrAbu TheAbubakrAbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Samika! Just following up on the previous comments from Lex:

  • The Meal Tracker link still seems to be missing from the toolbar
  • The Food Courts button is still enabled even though it’s not implemented yet

Just wanted to check if this is still being worked on. Let us know if you need anything!

@samikabhatkar-web
Copy link
Copy Markdown
Contributor Author

Hi Samika! Just following up on the previous comments from Lex:

  • The Meal Tracker link still seems to be missing from the toolbar
  • The Food Courts button is still enabled even though it’s not implemented yet

Just wanted to check if this is still being worked on. Let us know if you need anything!

Hi Abu, I'll get to these changes today!

@TheAbubakrAbu TheAbubakrAbu temporarily deployed to staging-645 April 8, 2026 04:57 — with GitHub Actions Inactive
@github-actions github-actions Bot temporarily deployed to staging-645 April 8, 2026 04:58 Inactive
Copy link
Copy Markdown
Collaborator

@TheAbubakrAbu TheAbubakrAbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks for the fixes!

@TheAbubakrAbu TheAbubakrAbu merged commit 017df2a into dev Apr 9, 2026
1 of 2 checks passed
@TheAbubakrAbu TheAbubakrAbu deleted the 642/toolbar-touchup branch April 9, 2026 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants