Merge branch 'master' into reboot

plainblack · Mar 26, 2016 · 3f80c39 · 3f80c39
2 parents c742926 + beadc52
commit 3f80c39
Show file tree

Hide file tree

Showing 18 changed files with 229 additions and 213 deletions.
diff --git a/app/js/actions/rpc/empire.js b/app/js/actions/rpc/empire.js
@@ -25,6 +25,30 @@ var EmpireRPCActions = Reflux.createActions([
     'successEmpireRPCViewBoosts',
     'failureEmpireRPCViewBoosts',
 
+    'requestEmpireRPCViewAuthorizedSitters',
+    'successEmpireRPCViewAuthorizedSitters',
+    'failureEmpireRPCViewAuthorizedSitters',
+
+    'requestEmpireRPCAuthorizeSitters',
+    'successEmpireRPCAuthorizeSitters',
+    'failureEmpireRPCAuthorizeSitters',
+
+    'requestEmpireRPCDeauthorizeSitters',
+    'successEmpireRPCDeauthorizeSitters',
+    'failureEmpireRPCDeauthorizeSitters',
+
+    'requestEmpireRPCEnableSelfDestruct',
+    'successEmpireRPCEnableSelfDestruct',
+    'failureEmpireRPCEnableSelfDestruct',
+
+    'requestEmpireRPCDisableSelfDestruct',
+    'successEmpireRPCDisableSelfDestruct',
+    'failureEmpireRPCDisableSelfDestruct',
+
+    'requestEmpireRPCRedeemEssentiaCode',
+    'successEmpireRPCRedeemEssentiaCode',
+    'failureEmpireRPCRedeemEssentiaCode',
+
     'requestEmpireRPCLogout',
     'successEmpireRPCLogout',
     'failureEmpireRPCLogout'

diff --git a/app/js/actions/rpc/genericBuilding.js b/app/js/actions/rpc/genericBuilding.js
@@ -7,6 +7,18 @@ var GenericBuildingRPCActions = Reflux.createActions([
     'successGenericBuildingRPCView',
     'failureGenericBuildingRPCView',
 
+    'requestGenericBuildingRPCUpgrade',
+    'successGenericBuildingRPCUpgrade',
+    'failureGenericBuildingRPCUpgrade',
+
+    'requestGenericBuildingRPCDemolish',
+    'successGenericBuildingRPCDemolish',
+    'failureGenericBuildingRPCDemolish',
+
+    'requestGenericBuildingRPCDowngrade',
+    'successGenericBuildingRPCDowngrade',
+    'failureGenericBuildingRPCDowngrade',
+
     'requestGenericBuildingRPCRepair',
     'successGenericBuildingRPCRepair',
     'failureGenericBuildingRPCRepair'

diff --git a/app/js/actions/windows/sitterManager.js b/app/js/actions/windows/sitterManager.js
diff --git a/app/js/components/menu/leftSidebar.jsx b/app/js/components/menu/leftSidebar.jsx
@@ -2,13 +2,17 @@
 
 var React                   = require('react');
 var Reflux                  = require('reflux');
+
+var vex                     = require('js/vex');
 var util                    = require('js/util');
 var server                  = require('js/server');
 var $                       = require('js/shims/jquery');
 
 var LeftSidebarActions      = require('js/actions/menu/leftSidebar');
 var OptionsWindowActions    = require('js/actions/windows/options');
 var WindowActions           = require('js/actions/window');
+var EmpireRPCActions        = require('js/actions/rpc/empire');
+
 var AboutWindow             = require('js/components/window/about');
 var InviteWindow            = require('js/components/window/invite');
 var SitterManagerWindow     = require('js/components/window/sitterManager');
@@ -22,48 +26,26 @@ var LeftSidebarStore        = require('js/stores/menu/leftSidebar');
 var SelfDestruct = React.createClass({
 
     mixins : [
-        Reflux.connect(EmpireRPCStore, 'empire')
+        Reflux.connect(EmpireRPCStore, 'empireRPCStore')
     ],
 
     handleDestructClick : function() {
         LeftSidebarActions.hide();
-        this.onClickSelfDestruct();
-    },
 
-    onClickSelfDestruct : function() {
-        var method = '';
-
-        if (this.state.empire.self_destruct_active === 1) {
-            method = 'disable_self_destruct';
-        } else if (this.confirmSelfDestruct()) {
-            method = 'enable_self_destruct';
-        } else {
+        if (this.state.empireRPCStore.self_destruct_active === 1) {
+            EmpireRPCActions.requestEmpireRPCDisableSelfDestruct();
             return;
         }
-
-        server.call({
-            module  : 'empire',
-            method  : method,
-            params  : [],
-            scope   : this,
-            success : function() {
-                if (method === 'enable_self_destruct') {
-                    window.alert('Success - your empire will be deleted in 24 hours.');
-                } else {
-                    window.alert('Success - your empire will not be deleted. Phew!');
-                }
-            }
-        });
-    },
-
-    confirmSelfDestruct : function() {
-        return window.confirm('Are you ABSOLUTELY sure you want to enable self destuct?  If enabled, your empire will be deleted after 24 hours.');
+
+        vex.confirm(
+            'Are you ABSOLUTELY sure you want to enable self destuct?  If enabled, your empire will be deleted after 24 hours.',
+            EmpireRPCActions.requestEmpireRPCEnableSelfDestruct
+        );
     },
 
     render : function() {
-        var destructActive      = this.state.empire.self_destruct_active &&
-            this.state.empire.self_destruct_ms > 0;
-        var destructMs          = this.state.empire.self_destruct_ms;
+        var destructMs          = this.state.empireRPCStore.self_destruct_ms;
+        var destructActive      = this.state.empireRPCStore.self_destruct_active && destructMs > 0;
         var formattedDestructMs = destructActive ? util.formatMillisecondTime(destructMs) : '';
 
         var itemStyle = destructActive

diff --git a/app/js/components/window/building/productionTab.jsx b/app/js/components/window/building/productionTab.jsx
@@ -1,19 +1,18 @@
 'use strict';
 
-var React                   = require('react');
-var Reflux                  = require('reflux');
-var _                       = require('lodash');
+var React                       = require('react');
+var Reflux                      = require('reflux');
+var _                           = require('lodash');
 
+var GenericBuildingRPCActions   = require('js/actions/rpc/genericBuilding');
 
-var BuildingWindowActions   = require('js/actions/windows/building');
+var ActionButton                = require('js/components/window/building/actionButton');
+var ResourceProduction          = require('js/components/window/building/resourceProduction');
+var ResourceCost                = require('js/components/window/building/resourceCost');
+var ResourceLine                = require('js/components/window/building/resourceLine');
 
-var ActionButton            = require('js/components/window/building/actionButton');
-var ResourceProduction      = require('js/components/window/building/resourceProduction');
-var ResourceCost            = require('js/components/window/building/resourceCost');
-var ResourceLine            = require('js/components/window/building/resourceLine');
-
-var util                    = require('js/util');
-var vex                     = require('js/vex');
+var util                        = require('js/util');
+var vex                         = require('js/vex');
 
 var ProductionTab = React.createClass({
 
@@ -23,7 +22,7 @@ var ProductionTab = React.createClass({
         vex.confirm(
             'Are you sure you want to demolish your ' + name + '?',
             _.bind(function() {
-                BuildingWindowActions.buildingWindowDemolish(this.props.building.url, this.props.building.id);
+                GenericBuildingRPCActions.requestGenericBuildingRPCDemolish(this.props.building.url, this.props.building.id);
             }, this)
         );
     },
@@ -34,13 +33,13 @@ var ProductionTab = React.createClass({
         vex.confirm(
             'Are you sure you want to downgrade your ' + name + '?',
             _.bind(function() {
-                BuildingWindowActions.buildingWindowDowngrade(this.props.building.url, this.props.building.id);
+                GenericBuildingRPCActions.requestGenericBuildingRPCDowngrade(this.props.building.url, this.props.building.id);
             }, this)
         );
     },
 
     onUpgradeClick : function() {
-        BuildingWindowActions.buildingWindowUpgrade(this.props.building.url, this.props.building.id);
+        GenericBuildingRPCActions.requestGenericBuildingRPCUpgrade(this.props.building.url, this.props.building.id);
     },
 
     render : function() {

diff --git a/app/js/components/window/building/standardTabs.jsx b/app/js/components/window/building/standardTabs.jsx
@@ -15,7 +15,7 @@ var StandardTabs = {
     tabs : function(options, body, building) {
         var tabs = [];
 
-        if (building.efficiency !== 100) {
+        if (building.efficiency !== 100 && building.id) {
             tabs.push(
                 <Tab title="Repair" key="Repair">
                     <RepairTab building={building} body={body} />

diff --git a/app/js/components/window/essentia/boost.jsx b/app/js/components/window/essentia/boost.jsx
@@ -1,5 +1,7 @@
 'use strict';
 
+var vex                     = require('js/vex');
+
 var React                   = require('react');
 var Reflux                  = require('reflux');
 var classnames              = require('classnames');
@@ -37,10 +39,10 @@ var Boost = React.createClass({
                 max : 100 // The server has no max but this seems like a reasonable limit, to me.
             })
         ) {
-            window.alert('Number of weeks must be an integer between 1 and 100.');
+            vex.alert('Number of weeks must be an integer between 1 and 100.');
             return;
         } else if (weeks * 5 > this.props.essentia) {
-            window.alert('Insufficient Essentia.');
+            vex.alert('Insufficient Essentia.');
             return;
         }
         EmpireRPCActions.requestEmpireRPCBoost({ type : type, weeks : weeks });

diff --git a/app/js/components/window/essentia/getEssentiaTab.jsx b/app/js/components/window/essentia/getEssentiaTab.jsx
@@ -3,7 +3,8 @@
 var React               = require('react');
 var _                   = require('lodash');
 
-var EssentiaActions     = require('js/actions/windows/essentia');
+var EmpireRPCActions    = require('js/actions/rpc/empire');
+
 var WindowActions       = require('js/actions/window');
 
 var InviteWindow        = require('js/components/window/invite');
@@ -17,7 +18,7 @@ var GetEssentiaTab = React.createClass({
 
     redeem : function() {
         var node = this.refs.code;
-        EssentiaActions.redeemCode(node.value);
+        EmpireRPCActions.requestEmpireRPCRedeemEssentiaCode({ code : node.value });
         node.value = '';
     },
 

diff --git a/app/js/components/window/invite.jsx b/app/js/components/window/invite.jsx
@@ -27,7 +27,7 @@ var InviteWindow = React.createClass({
     },
 
 
-    invite : function() {
+    handleInvite : function() {
         var email = this.refs.email.value;
         var message = this.refs.message.value;
 
@@ -68,7 +68,7 @@ var InviteWindow = React.createClass({
                         <textarea ref="message" defaultValue={defaultMessage}></textarea>
                     </div>
 
-                    <div className="ui green button" onClick={this.invite}>Send Invite</div>
+                    <div className="ui green button" onClick={this.handleInvite}>Send Invite</div>
                 </div>
 
                 <div className="ui divider"></div>

diff --git a/app/js/components/window/sitterManager.jsx b/app/js/components/window/sitterManager.jsx
@@ -1,18 +1,18 @@
 'use strict';
 
-var React                = require('react');
-var Reflux               = require('reflux');
+var React                   = require('react');
+var Reflux                  = require('reflux');
 
-var SitterManagerActions = require('js/actions/windows/sitterManager');
+var EmpireRPCActions        = require('js/actions/rpc/empire');
 
 var SittersEmpireRPCStore   = require('js/stores/rpc/empire/sitters');
 
-var Tabber               = require('js/components/tabber');
-var Tabs                 = Tabber.Tabs;
-var Tab                  = Tabber.Tab;
+var Tabber                  = require('js/components/tabber');
+var Tabs                    = Tabber.Tabs;
+var Tab                     = Tabber.Tab;
 
-var AuthorizeEmpiresTab  = require('js/components/window/sitterManager/authorizeEmpiresTab');
-var CurrentSittersTab    = require('js/components/window/sitterManager/currentSittersTab');
+var AuthorizeEmpiresTab     = require('js/components/window/sitterManager/authorizeEmpiresTab');
+var CurrentSittersTab       = require('js/components/window/sitterManager/currentSittersTab');
 
 var SitterManagerWindow = React.createClass({
     mixins : [
@@ -30,7 +30,7 @@ var SitterManagerWindow = React.createClass({
     render : function() {
         return (
             <Tabs>
-                <Tab title="Current Sitters" onSelect={SitterManagerActions.load}>
+                <Tab title="Current Sitters" onSelect={ EmpireRPCActions.requestEmpireRPCViewAuthorizedSitters }>
                     <CurrentSittersTab sitters={this.state.sitters} />
                 </Tab>
 

diff --git a/app/js/components/window/sitterManager/authorizeEmpiresTab.jsx b/app/js/components/window/sitterManager/authorizeEmpiresTab.jsx
@@ -3,7 +3,7 @@
 var React                = require('react');
 var _                    = require('lodash');
 
-var SitterManagerActions = require('js/actions/windows/sitterManager');
+var EmpireRPCActions    = require('js/actions/rpc/empire');
 
 var vex                  = require('js/vex');
 
@@ -12,7 +12,7 @@ var AuthorizeEmpiresTab = React.createClass({
     authorizeAllies : function() {
         vex.confirm(
             'Are you sure you want to authorize all members of your alliance?',
-            SitterManagerActions.authorizeAllies
+            _.partial(EmpireRPCActions.requestEmpireRPCAuthorizeSitters, { allied : true })
         );
     },
 
@@ -21,7 +21,7 @@ var AuthorizeEmpiresTab = React.createClass({
 
         vex.confirm(
             'Are you sure you want to authorize all members of ' + name + '?',
-            _.partial(SitterManagerActions.authorizeAlliance, name)
+            _.partial(EmpireRPCActions.requestEmpireRPCAuthorizeSitters, { alliance : name })
         );
     },
 
@@ -30,7 +30,7 @@ var AuthorizeEmpiresTab = React.createClass({
 
         vex.confirm(
             'Are you sure you want to authorize ' + name + '?',
-            _.partial(SitterManagerActions.authorizeEmpire, name)
+            _.partial(EmpireRPCActions.requestEmpireRPCAuthorizeSitters, { empires : [name] })
         );
     },
 

diff --git a/app/js/components/window/sitterManager/currentSittersTab.jsx b/app/js/components/window/sitterManager/currentSittersTab.jsx
@@ -1,25 +1,25 @@
 'use strict';
 
-var React                       = require('react');
-var Reflux                      = require('reflux');
-var _                           = require('lodash');
-var vex                         = require('js/vex');
+var React               = require('react');
+var Reflux              = require('reflux');
+var _                   = require('lodash');
+var vex                 = require('js/vex');
 
-var SitterManagerWindowActions  = require('js/actions/windows/sitterManager');
+var EmpireRPCActions    = require('js/actions/rpc/empire');
 
-var SitterListItem              = require('js/components/window/sitterManager/sitterListItem');
+var SitterListItem      = require('js/components/window/sitterManager/sitterListItem');
 
 
 var CurrentSittersTab = React.createClass({
 
-    reauthorizeAll : function() {
-        SitterManagerWindowActions.reauthorizeAll();
+    handleReauthorizeAll : function() {
+        EmpireRPCActions.requestEmpireRPCAuthorizeSitters({ revalidate_all : true });
     },
 
-    deauthorizeAll : function() {
+    handleDeauthorizeAll : function() {
         vex.confirm(
             "Are you sure you want to revoke everyone's access to your empire?",
-            SitterManagerWindowActions.deauthorizeAll
+            _.partial(EmpireRPCActions.requestEmpireRPCDeauthorizeSitters, { deauthorize_all : true } )
         );
     },
 
@@ -30,11 +30,11 @@ var CurrentSittersTab = React.createClass({
                 <div className="ui grid">
                     <div className="centered row">
                         <div className="ui large icon buttons">
-                            <div className="ui green button" onClick={this.reauthorizeAll}>
+                            <div className="ui green button" onClick={this.handleReauthorizeAll}>
                                 <i className="refresh icon"></i>
                                 Renew all
                             </div>
-                            <div className="ui red button" onClick={this.deauthorizeAll}>
+                            <div className="ui red button" onClick={this.handleDeauthorizeAll}>
                                 <i className="warning sign icon"></i>
                                 Revoke all
                             </div>