Skip to content
This repository was archived by the owner on Mar 16, 2022. It is now read-only.

Commit 167dfe2

Browse files
n1c01a5n1c01a5
authored
Merge branch 'develop' into new_contract_longer_periods
2 parents c683959 + 3401c1d commit 167dfe2

File tree

9 files changed

+169
-194
lines changed

9 files changed

+169
-194
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ src/**/*.css
2727
# editors
2828
/.vscode/
2929
.idea/*
30+
31+
# storybook build
32+
/storybook-static

‎src/Components/Banner/index.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import React from 'react'
22
import { Link } from 'react-router-dom'
33
import './Banner.css'
44

5-
const Banner = ({
6-
title,
7-
linkTo,
8-
children
9-
}) => (
5+
const Banner = ({ title, linkTo, children }) => (
106
<div className='dispute-resolution-banner'>
117
<div className='banner-container'>
128
<Link to={linkTo}>&#x2190; Go back to the list</Link>

‎src/Components/ContractsTable/Grid/index.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import React from 'react'
22
import './Grid.css'
33

4-
const Grid = ({
5-
className,
6-
children
7-
}) => (
4+
const Grid = ({ className, children }) => (
85
<div className={`Grid-container ${className}`}>
96
<div className='grid'>
107
<div className='header'>
@@ -13,9 +10,8 @@ const Grid = ({
1310
<div className='item header-party-b'>Address Party B</div>
1411
<div className='item header-rule'>Rule</div>
1512
</div>
16-
{ children }
13+
{children}
1714
</div>
18-
1915
</div>
2016
)
2117

‎src/Components/ExpandableTable/index.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { Component } from 'react'
2+
23
import './ExpandableTable.css'
34

45
class ExpandableTable extends Component {
@@ -13,26 +14,32 @@ class ExpandableTable extends Component {
1314
}
1415

1516
render () {
16-
const rowLimit = this.state.expand ? this.props.rows.length : this.props.rowLimit
17+
const rowLimit = this.state.expand
18+
? this.props.rows.length
19+
: this.props.rowLimit
1720
const rows = this.props.rows.slice(0, rowLimit)
1821
let actionDiv
1922

2023
if (this.props.rows.length > this.props.rowLimit) {
2124
if (this.state.expand) {
2225
actionDiv = (
23-
<div className='actionDiv' onClick={this.toggleMore}>{this.props.lessMessage} &and;</div>
26+
<div className='actionDiv' onClick={this.toggleMore}>
27+
{this.props.lessMessage} &and;
28+
</div>
2429
)
2530
} else {
2631
actionDiv = (
27-
<div className='actionDiv' onClick={this.toggleMore}>{this.props.moreMessage} &or;</div>
32+
<div className='actionDiv' onClick={this.toggleMore}>
33+
{this.props.moreMessage} &or;
34+
</div>
2835
)
2936
}
3037
}
3138

3239
return (
3340
<div className={`ExpandableTable ${this.props.theme}`}>
34-
{ rows }
35-
{ actionDiv }
41+
{rows}
42+
{actionDiv}
3643
</div>
3744
)
3845
}

‎src/Components/Home/MetroCard/index.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import _ from 'lodash'
33
import { connect } from 'react-redux'
44
import { withRouter, Link } from 'react-router-dom'
55
import 'babel-polyfill'
6+
67
import { getContracts } from '../../../redux/contracts/action-creators'
78
import { truncateText } from '../../../helpers/truncateText'
89
import Identicon from '../../Identicon'
@@ -39,36 +40,33 @@ class MetroCard extends Component {
3940

4041
return (
4142
<div className='MetroCard-container'>
42-
{
43-
_.isEmpty(contracts) &&
44-
<div className='no-contracts'>
45-
You have no contracts.
46-
</div>
47-
}
48-
{
49-
contractsLast3Elements.map(contract =>
50-
<div className='card'>
51-
<Link key={contract.address} to={`contract-summary/${contract.address}`}>
52-
<div className='card-content'>
53-
<div className='card-icon'>
54-
<Identicon seed={contract.address} />
43+
{_.isEmpty(contracts) && (
44+
<div className='no-contracts'>You have no contracts.</div>
45+
)}
46+
{contractsLast3Elements.map(contract => (
47+
<div className='card'>
48+
<Link
49+
key={contract.address}
50+
to={`contract-summary/${contract.address}`}>
51+
<div className='card-content'>
52+
<div className='card-icon'>
53+
<Identicon seed={contract.address} />
54+
</div>
55+
<div className='card-details'>
56+
<div className='card-details-item'>
57+
<b>{truncateText(contract.address, 20)}</b>
5558
</div>
56-
<div className='card-details'>
57-
<div className='card-details-item'>
58-
<b>{truncateText(contract.address, 20)}</b>
59-
</div>
60-
<div className='card-details-item'>
61-
Party A: {truncateText(contract.partyA, 20)}
62-
</div>
63-
<div className='card-details-item'>
64-
Party B: {truncateText(contract.partyB, 20)}
65-
</div>
59+
<div className='card-details-item'>
60+
Party A: {truncateText(contract.partyA, 20)}
61+
</div>
62+
<div className='card-details-item'>
63+
Party B: {truncateText(contract.partyB, 20)}
6664
</div>
6765
</div>
68-
</Link>
69-
</div>
70-
)
71-
}
66+
</div>
67+
</Link>
68+
</div>
69+
))}
7270
</div>
7371
)
7472
}
@@ -88,4 +86,6 @@ const mapDispatchToProps = dispatch => {
8886
}
8987
}
9088

91-
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(MetroCard))
89+
export default withRouter(
90+
connect(mapStateToProps, mapDispatchToProps)(MetroCard)
91+
)

‎src/Components/Icon/index.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { Component } from 'react'
22
import _ from 'lodash'
3+
34
import './Icon.css'
45

56
class Icon extends Component {
@@ -9,7 +10,9 @@ class Icon extends Component {
910
}
1011

1112
componentDidMount = async () => {
12-
let iconPicturePath = await import(`../../assets/icons/${this.props.name}.svg`)
13+
let iconPicturePath = await import(`../../assets/icons/${
14+
this.props.name
15+
}.svg`)
1316

1417
if (!_.isUndefined(iconPicturePath)) {
1518
this.setState({
@@ -21,7 +24,7 @@ class Icon extends Component {
2124

2225
render () {
2326
if (this.state.isLoading) {
24-
return (<div>Icon not found...</div>)
27+
return <div>Icon not found...</div>
2528
}
2629

2730
return (

‎src/Components/Input/index.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@ const Input = ({
99
placeholder,
1010
children,
1111
value,
12-
meta = {touched: false, error: false},
12+
meta = { touched: false, error: false },
1313
...rest
1414
}) => {
1515
// FIXME hack. Can't specify both value and defaultValue
1616
if (input && !input.value) delete input.value
17-
1817
return (
1918
<div className={`Input-container ${className}`}>
2019
{children}
21-
{ (() => {
20+
{(() => {
2221
switch (type) {
2322
case 'textarea':
2423
return (
@@ -49,7 +48,7 @@ const Input = ({
4948
{...input}
5049
/>
5150
)
52-
default :
51+
default:
5352
return (
5453
<input
5554
className={innerClassName}
@@ -60,11 +59,14 @@ const Input = ({
6059
/>
6160
)
6261
}
63-
})() }
64-
{
65-
meta.touched && meta.error &&
66-
<span className='input_error'><br />{ meta.error }</span>
67-
}
62+
})()}
63+
{meta.touched &&
64+
meta.error && (
65+
<span className='input_error'>
66+
<br />
67+
{meta.error}
68+
</span>
69+
)}
6870
</div>
6971
)
7072
}

‎src/Components/Layout/index.js‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,22 @@
11
import React from 'react'
2+
23
import Sidebar from '../Sidebar'
34
import { APP_VIEWS } from '../../constants'
5+
46
import './Layout.css'
57

6-
const Layout = ({
7-
className,
8-
address,
9-
view,
10-
children
11-
}) => {
8+
const Layout = ({ className, address, view, children }) => {
129
let items = []
1310
if (view === APP_VIEWS.JUROR) {
14-
items = [
15-
'disputes',
16-
'jury',
17-
'decisions',
18-
'settings'
19-
]
11+
items = ['disputes', 'jury', 'decisions', 'settings']
2012
} else if (view === APP_VIEWS.PARTY) {
21-
items = [
22-
'disputes',
23-
'contracts',
24-
'decisions',
25-
'settings'
26-
]
13+
items = ['disputes', 'contracts', 'decisions', 'settings']
2714
}
2815

2916
return (
3017
<div className={`Layout-container ${className}`}>
31-
<Sidebar
32-
items={items}
33-
address={address}
34-
balancePNK={242}
35-
/>
36-
{ children }
18+
<Sidebar items={items} address={address} balancePNK={242} />
19+
{children}
3720
</div>
3821
)
3922
}

0 commit comments

Comments
 (0)