Fix(challenge): coming soon challenges unclickable in prod

pull/7430/head
Berkeley Martinez 2016-06-29 13:00:22 -07:00
parent 627c92c72f
commit 94a297c570
2 changed files with 35 additions and 10 deletions

View File

@ -24,8 +24,7 @@ import {
saveToColdStorage saveToColdStorage
} from './cold-reload'; } from './cold-reload';
const isDev = Rx.config.longStackSupport = !!debug.enabled; const isDev = Rx.config.longStackSupport = debug.enabled('fcc:*');
const log = debug('fcc:client'); const log = debug('fcc:client');
const hotReloadTimeout = 5000; const hotReloadTimeout = 5000;
const csrfToken = window.__fcc__.csrf.token; const csrfToken = window.__fcc__.csrf.token;

View File

@ -4,6 +4,7 @@ import { createSelector } from 'reselect';
import { Link } from 'react-router'; import { Link } from 'react-router';
import PureComponent from 'react-pure-render/component'; import PureComponent from 'react-pure-render/component';
import classnames from 'classnames'; import classnames from 'classnames';
import debug from 'debug';
import { updateCurrentChallenge } from '../../redux/actions'; import { updateCurrentChallenge } from '../../redux/actions';
@ -20,7 +21,9 @@ const mapStateToProps = createSelector(
block: challenge.block, block: challenge.block,
isLocked: challenge.isLocked, isLocked: challenge.isLocked,
isRequired: challenge.isRequired, isRequired: challenge.isRequired,
isCompleted: challenge.isCompleted isCompleted: challenge.isCompleted,
isComingSoon: challenge.isComingSoon,
isDev: debug.enabled('fcc:*')
}; };
} }
); );
@ -54,7 +57,21 @@ export class Challenge extends PureComponent {
return <span className='text-primary'><strong>*</strong></span>; return <span className='text-primary'><strong>*</strong></span>;
} }
renderLocked(title, isRequired, className) { renderComingSoon(isComingSoon) {
if (!isComingSoon) {
return null;
}
return (
<span className='text-info small'>
&thinsp; &thinsp;
<strong>
<em>Coming Soon</em>
</strong>
</span>
);
}
renderLocked(title, isRequired, isComingSoon, className) {
return ( return (
<p <p
className={ className } className={ className }
@ -62,10 +79,12 @@ export class Challenge extends PureComponent {
> >
{ title } { title }
{ this.renderRequired(isRequired) } { this.renderRequired(isRequired) }
{ this.renderComingSoon(isComingSoon) }
</p> </p>
); );
} }
render() { render() {
const { const {
title, title,
@ -74,6 +93,8 @@ export class Challenge extends PureComponent {
isLocked, isLocked,
isRequired, isRequired,
isCompleted, isCompleted,
isComingSoon,
isDev,
challenge, challenge,
updateCurrentChallenge updateCurrentChallenge
} = this.props; } = this.props;
@ -82,13 +103,18 @@ export class Challenge extends PureComponent {
'padded-ionic-icon': true, 'padded-ionic-icon': true,
'negative-15': true, 'negative-15': true,
'challenge-title': true, 'challenge-title': true,
'ion-checkmark-circled faded': !isLocked && isCompleted, 'ion-checkmark-circled faded': !(isLocked || isComingSoon) && isCompleted,
'ion-ios-circle-outline': !isLocked && !isCompleted, 'ion-ios-circle-outline': !(isLocked || isComingSoon) && !isCompleted,
'ion-locked': isLocked, 'ion-locked': isLocked || isComingSoon,
disabled: isLocked disabled: isLocked || (!isDev && isComingSoon)
}); });
if (isLocked) { if (isLocked || (!isDev && isComingSoon)) {
return this.renderLocked(title, isRequired, challengeClassName); return this.renderLocked(
title,
isRequired,
isComingSoon,
challengeClassName
);
} }
return ( return (
<p <p