* feat(seed): Add modern challenge * chore(react): Use prop-types package * feat: Initial refactor to redux-first-router BREAKING CHANGE: Everything is different! * feat: First rendering * feat(routes): Challenges view render but failing * fix(Challenges): Remove contain HOC * fix(RFR): Add params selector * fix(RFR): :en should be :lang * fix: Update berks utils for redux * fix(Map): Challenge link to arg * fix(Map): Add trailing slash to map page * fix(RFR): Use FCC Link Use fcc Link to get around issue of lang being undefined * fix(Router): Link to is required * fix(app): Rely on RFR state for app lang * chore(RFR): Remove unused RFR Link * fix(RFR): Hydrate initial challenge using RFR and RO * fix: Casing issue * fix(RFR): Undefined links * fix(RFR): Use onRoute<name> convention for route types * feat(server/react): Add helpful redux logging/throwing * fix(server/react): Strip out nonjson from state This prevents thunks in routesMap from breaking serialization * fix(RFR/Link): Should accept any renderable * fix(RFR): Get redirects working * fix(RFR): Redirects and not found's * fix(Map): Move challenge onClick handler * fix(Map): Allow Router.link to handle clicks after onClick * fix(routes): Remove react-router-redux * feat(Router): Add lang to all route actions by default * fix(entities): Only fetch challenge if not already loaded * fix(Files): Move files to own feature * chore(Challenges): Remove vestigial hints logic * fix(RFR): Update challenges on route challenges * fix(code-storage): Should use events instead of commands * fix(Map): ClickOnMap should not hold on to event * chore(lint): Use eslint-config-freecodecamp Closes #15938 * feat(Panes): Update panes on route instead of render * fix(Panes): Store panesmap and update on fetchchallenges * fix(Panes): Normalize panesmaps * fix(Panes): Remove filter from createpanemap * fix(Panes): Middleware on location meta object * feat(Panes): Filter preview on nonhtml challenges * build(babel): Add lodash babel plugin * chore(lint): Lint js files * fix(server/user-stats): Remove use of lodash chain this interferes with babel-plugin-lodash * feat(dev): Add remote redux devtools for ssr * fix(Panes): Dispatch mount action this is needed to trigger window/divider epics * fix(Panes): Getpane to use new panesmap format * fix(Panes): Always update panes after state this lets the panes logic be affected by changes in state
171 lines
3.9 KiB
JavaScript
171 lines
3.9 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { connect } from 'react-redux';
|
|
import { createSelector } from 'reselect';
|
|
import PureComponent from 'react-pure-render/component';
|
|
import classnames from 'classnames';
|
|
import debug from 'debug';
|
|
|
|
import {
|
|
clickOnChallenge,
|
|
|
|
makePanelHiddenSelector
|
|
} from './redux';
|
|
import { userSelector } from '../redux';
|
|
import { challengeMapSelector } from '../entities';
|
|
import { Link } from '../Router';
|
|
import { onRouteChallenges } from '../routes/Challenges/redux';
|
|
|
|
const propTypes = {
|
|
block: PropTypes.string,
|
|
challenge: PropTypes.object,
|
|
clickOnChallenge: PropTypes.func.isRequired,
|
|
dashedName: PropTypes.string,
|
|
isComingSoon: PropTypes.bool,
|
|
isCompleted: PropTypes.bool,
|
|
isDev: PropTypes.bool,
|
|
isHidden: PropTypes.bool,
|
|
isLocked: PropTypes.bool,
|
|
isRequired: PropTypes.bool,
|
|
title: PropTypes.string
|
|
};
|
|
const mapDispatchToProps = { clickOnChallenge };
|
|
|
|
function makeMapStateToProps(_, { dashedName }) {
|
|
return createSelector(
|
|
userSelector,
|
|
challengeMapSelector,
|
|
makePanelHiddenSelector(dashedName),
|
|
(
|
|
{ challengeMap: userChallengeMap },
|
|
challengeMap,
|
|
isHidden
|
|
) => {
|
|
const {
|
|
id,
|
|
title,
|
|
block,
|
|
isLocked,
|
|
isRequired,
|
|
isComingSoon
|
|
} = challengeMap[dashedName] || {};
|
|
const isCompleted = userChallengeMap ? !!userChallengeMap[id] : false;
|
|
return {
|
|
dashedName,
|
|
isHidden,
|
|
isCompleted,
|
|
title,
|
|
block,
|
|
isLocked,
|
|
isRequired,
|
|
isComingSoon,
|
|
isDev: debug.enabled('fcc:*')
|
|
};
|
|
}
|
|
);
|
|
}
|
|
|
|
export class Challenge extends PureComponent {
|
|
renderCompleted(isCompleted, isLocked) {
|
|
if (isLocked || !isCompleted) {
|
|
return null;
|
|
}
|
|
return <span className='sr-only'>completed</span>;
|
|
}
|
|
|
|
renderRequired(isRequired) {
|
|
if (!isRequired) {
|
|
return '';
|
|
}
|
|
return <span className='text-primary'><strong>*</strong></span>;
|
|
}
|
|
|
|
renderComingSoon(isComingSoon) {
|
|
if (!isComingSoon) {
|
|
return null;
|
|
}
|
|
return (
|
|
<span className='text-info small'>
|
|
   
|
|
<strong>
|
|
<em>Coming Soon</em>
|
|
</strong>
|
|
</span>
|
|
);
|
|
}
|
|
|
|
renderLocked(title, isRequired, isComingSoon, className) {
|
|
return (
|
|
<p
|
|
className={ className }
|
|
key={ title }
|
|
>
|
|
{ title }
|
|
{ this.renderRequired(isRequired) }
|
|
{ this.renderComingSoon(isComingSoon) }
|
|
</p>
|
|
);
|
|
}
|
|
|
|
|
|
render() {
|
|
const {
|
|
block,
|
|
clickOnChallenge,
|
|
dashedName,
|
|
isComingSoon,
|
|
isCompleted,
|
|
isDev,
|
|
isHidden,
|
|
isLocked,
|
|
isRequired,
|
|
title
|
|
} = this.props;
|
|
if (isHidden || !title) {
|
|
return null;
|
|
}
|
|
const challengeClassName = classnames({
|
|
'text-primary': true,
|
|
'padded-ionic-icon': true,
|
|
'map-challenge-title': true,
|
|
'ion-checkmark-circled faded': !(isLocked || isComingSoon) && isCompleted,
|
|
'ion-ios-circle-outline': !(isLocked || isComingSoon) && !isCompleted,
|
|
'ion-locked': isLocked || isComingSoon,
|
|
disabled: isLocked || (!isDev && isComingSoon)
|
|
});
|
|
if (isLocked || (!isDev && isComingSoon)) {
|
|
return this.renderLocked(
|
|
title,
|
|
isRequired,
|
|
isComingSoon,
|
|
challengeClassName
|
|
);
|
|
}
|
|
return (
|
|
<div
|
|
className={ challengeClassName }
|
|
key={ title }
|
|
>
|
|
<Link
|
|
onClick={ clickOnChallenge }
|
|
to={ onRouteChallenges({ dashedName, block }) }
|
|
>
|
|
<span >
|
|
{ title }
|
|
{ this.renderCompleted(isCompleted, isLocked) }
|
|
{ this.renderRequired(isRequired) }
|
|
</span>
|
|
</Link>
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
Challenge.propTypes = propTypes;
|
|
Challenge.dispalyName = 'Challenge';
|
|
|
|
export default connect(
|
|
makeMapStateToProps,
|
|
mapDispatchToProps
|
|
)(Challenge);
|