Skip to content
This repository was archived by the owner on Jun 28, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
37b5b6f
HOTFIX reading mode markers (#303)
mmahalwy May 22, 2016
bc50cd3
Default api and files (#306)
mmahalwy May 22, 2016
30d2930
Reducing bundle size (#310)
mmahalwy May 24, 2016
2dcbd22
add default segments key (#313)
May 25, 2016
b6d7c7d
transitioning to al-quran al-kareem (#314)
May 25, 2016
7c6f7f5
Fix lint issues
azizur May 7, 2016
15350a8
Update Readme.md
azizur May 7, 2016
1a1ca97
Add devDependency Status
azizur May 7, 2016
5eb61c1
Merge pull request #317 from azizur/fix-lint-issues
ahmedre May 26, 2016
edc4b42
Update Readme for new developers
azizur May 26, 2016
07baa6f
Merge pull request #318 from azizur/update-readme
ahmedre May 26, 2016
2acaf1e
Code splitting assets (#321)
mmahalwy May 27, 2016
394403e
Autocomplete pointing to v2 suggest
mmahalwy May 27, 2016
c8f9299
Merge pull request #322 from quran/fix-auto-complete
ahmedre May 27, 2016
c0c840a
HOTFIX pretty-error dep (#323)
mmahalwy May 27, 2016
e59c56b
HOTFIX Search to the right route (#324)
mmahalwy May 27, 2016
8a6918a
No segments for non-segmented reciters (#325)
mmahalwy May 27, 2016
c233869
Adding sentry (#327)
mmahalwy Jun 1, 2016
9e4aab7
CDN images for surahinfo (#328)
mmahalwy Jun 2, 2016
884f1c5
Reduce data dehydration (#329)
mmahalwy Jun 2, 2016
9a11515
Search Action on homepage (#330)
mmahalwy Jun 2, 2016
78d0bcb
Descriptions for surahs (#331)
mmahalwy Jun 2, 2016
fa2b52f
Fixed head tags (#332)
mmahalwy Jun 3, 2016
936937b
audioplayer bug fixes, or more bugs (#335)
mmahalwy Jun 12, 2016
73f233b
Add sourcemaps to prod
mmahalwy Jun 12, 2016
6a5e9b5
Remove zero padding in urls
mmahalwy Jun 13, 2016
70fbbfd
(WIP) Issue #248 (#336)
abiodun0 Jun 15, 2016
2f493f2
correct waffle url. (#338)
thabti Jun 16, 2016
0f214b0
JS error on surah click (#349)
mahboob-awan Jun 25, 2016
e6d2a8e
Add Heroku generated app.json
mmahalwy Jun 25, 2016
4d0a9be
Ramadan Todo list (#343)
mmahalwy Jun 25, 2016
8b092af
Sourcemap for sentry (#352)
mmahalwy Jun 25, 2016
bd3e55c
contribution guideline (#355)
mahboob-awan Jun 25, 2016
540950f
Heroku pipeline trials (#354)
mmahalwy Jun 25, 2016
4a61d26
Heroku push (#356)
mmahalwy Jun 25, 2016
d23a3ac
Add zendesk widget (#358)
mmahalwy Jun 25, 2016
687f0f0
Fix font artifacts
ahmedre Jul 2, 2016
b0337c4
Merge pull request #366 from quran/fontfix
ahmedre Jul 2, 2016
186867e
Update font for page 237 to fix spacing in 12:17
ahmedre Jul 2, 2016
cf6bbc6
Merge pull request #370 from quran/fix237
ahmedre Jul 2, 2016
1e10b98
Feature/341 social share (#367)
thabti Jul 3, 2016
eed2ce3
Simplify audioplayer (#360)
mmahalwy Jul 3, 2016
1a21634
Fix sentry bug (#373)
mmahalwy Jul 3, 2016
50f210d
#372 colon separated surah/ayah (#374)
thabti Jul 3, 2016
948b91b
Re-output fonts with Apple option enabled
ahmedre Jul 4, 2016
d5c5293
Merge pull request #375 from quran/applefonts
ahmedre Jul 4, 2016
2706cf7
Tooltip options for translation and transliteration (#376)
mmahalwy Jul 4, 2016
b23a80c
Reading mode single line (#377)
mmahalwy Jul 4, 2016
30a7015
- ayah's have link (discuss, maybe not needed) (#379)
thabti Jul 6, 2016
74004e3
Added Mixpanel (#384)
mmahalwy Jul 9, 2016
85c0739
Remove footer links (#385)
mmahalwy Jul 9, 2016
fb35d4f
Fix json-ld (#386)
mmahalwy Jul 9, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
contribution guideline (#355)
  • Loading branch information
mahboob-awan authored and mmahalwy committed Jun 25, 2016
commit bd3e55c4b8be2929e218e14deace7ebac2e6137a
77 changes: 77 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Contributing

You want to help? You rock! Now, take a moment to be sure your contributions make sense to everyone else.

## Reporting Issues

Found a problem? Want a new feature?

- See if your issue or idea has [already been reported].


## Submitting Pull Requests

Pull requests are the greatest contributions, so be sure they are focused in scope, and do avoid unrelated commits.

1. To begin, [fork this project], clone your fork, and add our [upstream].
```bash
# Clone your fork of the repository into the current directory
git clone https://github.com/<your-username>/quran.com-frontend
# Navigate to the newly cloned directory
cd quran.com-frontend
#Assign the forked repository to a remote call "origin"
git remote add origin git://github.com/<your-username>/quran.com-frontend.git
# Assign the original repository to a remote called "upstream"
git remote add upstream https://github.com/quran/quran.com-frontend
# Install the tools necessary for development
npm install
```

2. Create a branch for your feature or fix:
```bash
# Move into a new branch for a feature
git checkout -b feature/thing
```
```bash
# Move into a new branch for a fix
git checkout -b fix/something
```

3. Be sure your code follows our practices.
```bash
# Test current code
npm run test
```
Our `npm run test` tests and _watch_. Otherwise use `npm run test:ci:unit` for CI level tests.

We also have nightwatch function tests. You can install nightwatch globally and can run tests like this:
```
nightwatch --test tests/functional/specs/Index_spec.js
```

4. To create a PR you need to push your branch to the origin(forked) remote and then press some buttons on GitHub:
```bash
# Push a feature branch
git push -u origin feature/thing
```
```bash
# Push a fix branch
git push -u origin fix/something
```

This will create the branch on your GitHub project. The ```-u``` flag links this branch with the remote one, so that in the future, you can simply type ```git push origin```.

5. Now [open a pull request] with a clear title and description.

## Sever-side integration
Unless you have the backend API running locally, you will need to update the `API_URL`, in `development.env` file, from `localhost` to `api.quran.com`. Leave the port number same.

To start the app, run `npm run dev` which will run both the server and the client (webpack) to compile upon edits. Go to http://localhost:8001 in your browser, not 8000 (that is just the express server).

If you experience an issue, check the [contributing] guidelines.

[upstream]: https://help.github.com/articles/syncing-a-fork/
[contributing]: https://guides.github.com/activities/contributing-to-open-source/
[already been reported]: https://github.com/quran/quran.com-frontend/issues
[fork this project]: https://github.com/quran/quran.com-frontend/fork
[open a pull request]: https://help.github.com/articles/using-pull-requests/
30 changes: 12 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Quran.com

This is the project soon to be the Quran.com facing site. This is built in
Reactjs + Redux + Expressjs + Webpack. It is isomorphic (javascript shared
[Reactjs] + [Redux] + [Expressjs] + [Webpack]. It is isomorphic (javascript shared
between both the server and the client) for SEO reasons.

[![Stories Ready](https://badge.waffle.io/quran/quran.com-frontend.svg?label=ready&title=Ready)](http://waffle.io/quran/quran.com-frontend)
Expand All @@ -13,33 +13,21 @@ between both the server and the client) for SEO reasons.
[![Dependency Status](https://david-dm.org/quran/quran.com-frontend.svg)](https://david-dm.org/quran/quran.com-frontend) [![devDependency Status](https://david-dm.org/quran/quran.com-frontend/dev-status.svg)](https://david-dm.org/quran/quran.com-frontend#info=devDependencies)
[![Code Climate](https://codeclimate.com/github/quran/quran.com-frontend.png)](https://codeclimate.com/github/quran/quran.com-frontend)

## Getting started
Simply clone this repo, then run `npm install` to install all the required node_modules.
From there, you are ready to go!
## How to contribute
We trust that you will not copy this idea/project, this is at the end for the sake of Allah and we all have good intentions while working with this project. But We must stress that copying the code/project is unacceptable.

Read the [contributing] section before creating an issue.

## Developing
## Server-Side Integration
Unless you have the backend API running locally, you will need to update the `API_URL`, in `development.env` file, from `localhost` to `api.quran.com`. Leave the port number same.

To start the app, run `npm run dev` which will run both the server and the client (webpack) to compile upon edits. Go to http://localhost:8001 in your browser, not 8000 (that is just the express server).


#### Tests
Run `npm run test` to run the tests locally and watching. Otherwise use `npm run test:ci:unit` for CI level tests.

We also have nightwatch function tests. You can install nightwatch globally and can run tests like this:
```
nightwatch --test tests/functional/specs/Index_spec.js
```

## Backend
Current at: https://github.com/quran/quran-api-rails
DB is private, message me for acceess.

## How to contribute
Fork this repo, then create a PR for specific fixes, improvements, etc. We trust that
you will not steal this, this is at the end of the day for the sake of Allah and we
all have good intentions while working with this project. But I must stress, stealing
this is unacceptable.

## Design
We currently use InvisionApp. Again, contact me if you'd like access to it.
Expand All @@ -53,3 +41,9 @@ analyze-bundle-size bundle-stats.json
```

## [View project issues on waffle.io...](https://waffle.io/quran/quran.com-frontend)

[Reactjs]: https://facebook.github.io/react/docs/getting-started.html
[Redux]: http://redux.js.org/
[Expressjs]: http://expressjs.com/en/starter/hello-world.html
[Webpack]: http://webpack.github.io/docs/what-is-webpack.html
[contributing]: CONTRIBUTING.md