Merge pull request #342 from Rostlab/hotfix

Commented out antagonists with problematic characters
Rostlab · Apr 8, 2016 · a1014d3 · a1014d3
2 parents c5b1a7c + a7a0ec4
commit a1014d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/components/common/AntagonistsComp/AntagonistsComp.jsx b/app/components/common/AntagonistsComp/AntagonistsComp.jsx
@@ -5,6 +5,7 @@ require.context("./img", false, /^\.\/.*\.jpg$/); /*eslint no-undef:0*/
 
 import BigBattle from '../BigBattle/BigBattle.jsx';
 import json from 'json!./antagonists.json';
+
 import MapComp from '../MapComp/MapComp.jsx';
 
 import Actions from '../../../actions/CharactersPlodActions.js';

diff --git a/app/components/common/AntagonistsComp/antagonists.json b/app/components/common/AntagonistsComp/antagonists.json
@@ -5,7 +5,6 @@
   ["Arya Stark","Dunsen"],
   ["Arya Stark","Meryn Trant"],
   ["Arya Stark","Meryn Trant"],
-  ["Arya Stark","Thoros of Myr"],
   ["Arya Stark","Walder Frey"],
   ["Arya Stark","Ilyn Payne"],
   ["Ramsay Snow","Sansa Stark"],
@@ -30,7 +29,6 @@
   ["Bowen Marsh","Jon Snow"],
   ["Doran Martell","Tommen Baratheon"],
   ["Olenna Redwyne", "Cersei Lannister"],
-  ["Aegon Targaryen (son of Rhaegar)","Tommen Baratheon"],
   ["Tyrion Lannister","Jaime Lannister"],
   ["Barristan Selmy","Jorah Mormont"],
   ["Obara Sand","Doran Martell"],

diff --git a/app/network/SentimentsApi.js b/app/network/SentimentsApi.js
@@ -1,8 +1,11 @@
 var request = require('superagent');
 var Promise = require('es6-promise').Promise;
+
 var protocol = (process.env.NODE_ENV === 'development') ? 'http://' : process.env.__PROTOCOL__;
 var port = (process.env.NODE_ENV === 'development') ? ':8080' : '';
-var baseUrl = protocol + process.env.__API__ + port + '/';
+var api = (process.env.NODE_ENV === 'development') ? 'localhost' : process.env.__API__;
+
+var baseUrl = protocol + api + port + '/';
 
 var Api = {
   get: function (url, query) {