Skip to content

Commit

Permalink
Switch production environment for API
Browse files Browse the repository at this point in the history
  • Loading branch information
mxfactorial committed Apr 11, 2017
1 parent b90157d commit de4df7d
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -23,15 +23,15 @@ This public project is intended to exploit the software engineering community's
* Learn to deploy a Node.js web application by completing the Google App Engine ['Hello World!' tutorial](https://cloud.google.com/nodejs/getting-started/hello-world).
* Now that your development & production environments are set up, you may follow this project's [Code Delivery Workflow](https://docs.google.com/document/d/1UGklz7LwzES3t6i5IZrnt-ZwLeEFaeWhqaocFE3C9QE/edit?usp=sharing).

Details as of 11/15/2016:
Details as of 4/10/2017:
- Production: [mxfactorial.io](https://mxfactorial.io/)
- [Data Model](https://docs.google.com/document/d/1US0gamuV3ExzUWAnNHxdcfmUxB0tPbtxUBVRBmZKywA/edit?usp=sharing)
- [Wireframes](https://drive.google.com/folderview?id=0B9xlXsaN9dVQR1EyY3dQbnZ0aG8&usp=sharing)
- [Public drive](https://drive.google.com/drive/folders/0B9xlXsaN9dVQWkJERUxNRVZQVWc)
- Node.js v4.4.3
- npm v3.5.1
- web client & database on Firebase
- API on App Engine Flex
- API on Heroku

Roadmap:
* Set up managed application & persistence layer
Expand Down
2 changes: 0 additions & 2 deletions app.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions app/constants/index.js
@@ -1,8 +1,8 @@
import merge from 'lodash/merge';
import moment from 'moment-timezone';

export const BASE_URL = 'https://mxfactorial.appspot.com/systemaccounting';
export const SOCKET_URL = 'https://mxfactorial.appspot.com/';
export const BASE_URL = 'https://mxfactorial.herokuapp.com/systemaccounting';
export const SOCKET_URL = 'https://mxfactorial.herokuapp.com/';
// export const BASE_URL = 'http://192.168.66.131:8081/systemaccounting';
// export const SOCKET_URL = 'http://192.168.66.131:8081/';

Expand Down
2 changes: 1 addition & 1 deletion app/socket/notify.js
Expand Up @@ -53,7 +53,7 @@ notifyHub.on('value', (notifications) => {
});

notifyHub.on('unauthorized', (error) => {
console.log(error);
console.error(error);
});

notifyHub.on('disconnect', () => {
Expand Down
2 changes: 1 addition & 1 deletion config.js
Expand Up @@ -46,7 +46,7 @@ nconf
MYSQL_PASSWORD: '',
MYSQL_HOST: '',
FIREBASE_URL: 'https://mxfactorial.firebaseio.com',
FIREBASE_KEY_PATH: 'mxfactorial-cebe88ad95c6.json',
FIREBASE_KEY_PATH: 'mxfactorial-136a67d52477.json',

// Port the HTTP server
PORT: 8080
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Expand Up @@ -45,7 +45,7 @@ module.exports = function (config) {
}
},
webpackMiddleware: {
stats: 'errors-only'
noInfo: true
},
webpackServer: {
noInfo: true
Expand Down
8 changes: 1 addition & 7 deletions package.json
Expand Up @@ -4,14 +4,12 @@
"description": "Public demonstration of combinatorial game theory through a systemaccounting function.",
"repository": "https://github.com/systemaccounting/mxfactorial",
"scripts": {
"local-ds": "gcloud beta emulators datastore start --host-port 0.0.0.0:8082",
"set-local-ds-env": "(gcloud beta emulators datastore env-init)",
"dev": "webpack-dev-server --content-base build/ --watch-poll",
"webdev": "webpack-dev-server --host 0.0.0.0 --progress --colors --content-base build/",
"build": "webpack",
"start": "NODE_PATH=. node main.js",
"deploy-firebase": "firebase deploy",
"deploy-appengine": "gcloud preview app deploy",
"heroku-postbuild": "npm run build",
"test": "karma start",
"lint": "eslint app transact account main.js config.js"
},
Expand All @@ -32,17 +30,13 @@
"es6-promise": "^3.2.1",
"express": "^4.13.4",
"firebase-admin": "^4.1.0",
"gcloud": "^0.30.2",
"googleapis": "^5.1.0",
"history": "^1.17.0",
"immutable": "^3.8.1",
"jsonwebtoken": "^7.0.0",
"kerberos": "^0.0.18",
"lodash": "^4.13.1",
"moment": "^2.13.0",
"moment-timezone": "^0.5.4",
"mongodb": "^2.1.7",
"mysql": "^2.10.2",
"nconf": "^0.8.4",
"numeral": "^1.5.3",
"passport": "^0.3.2",
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
@@ -1,9 +1,10 @@
var webpack = require('webpack');
var path = require('path');

module.exports = {
entry: './app/client.js',
output: {
path: './build',
path: path.resolve(__dirname, 'build'),
filename: 'bundle.js'
},
devtool: 'inline-source-map',
Expand Down

0 comments on commit de4df7d

Please sign in to comment.