Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

issue fix #9581: heading strucutre fails WCAG 2.2AA- skipped heading #9631

Merged
merged 4 commits into from
Nov 3, 2023

Conversation

berryjen
Copy link
Contributor

@berryjen berryjen commented Oct 26, 2023

Fixes Issue

closes #9581

Changes proposed

modified all the h3 tags in all the files into a h2.
modified all the h3 tags

Check List (Check all the applicable boxes)

  • [ X] My code follows the code style of this project.

  • My change requires changes to the documentation.

  • I have updated the documentation accordingly.

  • [ X] All new and existing tests passed.

  • [X ] This PR does not contain plagiarized content.

  • [X ] The title of my pull request is a short description of the requested changes.

Screenshots

There are no longer any skipped heading warnings under the structure tab when using WAVE to inspect accessibility.

Screenshot 2023-10-26 at 8 37 15 PM

Note to reviewers

hopefully the screenshot appears!

…- skipped heading level

Restructure the document headings in DataList.js to ensure that heading levels are not skipped.
@github-actions github-actions bot added the tests label Oct 26, 2023
@@ -17,7 +17,7 @@
"icon": "FaLink"
},
{
"group": "Socials Primary",
"group": "",
Copy link
Member

Choose a reason for hiding this comment

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

Can you explain why are you removing this

Copy link
Member

@sital002 sital002 left a comment

Choose a reason for hiding this comment

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

The package-lock.json file shouldn't be changed unless you are installing a new package.
Please revert those changes. Here is the reference video for how to revert package-lock.json file https://www.youtube.com/watch?v=jHkIXYVpMTo&ab_channel=EddieJaoude

@sital002 sital002 added the issue linked Pull Request has issue linked label Oct 27, 2023
@berryjen
Copy link
Contributor Author

berryjen commented Oct 27, 2023

I had 2 merge conflicts trying to push my commit to my local branch, and VSC wasn't able to merge the conflict on its own so I had to resort to doing that (debugging) in order to push my code changes.

@berryjen
Copy link
Contributor Author

Is there a way to debug the merge conflict without reinstalling npm? If so, would you be able to help me out? TIA!

@eddiejaoude
Copy link
Member

Is there a way to debug the merge conflict without reinstalling npm? If so, would you be able to help me out? TIA!

You probably had merge conflicts because you are making changes in the main branch. You can still remove the changes in the lock file back to the upstream (original repo not your fork) as Sital suggested - because you haven't made changes to the package.json. To reduce these types of conflicts in the future use any branch other than main.

@berryjen
Copy link
Contributor Author

Is there a way to debug the merge conflict without reinstalling npm? If so, would you be able to help me out? TIA!

You probably had merge conflicts because you are making changes in the main branch. You can still remove the changes in the lock file back to the upstream (original repo not your fork) as Sital suggested - because you haven't made changes to the package.json. To reduce these types of conflicts in the future use any branch other than main.

I'm still confused...i was comparing the main branch of my repo to themainbranch of eddiehub....the local main branch on my GH is the branch i was working on....
Do i delete the changes on my lock json file, copy& paste the original repo lock json file?
when you mention to use any other branch other than main....but there is only 1 branch on my own repo? Or do you mean eddiehub repo? >"<

@akash19coder
Copy link
Contributor

akash19coder commented Oct 31, 2023

when you mention to use any other branch other than main....but there is only 1 branch on my own repo? Or do you mean eddiehub repo? >

Whenever we are working on an issue, we should create a new branch other than main with git branch <branch-name> command and switch to that branch with git switch <branch-name> and make all the changes there related to issue because it prevents the conflicts like we faced earlier with lock-json files

@eddiejaoude
Copy link
Member

I'm still confused...i was comparing the main branch of my repo to themainbranch of eddiehub....the local main branch on my GH is the branch i was working on.... Do i delete the changes on my lock json file, copy& paste the original repo lock json file? when you mention to use any other branch other than main....but there is only 1 branch on my own repo? Or do you mean eddiehub repo? >"<

You can revert the changes to your lock file in a few different ways. I think using the git checkout command is probably best here with git checkout main -- package-lock.json, I made a video on this https://www.youtube.com/watch?v=jHkIXYVpMTo

On your repo, the main branch should not contain any of your changes directly from your commits. After your PR is merged in the original repo (upstream) you sync your main branch (in your fork) with the original repo and then your changes will appear in your main branch.

@berryjen
Copy link
Contributor Author

berryjen commented Oct 31, 2023

I'm still confused...i was comparing the main branch of my repo to themainbranch of eddiehub....the local main branch on my GH is the branch i was working on.... Do i delete the changes on my lock json file, copy& paste the original repo lock json file? when you mention to use any other branch other than main....but there is only 1 branch on my own repo? Or do you mean eddiehub repo? >"<

You can revert the changes to your lock file in a few different ways. I think using the git checkout command is probably best here with git checkout main -- package-lock.json, I made a video on this https://www.youtube.com/watch?v=jHkIXYVpMTo

On your repo, the main branch should not contain any of your changes directly from your commits. After your PR is merged in the original repo (upstream) you sync your main branch (in your fork) with the original repo and then your changes will appear in your main branch.

so does that mean in the future, i need to create 2 branches? One is called main, and the other <branch name> , where i will be pushing my commits to? The PR will be raised on branch, which then gets merged with the original repo <eddieHub main>? I then synch my <main> branch with the <eddieHub main>, which means that i'll have the latest version of all the changes made to <eddieHub main>? Is this mental model correct?
Sorry for the continuous questions, but this Git stuff really is so confusing, esp. in a commercial setting...I do apologize for my lack of knowledge on it. Believe me I've watched YT tutorials, but without actually trying it out, my mental schema in my head is always different from reality @___@

@eddiejaoude
Copy link
Member

It is confusing, you are right the best way to understand is to try it. main will be created on your fork repo already, you should always keep this up to date with the original repo and then create your branches from there

@berryjen
Copy link
Contributor Author

Screenshot 2023-10-31 at 8 16 07 PM
Nothing appeared on the terminal...is this correct?!

@berryjen
Copy link
Contributor Author

additionally, i did git status, which displays theres nothing to commit....im unsure if the reverted changes has been committed to my local branch?!
Screenshot 2023-10-31 at 11 27 26 PM

@eddiejaoude
Copy link
Member

eddiejaoude commented Nov 2, 2023

additionally, i did git status, which displays theres nothing to commit....im unsure if the reverted changes has been committed to my local branch?!

sorry, I just realised it won't work because you are working / made changes in the main branch. Let me try to think of another way

@berryjen
Copy link
Contributor Author

berryjen commented Nov 2, 2023

Ahh ok..looks like i made a big oppose 🥲

@eddiejaoude
Copy link
Member

I can try to fix via a temporary branch - I will take a look tomorrow

@Abhishek-90
Copy link
Contributor

Screenshot 2023-10-31 at 8 16 07 PM Nothing appeared on the terminal...is this correct?!

I would say to use git bash rather than VSC's inbuilt terminal for git related operations. It will give you a clear picture.

@eddiejaoude eddiejaoude changed the base branch from main to fix-pr-9631 November 3, 2023 10:41
@eddiejaoude eddiejaoude merged commit f095519 into EddieHubCommunity:fix-pr-9631 Nov 3, 2023
5 of 8 checks passed
@eddiejaoude
Copy link
Member

eddiejaoude commented Nov 3, 2023

Thank you for fixing the headings @berryjen 👍

I fixed the package lock file changes in a temporary PR here #9719

@berryjen
Copy link
Contributor Author

berryjen commented Nov 8, 2023

@eddiejaoude sorry for the late reply, just finished midterms as of yesterday, so spent all last week and early this week studying...@__@ the solution was that you moved #9581 onto a separate branch and then merged the new branch onto eddiehub main?

eddiejaoude added a commit that referenced this pull request Nov 8, 2023
* fix: heading strucuture fails WCAG 2.2AA (#9631)

* issue fix #9581: heading strrucutre fails WCAG 2.2AA- skipped heading level

Restructure the document headings in DataList.js to ensure that heading levels are not skipped.

* issue fix #9581_ heading structure fails WCAG 2.2AA- skipped heading

changed all <h3> to <h2>

---------

Co-authored-by: Eddie Jaoude <[email protected]>

* fix: undo file changes

* fix: failing tests

* fix: search tests for h2 changes

---------

Co-authored-by: Jen <[email protected]>
@eddiejaoude
Copy link
Member

eddiejaoude sorry for the late reply, just finished midterms as of yesterday, so spent all last week and early this week studying...

No worries, I hope it all went well.

the solution was that you moved #9581 onto a separate branch and then merged the new branch onto eddiehub main?

I created a new branch from main, then updated your PR settings to merge to that new branch, then made changes

malay44 pushed a commit to malay44/BioDrop that referenced this pull request Nov 9, 2023
…dieHubCommunity#9719)

* fix: heading strucuture fails WCAG 2.2AA (EddieHubCommunity#9631)

* issue fix EddieHubCommunity#9581: heading strrucutre fails WCAG 2.2AA- skipped heading level

Restructure the document headings in DataList.js to ensure that heading levels are not skipped.

* issue fix #9581_ heading structure fails WCAG 2.2AA- skipped heading

changed all <h3> to <h2>

---------

Co-authored-by: Eddie Jaoude <[email protected]>

* fix: undo file changes

* fix: failing tests

* fix: search tests for h2 changes

---------

Co-authored-by: Jen <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
issue linked Pull Request has issue linked tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Heading structure fails WCAG 2.2 AA - Skipped heading level
5 participants