To finalize filter
This commit is contained in:
parent
dba9fa0606
commit
06e0ea1305
|
@ -17,6 +17,10 @@ class App extends Component {
|
||||||
return <Ballots isActiveFilter={true}/>;
|
return <Ballots isActiveFilter={true}/>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onToFinalizeBallotsRender = () => {
|
||||||
|
return <Ballots isToFinalizeFilter={true}/>;
|
||||||
|
}
|
||||||
|
|
||||||
onNewBallotRender = () => {
|
onNewBallotRender = () => {
|
||||||
return <NewBallot/>;
|
return <NewBallot/>;
|
||||||
}
|
}
|
||||||
|
@ -37,7 +41,8 @@ class App extends Component {
|
||||||
currentPath === `${commonStore.rootPath}`
|
currentPath === `${commonStore.rootPath}`
|
||||||
|| currentPath === "/"
|
|| currentPath === "/"
|
||||||
|| currentPath === `${commonStore.rootPath}/`
|
|| currentPath === `${commonStore.rootPath}/`
|
||||||
|| currentPath === `${commonStore.rootPath}/active`;
|
|| currentPath === `${commonStore.rootPath}/active`
|
||||||
|
|| currentPath === `${commonStore.rootPath}/tofinalize`;
|
||||||
return showNavPan;
|
return showNavPan;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,6 +54,7 @@ class App extends Component {
|
||||||
<div className="nav">
|
<div className="nav">
|
||||||
<NavLink className="nav-i" exact activeClassName="nav-i_active" to={`${commonStore.rootPath}/`}>All</NavLink>
|
<NavLink className="nav-i" exact activeClassName="nav-i_active" to={`${commonStore.rootPath}/`}>All</NavLink>
|
||||||
<NavLink className="nav-i" activeClassName="nav-i_active" to={`${commonStore.rootPath}/active`}>Active</NavLink>
|
<NavLink className="nav-i" activeClassName="nav-i_active" to={`${commonStore.rootPath}/active`}>Active</NavLink>
|
||||||
|
<NavLink className="nav-i" activeClassName="nav-i_active" to={`${commonStore.rootPath}/tofinalize`}>To finalize</NavLink>
|
||||||
</div>
|
</div>
|
||||||
<input type="search" className="search-input" onChange={this.onSearch}/>
|
<input type="search" className="search-input" onChange={this.onSearch}/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -61,6 +67,7 @@ class App extends Component {
|
||||||
<Route exact path={`/`} render={this.onBallotsRender}/>
|
<Route exact path={`/`} render={this.onBallotsRender}/>
|
||||||
<Route exact path={`${commonStore.rootPath}/`} render={this.onBallotsRender}/>
|
<Route exact path={`${commonStore.rootPath}/`} render={this.onBallotsRender}/>
|
||||||
<Route exact path={`${commonStore.rootPath}/active`} render={this.onActiveBallotsRender}/>
|
<Route exact path={`${commonStore.rootPath}/active`} render={this.onActiveBallotsRender}/>
|
||||||
|
<Route exact path={`${commonStore.rootPath}/tofinalize`} render={this.onToFinalizeBallotsRender}/>
|
||||||
<Route path={`${commonStore.rootPath}/new`} render={this.onNewBallotRender}/>
|
<Route path={`${commonStore.rootPath}/new`} render={this.onNewBallotRender}/>
|
||||||
{/*<Route path={`${commonStore.rootPath}/settings`} render={this.onSettingsRender}/>*/}
|
{/*<Route path={`${commonStore.rootPath}/settings`} render={this.onSettingsRender}/>*/}
|
||||||
<Footer netId={contractsStore.netId} />
|
<Footer netId={contractsStore.netId} />
|
||||||
|
|
|
@ -377,7 +377,8 @@ export class BallotCard extends React.Component {
|
||||||
|
|
||||||
showCard = () => {
|
showCard = () => {
|
||||||
let { commonStore } = this.props;
|
let { commonStore } = this.props;
|
||||||
let show = commonStore.isActiveFilter ? !this.isFinalized : true;
|
let checkToFinalizeFilter = commonStore.isToFinalizeFilter ? !this.isFinalized && this.timeToFinish.val == 0 : true;
|
||||||
|
let show = commonStore.isActiveFilter ? !this.isFinalized : checkToFinalizeFilter;
|
||||||
return show;
|
return show;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ export class Ballots extends React.Component {
|
||||||
componentWillMount () {
|
componentWillMount () {
|
||||||
const { commonStore } = this.props;
|
const { commonStore } = this.props;
|
||||||
commonStore.isActiveFilter = this.props.isActiveFilter;
|
commonStore.isActiveFilter = this.props.isActiveFilter;
|
||||||
|
commonStore.isToFinalizeFilter = this.props.isToFinalizeFilter;
|
||||||
}
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
|
|
|
@ -4,11 +4,13 @@ class CommonStore {
|
||||||
@observable loading;
|
@observable loading;
|
||||||
@observable rootPath;
|
@observable rootPath;
|
||||||
@observable isActiveFilter;
|
@observable isActiveFilter;
|
||||||
|
@observable isToFinalizeFilter;
|
||||||
@observable searchTerm;
|
@observable searchTerm;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.isActiveFilter = false;
|
this.isActiveFilter = false;
|
||||||
|
this.isToFinalizeFilter = false;
|
||||||
this.rootPath = '/poa-dapps-voting'
|
this.rootPath = '/poa-dapps-voting'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue