Skip to content
This repository was archived by the owner on Sep 25, 2019. It is now read-only.

fix(challenges): add note at bottom of description in d3 challenge#259

Merged
scissorsneedfoodtoo merged 1 commit intofreeCodeCamp:devfrom
nischaldutt:add/note-in-description-d3-challenge
Sep 4, 2018
Merged

fix(challenges): add note at bottom of description in d3 challenge#259
scissorsneedfoodtoo merged 1 commit intofreeCodeCamp:devfrom
nischaldutt:add/note-in-description-d3-challenge

Conversation

@nischaldutt
Copy link
Copy Markdown
Contributor

@nischaldutt nischaldutt commented Aug 17, 2018

Add a short message in note at bottom of description in d3 challenge

ISSUES CLOSED: freeCodeCamp/freeCodeCamp#17767

Description

Pre-Submission Checklist

  • Your pull request targets the dev branch.
  • Branch starts with either fix/, feature/, or translate/ (e.g. fix/challenge-tests)
  • All new and existing tests pass the command npm test.
  • Use npm run commit to generate a conventional commit message.
    Learn more here: https://conventionalcommits.org/#why-use-conventional-commits
  • The changes were done locally on your machine and NOT GitHub web interface.
    If they were done on the web interface you have ensured that you are creating conventional commit messages.

Checklist:

  • Tested changes locally.
  • Addressed currently open issue

Closes freeCodeCamp/freeCodeCamp#17767

@scissorsneedfoodtoo
Copy link
Copy Markdown
Contributor

scissorsneedfoodtoo commented Aug 24, 2018

@nischaldutt, thank you for taking the time to fix this issue. However, there is a small grammatical problem and an issue with some of the wording in the note you added. It seems that the circles are not really styled in later challenges, at least using the d3 style method. Instead, they just have attributes like radius and height applied to them. Would you mind updating your PR so the note reads something like the following?

"<strong>Note</strong><br>The circles won't be visible because we haven't set their attributes yet. We'll do that in the next challenge."

This is just a suggestion, so let me know what you think about the updated note and if you have any other ideas.

Please take a look at this section of the Contributor's Guide for how to update your PR and amend your git commit message. Also, feel free to reach out if you need any help with the process.

@nischaldutt
Copy link
Copy Markdown
Contributor Author

yes sir, I'll look forward to it.

@scissorsneedfoodtoo
Copy link
Copy Markdown
Contributor

@nischaldutt, alright! Looking forward to your updated description.

@nischaldutt
Copy link
Copy Markdown
Contributor Author

nischaldutt commented Sep 2, 2018

thank you sir, I've update the pull request as specified 😊
Do I need to add further description? If so then What do I need to mention?
sorry if I am bothering you... its my first time

@scissorsneedfoodtoo
Copy link
Copy Markdown
Contributor

Yes, would you mind updating the note so it reads something like the following?

"<strong>Note</strong><br>The circles won't be visible because we haven't set their attributes yet. We'll do that in the next challenge."

To do that, make sure you're on the right branch with git checkout add/note-in-description-d3-challenge. Make the changes and add the file with git add challenges/04-data-visualization/data-visualization-with-d3.json. Then you'll need to use git commit --amend to amend your current commit message. It's fine now, so just exit out after that command. Finally, just push back to your branch with git push -f origin dev and we'll see the changes reflected here.

Let me know if you need any help throughout the process!

Add a short message in note at bottom of description in d3 challenge

ISSUES CLOSED: #17767
@nischaldutt
Copy link
Copy Markdown
Contributor Author

nischaldutt commented Sep 2, 2018

Thanks for the valuable response :)
I've pushed the commit.

@scissorsneedfoodtoo
Copy link
Copy Markdown
Contributor

@nischaldutt, I'm not seeing the changes here, and I think it's due to an error in the instructions I gave earlier. I'm very sorry, but I believe I told you to force push to the dev branch rather than the one you created for this PR.

Let's try again:

All you should have to do is make sure you're on the right branch with git checkout add/note-in-description-d3-challenge. Then just run git push -f origin add/note-in-description-d3-challenge. After that we should see the changes you made here.

To get your dev branch back to normal, switch to it with git checkout dev, then run git pull --rebase upstream dev. Finally, all you should have to do is force push to the dev branch with git push -f.

Sorry again for the trouble!

@nischaldutt
Copy link
Copy Markdown
Contributor Author

Makes sense, thanks for such a constructive response
I've committed the changes

@scissorsneedfoodtoo scissorsneedfoodtoo merged commit c60d332 into freeCodeCamp:dev Sep 4, 2018
@scissorsneedfoodtoo
Copy link
Copy Markdown
Contributor

✨ ✨ ✨ Awesome! Congratulations on your first contribution to freeCodeCamp! ✨ ✨ ✨

Thank you for submitting a PR for this issue, @nischaldutt. We're all really looking forward to your next contribution! And sorry again for the incorrect directions earlier -- I'll be more careful next time you contribute.

@nischaldutt
Copy link
Copy Markdown
Contributor Author

Thanks for guiding me throughout the process. I learned allot from it

@nischaldutt nischaldutt deleted the add/note-in-description-d3-challenge branch September 4, 2018 06:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

D3: Create a Scatterplot with SVG Circles - Test is Passing But Should Fail

2 participants