* 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
84 lines
1.7 KiB
JavaScript
84 lines
1.7 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { connect } from 'react-redux';
|
|
|
|
import ns from './ns.json';
|
|
import {
|
|
appMounted,
|
|
fetchUser,
|
|
|
|
isSignedInSelector
|
|
} from './redux';
|
|
|
|
import Nav from './Nav';
|
|
import Toasts from './Toasts';
|
|
import NotFound from './NotFound';
|
|
import { mainRouteSelector } from './routes/redux';
|
|
import Challenges from './routes/Challenges';
|
|
import Settings from './routes/Settings';
|
|
|
|
const mapDispatchToProps = {
|
|
appMounted,
|
|
fetchUser
|
|
};
|
|
|
|
const mapStateToProps = state => {
|
|
const isSignedIn = isSignedInSelector(state);
|
|
const route = mainRouteSelector(state);
|
|
return {
|
|
toast: state.app.toast,
|
|
isSignedIn,
|
|
route
|
|
};
|
|
};
|
|
|
|
const propTypes = {
|
|
appMounted: PropTypes.func.isRequired,
|
|
children: PropTypes.node,
|
|
fetchUser: PropTypes.func,
|
|
isSignedIn: PropTypes.bool,
|
|
route: PropTypes.string,
|
|
toast: PropTypes.object
|
|
};
|
|
|
|
const routes = {
|
|
challenges: Challenges,
|
|
settings: Settings
|
|
};
|
|
|
|
// export plain class for testing
|
|
export class FreeCodeCamp extends React.Component {
|
|
componentDidMount() {
|
|
this.props.appMounted();
|
|
if (!this.props.isSignedIn) {
|
|
this.props.fetchUser();
|
|
}
|
|
}
|
|
|
|
render() {
|
|
const {
|
|
route
|
|
} = this.props;
|
|
const Child = routes[route] || NotFound;
|
|
// we render nav after the content
|
|
// to allow the panes to update
|
|
// redux store, which will update the bin
|
|
// buttons in the nav
|
|
return (
|
|
<div className={ `${ns}-container` }>
|
|
<Nav />
|
|
<Child />
|
|
<Toasts />
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
FreeCodeCamp.displayName = 'freeCodeCamp';
|
|
FreeCodeCamp.propTypes = propTypes;
|
|
|
|
export default connect(
|
|
mapStateToProps,
|
|
mapDispatchToProps
|
|
)(FreeCodeCamp);
|