Merge master into production

.babelrc

@@ -4,13 +4,20 @@
     "transform-runtime",
     "add-module-exports",
     "transform-decorators-legacy",
-    "transform-react-display-name"
+    "transform-react-display-name",
+    ["system-import-transformer", {"modules": "common"}]
   ],
   "env": {
     "development": {
       "plugins": [
         "typecheck"
       ]
+    },
+    "production": {
+      "plugins": [
+        "transform-react-inline-elements",
+        "transform-react-constant-elements"
+      ]
     }
   }
 }

.gitignore

@@ -3,13 +3,15 @@ build
 node_modules
 /node_modules
 static/dist
+dist
 test-results.xml
 npm-debug.log
+npm-debug.log.*
 webpack-stats.json
 webpack-assets.json
 bundle-stats.json
 selenium-debug.log
 tests/functional/output/*
 test/functional/screenshots/*
 .ssh
-webpack-stats.debug.json
+webpack-stats.debug.json

.npmrc

@@ -0,0 +1 @@
+save-exact = true

.nvmrc

@@ -0,0 +1 @@
+6.3.0

.travis.yml

@@ -1,8 +1,8 @@
 sudo: false
 language: node_js
 env: TEST_SUITE=unit
-node_js:
-  - "5.6.0"
+# Node version is handled inside `.nvmrc` file & travis picks it up automatically because it uses `nvm`
+# https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Using-.nvmrc
 cache:
   directories:
     - node_modules

CONTRIBUTING.md

@@ -14,6 +14,7 @@ Found a problem? Want a new feature?
 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
@@ -26,8 +27,17 @@ Pull requests are the greatest contributions, so be sure they are focused in sco
 	# Install the tools necessary for development
 	npm install
 	```
+2. Pull latest changes from "upstream" and push these changes to your "origin"(forked)
+	> NOTE - This step will repeat every time You plan to contribute
+
+	```bash
+	# Pull latest changes from "upstream" repository
+	git pull upstream master
+	#Push latest changes to Your "origin" repository
+	git push origin master
+	```
+3. Create a branch for your feature or fix:
 
-2. Create a branch for your feature or fix:
 	```bash
 	# Move into a new branch for a feature
 	git checkout -b feature/thing
@@ -37,7 +47,8 @@ Pull requests are the greatest contributions, so be sure they are focused in sco
 	git checkout -b fix/something
 	```
 
-3. Be sure your code follows our practices.
+4. Be sure your code follows our practices.
+
 	```bash
 	# Test current code
 	npm run test
@@ -49,7 +60,8 @@ Pull requests are the greatest contributions, so be sure they are focused in sco
 	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:
+5. 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
@@ -61,7 +73,7 @@ Pull requests are the greatest contributions, so be sure they are focused in sco
 
 	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.
+6. 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.

Dockerfile

@@ -1,10 +1,11 @@
-FROM node:5.10.0
+FROM node:6.3
 
 ENV NODE_ENV production
 ENV API_URL http://api.quran.com:3000
 ENV SENTRY_KEY_CLIENT https://44c105328ae544ae9928f9eb74b40061@app.getsentry.com/80639
 ENV SENTRY_KEY_SERVER https://44c105328ae544ae9928f9eb74b40061:41ca814d33124e04ab450104c3938cb1@app.getsentry.com/80639
 ENV PORT 8000
+ENV NODE_PATH "./src"
 
 RUN apt-get -y update && apt-get -y install supervisor ssh rsync
 
@@ -17,15 +18,16 @@ RUN cp /etc/cron.daily/logrotate /etc/cron.hourly
 # cache npm install when package.json hasn't changed
 WORKDIR /tmp
 ADD package.json package.json
-RUN npm install
+RUN npm install --silent --no-progress
 RUN npm install -g pm2
 
 RUN mkdir /quran
 RUN cp -a /tmp/node_modules /quran
 
 WORKDIR /quran
 ADD . /quran/
-RUN npm run build
+RUN npm run build:client
+RUN npm run build:server
 
 # ssh keys
 WORKDIR /root
@@ -38,5 +40,7 @@ RUN rsync --update --progress -raz . ahmedre@rsync.keycdn.com:zones/assets/
 # go back to /quran
 WORKDIR /quran
 
+ENV NODE_PATH "./dist"
+
 EXPOSE 8000
 CMD ["supervisord", "--nodaemon", "-c", "/etc/supervisor/supervisord.conf"]

README.md

@@ -26,7 +26,7 @@ To start the app, run `npm run dev` which will run both the server and the clien
 
 ## Backend
 Current at: https://github.com/quran/quran-api-rails
-DB is private, message me for acceess.
+DB is private, message me for access.
 
 
 ## Design
@@ -40,8 +40,6 @@ subl bundle-stats.json #so that you can the output
 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

start.js → bin/server.js

@@ -1,9 +1,12 @@
 require('dotenv').load();
 require('app-module-path').addPath(__dirname);
-require('app-module-path').addPath('./src');
+require('app-module-path').addPath('../src');
 
 var fs = require('fs');
+var path = require('path');
+var webpackIsomorphicTools = require('webpack-isomorphic-tools');
 var babelrc = fs.readFileSync('./.babelrc');
+var rootDir = path.resolve(__dirname, '..');
 var config;
 
 try {
@@ -13,8 +16,6 @@ try {
   console.error(err);
 }
 
-config.plugins.push(['system-import-transformer', {modules: 'common'}]);
-
 require('babel-register')(config);
 
 global.__CLIENT__ = false;
@@ -30,12 +31,8 @@ if (__DEVELOPMENT__) {
   }
 }
 
-var webpackIsomorphicTools = require('webpack-isomorphic-tools');
-// this must be equal to your Webpack configuration "context" parameter
-var rootPath = require('path').resolve(__dirname, './')
-
-global.webpack_isomorphic_tools = new webpackIsomorphicTools(require('./webpack/isomorphic-tools-configuration'))
+global.webpack_isomorphic_tools = new webpackIsomorphicTools(require('../webpack/isomorphic-tools-configuration'))
 .development(process.env.NODE_ENV === 'development')
-.server(rootPath, function() {
-  require('./server.js')();
+.server(rootDir, function() {
+  require('../src/server.js')();
 });

bin/server.prod.js

@@ -0,0 +1,17 @@
+require('dotenv').load();
+require('app-module-path').addPath(__dirname);
+require('app-module-path').addPath('../dist');
+
+var webpackIsomorphicTools = require('webpack-isomorphic-tools');
+var path = require('path');
+var rootDir = path.resolve(__dirname, '../dist');
+
+global.__CLIENT__ = false;
+global.__SERVER__ = true;
+global.__DEVELOPMENT__ = process.env.NODE_ENV !== 'production';
+
+global.webpack_isomorphic_tools = new webpackIsomorphicTools(require('../webpack/isomorphic-tools-configuration'))
+.development(__DEVELOPMENT__)
+.server(rootDir, function() {
+  require('../dist/server.js')();
+});

docker/supervisord.conf

@@ -2,7 +2,7 @@
 nodaemon=true
 
 [program:pm2]
-command=pm2 start /quran/start.js -i 4 --no-daemon
+command=pm2 start /quran/bin/server.prod.js -i 0 --no-daemon
 directory=/quran
 redirect_stderr=true
 stdout_logfile=/dev/stdout