freeCodeCamp/CONTRIBUTING.md

475 lines
19 KiB
Markdown
Raw Normal View History

# Contributor's Guide
2015-11-29 09:04:50 +00:00
2017-01-15 19:15:21 +00:00
We welcome pull requests from freeCodeCamp campers (our students) and seasoned JavaScript developers alike! Follow these steps to contribute:
2017-01-15 19:15:21 +00:00
1. Find an issue that needs assistance by searching for the [Help Wanted](https://github.com/freeCodeCamp/freeCodeCamp/labels/help%20wanted) tag.
2. Let us know you are working on it by posting a comment on the issue.
3. Follow the [Contribution Guidelines](#contribution-guidelines) to start working on the issue.
Remember to feel free to ask for help in our [Contributors](https://gitter.im/FreeCodeCamp/Contributors) Gitter room.
2017-02-08 16:38:18 +00:00
Working on your first Pull Request? You can learn how from this *free* series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
###### If you've found a bug that is not on the board, [follow these steps](README.md#found-a-bug).
--------------------------------------------------------------------------------
## Contribution Guidelines
2015-11-29 09:04:50 +00:00
- [Prerequisites](#prerequisites)
- [Forking The Project](#forking-the-project)
- [Create A Branch](#create-a-branch)
- [Setup Linting](#setup-linting)
2017-01-15 19:15:21 +00:00
- [Setup freeCodeCamp](#setup-freecodecamp)
- [Make Changes](#make-changes)
- [Run The Test Suite](#run-the-test-suite)
- [Squash Your Commits](#squash-your-commits)
- [Commit Message](#commit-message)
- [Creating A Pull Request](#creating-a-pull-request)
- [Common Steps](#common-steps)
- [How We Review and Merge Pull Requests](#how-we-review-and-merge-pull-requests)
- [How We Close Stale Issues](#how-we-close-stale-issues)
- [Next Steps](#next-steps)
- [Other resources](#other-resources)
### Prerequisites
| Prerequisite | Version |
| ------------------------------------------- | ------- |
| [MongoDB Community Server](https://docs.mongodb.com/manual/administration/install-community/) | `~ ^3` |
| [MailHog](https://github.com/mailhog/MailHog) | `~ ^1` |
| [Node.js](http://nodejs.org) | `~ ^8` |
| npm (comes with Node) | `~ ^5` |
> _Updating to the latest releases is recommended_.
If Node or MongoDB is already installed in your machine, run the following commands to validate the versions:
2016-11-26 20:43:28 +00:00
```shell
node -v
mongo --version
2016-11-26 20:43:28 +00:00
```
To check your MongoDB version on Windows, you have to locate the installation directory. It is probably located at something like `C:\Program Files\MongoDB\Server\3.4\` where 3.4 is your version number.
2016-11-26 20:43:28 +00:00
If your versions are lower than the prerequisite versions, you should update.
Platform-specific guides to setting up a development environment:
2017-08-25 22:07:44 +00:00
- [How to clone and setup the freeCodeCamp website on a Windows pc](https://forum.freecodecamp.org/t/how-to-clone-and-setup-the-free-code-camp-website-on-a-windows-pc/19366)
- [How to Clone and Setup the freeCodeCamp Website on a Mac](https://forum.freecodecamp.org/t/how-to-clone-and-setup-the-freecodecamp-website-on-a-mac/78450)
### Forking The Project
#### Setting Up Your System
1. Install [Git](https://git-scm.com/) or your favorite Git client.
2. (Optional) [Setup an SSH Key](https://help.github.com/articles/generating-an-ssh-key/) for GitHub.
3. Create a parent projects directory on your system. For this guide, it will be assumed that it is `/mean/`
2017-01-15 19:15:21 +00:00
#### Forking freeCodeCamp
2017-01-15 19:15:21 +00:00
1. Go to the top level freeCodeCamp repository: <https://github.com/freeCodeCamp/freeCodeCamp>
2. Click the "Fork" Button in the upper right hand corner of the interface ([More Details Here](https://help.github.com/articles/fork-a-repo/))
2017-01-15 19:15:21 +00:00
3. After the repository has been forked, you will be taken to your copy of the FCC repo at `yourUsername/freeCodeCamp`
#### Cloning Your Fork
1. Open a Terminal / Command Line / Bash Shell in your projects directory (_i.e.: `/yourprojectdirectory/`_)
2017-01-15 19:15:21 +00:00
2. Clone your fork of freeCodeCamp
```shell
2017-01-15 19:15:21 +00:00
$ git clone https://github.com/yourUsername/freeCodeCamp.git
```
##### (make sure to replace `yourUsername` with your GitHub Username)
This will download the entire FCC repo to your projects directory.
#### Setup Your Upstream
2017-01-15 19:15:21 +00:00
1. Change directory to the new freeCodeCamp directory (`cd freeCodeCamp`)
2. Add a remote to the official FCC repo:
```shell
2017-01-15 19:15:21 +00:00
$ git remote add upstream https://github.com/freeCodeCamp/freeCodeCamp.git
```
Congratulations, you now have a local copy of the FCC repo!
#### Maintaining Your Fork
Now that you have a copy of your fork, there is work you will need to do to keep it current.
##### **Rebasing from Upstream**
Do this prior to every time you create a branch for a PR:
1. Make sure you are on the `staging` branch
2017-12-16 10:13:08 +00:00
```shell
$ git status
On branch staging
Your branch is up-to-date with 'origin/staging'.
```
If your aren't on `staging`, resolve outstanding files / commits and checkout the `staging` branch
2017-12-16 10:13:08 +00:00
```shell
$ git checkout staging
```
2. Do a pull with rebase against `upstream`
2017-12-16 10:13:08 +00:00
```shell
$ git pull --rebase upstream staging
```
2017-12-16 10:13:08 +00:00
This will pull down all of the changes to the official staging branch, without making an additional commit in your local repo.
3. (_Optional_) Force push your updated staging branch to your GitHub fork
2017-12-16 10:13:08 +00:00
```shell
$ git push origin staging --force
```
2017-12-16 10:13:08 +00:00
This will overwrite the staging branch of your fork.
### Create A Branch
Before you start working, you will need to create a separate branch specific to the issue / feature you're working on. You will push your work to this branch.
#### Naming Your Branch
2016-11-26 20:43:28 +00:00
Name the branch something like `fix/xxx` or `feature/xxx` where `xxx` is a short description of the changes or feature you are attempting to add. For example `fix/email-login` would be a branch where you fix something specific to email login.
#### Adding Your Branch
To create a branch on your local machine (and switch to this branch):
```shell
$ git checkout -b [name_of_your_new_branch]
```
and to push to GitHub:
```shell
$ git push origin [name_of_your_new_branch]
```
##### If you need more help with branching, take a look at _[this](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches)_.
### Setup Linting
2017-08-25 22:07:44 +00:00
You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [freeCodeCamp's JavaScript Style Guide](http://forum.freecodecamp.org/t/free-code-camp-javascript-style-guide/19121) (you can find a summary of those rules [here](https://github.com/freeCodeCamp/freeCodeCamp/blob/staging/.eslintrc)).
> Please do not ignore any linting errors, as they are meant to **help** you and to ensure a clean and simple code base.
2017-01-15 19:15:21 +00:00
### Setup freeCodeCamp
Once you have freeCodeCamp cloned, before you start the application, you first need to install all of the dependencies:
```bash
# Install NPM dependencies
npm install
```
Then you need to add the private environment variables (API Keys):
```bash
# Create a copy of the "sample.env" and name it as ".env".
# Populate it with the necessary API keys and secrets:
cp sample.env .env
```
Then edit the `.env` file and modify the API keys only for services that you will use.
Note: Not all keys are required, to run the app locally, however `MONGOHQ_URL` is the most important one. Unless you have MongoDB running in a setup different than the defaults, the URL in the sample.env should work fine.
You can leave the other keys as they are. Keep in mind if you want to use more services you'll have to get your own API keys for those services and edit those entries accordingly in the .env file.
Next you should setup MailHog, a local SMTP mail server that will catch all the outgoing freeCodeCamp messages generated locally. How you start up MailHog is dependent upon your OS, but here's an example for MacOS with Brew.
```bash
brew services start mailhog
```
2017-12-16 10:13:08 +00:00
To access your MailHog inbox, open your browser and navigate to [http://localhost:8025](http://localhost:8025). For any other questions related to MailHog or for instructions on custom configurations, check out the [MailHog](https://github.com/mailhog/MailHog) repository.
Now you will need to start MongoDB, and then seed the database, then you can start the application:
```bash
2016-01-27 23:58:09 +00:00
# Start the mongo server in a separate terminal
# On OS X:
mongod
# If you are using Windows, you have to instead specify the full path to the mongod binary
# Make sure to replace 3.4 with the version you have installed
"C:\Program Files\MongoDB\Server\3.4\bin\mongod"
2017-01-15 19:15:21 +00:00
# Initialize freeCodeCamp
# This will seed the database for the first time.
# This command should only be run once.
npm run only-once
# start the application
2017-12-16 10:13:08 +00:00
npm run develop
```
Now navigate to your browser and open
2016-10-04 11:44:11 +00:00
<http://localhost:3000>. If the app loads,
2016-11-30 22:29:44 +00:00
congratulations you're all set. Otherwise, let us know by asking in the [Contributors chat room](https://gitter.im/FreeCodeCamp/Contributors) on Gitter. There also might be an error in the console of your browser or in Bash / Terminal / Command Line that will help identify the problem. If the app launches but you are encountering errors with the UI itself, for example if fonts are not being loaded or if the code editor is not displaying properly, you may try the following:
2017-01-15 19:15:21 +00:00
2017-12-16 10:13:08 +00:00
```bash
# Remove all installed node modules
rm -rf node_modules
2017-01-15 19:15:21 +00:00
2017-12-16 10:13:08 +00:00
# Reinstall npm packages
npm install
2017-01-15 19:15:21 +00:00
2017-12-16 10:13:08 +00:00
# Seed the database (optional)
node seed
2017-01-15 19:15:21 +00:00
2017-12-16 10:13:08 +00:00
# Re-start the application
npm run develop
```
### Make Changes
This bit is up to you!
2017-01-15 19:15:21 +00:00
#### How to find the code in the freeCodeCamp codebase to fix/edit?
2016-11-26 20:43:28 +00:00
The best way to find out any code you wish to change/add or remove is using
the GitHub search bar at the top of the repository page. For example, you could
search for a challenge name and the results will display all the files along
with line numbers. Then you can proceed to the files and verify this is the area
that you were looking forward to edit. Always feel free to reach out to the chat
room when you are not certain of any thing specific in the code.
2016-11-26 20:43:28 +00:00
#### Changes to the seed files
If you made changes to any file in the `/seed` directory, you need to run
```shell
2016-11-26 20:43:28 +00:00
$ node seed
```
2016-11-26 20:43:28 +00:00
in order to see the changes.
2016-11-26 20:43:28 +00:00
### Run The Test Suite
When you're ready to share your code, run the test suite:
```shell
2016-11-26 20:43:28 +00:00
$ npm test
```
2016-11-26 20:43:28 +00:00
and ensure all tests pass.
### Squash Your Commits
When you make a pull request, all of your changes need to be in one commit.
2017-04-04 09:01:07 +00:00
If you have made more than one commit, then you will need to _squash_ your commits.
2017-08-25 22:07:44 +00:00
To do this, see [Squashing Your Commits](http://forum.freecodecamp.org/t/how-to-squash-multiple-commits-into-one-with-git/13231).
### Commit Message
When you commit your changes, please use conventional commit messages.
The commit message should be structured as follows:
```
<type>[optional scope]: <description>
[optional body]
[optional footer]
```
For help writing your commit message, execute `npm run commit` from the command line and the [commitizen](http://commitizen.github.io/cz-cli/) CLI tool will assist you in creating a conventional commit message.
Learn more at [Conventional Commits](http://conventionalcommits.org).
### Creating A Pull Request
#### What is a Pull Request?
2017-01-15 19:15:21 +00:00
A pull request (PR) is a method of submitting proposed changes to the freeCodeCamp
Repo (or any Repo, for that matter). You will make changes to copies of the
files which make up freeCodeCamp in a personal fork, then apply to have them
accepted by freeCodeCamp proper.
#### Need Help?
2017-01-15 19:15:21 +00:00
freeCodeCamp Issue Mods and staff are on hand to assist with Pull Request
2016-11-26 20:43:28 +00:00
related issues in our [Contributors chat room](https://gitter.im/FreeCodeCamp/Contributors).
#### Important: ALWAYS EDIT ON A BRANCH
2017-04-04 09:01:07 +00:00
Take away only one thing from this document: Never, **EVER**
make edits to the `staging` branch. ALWAYS make a new branch BEFORE you edit
files. This is critical, because if your PR is not accepted, your copy of
staging will be forever sullied and the only way to fix it is to delete your
fork and re-fork.
#### Methods
2017-01-15 19:15:21 +00:00
There are two methods of creating a pull request for freeCodeCamp:
2016-11-26 20:43:28 +00:00
- Editing files on a local clone (recommended)
- Editing files via the GitHub Interface
##### Method 1: Editing via your Local Fork _(Recommended)_
This is the recommended method. Read about [How to Setup and Maintain a Local
2017-01-15 19:15:21 +00:00
Instance of freeCodeCamp](#maintaining-your-fork).
1. Perform the maintenance step of rebasing `staging`.
2. Ensure you are on the `staging` branch using `git status`:
```bash
$ git status
On branch staging
Your branch is up-to-date with 'origin/staging'.
nothing to commit, working directory clean
```
1. If you are not on staging or your working directory is not clean, resolve
any outstanding files/commits and checkout staging `git checkout staging`
2. Create a branch off of `staging` with git: `git checkout -B
branch/name-here` **Note:** Branch naming is important. Use a name like
`fix/short-fix-description` or `feature/short-feature-description`. Review
the [Contribution Guidelines](#contribution-guidelines) for more detail.
3. Edit your file(s) locally with the editor of your choice
4. Check your `git status` to see unstaged files.
5. Add your edited files: `git add path/to/filename.ext` You can also do: `git
add .` to add all unstaged files. Take care, though, because you can
accidentally add files you don't want added. Review your `git status` first.
6. Commit your edits (follow any one of the below methods):
a. Using the inbuilt script (_recommended_):
- We have a [tool](https://commitizen.github.io/cz-cli/) that helps you to make standard commit messages. Simply execute `npm run commit` after you have added the necessary files as mentioned in the step earlier.
b. Using Commitizen CLI:
- If you are already using [commitizen](http://commitizen.github.io/cz-cli/), simply doing a `git cz` works as expected too!
7. Squash your commits, if there are more than one.
8. If you would want to add/remove changes to previous commit simply add the files as in Step 5 earlier,
and use `git commit --amend` or `git commit --amend --no-edit` (for keeping the same commit message).
9. Push your commits to your GitHub Fork: `git push -u origin branch/name-here`
10. Go to [Common Steps](#common-steps)
##### Method 2: Editing via the GitHub Interface
Note: Editing via the GitHub Interface is not recommended, since it is not
possible to update your fork via GitHub's interface without deleting and
recreating your fork.
Read the [Wiki
2017-08-25 22:07:44 +00:00
article](http://forum.freecodecamp.org/t/how-to-make-a-pull-request-on-free-code-camp/19114)
for further information
### Common Steps
1. Once the edits have been committed, you will be prompted to create a pull
request on your fork's GitHub Page.
2. By default, all pull requests should be against the FCC main repo, `staging`
branch.
3. Submit a [pull
2017-08-25 22:07:44 +00:00
request](http://forum.freecodecamp.org/t/how-to-contribute-via-a-pull-request/19368)
2017-01-15 19:15:21 +00:00
from your branch to freeCodeCamp's `staging` branch.
4. The title (also called the subject) of your PR should be descriptive of your
changes and succinctly indicates what is being fixed.
- **Do not add the issue number in the PR title or commit message.**
- Examples: `Add Test Cases to Bonfire Drop It` `Correct typo in Waypoint
Size Your Images`
5. In the body of your PR include a more detailed summary of the changes you
made and why.
2017-04-04 09:01:07 +00:00
- If the PR is meant to fix an existing bug/issue then, at the end of
your PR's description, append the keyword `closes` and #xxxx (where xxxx
is the issue number). Example: `closes #1337`. This tells GitHub to
close the existing issue, if the PR is merged.
6. Indicate if you have tested on a local copy of the site or not.
### How We Review and Merge Pull Requests
2017-01-15 19:15:21 +00:00
freeCodeCamp has a team of volunteer Issue Moderators. These Issue Moderators routinely go through open pull requests in a process called [Quality Assurance](https://en.wikipedia.org/wiki/Quality_assurance) (QA).
1. If an Issue Moderator QA's a pull request and confirms that the new code does what it is supposed without seeming to introduce any new bugs, they will comment "LGTM" which means "Looks good to me."
2. Another Issue Moderator will QA the same pull request. Once they have also confirmed that the new code does what it is supposed to without seeming to introduce any new bugs, they will merge the pull request.
2016-11-26 20:43:28 +00:00
If you would like to apply to join our Issue Moderator team - which is a Core Team position - message [@BerkeleyTrue](https://gitter.im/berkeleytrue) with links to 5 of your pull requests that have been accepted and 5 issues where you have helped someone else through commenting or QA'ing.
### How We Close Stale Issues
We will close any issues or pull requests that have been inactive for more than 15 days, except those that match the following criteria:
- bugs that are confirmed
2016-10-13 22:20:11 +00:00
- pull requests that are waiting on other pull requests to be merged
- features that are a part of a GitHub project
### Next Steps
#### If your PR is accepted
Once your PR is accepted, you may delete the branch you created to submit it.
This keeps your working fork clean.
You can do this with a press of a button on the GitHub PR interface. You can
delete the local copy of the branch with: `git branch -D branch/to-delete-name`
#### If your PR is rejected
Don't despair! You should receive solid feedback from the Issue Moderators as to
why it was rejected and what changes are needed.
Many Pull Requests, especially first Pull Requests, require correction or
updating. If you have used the GitHub interface to create your PR, you will need
2016-08-17 10:59:39 +00:00
to close your PR, create a new branch, and re-submit.
If you have a local copy of the repo, you can make the requested changes and
amend your commit with: `git commit --amend` This will update your existing
commit. When you push it to your fork you will need to do a force push to
overwrite your old commit: `git push --force`
2015-11-29 09:04:50 +00:00
Be sure to post in the PR conversation that you have made the requested changes.
### Other resources
2017-02-07 20:28:47 +00:00
- [Style Guide for freeCodeCamp
Challenges](https://github.com/freeCodeCamp/freeCodeCamp/blob/staging/seed/challenge-style-guide.md)
- [Searching for Your Issue on
2017-08-25 22:07:44 +00:00
GitHub](http://forum.freecodecamp.org/t/searching-for-existing-issues/19139)
- [Creating a New GitHub
2017-08-25 22:07:44 +00:00
Issue](http://forum.freecodecamp.org/t/creating-a-new-github-issue/18392)
- [Select Issues for Contributing Using
2017-08-25 22:07:44 +00:00
Labels](http://forum.freecodecamp.org/t/free-code-camp-issue-labels/19556)
2017-01-15 19:15:21 +00:00
- [How to clone the freeCodeCamp website on a Windows
2017-08-25 22:07:44 +00:00
pc](http://forum.freecodecamp.org/t/how-to-clone-and-setup-the-free-code-camp-website-on-a-windows-pc/19366)
- [How to log in to your local FCC site - using
2017-08-25 22:07:44 +00:00
GitHub](http://forum.freecodecamp.org/t/how-to-log-in-to-your-local-instance-of-free-code-camp/19552)
- [Writing great git commit
2017-08-25 22:07:44 +00:00
messages](http://forum.freecodecamp.org/t/writing-good-git-commit-messages/13210)
- [Contributor Chat Support - For the FCC Repositories, and running a local
2016-09-24 23:42:24 +00:00
instance](https://gitter.im/FreeCodeCamp/Contributors)