Merge branch 'develop' into develop

majidmazin · web-flow · commit 3ce4342d35a2 · 2017-11-28T21:49:35.000+05:30
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -28,7 +28,7 @@ Coderplex web application comprises of two repositories :
 
 
 ## Code of Conduct
-Coderplex has adopted [Contributor Covenant](https://github.com/coderplex/coderplex/blob/docs-update/CODE_OF_CONDUCT.md) that we expect project participants to adhere to.
+Coderplex has adopted [Contributor Covenant](https://github.com/coderplex/coderplex/blob/develop/.github/CODE_OF_CONDUCT.md) that we expect project participants to adhere to.
 
 ## Open Development
 All work related to the application takes place on Github itself. We use [Issues](https://github.com/coderplex/coderplex/issues) to track bugs, discuss ideas and to engage open source contributors. [Projects](https://github.com/coderplex/coderplex/projects) are used to keep track of everything and is our project management tool. We maintain [Wiki](https://github.com/coderplex/coderplex/wiki) for structuring our long term thoughts. Both core team members and contributors sends a pull request which goes through the same review process. Whole process is as transparent as it can be and we strive to keep it that way.
@@ -83,42 +83,42 @@ We welcome pull requests from beginners and seasoned javaScript developers alike
 
 #### Running Locally
 
-1. Clone repository
+1. Fork the [repository](https://github.com/coderplex/coderplex).
+1. Then clone your forked repository
     ```bash
-    $ git clone https://github.com/coderplex/coderplex.git
+    $ git clone <your forked repository url>
     ```
-2. Move to the repository root folder
+1. Move to the repository root folder
     ```bash
     $ cd coderplex
     ```  
-3. Install dependencies
+1. Install dependencies
     ```bash
     $ yarn
     ```
-4. Start the development server
+1. Start the development server
     ```bash
     $ yarn dev
     ```
     App now opens at `localhost:3000` in your default browser.
     > You may get this [error]() if any other app is already running the above port.
 
 #### Before submitting:
-1. Fork the [repository](https://github.com/coderplex/coderplex).
-2. From your fork, create a [branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/) and name it. eg. `typo-in-readme`
-3. If you’ve fixed a bug or added code that should be tested, add tests!
-4. Ensure that all test pass
+1. From your fork, create a [branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/) and name it. eg. `typo-in-readme`
+1. If you’ve fixed a bug or added code that should be tested, add tests!
+1. Ensure that all test pass
     ```bash
     $ yarn test
     ```
-5. Run code formatters
+1. Run code formatters
     ```bash
     $ yarn lint
     ```
-6. Add and commit your code. Please give meaning full commit messages.
-7. Pull latest code from [upstream repository's ](https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/)`develop`, if in case anything new were merged while you were working on your fork.
-8. Push the code to your fork.
-9. Raise the pull request from your created branch to `develop` branch of coderplex. [why develop instead of master branch?]()
-10. Take some time to give a brief description of the work you have done.
+1. Add and commit your code. Please give meaning full commit messages.
+1. Pull latest code from [upstream repository's ](https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/)`develop`, if in case anything new were merged while you were working on your fork.
+1. Push the code to your fork.
+1. Raise the pull request from your created branch to `develop` branch of coderplex. [why develop instead of master branch?]()
+1. Take some time to give a brief description of the work you have done.
 
 #### After submitting
 1. Wait for all checks to pass in below section.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1 +1,33 @@
-added
+<!--- Provide a general summary of the issue in the Title above -->
+
+<!--
+    Thank you very much for contributing to coderplex by creating an issue! ❤️
+    To avoid duplicate issues we ask you to check off the following list
+-->
+
+<!-- Checked checkbox should look like this: [x] -->
+- [ ] I have searched the [issues](https://github.com/coderplex/coderplex/issues) of this repository and believe that this is not a duplicate.
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide unambiguous set of steps to -->
+<!--- reproduce this bug. Include screenshot, if relevant -->
+1.
+2.
+3.
+4.
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+| Tech    | Version |
+|---------|---------|
+| OS      |         |
+| browser |         |
+| etc     |         |
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1 +1,23 @@
-will work
+<!--- Provide a general summary of the PR in the Title above -->
+
+<!--
+    Thank you very much for contributing to coderplex by creating an PR! ❤️
+    To quickly merge this PR we ask you to check off the following list
+-->
+
+<!--place the issue number which this PR is solving. Eg: Fixes #27-->
+Fixes
+
+## Changes proposed in this PR
+- <!-- change 1-->
+- <!--change 2-->
+
+<!-- Checked checkbox should look like this: [x] -->
+### Checklist for this PR
+
+- [ ] I have read [contributing guidelines](https://github.com/coderplex/coderplex/blob/develop/.github/CONTRIBUTING.md).
+- [ ] I executed `yarn lint` locally to format my code.
+- [ ] All tests `yarn test` ran successfully.
+- [ ] Pull request is towards `develop` branch.
+<!--If change is related to UI then tick below checkbox otherwise delete below line-->
+- [ ] I have tested responsiveness of the UI by checking on max devices using [ScreenFly](http://quirktools.com/screenfly/)
diff --git a/README.md b/README.md
@@ -1,11 +1,14 @@
-# Coderplex Website [Work In Progress]
+# Coderplex Website
 
 [![Greenkeeper badge](https://badges.greenkeeper.io/coderplex/coderplex.svg)](https://greenkeeper.io/)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
 [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 [![Build Status](https://travis-ci.org/coderplex/coderplex.svg?branch=master)](https://travis-ci.org/coderplex/coderplex)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/coderplex/coderplex/blob/master/LICENSE)
 
+##### Join our community here at https://www.coderplex.org
+>:construction: under active development
+
 ## About
 
 This project mainly uses
@@ -15,7 +18,6 @@ This project mainly uses
 * [Next.js](https://github.com/zeit/next.js/) - A minimalistic framework for server-rendered React applications.
 * [emotion](https://emotion.sh) - A high performance, lightweight css-in-js library.
 
-### [Join our community here](https://www.coderplex.org)
 
 ## Contributing
 
