From 0157537cc049d4b13384b7042129a61f297f9132 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 26 May 2018 17:10:56 +0200 Subject: pass thru if server/relay are connected --- app/client/system/system.component.js | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'app/client/system/system.component.js') diff --git a/app/client/system/system.component.js b/app/client/system/system.component.js index 0819c2f..e097b61 100644 --- a/app/client/system/system.component.js +++ b/app/client/system/system.component.js @@ -3,9 +3,7 @@ import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import Group from '../common/group.component' -import Slider from '../common/slider.component' -import Select from '../common/select.component' -import Button from '../common/button.component' +import Param from '../common/param.component' import * as systemActions from './system.actions' @@ -14,21 +12,34 @@ class System extends Component { super() } render(){ - const { site, actions } = this.props + const { site, server, relay, rpc, actions } = this.props return ( -
+

{site.name} System

-
+
+ + {server.status} + {server.error && + {server.error.message} + } + {relay.status} + {rpc.status} + pix2pix dataset.py + pix2pix train.py + train samplernn + - - - + + + + + - {this.renderCommandOutput()}
+ {this.renderCommandOutput()}
) } @@ -57,8 +68,7 @@ class System extends Component { } } const mapStateToProps = state => ({ - site: state.system.site, - cmd: state.system.cmd, + ...state.system }) const mapDispatchToProps = (dispatch, ownProps) => ({ -- cgit v1.2.3-70-g09d2