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

fix (curriculum): added functionality to merge steps 21 - 22 and steps 41 - 42 #54917

Conversation

vaibhav-ace
Copy link
Contributor

@vaibhav-ace vaibhav-ace commented May 22, 2024

Checklist:

Closes #54912

PR Description

This PR combines Steps 21 and 22 of the Responsive Web Design project to build a cat painting into a single step. The updated step now instructs learners to create two div elements, one inside the .cat-left-ear element with the class cat-left-inner-ear and another inside the .cat-right-ear element with the class cat-right-inner-ear.

Then using the doc guide at: https://contribute.freecodecamp.org/how-to-work-on-practice-projects/#how-to-work-on-practice-projects

I have delete step 22.

Moving on, I have combined Steps 41 and 42 of the Responsive Web Design project as well in this PR according to the comments mentioned in the original thread.

Note: The updated steps were 40 and 41 when changes were made to them (due to deletion of step 22).

Following on, I deleted the updated step 41 to ensure that duplication is removed from the codebase.

All tests were also updated for the combined steps.

All changes have been tested locally to ensure the instructions work as expected and do not disrupt the learning flow.

Step 21 after update:

image

Step 40 after update:

image

@camperbot
Copy link
Contributor

Thanks for your pull request.

Please remove the changes made to the non-English versions of the files. No need to close this pull request; just add more commits as needed.

We require you to change only English versions of files in the codebase. Translations to corresponding files in other world languages are managed on our translation platform. Once your pull request is merged, changes will be synced automatically to other world languages.

Please visit our contributing guidelines to learn more about translating freeCodeCamp's resources.

As always, we value all of your contributions.

Happy contributing!


Note: This message was automatically generated by a bot. If you feel this message is in error or would like help resolving it, feel free to reach us in our contributor chat.

@github-actions github-actions bot added scope: curriculum Lessons, Challenges, Projects and other Curricular Content in curriculum directory. scope: i18n language translation/internationalization. Often combined with language type label labels May 22, 2024
@vaibhav-ace vaibhav-ace changed the title Added functionality to merge steps 21 and 22 Added functionality to merge steps 21 and 22, 41 and 42 May 22, 2024
@vaibhav-ace vaibhav-ace marked this pull request as draft May 22, 2024 11:18
@vaibhav-ace vaibhav-ace force-pushed the Feature/combine-step-21-22-and-step-41-42-for-cat-painting-project branch from 691795b to 4de9b33 Compare May 22, 2024 11:24
@github-actions github-actions bot removed the scope: i18n language translation/internationalization. Often combined with language type label label May 22, 2024
@vaibhav-ace vaibhav-ace changed the title Added functionality to merge steps 21 and 22, 41 and 42 [Bugfix]: Added functionality to merge steps 21 - 22 and steps 41 - 42 May 22, 2024
@github-actions github-actions bot added the scope: i18n language translation/internationalization. Often combined with language type label label May 22, 2024
@vaibhav-ace vaibhav-ace changed the title [Bugfix]: Added functionality to merge steps 21 - 22 and steps 41 - 42 fix: Added functionality to merge steps 21 - 22 and steps 41 - 42 May 22, 2024
@vaibhav-ace vaibhav-ace changed the title fix: Added functionality to merge steps 21 - 22 and steps 41 - 42 fix: added functionality to merge steps 21 - 22 and steps 41 - 42 May 22, 2024
@vaibhav-ace vaibhav-ace marked this pull request as ready for review May 23, 2024 01:37
@vaibhav-ace vaibhav-ace requested a review from a team as a code owner May 23, 2024 01:37
@vaibhav-ace vaibhav-ace changed the title fix: added functionality to merge steps 21 - 22 and steps 41 - 42 fix (curriculum): added functionality to merge steps 21 - 22 and steps 41 - 42 May 23, 2024
Copy link
Contributor

@ilenia-magoni ilenia-magoni left a comment

Choose a reason for hiding this comment

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

Thank you for your work, you are doing well!

I have left some comments on things to change

@camperbot
Copy link
Contributor

Thanks for your pull request.

Please remove the changes made to the non-English versions of the files. No need to close this pull request; just add more commits as needed.

We require you to change only English versions of files in the codebase. Translations to corresponding files in other world languages are managed on our translation platform. Once your pull request is merged, changes will be synced automatically to other world languages.

Please visit our contributing guidelines to learn more about translating freeCodeCamp's resources.

As always, we value all of your contributions.

Happy contributing!


Note: This message was automatically generated by a bot. If you feel this message is in error or would like help resolving it, feel free to reach us in our contributor chat.

@github-actions github-actions bot added platform: api Server application that needs familiarity with Express, Loopback, MongoDB etc. platform: learn UI side of the client application that needs familiarity with React, Gatsby etc. scope: tools/scripts Scripts for supporting dev work, generating config and build artifacts, etc. labels May 23, 2024
@vaibhav-ace vaibhav-ace force-pushed the Feature/combine-step-21-22-and-step-41-42-for-cat-painting-project branch from 7297351 to fa709ca Compare May 23, 2024 12:20
@github-actions github-actions bot removed platform: api Server application that needs familiarity with Express, Loopback, MongoDB etc. platform: learn UI side of the client application that needs familiarity with React, Gatsby etc. scope: tools/scripts Scripts for supporting dev work, generating config and build artifacts, etc. labels May 23, 2024
@vaibhav-ace
Copy link
Contributor Author

Thanks a lot for the review and feedback. I highly appreciate the help as I try and get better in my contributions 🙏 I have made the necessary changes and hope they suffice the conditions for a merge. Please let me know if any further changes are required, I will be more than happy to work on them. 😄

Copy link
Contributor

@ilenia-magoni ilenia-magoni left a comment

Choose a reason for hiding this comment

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

Going well, the new hints require some adjustments!

@vaibhav-ace
Copy link
Contributor Author

Thanks for the suggestions. I've changed the code as per the feedback.

Copy link
Contributor

@ilenia-magoni ilenia-magoni left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@ilenia-magoni ilenia-magoni added the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label May 24, 2024
@naomi-lgbt naomi-lgbt merged commit 58b3218 into freeCodeCamp:main May 25, 2024
21 checks passed
@vaibhav-ace vaibhav-ace deleted the Feature/combine-step-21-22-and-step-41-42-for-cat-painting-project branch May 26, 2024 03:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
scope: curriculum Lessons, Challenges, Projects and other Curricular Content in curriculum directory. scope: i18n language translation/internationalization. Often combined with language type label status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Combine step 21 -22 and steps 41 - 42 for cat painting project
4 participants