Skip to content
This repository was archived by the owner on Jun 28, 2021. It is now read-only.

Commit 4395405

Browse files
mmahalwymmahalwy
authored
Develop -> Master (#387)
* HOTFIX reading mode markers (#303) * Default api and files (#306) * Reducing bundle size (#310) * Reducing bundle size * rearranged files * more rearrange and deleted unneeded files * add default segments key (#313) * transitioning to al-quran al-kareem (#314) transitioning to Al-Quran al-Kareem * Fix lint issues * Update Readme.md * Add devDependency Status * Update Readme for new developers * Code splitting assets (#321) * Code splitting * Split the html files into their own and ajax requested * Pass tests * Wrong files * Add segments * Add segments * Autocomplete pointing to v2 suggest * HOTFIX pretty-error dep (#323) * HOTFIX Search to the right route (#324) * No segments for non-segmented reciters (#325) * Adding sentry (#327) * CDN images for surahinfo (#328) * Reduce data dehydration (#329) * Search Action on homepage (#330) * Descriptions for surahs (#331) * Fixed head tags (#332) * Head tags improved and more organized * Fixed the head problem * audioplayer bug fixes, or more bugs (#335) * audioplayer bug fixes, or more bugs * removes some unneeded state things in audioplayer redux, also fixes a bug where event listeners would get bound without properly unbinding multiple times, which caused the player to skip ayahs after using next <-> prev more then once on the same ayah * temporarily disables word focusing capacity * Add sourcemaps to prod * Remove zero padding in urls * (WIP) Issue #248 (#336) Fixes #248 Out of range bug * correct waffle url. (#338) * JS error on surah click (#349) * Add Heroku generated app.json * Ramadan Todo list (#343) * Change * Eslint added (#345) * Eslint added * eslint in travis * ayah require * Fixed * fixed bug that was preventing ayah transition on audioplayer * fix autocomplete thing * Extract connect from the surah container (#347) * Fout fonts (#346) * Fout fonts * wip * wip2 * do not update * pass tests * Sourcemap for sentry (#352) * contribution guideline (#355) * Heroku pipeline trials (#354) * push * push * push * push * push * Heroku push (#356) * Heroku push * public urls * Add zendesk widget (#358) * Fix font artifacts This fixes #365 by merging the 3 fonts from quran/quran.com-images#7, quran/quran.com-images#8, and quran/quran.com-images#9. * Update font for page 237 to fix spacing in 12:17 This fixes the spacing issue in 12:17 by updating the font. Fixes #369. * Feature/341 social share (#367) * Add zendesk widget (#358) * The first commit's message is: * Simplify audioplayer (#360) * Audioplayer refactor * more reshuffling * move logic outside of tracker * fixes #359 * eslint * refactor and works * Added segments * Fix navigating from home to surah * reciter change * on word click working! * segments encryption and lazy decryption * encryption lib * linter is happy * unit tests * env * Fix sentry bug (#373) * Fix sentry bug * no build * #372 colon separated surah/ayah (#374) * #372 colon separated surah/ayah * #372 colon separated surah/ayah * #372 colon separated surah/ayah * Re-output fonts with Apple option enabled This probably doesn't matter for web, but it may matter for apps in the future, plus wanted to keep in sync with the versions of the fonts used by quran/quran.com-images. * Tooltip options for translation and transliteration (#376) * Reading mode single line (#377) * - ayah's have link (discuss, maybe not needed) (#379) - Fix audio player playing text - Remove unneeded padding on mobile - Hide Share on mobile devices (native share is built into the browsers) * Added Mixpanel (#384) * Remove footer links (#385) * Remove footer links * eslint * Fix json-ld (#386)
1 parent a180652 commit 4395405

File tree

147 files changed

+3611
-3312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+3611
-3312
lines changed

‎.babelrc‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,7 @@
1414
},
1515
"development": {
1616
"plugins": [
17-
"typecheck",
18-
["react-transform", {
19-
"transforms": [{
20-
"transform": "react-transform-catch-errors",
21-
"imports": ["react", "redbox-react"]
22-
}
23-
]
24-
}]
17+
"typecheck"
2518
]
2619
}
2720
}

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ root = true
33

44
[*]
55
indent_style = space
6-
indent_size = 4
6+
indent_size = 2
77
charset = utf-8
88
trim_trailing_whitespace = true
99
insert_final_newline = true

‎.env‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
NODE_ENV=development
2+
PORT=8000
3+
API_URL=http://quran.com:3000
4+
SEGMENTS_KEY=
5+
SENTRY_KEY_CLIENT=
6+
SENTRY_KEY_SERVER=

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/components/SurahInfo/htmls/*

‎.eslintrc‎

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,55 @@
11
{
22
"parser": "babel-eslint",
3+
"extends": "airbnb",
34
"env": {
4-
"es6": true,
5-
"node": true,
65
"browser": true,
7-
"jquery": true
8-
},
9-
"ecmaFeatures": {
10-
"arrowFunctions": true,
11-
"binaryLiterals": true,
12-
"blockBindings": true,
13-
"classes": true,
14-
"defaultParams": true,
15-
"destructuring": true,
16-
"forOf": true,
17-
"generators": true,
18-
"modules": true,
19-
"objectLiteralComputedProperties": true,
20-
"objectLiteralDuplicateProperties": true,
21-
"objectLiteralShorthandMethods": true,
22-
"objectLiteralShorthandProperties": true,
23-
"octalLiterals": true,
24-
"regexUFlag": true,
25-
"regexYFlag": true,
26-
"spread": true,
27-
"superInFunctions": true,
28-
"templateStrings": true,
29-
"unicodeCodePointEscapes": true,
30-
"globalReturn": true,
31-
"jsx": false
6+
"node": true,
7+
"mocha": true,
8+
"es6": true
329
},
3310
"rules": {
34-
"strict": 0,
35-
"indent": [2, 2],
36-
"quotes": [2, "single"],
37-
"no-unused-vars": 0
11+
"react/no-multi-comp": 0,
12+
"import/default": 0,
13+
"import/no-duplicates": 0,
14+
"import/named": 0,
15+
"import/namespace": 0,
16+
"import/no-unresolved": 0,
17+
"import/no-named-as-default": 2,
18+
// Temporarirly disabled due to a possible bug in babel-eslint (todomvc example)
19+
"block-scoped-var": 0,
20+
// Temporarily disabled for test/* until babel/babel-eslint#33 is resolved
21+
"padded-blocks": 0,
22+
"comma-dangle": 0, // not sure why airbnb turned this on. gross!
23+
"indent": [2, 2, {"SwitchCase": 1}],
24+
"no-console": 0,
25+
"no-alert": 0,
26+
"object-curly-spacing": 0,
27+
"no-case-declarations": 0
28+
},
29+
"plugins": [
30+
"react", "import"
31+
],
32+
"settings": {
33+
"import/parser": "babel-eslint",
34+
"import/resolve": {
35+
moduleDirectory: ["node_modules", "src"]
36+
}
37+
},
38+
"parserOptions":{
39+
"ecmaFeatures": {
40+
"experimentalObjectRestSpread": true
41+
}
3842
},
39-
"plugins": ["react"]
43+
"globals": {
44+
"__DEVELOPMENT__": true,
45+
"__CLIENT__": true,
46+
"__SERVER__": true,
47+
"__DISABLE_SSR__": true,
48+
"__DEVTOOLS__": true,
49+
"socket": true,
50+
"webpackIsomorphicTools": true,
51+
ga: true,
52+
Raven: true,
53+
mixpanel: true
54+
}
4055
}

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ selenium-debug.log
1212
tests/functional/output/*
1313
test/functional/screenshots/*
1414
.ssh
15-
webpack-stats.debug.json
15+
webpack-stats.debug.json

‎CONTRIBUTING.md‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Contributing
2+
3+
You want to help? You rock! Now, take a moment to be sure your contributions make sense to everyone else.
4+
5+
## Reporting Issues
6+
7+
Found a problem? Want a new feature?
8+
9+
- See if your issue or idea has [already been reported].
10+
11+
12+
## Submitting Pull Requests
13+
14+
Pull requests are the greatest contributions, so be sure they are focused in scope, and do avoid unrelated commits.
15+
16+
1. To begin, [fork this project], clone your fork, and add our [upstream].
17+
```bash
18+
# Clone your fork of the repository into the current directory
19+
git clone https://github.com/<your-username>/quran.com-frontend
20+
# Navigate to the newly cloned directory
21+
cd quran.com-frontend
22+
#Assign the forked repository to a remote call "origin"
23+
git remote add origin git://github.com/<your-username>/quran.com-frontend.git
24+
# Assign the original repository to a remote called "upstream"
25+
git remote add upstream https://github.com/quran/quran.com-frontend
26+
# Install the tools necessary for development
27+
npm install
28+
```
29+
30+
2. Create a branch for your feature or fix:
31+
```bash
32+
# Move into a new branch for a feature
33+
git checkout -b feature/thing
34+
```
35+
```bash
36+
# Move into a new branch for a fix
37+
git checkout -b fix/something
38+
```
39+
40+
3. Be sure your code follows our practices.
41+
```bash
42+
# Test current code
43+
npm run test
44+
```
45+
Our `npm run test` tests and _watch_. Otherwise use `npm run test:ci:unit` for CI level tests.
46+
47+
We also have nightwatch function tests. You can install nightwatch globally and can run tests like this:
48+
```
49+
nightwatch --test tests/functional/specs/Index_spec.js
50+
```
51+
52+
4. To create a PR you need to push your branch to the origin(forked) remote and then press some buttons on GitHub:
53+
```bash
54+
# Push a feature branch
55+
git push -u origin feature/thing
56+
```
57+
```bash
58+
# Push a fix branch
59+
git push -u origin fix/something
60+
```
61+
62+
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```.
63+
64+
5. Now [open a pull request] with a clear title and description.
65+
66+
## Sever-side integration
67+
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.
68+
69+
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).
70+
71+
If you experience an issue, check the [contributing] guidelines.
72+
73+
[upstream]: https://help.github.com/articles/syncing-a-fork/
74+
[contributing]: https://guides.github.com/activities/contributing-to-open-source/
75+
[already been reported]: https://github.com/quran/quran.com-frontend/issues
76+
[fork this project]: https://github.com/quran/quran.com-frontend/fork
77+
[open a pull request]: https://help.github.com/articles/using-pull-requests/

‎Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
FROM node:5.10.0
22

33
ENV NODE_ENV production
4+
ENV API_URL http://api.quran.com:3000
5+
ENV SENTRY_KEY_CLIENT https://[email protected]/80639
6+
ENV SENTRY_KEY_SERVER https://44c105328ae544ae9928f9eb74b40061:[email protected]/80639
7+
ENV PORT 8000
48

59
RUN apt-get -y update && apt-get -y install supervisor ssh rsync
610

‎README.md‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,49 @@
1-
[![Stories Ready](https://badge.waffle.io/quran/quran.com-frontend.svg?label=ready&title=Ready)](http://waffle.io/quran/quran.com-frontend)
2-
[![Stories In Progress](https://badge.waffle.io/quran/quran.com-frontend.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/quran/quran.com-frontend)
3-
[![Stories In Review](https://badge.waffle.io/quran/quran.com-frontend.svg?label=in%20review&title=In%20Review)](http://waffle.io/quran/quran.com-frontend)
41

2+
# Quran.com
53

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

11-
[![Dependency Status](https://david-dm.org/quran/quran.com-frontend.svg)](https://david-dm.org/quran/quran.com-frontend)
8+
[![Stories Ready](https://badge.waffle.io/quran/quran.com-frontend.svg?label=ready&title=Ready)](http://waffle.io/quran/quran.com-frontend)
9+
[![Stories In Progress](https://badge.waffle.io/quran/quran.com-frontend.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/quran/quran.com-frontend)
10+
[![Stories In Review](https://badge.waffle.io/quran/quran.com-frontend.svg?label=in%20review&title=In%20Review)](http://waffle.io/quran/quran.com-frontend)
11+
12+
13+
[![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)
1214
[![Code Climate](https://codeclimate.com/github/quran/quran.com-frontend.png)](https://codeclimate.com/github/quran/quran.com-frontend)
1315

14-
#### Getting started
15-
Simply clone this repo, then run `npm install` to install all the required node_modules.
16-
From there, you are ready to go!
16+
## How to contribute
17+
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.
1718

18-
#### Developing
19-
To start the app, run `npm run dev` which will
20-
run both the server and the client (webpack) to compile upon edits. Go to localhost:8001 in your browser, not 8000 (that is just the express server).
19+
Read the [contributing] section before creating an issue.
2120

22-
#### Tests
23-
Run `npm run test:watch` to run the tests locally and watching. Otherwise use `npm run test` for CI level tests.
21+
## Server-Side Integration
22+
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.
23+
24+
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).
2425

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

30-
#### Backend
27+
## Backend
3128
Current at: https://github.com/quran/quran-api-rails
3229
DB is private, message me for acceess.
3330

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

40-
#### Design
32+
## Design
4133
We currently use InvisionApp. Again, contact me if you'd like access to it.
4234

43-
#### Making sure main.js is small
35+
## Making sure main.js is small
4436
Follow: https://www.npmjs.com/package/webpack-bundle-size-analyzer
4537
```
4638
env NODE_ENV=development webpack --json > bundle-stats.json
4739
subl bundle-stats.json #so that you can the output
4840
analyze-bundle-size bundle-stats.json
4941
```
5042

51-
###### [View project issues on waffle.io...](https://badge.waffle.io/quran/quran.com-frontend)
43+
## [View project issues on waffle.io...](https://waffle.io/quran/quran.com-frontend)
44+
45+
[Reactjs]: https://facebook.github.io/react/docs/getting-started.html
46+
[Redux]: http://redux.js.org/
47+
[Expressjs]: http://expressjs.com/en/starter/hello-world.html
48+
[Webpack]: http://webpack.github.io/docs/what-is-webpack.html
49+
[contributing]: CONTRIBUTING.md

‎app.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"name": "quran.com-frontend",
3+
"scripts": {
4+
},
5+
"env": {
6+
"API_URL": "http://api.quran.com:3000",
7+
"USE_LOCAL_ASSETS": "true"
8+
},
9+
"formation": {
10+
},
11+
"addons": [
12+
13+
],
14+
"buildpacks": [
15+
]
16+
}

0 commit comments

Comments
 (0)