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 redesigned "Users" page #1798

Open
wants to merge 4 commits into
base: development
Choose a base branch
from
Open

Create redesigned "Users" page #1798

wants to merge 4 commits into from

Conversation

vorleakyek
Copy link
Member

Fixes #1751

What changes did you make and why did you make them ?

  • Create redesigned "Users" page /users/ with links to /users/user-search and /users/permission-search as separate buttons.
  • Click on "Users" takes the user to the new, redesigned "Users" page
  • Change "User Management" title on existing User Management page to "User Search"
  • Note: There is a follow up ticket to handle the user permission search page in Create the "User Permission Search" screen #1752. So, clicking on the button might not work as expected yet.

Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)

Visuals before changes are applied

users-page-previous

Visuals after changes are applied

redesigned-users-page

@github-actions GitHub Actions
Copy link

Want to review this pull request? Take a look at this documentation for a step by step guide!

From your project repository, check out a new branch and test the changes.

git checkout -b vorleakyek-redesign-users-screen-1751 development
git pull https://github.com/vorleakyek/VRMS.git redesign-users-screen-1751

@JackHaeg JackHaeg mentioned this pull request Oct 22, 2024
Open
@pluto-bell pluto-bell self-requested a review October 28, 2024 18:20
pluto-bell
pluto-bell reviewed Oct 28, 2024
View reviewed changes
Copy link
Member

@pluto-bell pluto-bell left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Great work! MUI is being used for the buttons, the styling looks correct and the links work as expected (user permission search page to be added).

I noticed that the package.json, package-lock.json and yarn.lock files show updates, I don't know enough about back-end to say whether this would be an issue to merge or not, so I will leave this to the lead devs.

Edit: I'd love to hear from a lead dev on the above comment so I can know how to approach moving forward.

@pluto-bell pluto-bell assigned pluto-bell and unassigned pluto-bell Oct 28, 2024
@pluto-bell pluto-bell added the ready for dev lead Add to issue when dev lead needs to take some action label Oct 28, 2024
@vorleakyek
Copy link
Member Author

vorleakyek commented Oct 28, 2024 •
edited
Loading

@pluto-bell, thanks for taking a look at the PR. I think you're right that the package.json, package-lock.json and yarn.lock files shouldn't be included in the PR.

@trillium, is this okay? I tried to remove those files from the PR, but it's still showing this in the files changed. If not, what is the proper command to remove the files from PR?

image

@JackHaeg
Copy link
Member

JackHaeg commented Oct 29, 2024 •
edited
Loading

Per @trillium: restore the files using:

git checkout development -- FILEPATH1 FILEPATH2

@trillium will plan to meet with @vorleakyek this week to restore the json files.

@JackHaeg JackHaeg added the time-sensitive should be solved as soon as possible label Oct 29, 2024
@vorleakyek vorleakyek force-pushed the redesign-users-screen-1751 branch from fe36cf4 to 79c59f0 Compare October 30, 2024 00:39
@vorleakyek vorleakyek force-pushed the redesign-users-screen-1751 branch from 79c59f0 to ef5c3a0 Compare October 30, 2024 00:42
@vorleakyek vorleakyek force-pushed the redesign-users-screen-1751 branch from ef5c3a0 to 29f1c9b Compare October 30, 2024 00:49
@vorleakyek
Copy link
Member Author

Thanks @trillium for helping me restore the JSON files yesterday.
I also updated the code in client/src/pages/Users.jsx to use "Box" and "Container" MUI components instead of the "div" element, and updated the style in client/src/sass/Users.scss file.

@vorleakyek vorleakyek requested a review from pluto-bell October 31, 2024 03:40
@vorleakyek vorleakyek mentioned this pull request Oct 31, 2024
Open
pluto-bell
pluto-bell approved these changes Nov 1, 2024
View reviewed changes
Copy link
Member

@pluto-bell pluto-bell left a comment

Choose a reason for hiding this comment

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

Great, everything looks good to me and is working as expected (:

@vorleakyek vorleakyek mentioned this pull request Nov 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pluto-bell pluto-bell pluto-bell approved these changes

Assignees
No one assigned
Labels
ready for dev lead Add to issue when dev lead needs to take some action time-sensitive should be solved as soon as possible
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Redesign the "Users" Screen
3 participants
@vorleakyek @JackHaeg @pluto-bell