f2f challenge 30056013

chqy24 · gondzo · commit d08f40e92fae · 2016-12-23T02:09:21.000+01:00
diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web: npm run start
diff --git a/README.md b/README.md
@@ -34,3 +34,24 @@ See Guild https://github.com/lorenwest/node-config/wiki/Configuration-Files
 |`lint:fix`|Lint and fix all `.js` files. [Read more on this](http://eslint.org/docs/user-guide/command-line-interface.html#fix).|
 |`test`|Run tests using [mocha-webpack](https://github.com/webpack/mocha-loader) for all `*.spec.(js|jsx)` files in the `src` dir.|
 
+## Local deploy
+    NODE_ENV=production npm run build
+    NODE_ENV=production npm run start
+
+## Heroku deploy
+
+### Prerequisites
+  - Heroku CLI
+
+### set up
+    npm run heroku:[ENV]:init
+    npm run heroku:[ENV]:deploy
+
+### update
+    npm run heroku:[ENV]:deploy
+
+`npm run heroku:[ENV]:init` will create a new git remote in current git repository and a new app in remote server.
+
+`npm run heroku:[ENV]:deploy` line will push current branch to corresponding remote environment.
+
+`ENV` can be 'prod', 'dev', 'staging', 'test'.
diff --git a/config/development.js b/config/development.js
@@ -0,0 +1,12 @@
+/* eslint-disable import/no-commonjs */
+/**
+ * Main config file
+ */
+module.exports = {
+  // below env variables are NOT visible in frontend
+  PORT: process.env.PORT || 3000,
+
+  // below env variables are visible in frontend
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
+};
diff --git a/config/production.js b/config/production.js
@@ -0,0 +1,12 @@
+/* eslint-disable import/no-commonjs */
+/**
+ * config file for production environment
+ */
+module.exports = {
+  // below env variables are NOT visible in frontend
+  PORT: process.env.PORT || 3000,
+
+  // below env variables are visible in frontend
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
+};
diff --git a/config/staging.js b/config/staging.js
@@ -0,0 +1,12 @@
+/* eslint-disable import/no-commonjs */
+/**
+ * Main config file
+ */
+module.exports = {
+  // below env variables are NOT visible in frontend
+  PORT: process.env.PORT || 3000,
+
+  // below env variables are visible in frontend
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
+};
diff --git a/config/test.js b/config/test.js
@@ -0,0 +1,12 @@
+/* eslint-disable import/no-commonjs */
+/**
+ * Main config file
+ */
+module.exports = {
+  // below env variables are NOT visible in frontend
+  PORT: process.env.PORT || 3000,
+
+  // below env variables are visible in frontend
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
+};
diff --git a/package.json b/package.json
@@ -5,11 +5,20 @@
   "main": "index.js",
   "scripts": {
     "dev": "cross-env NODE_ENV=development nodemon server",
-    "start": "cross-env NODE_ENV=production node server",
-    "build": "cross-env NODE_ENV=production webpack --bail --progress --build --tc",
+    "start": "node --max-old-space-size=512 server",
+    "build": "node --max-old-space-size=512 ./node_modules/webpack/bin/webpack --bail --progress --build --tc",
     "lint": "eslint --ext jsx --ext js .",
     "lint:fix": "npm run lint -- --fix",
-    "test": "mocha-webpack --require setup-test.js --webpack-config webpack.config-test.js \"src/**/*.spec.(jsx|js)\""
+    "test": "mocha-webpack --require setup-test.js --webpack-config webpack.config-test.js \"src/**/*.spec.(jsx|js)\"",
+    "postinstall":"npm run build",
+    "heroku:prod:init":"git remote remove production && heroku create --remote production && heroku config:set NODE_ENV=production --remote production",
+    "heroku:dev:init": "git remote remove dev && heroku create --remote dev && heroku config:set NODE_ENV=development NPM_CONFIG_PRODUCTION=false --remote dev",
+    "heroku:staging:init":  "git remote remove staging && heroku create --remote staging && heroku config:set NODE_ENV=staging --remote staging",
+    "heroku:test:init": "git remote remove test && heroku create --remote test && heroku config:set NODE_ENV=test --remote test",
+    "heroku:prod:deploy":"git push production master",
+    "heroku:dev:deploy":"git push dev master",
+    "heroku:staging:deploy":"git push staging master",
+    "heroku:test:deploy":"git push test master"
   },
   "author": "",
   "license": "MIT",
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react';
 import CSSModules from 'react-css-modules';
 import { Link } from 'react-router';
-import LogInModalContainer from 'routes/Home/containers/LogInModalContainer';
+import LogInModalContainer from 'routes/Home/containers/LoginModalContainer';
 import SignupModalContainer from 'routes/Home/containers/SignupModalContainer';
 import SearchInput from '../SearchInput';
 import Dropdown from '../Dropdown';
diff --git a/src/routes/DroneDetails/components/DroneScheduleTable/DroneScheduleTable.jsx b/src/routes/DroneDetails/components/DroneScheduleTable/DroneScheduleTable.jsx
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import CSSModules from 'react-css-modules';
-import Reactable from 'Reactable';
+import Reactable from 'reactable';
 import styles from './DroneScheduleTable.scss';
 
 const Table = Reactable.Table;
diff --git a/src/routes/DroneDetails/components/FeedbackItem/index.js b/src/routes/DroneDetails/components/FeedbackItem/index.js
@@ -1,3 +1,3 @@
-import feedbackItem from './feedbackItem';
+import FeedbackItem from './FeedbackItem';
 
-export default feedbackItem;
+export default FeedbackItem;
diff --git a/src/routes/Home/components/LoginModal/LoginModal.jsx b/src/routes/Home/components/LoginModal/LoginModal.jsx
@@ -7,7 +7,7 @@ import Modal from 'react-modal';
 import Button from 'components/Button';
 import Checkbox from 'components/Checkbox';
 import TextField from 'components/TextField';
-import styles from './LogInModal.scss';
+import styles from './LoginModal.scss';
 const { DOM: { input } } = React;
 
 import UserApi from 'api/User.js';
@@ -168,7 +168,7 @@ class LogInModal extends React.Component {
           </form>
         </Modal>
 
-        
+
       </div>
     );
   }
diff --git a/src/routes/Home/components/LoginModal/index.js b/src/routes/Home/components/LoginModal/index.js
@@ -1,3 +1,3 @@
-import LogInModal from './LogInModal';
+import LoginModal from './LoginModal';
 
-export default LogInModal;
+export default LoginModal;
diff --git a/src/routes/Home/containers/LoginModalContainer.js b/src/routes/Home/containers/LoginModalContainer.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import {actions, sendLoginRequest, loginAction} from '../../../store/modules/global';
 
-import LogInModal from '../components/LogInModal';
+import LogInModal from '../components/LoginModal';
 
 const mapState = (state) => ({...state.global, onSubmit: sendLoginRequest});
 
diff --git a/src/routes/MyDrone/components/MyDronesTable/MyDronesTable.jsx b/src/routes/MyDrone/components/MyDronesTable/MyDronesTable.jsx
@@ -1,5 +1,5 @@
 import React, { PropTypes, Component } from 'react';
-import Reactable from 'Reactable';
+import Reactable from 'reactable';
 import CSSModules from 'react-css-modules';
 import Dropdown from 'react-dropdown';
 import styles from './MyDronesTable.scss';
diff --git a/src/routes/MyDrone/modules/MyDrone.js b/src/routes/MyDrone/modules/MyDrone.js
diff --git a/src/routes/MyServices/components/MyServicesTable/MyServicesTable.jsx b/src/routes/MyServices/components/MyServicesTable/MyServicesTable.jsx
@@ -1,5 +1,5 @@
 import React, { PropTypes, Component } from 'react';
-import Reactable from 'Reactable';
+import Reactable from 'reactable';
 import CSSModules from 'react-css-modules';
 import Dropdown from 'react-dropdown';
 import styles from './MyServicesTable.scss';
diff --git a/src/routes/MyServices/modules/MyServices.js b/src/routes/MyServices/modules/MyServices.js
diff --git a/webpack.config.js b/webpack.config.js
@@ -93,7 +93,7 @@ module.exports = {
   output: {
     filename: '[name].[hash].js',
     path: path.join(__dirname, './dist'),
-    publicPath: __DEV__ ? `http://${ip.address()}:${process.env.PORT || 3000}/` : '/',
+    publicPath: '/',
   },
   plugins: [
     new webpack.DefinePlugin({
