* 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
119 lines
2.7 KiB
JavaScript
119 lines
2.7 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { connect } from 'react-redux';
|
|
import { createSelector } from 'reselect';
|
|
import FA from 'react-fontawesome';
|
|
import PureComponent from 'react-pure-render/component';
|
|
import { Panel } from 'react-bootstrap';
|
|
|
|
import ns from './ns.json';
|
|
import Challenge from './Challenge.jsx';
|
|
import {
|
|
toggleThisPanel,
|
|
|
|
makePanelOpenSelector,
|
|
makePanelHiddenSelector
|
|
} from './redux';
|
|
|
|
import { makeBlockSelector } from '../entities';
|
|
|
|
const dispatchActions = { toggleThisPanel };
|
|
function makeMapStateToProps(_, { dashedName }) {
|
|
return createSelector(
|
|
makeBlockSelector(dashedName),
|
|
makePanelOpenSelector(dashedName),
|
|
makePanelHiddenSelector(dashedName),
|
|
(block, isOpen, isHidden) => {
|
|
return {
|
|
isOpen,
|
|
isHidden,
|
|
dashedName,
|
|
title: block.title,
|
|
time: block.time,
|
|
challenges: block.challenges
|
|
};
|
|
}
|
|
);
|
|
}
|
|
const propTypes = {
|
|
challenges: PropTypes.array,
|
|
dashedName: PropTypes.string,
|
|
isHidden: PropTypes.bool,
|
|
isOpen: PropTypes.bool,
|
|
time: PropTypes.string,
|
|
title: PropTypes.string,
|
|
toggleThisPanel: PropTypes.func
|
|
};
|
|
|
|
export class Block extends PureComponent {
|
|
constructor(...props) {
|
|
super(...props);
|
|
this.handleSelect = this.handleSelect.bind(this);
|
|
}
|
|
handleSelect(eventKey, e) {
|
|
e.preventDefault();
|
|
this.props.toggleThisPanel(eventKey);
|
|
}
|
|
|
|
renderHeader(isOpen, title, time, isCompleted) {
|
|
return (
|
|
<div className={ isCompleted ? 'faded' : '' }>
|
|
<FA
|
|
className='map-caret'
|
|
name={ isOpen ? 'caret-down' : 'caret-right' }
|
|
size='lg'
|
|
/>
|
|
<span>
|
|
{ title }
|
|
</span>
|
|
<span className={ `${ns}-block-time` }>({ time })</span>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
renderChallenges(challenges) {
|
|
if (!Array.isArray(challenges) || !challenges.length) {
|
|
return <div>No Challenges Found</div>;
|
|
}
|
|
return challenges.map(dashedName => (
|
|
<Challenge
|
|
dashedName={ dashedName }
|
|
key={ dashedName }
|
|
/>
|
|
));
|
|
}
|
|
|
|
render() {
|
|
const {
|
|
title,
|
|
time,
|
|
dashedName,
|
|
isOpen,
|
|
isHidden,
|
|
challenges
|
|
} = this.props;
|
|
if (isHidden) {
|
|
return null;
|
|
}
|
|
return (
|
|
<Panel
|
|
bsClass={ `${ns}-accordion-panel` }
|
|
collapsible={ true }
|
|
eventKey={ dashedName || title }
|
|
expanded={ isOpen }
|
|
header={ this.renderHeader(isOpen, title, time) }
|
|
id={ title }
|
|
key={ title }
|
|
onSelect={ this.handleSelect }
|
|
>
|
|
{ this.renderChallenges(challenges) }
|
|
</Panel>
|
|
);
|
|
}
|
|
}
|
|
|
|
Block.displayName = 'Block';
|
|
Block.propTypes = propTypes;
|
|
|
|
export default connect(makeMapStateToProps, dispatchActions)(Block);
|