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

Create the departmental account icon #112

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Create the departmental account icon #112

merged 1 commit into from
Dec 12, 2024

Conversation

michho8
Copy link
Contributor

@michho8 michho8 commented Nov 18, 2024 •
edited
Loading

Ticket Link

Ticket 1835

List of squashed commits

  • Add user and school icon
  • Create navbar wrapper
  • Dealing with hydration error
  • Change navbar to use client and delete navbar wrapper
  • Change icon since resource was changed
  • Add ShadCN tooltip
  • Call client dept-account-icon file, change navbar to server
  • Fix dynamic modal tests by adding onClose
  • Create departmental role
  • Add departmental test to navbar.test and rename dept-account-icon.test
  • Finish unit tests
  • Remove svg files from /public/
  • Clean up code
  • Change imports and definition of a departmental account
  • Change to FontAwesome icon and fix tests
  • Change to use type equality

Test Checklist

  • Unit Tests Passed
  • Integration Tests Passed
  • General Visual Inspection

@michho8 michho8 force-pushed the dev-michelleh-1835 branch 3 times, most recently from 87899bb to f7a55fa Compare November 23, 2024 00:14
@JorWo
Copy link
Contributor

JorWo commented Nov 26, 2024 •
edited
Loading

Make sure to delete the SVGs in the /public folder. We used to not have FontAwesome icons installed so we just imported the icons not contained in Lucide React icons as SVGs.

@michho8 michho8 force-pushed the dev-michelleh-1835 branch 2 times, most recently from 4b6bb2f to 28097db Compare December 5, 2024 02:19
@michho8 michho8 force-pushed the dev-michelleh-1835 branch 4 times, most recently from 5279ef5 to 0c315a2 Compare December 5, 2024 19:11
@michho8
Copy link
Contributor Author

michho8 commented Dec 5, 2024

The icon, tooltip, and warning modal:
image
image
image

@michho8 michho8 marked this pull request as ready for review December 5, 2024 19:16
@michho8 michho8 requested a review from JorWo December 5, 2024 19:16
@michho8 michho8 self-assigned this Dec 5, 2024
@JorWo
Copy link
Contributor

JorWo commented Dec 5, 2024

Also update authorization.test.ts to assert that the DEPARTMENTAL role has been added to the user, thanks.

@michho8 michho8 force-pushed the dev-michelleh-1835 branch from 0c315a2 to fcd19c6 Compare December 6, 2024 03:40
@michho8
Copy link
Contributor Author

michho8 commented Dec 12, 2024

The new icon after changing to FontAwesome:
image

@michho8 michho8 requested a review from JorWo December 12, 2024 21:24
JorWo
JorWo reviewed Dec 12, 2024
View reviewed changes
ui/src/components/layout/navbar/dept-account-icon.tsx
<FontAwesomeIcon aria-label="user" icon={faUser} width={14} height={16} />
<div
className="bg-blue-background rounded-full flex justify-center
items-center h-[20px] w-[25px] absolute left-7 bottom-0"
Copy link
Contributor

@JorWo JorWo Dec 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Try h-6 w-6 for the width and height, let me know if you think it looks better. The school icon looks off center.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Using h-6 and w-6 will make the blue background into more a circular shape. I like this one more than how it looked before with it being more oval-shaped.
image

@JorWo JorWo merged commit 6bc7912 into uhawaii-system-its-ti-iam:main Dec 12, 2024
6 checks passed
gitCarrot pushed a commit to gitCarrot/uh-groupings that referenced this pull request Dec 20, 2024
@michho8 @gitCarrot
Create the departmental account icon (uhawaii-system-its-ti-iam#112)
554f5ca
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JorWo JorWo JorWo approved these changes

Assignees

@michho8 michho8

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@michho8 @JorWo