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

USER REDESIGN: Redesign the sidenav for Talawa user portal #1539

Closed

Conversation

pateldivyesh1323
Copy link
Contributor

What kind of change does this PR introduce?

Issue Number:

Fixes #1510

Redesign the sidenav of talawa user portal with theme similar to admin portal.

Figma: https://www.figma.com/file/WksD4uIa5sQJMIk3pR4l0c/Talawa-Design-System-(Official)?type=design&node-id=3447%3A59&mode=design&t=fkgMPaaz67qLwmMz-1

Previous sidebar is removed and two sidebars are added:

  1. User:

    • My Organizations -> /user/organizations
    • Settings -> /user/settings
    • UserInfo Button -> /user/settings
    • Sign out -> /user
  2. Organization:

    • OrganizationInfo Button -> /user/organizations
    • Posts -> /user/organization/id={id}
    • Events -> /user/events/id={id}
    • Donations -> /user/donations/id={id}
    • UserInfo Button -> /user/settings
    • Sign out -> /user

Did you add tests for your changes?

Yes

Snapshots/Videos:

Talawa.Admin.-.Google.Chrome.2024-02-04.18-28-48.mp4

If relevant, did you update the documentation?

No

Does this PR introduce a breaking change?

No

Have you read the contributing guide?

Yes

Copy link

github-actions bot commented Feb 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
Contributor

@pateldivyesh1323 Can you please fix the failing introspection test? We are working on a fix to this issue.

@pateldivyesh1323
Copy link
Contributor Author

@Cioppolo14 Is there something to be done from my side?

@Cioppolo14
Copy link
Contributor

We can move forward without it for now. I will assign reviewers.

@Cioppolo14
Copy link
Contributor

@rishav-jha-mech @aashimawadhwa Can you review this PR?

@aashimawadhwa
Copy link
Member

as now the side navbar is ready please remove the topbar. @pateldivyesh1323

@PalisadoesFoundation PalisadoesFoundation deleted a comment from codecov bot Feb 6, 2024
Copy link

codecov bot commented Feb 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (25d3fe1) 96.74% compared to head (9667d9e) 96.79%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1539      +/-   ##
===========================================
+ Coverage    96.74%   96.79%   +0.05%     
===========================================
  Files          138      139       +1     
  Lines         3688     3747      +59     
  Branches      1125     1172      +47     
===========================================
+ Hits          3568     3627      +59     
  Misses         114      114              
  Partials         6        6              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pateldivyesh1323
Copy link
Contributor Author

@aashimawadhwa I have removed the top navbar.

image

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.

src/components/UserPortal/OrgLeftDrawer/OrgLeftDrawer.module.css

The left drawer has same style and classes as the one component we are using in Admin, just the logical part is different, instead of creating new files everywhere for the same component, create a index.css file in src/assets/css/ folder and import it in src/index.tsx file. Also when you do this, make sure to remove the same from all the left drawer and corresponding screen components.

@pateldivyesh1323
Copy link
Contributor Author

src/components/UserPortal/OrgLeftDrawer/OrgLeftDrawer.module.css

The left drawer has same style and classes as the one component we are using in Admin, just the logical part is different, instead of creating new files everywhere for the same component, create a index.css file in src/assets/css/ folder and import it in src/index.tsx file. Also when you do this, make sure to remove the same from all the left drawer and corresponding screen components.

@rishav-jha-mech I have tried implementing the requested change but it is creating more and more confusion as the styles are slightly different. This is making one part to keep in index.css and other to keep in their respective module.css files. It is getting difficult to track all of them.

@palisadoes
Copy link
Contributor

NOTE Read very carefully

  1. We just merged this PR which upgraded the prettier package.
    1. Upgraded prettier from 2.3.2 to 3.2.5 #1599
  2. It reformatted over 150 files.

This will put your PR at risk of extensive merge conflicts. Do the following IN THIS ORDER:

  1. upgrade your prettier in your local branch to the same version
  2. run prettier on your local branch
  3. update your local branch with the latest upstream

This will help to reduce the number of existing and future merge conflicts for your PR.

@palisadoes
Copy link
Contributor

  1. You have submitted too many files.
  2. We'll have to close the PR
  3. Please resubmit

@palisadoes palisadoes closed this Feb 18, 2024
@palisadoes palisadoes reopened this Feb 18, 2024
@palisadoes palisadoes closed this Feb 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants