Skip to content
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

Jump to bottom

feat(form-v2): admin navbar feature #4129

Merged
merged 11 commits into from
Jul 22, 2022
Merged

feat(form-v2): admin navbar feature #4129

merged 11 commits into from
Jul 22, 2022

Conversation

r00dgirl
Copy link
Contributor

@r00dgirl r00dgirl commented Jul 9, 2022 •
edited
Loading

Added Admin Navbar feature

Also fixed these problems:

  1. Corrected type of AvatarMenu's children to React.ReactNode - this was incorrectly typed as a JSX Element
  2. Added sizes to Avatar's ComponentMultiStyleConfig, as Avatar component's default size was bigger than specified in design system
  3. Corrected size of username icon on AvatarMenu
  4. Implemented max width for AvatarMenu, and truncation of usernames that would exceed the max width
  5. Corrected aria role in AvatarMenu component

Closes #4006

@r00dgirl r00dgirl requested review from timotheeg and karrui and removed request for timotheeg July 9, 2022 15:13
@r00dgirl r00dgirl changed the title fix(form-v2): add sizes to Avatar style config; correct AvatarMenu props type feat(form-v2): admin navbar feature Jul 12, 2022
@r00dgirl r00dgirl marked this pull request as draft July 13, 2022 02:19
@karrui karrui mentioned this pull request Jul 19, 2022
Merged
1 task
@karrui
Copy link
Contributor

karrui commented Jul 19, 2022 •
edited
Loading

Opening a quick PR to fix Avatar sizing
edit: #4235

@karrui karrui mentioned this pull request Jul 19, 2022
Merged
@r00dgirl r00dgirl marked this pull request as ready for review July 19, 2022 14:20
timotheeg
timotheeg reviewed Jul 20, 2022
View reviewed changes
Copy link
Contributor

@timotheeg timotheeg left a comment

Choose a reason for hiding this comment

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

Looking good! I only have some minor nits.

frontend/src/app/AdminNavBar/AdminNavBar.tsx Outdated Show resolved Hide resolved
@r00dgirl
Merge branch 'form-v2/develop' into form-v2/admin-navbar
706ace3 
# Conflicts:
#	frontend/src/templates/AvatarMenu/AvatarMenu.tsx
#	frontend/src/theme/components/Avatar.ts
@r00dgirl
Copy link
Contributor Author

@karrui @timotheeg thanks for review! fixed and resolved merge conflicts

timotheeg
timotheeg approved these changes Jul 22, 2022
View reviewed changes
Copy link
Contributor

@timotheeg timotheeg left a comment

Choose a reason for hiding this comment

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

LGTM!

@r00dgirl r00dgirl merged commit e165807 into form-v2/develop Jul 22, 2022
@r00dgirl r00dgirl deleted the form-v2/admin-navbar branch July 22, 2022 10:40
This was referenced Oct 4, 2022
Closed
Merged
@justynoh justynoh mentioned this pull request Oct 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@karrui karrui karrui approved these changes

@timotheeg timotheeg timotheeg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@r00dgirl @karrui @timotheeg