Skip to content

Shravan : Resolve merge conflicts for PR #4072 - HGN Skills dark mode#4917

Open
Shravan-neelamsetty wants to merge 20 commits intodevelopmentfrom
shravan-fix-conflicts-4072
Open

Shravan : Resolve merge conflicts for PR #4072 - HGN Skills dark mode#4917
Shravan-neelamsetty wants to merge 20 commits intodevelopmentfrom
shravan-fix-conflicts-4072

Conversation

@Shravan-neelamsetty
Copy link

Description

Resolved merge conflicts for PR #4072 (Carlos's HGN Skills dark mode). Fixed duplicate variable declarations, CSS specificity issues, and ensured dark mode styling works correctly across all HGN Form pages and Skills Profile page.

Fixes # dark mode merge conflicts for HGN Form and Skills Dashboard

Related PRs (if any):

This frontend PR is related to the #4072 PR (carlos-hgn-form-user-skills-dark-mode).

Main changes explained:

  • Updated Page1-Page6.jsx to resolve import conflicts and remove duplicate darkMode declarations
  • Updated BackendQuestions.jsx, FrontendQuestions.jsx, GeneralQuestions.jsx, FollowupQuestions.jsx, InfoForm.jsx to resolve dark mode container class conflicts and remove duplicate declarations
  • Updated QuestionnaireHeader.jsx, QuestionnaireInfo.jsx, ThankYou.jsx to use CSS module dark mode classes with getFontColor support
  • Updated BackendSkills.jsx, FrontendSkills.jsx, DeploymentSkills.jsx, SoftwarePractices.jsx, Skills.jsx to resolve import conflicts and remove duplicates
  • Updated ProfileDetails.jsx to preserve Years of Experience editing functionality while adding dark mode text colors
  • Updated RadarChart.jsx to merge loading/error states with dark mode chart colors
  • Updated UserSkillsProfile.jsx to preserve redirect logic and error handling
  • Updated LeftSection.jsx to remove duplicate darkMode declaration
  • Updated hgnform.module.css to fix dark mode background using :global(.bg-oxford-blue)
  • Updated FollowupQuestions.module.css to add dark mode textarea styling
  • Updated RadarChart.module.css to add dark mode background for chart container
  • Updated LeftSection.module.css to add dark mode background for profile card
  • Updated AdditionalInfo.module.css to add dark mode background for work experience section

How to test:

  1. Check into shravan-fix-conflicts-4072 branch
  2. Do npm install and npm run start:local to run this PR locally
  3. Clear site data/cache
  4. Log in as any user
  5. Toggle dark mode on
  6. Go to /hgnform and navigate through all 6 pages — verify dark mode styling is consistent
  7. Verify button colors are consistent across all pages (Back/Next/Submit)
  8. Submit the form and verify the Skills Profile page loads at /hgn/profile/skills
  9. Verify the Skills Profile page shows dark mode on: profile card, radar chart, skill sections, and work experience section
  10. Toggle dark mode off and verify light mode still works correctly on all pages

Screenshots or videos of changes:

HGN Form

Screenshot 2026-02-27 at 9 32 38 PM

HGN Form next button fixed

Screenshot 2026-02-27 at 9 33 05 PM

HGN Skills Dashboard

Screenshot 2026-02-27 at 9 32 26 PM

Note:

one-community and others added 20 commits November 19, 2025 17:10
@netlify
Copy link

netlify bot commented Feb 28, 2026

Deploy Preview for highestgoodnetwork-dev ready!

Name Link
🔨 Latest commit dec1f28
🔍 Latest deploy log https://app.netlify.com/projects/highestgoodnetwork-dev/deploys/69a2544bedeee50008be5b78
😎 Deploy Preview https://deploy-preview-4917--highestgoodnetwork-dev.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@sonarqubecloud
Copy link

Copy link

@Anusha-Gali Anusha-Gali left a comment

Choose a reason for hiding this comment

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

Hi Shravan,

Reviewed this PR upon Jae's info - however unable to click next cause of the undefined issue as mentioned by Rohan in the 4072 PR and also the dark mode is not applied to the whole page and since i could not go next, i could not verify further details

Image Image Image

Copy link

@HemanthNidamanuru HemanthNidamanuru left a comment

Choose a reason for hiding this comment

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

Hi Shravan,

I reviewed the PR. In dark mode, the page styling doesn’t appear properly aligned, and some sections are not consistent with the overall theme. Sharing this for your review.

Image Image Image Image Image Image Image Image

Copy link

@rohanrastogi311 rohanrastogi311 left a comment

Choose a reason for hiding this comment

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

Hi Shravan,

Unable to click next in the form. Please look into this.

Image

Copy link

@Vishnu10-hub Vishnu10-hub left a comment

Choose a reason for hiding this comment

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

Request Changes
Followed the testing steps on branch shravan-fix-conflicts-4072

Ran the app locally and cleared cache

Logged in and opened /hgnform

Filled all required fields on the first page

However, the Next button does not navigate to the next page.
Clicking Next does nothing and the form stays on the same page.

Copy link

@Vishnu10-hub Vishnu10-hub left a comment

Choose a reason for hiding this comment

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

Request Changes
Followed the testing steps on branch shravan-fix-conflicts-4072

Ran the app locally and cleared cache

Logged in and opened /hgnform

Filled all required fields on the first page

However, the Next button does not navigate to the next page.
Clicking Next does nothing and the form stays on the same page.

Image

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.

7 participants