jann4025/exam2019

exam2019

Coding standards

All styling most be done in scss in the folder /src/scss/*.scss

• Airbnb Javascript Style guide for general javascript.
• Airbnb CSS Style guide for css/scss.
• Airbnb React/JSX Style guide for React & Jsx.

Workflow

Pull

Pull every time you start working on the project - If you get a pull/merge conflict make sure to ask the last person to push the repository about what to keep and not to keep. After solving the pull/merge conflict make sure to make following commands before you start working:
git add --all
git commit -m "Solving merge conflicts"
git push

Branches

Always work in branches. (Work only in master, if you have talked with the other group members about it)

Naming the branch
Name the branch based on wich part of the product you are working on. As example if you're working on styling the header do NOT call the branch "styling" but instead name the branch "header".

How to create the branch
If you already are in another branch than master go back to the master by using following command git checkout master. When you are in the master add the new branch with following command git branch header.

**You can always check wich brand you are working in with the following command git branch - The branch turning green is the branch you are currently working in **

Merge the sub branches with master
Do not merge the branches with master alone, this is something we always do together.

Merge the branches with following commands git checkout master(To make sure you are in the master while merging) git merge header(To merge the branch Header or another branch with master).

After merging delete the branch on the github.com repo

Commits

Commit as offent as posible. Commit when something is "Done" or atleast the part youve been working on is working

Commit messages:
Make sure to add commit messages that tells exactly what the commit is doing. As example if you fixed a bug in a function the commit message example could be: "Fixing calculator error in function 'randomNumberCalculator()'

Style guide

Link to style guide

Wireframe & Mockup

Link to wireframe of game
Link to wireframe of site
Link to Mockup
Link to Form Mockup