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.

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

Updated UI for Admin-> User Profile #1667

Merged
merged 36 commits into from
Mar 26, 2024

Conversation

pranshugupta54
Copy link
Member

@pranshugupta54 pranshugupta54 commented Mar 4, 2024

What kind of change does this PR introduce?

Admin -> User Profile -> Re-design

Issue Number:

Fixes #1615

Screenshot:
image

Other information

  • The left side panel (according to Figma) should be fixed in another issue to match the design.
  • The Top side panel (according to Figma) should be fixed in another issue to match the design.

NOTE:

  • Some features are not yet supported by API

Copy link

github-actions bot commented Mar 4, 2024

Our Pull Request Approval Process

We have these basic policies to make the approval process smoother for our volunteer team.

Testing Your Code

Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:

  1. The overall code coverage drops below the target threshold of the repository
  2. Any file in the pull request has code coverage levels below the repository threshold
  3. Merge conflicts

The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

Reviewers

Do not assign reviewers. Our Queue Monitors will review your PR and assign them.
When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

  1. arbitrators of future discussions with other contributors about the validity of your changes
  2. point of contact for evaluating the validity of your work
  3. person who verifies matching issues by others that should be closed.
  4. person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

  1. PRs with issues not assigned to you will be closed by the reviewer
  2. Fix the first comment in the PR so that each issue listed automatically closes

Other

  1. 🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
  2. Read the CONTRIBUTING.md file make

@Cioppolo14
Copy link

@pranshugupta54 Please fix the failing tests.

@pranshugupta54
Copy link
Member Author

Hey @Cioppolo14, sorry for the delay. I've fixed the test for MemberDetail, all the 9 tests are passing for the file.

@pranshugupta54
Copy link
Member Author

Fixed lint issue, failed test

@Cioppolo14
Copy link

@pranshugupta54 Are you working on the test application check?

@pranshugupta54
Copy link
Member Author

@pranshugupta54 Are you working on the test application check?

@Cioppolo14, fixed those!
image

Copy link
Contributor

@rishav-jha-mech rishav-jha-mech left a comment

Choose a reason for hiding this comment

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

@pranshugupta54

Add the following

  • Date input for birthdate
  • Placeholders for all the inputs
  • Select input for Employment and Marital Status
  • Choose file grey btn should be of our theme colour

@pranshugupta54
Copy link
Member Author

pranshugupta54 commented Mar 10, 2024

Hey @rishav-jha-mech,

  • Added date picker for birthDate
  • Placeholder for all inputs (didn't add for dropdown, they automatically have "select" text)
  • Added DynamicDropDown component which takes these labels and values for dropdown, instead of making multiple components
  • We'll have to use some external package or completely new component for that, react-bootstrap isn't providing an option for color, though it fits the theme.
  • Unable to figure how phone number works, it gives error Value is not a valid phone number of the form +17895551234 (7-15 digits)

Loom: https://www.loom.com/share/e38979b3d9f04e77b144022648e9a0cd?sid=63c58790-3fcf-4c56-82fa-457d1edb16a0

@Cioppolo14
Copy link

@pranshugupta54 Please fix the test application check.

@pranshugupta54
Copy link
Member Author

Hey @Cioppolo14, fixed the failing tests for MemberDetails

image

@palisadoes
Copy link
Contributor

This is an update on the PR merging freeze:

  1. In the next few hours we will be merging the develop-userTypeFix branch into the develop branch.
  2. The develop-userTypeFix branch was created to fix a long standing design flaw where Admins were Admins of all organizations, not specific ones.
  3. The userType field has been removed from the User collection and it has been replaced by an appUserProfileId field.
    1. This field is null if the user isn’t registered to use the apps. This will help people to add users manually during the event checkin process, or if an Admin wants to manually add someone in the Admin dashboard.
    2. When not null the AppUserProfileID will reference a AppUserProfile collection with App related information such as the organizations for which a user may be an Admin.
    3. The updated schema can be found here https://github.com/PalisadoesFoundation/talawa-api/blob/develop-userTypeFix/schema.graphql
    4. This is the parent issue that we have been using to track progress:
      1. PARENT ISSUE: Fix the usage of userType talawa-api#1965
  4. This merge will cause some conflicts in your PR.

We decided to do this at the beginning of the weekend to give us all time to adjust PR code and create bug fixes that may arise.

Update your code at or after midnight GMT on the morning of March 23, 2024. (5:30am IST).

If your PRs have already been approved, request a re-review after fixing the conflicts and refactoring to the new AppUserProfileID methodology.

@pranshugupta54
Copy link
Member Author

@Cioppolo14, sorry for the delay (bcuz of exams).

Fixed the tests
image

@pranshugupta54
Copy link
Member Author

Done for Dropdown too
image

@pranshugupta54
Copy link
Member Author

fixed lint issue

@palisadoes
Copy link
Contributor

The PR merging freeze is lifted.

  1. We are working on bug fixes that may arise. These should be few and are being tracked here:
    1. https://github.com/orgs/PalisadoesFoundation/projects/24
  2. Please update your PRs and local repos. Fix any new merge conflicts that may have occurred.

Background:

  1. The develop-userTypeFix branch was created to fix a long standing design flaw where Admins were Admins of all organizations, not specific ones.
  2. The userType field has been removed from the User collection and it has been replaced by an appUserProfileId field.
    1. This field is null if the user isn’t registered to use the apps. This will help people to add users manually during the event checkin process, or if an Admin wants to manually add someone in the Admin dashboard.
    2. When not null the AppUserProfileID will reference a AppUserProfile collection with App related information such as the organizations for which a user may be an Admin.
    3. The updated schema can be found here https://github.com/PalisadoesFoundation/talawa-api/blob/develop-userTypeFix/schema.graphql
    4. This is the parent issue that we have been using to track progress:
      1. PARENT ISSUE: Fix the usage of userType talawa-api#1965
  3. If your PRs have already been approved, request a re-review after fixing the conflicts and refactoring to the new AppUserProfileID methodology.

@palisadoes palisadoes linked an issue Mar 24, 2024 that may be closed by this pull request
@palisadoes palisadoes added the ui/ux issue related and being worked with the figma file of the Admin UI label Mar 24, 2024
@Cioppolo14
Copy link

@pranshugupta54 Please fix the failing tests.

@pranshugupta54
Copy link
Member Author

Yes, fixing it completely for userType

@pranshugupta54
Copy link
Member Author

pranshugupta54 commented Mar 26, 2024

@palisadoes, please check this.

Fixed everything,

  • userType fix
  • Testing done
  • 100% code coverage
image

Failing checks:

  1. Unauthorized files - changed package.json to add sanitize-html for image upload on frontend
  2. Introspection - Not related to this PR

@palisadoes palisadoes merged commit e78d952 into PalisadoesFoundation:develop Mar 26, 2024
10 of 12 checks passed
@pranshugupta54 pranshugupta54 deleted the admin-profile branch March 27, 2024 00:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready 4 PR Review ui/ux issue related and being worked with the figma file of the Admin UI
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

ADMIN REDESIGN: redesign the user profile for the talawa admin
4 participants