Skip to content

Commit

Permalink
FIX disable OpinionBar functionality when stats
Browse files Browse the repository at this point in the history
  • Loading branch information
JdeJ committed May 22, 2019
1 parent d35ab4c commit 0d467b7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
15 changes: 9 additions & 6 deletions src/components/OpinionBar.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import React from 'react';


const OpinionBar = ({skipRate, respond, cards}) => {
function backToOpinions() {
skipRate();
const OpinionBar = ({isResponded, respond, cards}) => {

function handleClick(event) {
if ( !isResponded && event.target.id !== 'skip') {
respond((cards.length -1), `${event.target.id}`);
}
}

return (
<div className="nav op-bar">
<div><button onClick={() => respond((cards.length -1), 'x')} className="btn-op-bar">&#171;</button></div>
<div><button onClick={backToOpinions} className="btn-op-bar btn-op-bar-red mr-4 ml-4">&#215;</button></div>
<div><button onClick={() => respond((cards.length -1), 'y')} className="btn-op-bar">&#187;</button></div>
<div><button id='x' onClick={ handleClick } className="btn-op-bar">&#171;</button></div>
<div><button id='skip' onClick={ handleClick } className="btn-op-bar btn-op-bar-red mr-4 ml-4">&#215;</button></div>
<div><button id='y' onClick={ handleClick } className="btn-op-bar">&#187;</button></div>
</div>
)
}
Expand Down
10 changes: 3 additions & 7 deletions src/pages/Opinions.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,19 @@ class Opinions extends Component {
}

render() {
const { isLoading, opinions, responded, lastStat, imzSwitch } = this.state;
const { isLoading, opinions, responded, lastStat } = this.state;
return (
<div className="deck-general">
{ responded ? <OpinionRate skipRate={this.skipRate} stat={lastStat} /> : <></> }
<Navbar {...this.props}/>
{
isLoading?
<SpinnerCentral />
<SpinnerCentral />
:
( imzSwitch ?
<InMyZone />
:
<>
<Deck cards={opinions} respond={this.onRespond} />
<OpinionBar skipRate={this.skipRate} cards={opinions} respond={this.onRespond} />
<OpinionBar isResponded={responded} cards={opinions} respond={this.onRespond} />
</>
)
}
</div>
);
Expand Down

0 comments on commit 0d467b7

Please sign in to comment.