mirror of https://github.com/embarklabs/embark.git
restrict logs; switch order in dashboard; don't limit height in contracts box
This commit is contained in:
parent
b06d224883
commit
b86761e83d
|
@ -42,7 +42,7 @@ class Console extends Component {
|
||||||
renderNav() {
|
renderNav() {
|
||||||
return (
|
return (
|
||||||
<Nav tabs>
|
<Nav tabs>
|
||||||
{this.props.processes.map((process) => (
|
{this.props.processes.filter((p) => ["embark", "blockchain"].indexOf(p.name) >= 0).map((process) => (
|
||||||
<NavItem key={process.name}>
|
<NavItem key={process.name}>
|
||||||
<NavLink
|
<NavLink
|
||||||
className={classnames({ active: this.state.activeTab === process.name })}
|
className={classnames({ active: this.state.activeTab === process.name })}
|
||||||
|
@ -79,7 +79,7 @@ class Console extends Component {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TabContent activeTab={this.state.activeTab}>
|
<TabContent activeTab={this.state.activeTab}>
|
||||||
{processes.map(process => (
|
{processes.filter((p) => ["embark", "blockchain"].indexOf(p.name) >= 0).map(process => (
|
||||||
<TabPane key={process.name} tabId={process.name}>
|
<TabPane key={process.name} tabId={process.name}>
|
||||||
<Logs>
|
<Logs>
|
||||||
{processLogs
|
{processLogs
|
||||||
|
|
|
@ -18,8 +18,6 @@ function iconClasses(state){
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// processList.push({state: service.status, name: serviceName, description: service.name})
|
|
||||||
|
|
||||||
const Process = ({process}) => (
|
const Process = ({process}) => (
|
||||||
<Col sm={6} lg={2}>
|
<Col sm={6} lg={2}>
|
||||||
<Widget02 header={process.name} mainText={process.description} icon={iconClasses(process.state)} color={colorClasses(process.state)} variant="1" />
|
<Widget02 header={process.name} mainText={process.description} icon={iconClasses(process.state)} color={colorClasses(process.state)} variant="1" />
|
||||||
|
|
|
@ -5,6 +5,7 @@ import {connect} from 'react-redux';
|
||||||
import {
|
import {
|
||||||
Card,
|
Card,
|
||||||
CardHeader,
|
CardHeader,
|
||||||
|
CardTitle,
|
||||||
CardBody
|
CardBody
|
||||||
} from 'reactstrap';
|
} from 'reactstrap';
|
||||||
|
|
||||||
|
@ -62,25 +63,11 @@ class HomeContainer extends Component {
|
||||||
<DataWrapper shouldRender={this.props.services.length > 0 } {...this.props} render={({services}) => (
|
<DataWrapper shouldRender={this.props.services.length > 0 } {...this.props} render={({services}) => (
|
||||||
<Processes processes={services} />
|
<Processes processes={services} />
|
||||||
)} />
|
)} />
|
||||||
<DataWrapper shouldRender={this.props.contracts.length > 0} {...this.props} render={({contracts}) => (
|
|
||||||
<Card>
|
|
||||||
<CardHeader>
|
|
||||||
Deployed Contracts
|
|
||||||
</CardHeader>
|
|
||||||
<CardBody>
|
|
||||||
<div style={{maxHeight: '227px', marginBottom: '1.5rem', overflow: 'auto'}}>
|
|
||||||
<ContractsList contracts={contracts} />
|
|
||||||
</div>
|
|
||||||
</CardBody>
|
|
||||||
</Card>
|
|
||||||
)} />
|
|
||||||
|
|
||||||
<DataWrapper shouldRender={this.props.processes.length > 0 } {...this.props} render={({processes, postCommand, postCommandSuggestions, processLogs, commandSuggestions}) => (
|
<DataWrapper shouldRender={this.props.processes.length > 0 } {...this.props} render={({processes, postCommand, postCommandSuggestions, processLogs, commandSuggestions}) => (
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
|
||||||
Console
|
|
||||||
</CardHeader>
|
|
||||||
<CardBody>
|
<CardBody>
|
||||||
|
<CardTitle>Console</CardTitle>
|
||||||
<Console activeProcess={this.state.activeProcess}
|
<Console activeProcess={this.state.activeProcess}
|
||||||
postCommand={postCommand}
|
postCommand={postCommand}
|
||||||
postCommandSuggestions={postCommandSuggestions}
|
postCommandSuggestions={postCommandSuggestions}
|
||||||
|
@ -92,6 +79,19 @@ class HomeContainer extends Component {
|
||||||
</CardBody>
|
</CardBody>
|
||||||
</Card>
|
</Card>
|
||||||
)} />
|
)} />
|
||||||
|
|
||||||
|
<DataWrapper shouldRender={this.props.contracts.length > 0} {...this.props} render={({contracts}) => (
|
||||||
|
<Card>
|
||||||
|
<CardBody>
|
||||||
|
<CardTitle>Deployed Contracts</CardTitle>
|
||||||
|
<div style={{marginBottom: '1.5rem', overflow: 'auto'}}>
|
||||||
|
<ContractsList contracts={contracts} />
|
||||||
|
</div>
|
||||||
|
</CardBody>
|
||||||
|
</Card>
|
||||||
|
)} />
|
||||||
|
|
||||||
|
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue