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

Fixed Merge conflict with the develop branch #926

Conversation

rishav-jha-mech
Copy link
Contributor

What kind of change does this PR introduce?
Migration of Bootstrap 4 to 5
Removal of redundant libraries such as Popper.js and React-Modal
Migration of components from plain html to components imported from Bootstrap 5

Issue Number:

Fixes None

Did you add tests for your changes?

Yes

Snapshots/Videos:

None

If relevant, did you update the documentation?

No

Summary

Migration and removal of redundant libraries.

Does this PR introduce a breaking change?

Class based modals wont work from now, other than that no breaking change.

Other information

Have you read the contributing guide?

Yes

@rishav-jha-mech rishav-jha-mech changed the title Develop merged into adminUI-redesign Develop merger into adminUI-redesign Jun 13, 2023
@github-actions
Copy link

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

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

@rishav-jha-mech rishav-jha-mech changed the title Develop merger into adminUI-redesign Fixed Merge conflict with the develop branch Jun 13, 2023
@codecov
Copy link

codecov bot commented Jun 13, 2023

Codecov Report

Merging #926 (8ae39ae) into adminUI-redesign (75bc4d6) will increase coverage by 0.05%.
The diff coverage is 94.48%.

@@                 Coverage Diff                  @@
##           adminUI-redesign     #926      +/-   ##
====================================================
+ Coverage             92.95%   93.01%   +0.05%     
====================================================
  Files                    65       65              
  Lines                  1462     1488      +26     
  Branches                371      377       +6     
====================================================
+ Hits                   1359     1384      +25     
- Misses                   98       99       +1     
  Partials                  5        5              
Impacted Files Coverage Δ
...mponents/UserPasswordUpdate/UserPasswordUpdate.tsx 83.33% <60.00%> (-7.15%) ⬇️
...rc/components/AddOn/core/AddOnStore/AddOnStore.tsx 25.37% <66.66%> (ø)
...rc/components/AddOn/core/AddOnEntry/AddOnEntry.tsx 60.00% <71.42%> (ø)
src/screens/Roles/Roles.tsx 96.00% <83.33%> (ø)
src/components/AdminNavbar/AdminNavbar.tsx 84.90% <88.23%> (+0.29%) ⬆️
src/utils/StaticMockLink.ts 84.61% <88.88%> (+1.07%) ⬆️
src/screens/OrgPost/OrgPost.tsx 93.44% <89.47%> (+0.33%) ⬆️
src/screens/Requests/Requests.tsx 94.00% <91.66%> (+0.25%) ⬆️
src/App.tsx 100.00% <100.00%> (ø)
src/components/AddOn/AddOn.tsx 100.00% <100.00%> (ø)
... and 44 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@rishav-jha-mech
Copy link
Contributor Author

The latest develop branch is merged into adminUI-redesign branch, I have fixed all the merge conflicts, now please merge this PR.

After this PR is merged I will open another PR, to merge my develop branch (which had my adminUI-redesign merged into it) into organization's develop branch.

The unauthorized file change error is because another contributor had modified eslintrc.json file, as a part of their PR to develop branch.

@palisadoes
Copy link
Contributor

@anwersayeed @muskan399 Please review

@anwersayeed anwersayeed merged commit 5468bda into PalisadoesFoundation:adminUI-redesign Jun 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants