From ee615717cf9ad5900565a3f096ce6d9cab59c694 Mon Sep 17 00:00:00 2001 From: Riku Rouvila Date: Tue, 24 Nov 2015 21:46:39 +0200 Subject: [PATCH] use heroku instance in production mode --- gulpfile.js | 2 +- package.json | 4 +++- src/js/api.js | 5 +++++ src/js/components/feed.jsx | 3 ++- src/js/components/inviteForm.jsx | 4 +++- src/js/components/members.jsx | 4 ++-- 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/js/api.js diff --git a/gulpfile.js b/gulpfile.js index 8432225..a2d9447 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -119,7 +119,7 @@ gulp.task('server', function() { var proxy = httpProxy.createProxyServer({ changeOrigin: true, - target: process.env.SERVER || 'https://koodiklinikka.fi/api' + target: process.env.SERVER || 'https://api.koodiklinikka.fi' }); proxy.on('error', function(err) { diff --git a/package.json b/package.json index 61c7a1d..c333ed2 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "deamdify": "^0.1.1", "debowerify": "~0.9.1", "ecstatic": "~0.5.3", + "envify": "^3.4.0", "event-stream": "^3.2.1", "faker": "^2.1.2", "gulp": "~3.8.1", @@ -62,7 +63,8 @@ "reactify", "6to5ify", "debowerify", - "deamdify" + "deamdify", + "envify" ] } } diff --git a/src/js/api.js b/src/js/api.js new file mode 100644 index 0000000..6741055 --- /dev/null +++ b/src/js/api.js @@ -0,0 +1,5 @@ +var host = process.env.NODE_ENV === 'production' ? 'https://lit-plateau-4689.herokuapp.com/' : '/api/'; + +module.exports = function(path) { + return host + path; +} diff --git a/src/js/components/feed.jsx b/src/js/components/feed.jsx index 82f9e41..254e53a 100644 --- a/src/js/components/feed.jsx +++ b/src/js/components/feed.jsx @@ -5,6 +5,7 @@ var request = require('axios'); var _ = require('lodash'); var transformers = require('../util'); +var api = require('../api'); function throwError(err) { setTimeout(() => { @@ -20,7 +21,7 @@ module.exports = React.createClass({ }; }, componentDidMount() { - request.get('/api/feeds').then((res) => { + request.get(api('feeds')).then((res) => { var feeds = res.data; var messages = []; diff --git a/src/js/components/inviteForm.jsx b/src/js/components/inviteForm.jsx index 0cdeeac..68451f1 100644 --- a/src/js/components/inviteForm.jsx +++ b/src/js/components/inviteForm.jsx @@ -4,6 +4,8 @@ var request = require('axios'); var React = require('react/addons'); var classSet = React.addons.classSet; +var api = require('../api'); + module.exports = React.createClass({ getInitialState() { return { @@ -22,7 +24,7 @@ module.exports = React.createClass({ error: null }); - request.post('/api/invites', { + request.post(api('invites'), { email: this.state.email }) .then(this.handleSuccess) diff --git a/src/js/components/members.jsx b/src/js/components/members.jsx index f6c5e4a..e0e4013 100644 --- a/src/js/components/members.jsx +++ b/src/js/components/members.jsx @@ -4,7 +4,7 @@ var React = require('react'); var request = require('axios'); var _ = require('lodash'); -var API_URL = '/api/members'; +var api = require('../api'); module.exports = React.createClass({ getInitialState() { @@ -13,7 +13,7 @@ module.exports = React.createClass({ }; }, componentDidMount() { - request.get(API_URL).then(function(res) { + request.get(api('members')).then(function(res) { this.setState({ members: _.shuffle(res.data) });