-
-
-
-
-
-
-
-
-
- )
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
- }
-
-
-
-
-
-
-
-
-
-
- );
-}
-
-NotFound.displayName = 'NotFound';
-NotFound.propTypes = propTypes;
diff --git a/api-server/common/app/NotFound/index.js b/api-server/common/app/NotFound/index.js
deleted file mode 100644
index b174c4f934f..00000000000
--- a/api-server/common/app/NotFound/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './Not-Found.jsx';
diff --git a/api-server/common/app/Router/Link.jsx b/api-server/common/app/Router/Link.jsx
deleted file mode 100644
index df29e53cbf4..00000000000
--- a/api-server/common/app/Router/Link.jsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import toUrl from './to-url.js';
-import createHandler from './handle-press.js';
-import { routesMapSelector } from './redux';
-
-const mapStateToProps = createSelector(
- routesMapSelector,
- routesMap => ({ routesMap })
-);
-
-const propTypes = {
- children: PropTypes.node,
- dispatch: PropTypes.func,
- onClick: PropTypes.func,
- redirect: PropTypes.bool,
- replace: PropTypes.bool,
- routesMap: PropTypes.object,
- shouldDispatch: PropTypes.bool,
- style: PropTypes.object,
- target: PropTypes.string,
- to: PropTypes.oneOfType([ PropTypes.object, PropTypes.string ]).isRequired
-};
-
-export const Link = (
- {
- children,
- dispatch,
- onClick,
- redirect,
- replace,
- routesMap,
- shouldDispatch = true,
- style,
- target,
- to
- }
-) => {
- const url = toUrl(to, routesMap);
- const handler = createHandler(
- url,
- routesMap,
- onClick,
- shouldDispatch,
- target,
- dispatch,
- to,
- replace || redirect
- );
-
- const localProps = {};
-
- if (url) {
- localProps.href = url;
- }
-
- if (handler) {
- localProps.onMouseDown = handler;
- localProps.onTouchStart = handler;
- }
-
- if (target) {
- localProps.target = target;
- }
-
- return (
-
- {children}
-
- );
-};
-
-Link.contextTypes = {
- store: PropTypes.object.isRequired
-};
-Link.propTypes = propTypes;
-
-export default connect(mapStateToProps)(Link);
diff --git a/api-server/common/app/Router/handle-press.js b/api-server/common/app/Router/handle-press.js
deleted file mode 100644
index 5cda85860d8..00000000000
--- a/api-server/common/app/Router/handle-press.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { pathToAction, redirect, getOptions } from 'redux-first-router';
-
-const isAction = to => typeof to === 'object' &&
- !Array.isArray(to);
-
-const isModified = e => !!(
- e.metaKey ||
- e.altKey ||
- e.ctrlKey ||
- e.shiftKey
-);
-
-export default (
- url,
- routesMap,
- onClick,
- shouldDispatch,
- target,
- dispatch,
- to,
- dispatchRedirect
-) => e => {
- let shouldGo = true;
-
- if (onClick) {
- // onClick can return false to prevent dispatch
- shouldGo = onClick(e);
- shouldGo = typeof shouldGo === 'undefined' ? true : shouldGo;
- }
-
- const prevented = e.defaultPrevented;
-
- if (!target && e && e.preventDefault && !isModified(e)) {
- e.preventDefault();
- }
-
- if (
- shouldGo &&
- shouldDispatch &&
- !target &&
- !prevented &&
- e.button === 0 &&
- !isModified(e)
- ) {
- const { querySerializer: serializer } = getOptions();
- let action = isAction(to) ? to : pathToAction(url, routesMap, serializer);
- action = dispatchRedirect ? redirect(action) : action;
- dispatch(action);
- }
-};
diff --git a/api-server/common/app/Router/index.js b/api-server/common/app/Router/index.js
deleted file mode 100644
index 79f148eac72..00000000000
--- a/api-server/common/app/Router/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Link } from './Link.jsx';
diff --git a/api-server/common/app/Router/redux/index.js b/api-server/common/app/Router/redux/index.js
deleted file mode 100644
index 9cae6f2f537..00000000000
--- a/api-server/common/app/Router/redux/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { selectLocationState } from 'redux-first-router';
-
-export const paramsSelector = state => selectLocationState(state).payload || {};
-export const locationTypeSelector =
- state => selectLocationState(state).type || '';
-export const routesMapSelector = state =>
- selectLocationState(state).routesMap || {};
-export const pathnameSelector = state => selectLocationState(state).pathname;
diff --git a/api-server/common/app/Router/to-url.js b/api-server/common/app/Router/to-url.js
deleted file mode 100644
index 37a5a4d210c..00000000000
--- a/api-server/common/app/Router/to-url.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { actionToPath, getOptions } from 'redux-first-router';
-
-export default (to, routesMap) => {
- if (to && typeof to === 'string') {
- return to;
- }
-
- if (typeof to === 'object') {
- const { payload = {}, ...action } = to;
-
- try {
- const { querySerializer } = getOptions();
- return actionToPath(
- {
- ...action,
- payload: {
- ...payload
- }
- },
- routesMap,
- querySerializer
- );
- } catch (e) {
- console.error(e);
- console.warn(
- '[Link] could not create path from action:',
- action,
- 'For reference, here are your current routes:',
- routesMap
- );
-
- return '#';
- }
- }
-
- console.warn(
- '[Link] `to` prop must be a string or action object. You provided: ',
- to
- );
- return '#';
-};
diff --git a/api-server/common/app/Toasts/Toasts.jsx b/api-server/common/app/Toasts/Toasts.jsx
deleted file mode 100644
index 322712dd93b..00000000000
--- a/api-server/common/app/Toasts/Toasts.jsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { NotificationStack } from '@freecodecamp/react-notification';
-
-import { removeToast } from './redux';
-
-const registeredActions = {};
-const mapStateToProps = state => ({ toasts: state.toasts });
-// we use styles here to overwrite those built into the library
-// but there are some styles applied using
-// regular css in /client/less/toastr.less
-const barStyle = {
- fontSize: '2rem',
- // null values let our css set the style prop
- padding: null
-};
-const rightBarStyle = {
- ...barStyle,
- left: null,
- right: '-100%'
-};
-const actionStyle = {
- fontSize: '2rem'
-};
-const addDispatchableActionsToToast = createSelector(
- state => state.toasts,
- state => state.dispatch,
- (toasts, dispatch) => toasts.map(({ position, actionCreator, ...toast }) => {
- const activeBarStyle = {};
- let finalBarStyle = barStyle;
- if (position !== 'left') {
- activeBarStyle.left = null;
- activeBarStyle.right = '1rem';
- finalBarStyle = rightBarStyle;
- }
- const onClick = !registeredActions[actionCreator] ?
- () => {
- dispatch(removeToast(toast));
- } :
- () => {
- dispatch(registeredActions[actionCreator]());
- dispatch(removeToast(toast));
- };
- return {
- ...toast,
- barStyle: finalBarStyle,
- activeBarStyle,
- actionStyle,
- onClick
- };
- })
-);
-const propTypes = {
- dispatch: PropTypes.func,
- toasts: PropTypes.arrayOf(PropTypes.object)
-};
-
-export class Toasts extends React.Component {
- constructor(...props) {
- super(...props);
- this.handleDismiss = this.handleDismiss.bind(this);
- }
- styleFactory(index, style) {
- return { ...style, bottom: `${4 + index * 8}rem` };
- }
-
- handleDismiss(notification) {
- this.props.dispatch(removeToast(notification));
- }
-
- render() {
- const { toasts = [], dispatch } = this.props;
- return (
- - { 'Sorry, we couldn\'t find a page for that address.' } -
-
-
-
- { takeMeToChallenges }
-
- );
- }
- if (!isCurrentUserProfile && (fetchOtherUserCompleted && !isUserFound)) {
- return (
- - { - `${paramsUsername} has not made their profile public. ` - } -
-- { - 'In order to view their freeCodeCamp certifications, ' + - 'they need to make their profile public' - } -
-
-
-
- { takeMeToChallenges }
-
- );
- }
- return (
- - { `We could not find a user by the name of "${paramsUsername}"` } -
-
-
- );
- }
-
- renderReportUserButton() {
- const {
- isSignedIn,
- fetchOtherUserCompleted,
- isCurrentUserProfile,
- isUserFound,
- paramsUsername
- } = this.props;
-
- return (
- !isSignedIn ||
- isCurrentUserProfile ||
- (fetchOtherUserCompleted && !isUserFound)
- ) ?
- null :
- (
-
-
-
- );
-}
-
-CamperHOC.displayName = 'CamperHOC';
-CamperHOC.propTypes = propTypes;
-
-export default connect(mapStateToProps)(CamperHOC);
diff --git a/api-server/common/app/routes/Profile/components/Certificates.jsx b/api-server/common/app/routes/Profile/components/Certificates.jsx
deleted file mode 100644
index 09051638564..00000000000
--- a/api-server/common/app/routes/Profile/components/Certificates.jsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import _ from 'lodash';
-import { createSelector } from 'reselect';
-import { connect } from 'react-redux';
-import {
- Button,
- Row,
- Col
-} from 'react-bootstrap';
-
-import { FullWidthRow } from '../../../helperComponents';
-
-import { userByNameSelector } from '../../../redux';
-
-const mapStateToProps = createSelector(
- userByNameSelector,
- ({
- isRespWebDesignCert,
- is2018DataVisCert,
- isFrontEndLibsCert,
- isJsAlgoDataStructCert,
- isApisMicroservicesCert,
- isInfosecQaCert,
- isFrontEndCert,
- isBackEndCert,
- isDataVisCert,
- isFullStackCert,
- is2018FullStackCert,
- username
- }) => ({
- username,
- hasModernCert: (
- isRespWebDesignCert ||
- is2018DataVisCert ||
- isFrontEndLibsCert ||
- isJsAlgoDataStructCert ||
- isApisMicroservicesCert ||
- isInfosecQaCert
- ),
- hasLegacyCert: (isFrontEndCert || isBackEndCert || isDataVisCert),
- currentCerts: [
- {
- show: is2018FullStackCert,
- title: 'Full Stack Certification',
- showURL: '2018-full-stack'
- },
- {
- show: isRespWebDesignCert,
- title: 'Responsive Web Design Certification',
- showURL: 'responsive-web-design'
- },
- {
- show: isJsAlgoDataStructCert,
- title: 'JavaScript Algorithms and Data Structures Certification',
- showURL: 'javascript-algorithms-and-data-structures'
- },
- {
- show: isFrontEndLibsCert,
- title: 'Front End Libraries Certification',
- showURL: 'front-end-libraries'
- },
- {
- show: is2018DataVisCert,
- title: 'Data Visualization Certification',
- showURL: 'data-visualization'
- },
- {
- show: isApisMicroservicesCert,
- title: 'APIs and Microservices Certification',
- showURL: 'apis-and-microservices'
- },
- {
- show: isInfosecQaCert,
- title: 'Information Security and Quality Assurance Certification',
- showURL: 'information-security-and-quality-assurance'
- }
- ],
- legacyCerts: [
- {
- show: isFullStackCert,
- title: 'Full Stack Certification',
- showURL: 'legacy-full-stack'
- },
- {
- show: isFrontEndCert,
- title: 'Front End Certification',
- showURL: 'legacy-front-end'
- },
- {
- show: isBackEndCert,
- title: 'Back End Certification',
- showURL: 'legacy-back-end'
- },
- {
- show: isDataVisCert,
- title: 'Data Visualization Certification',
- showURL: 'legacy-data-visualization'
- }
- ]
- })
-);
-
-function mapDispatchToProps() {
- return {};
-}
-
-const certArrayTypes = PropTypes.arrayOf(
- PropTypes.shape({
- show: PropTypes.bool,
- title: PropTypes.string,
- showURL: PropTypes.string
- })
-);
-
-const propTypes = {
- currentCerts: certArrayTypes,
- hasLegacyCert: PropTypes.bool,
- hasModernCert: PropTypes.bool,
- legacyCerts: certArrayTypes,
- username: PropTypes.string
-};
-
-function renderCertShow(username, cert) {
- return cert.show ? (
- -
-
-
- { - hasModernCert ? - currentCerts.map(renderCertShowWithUsername) : -
-
-
- );
-}
-
-Certificates.propTypes = propTypes;
-Certificates.displayName = 'Certificates';
-
-export default connect(mapStateToProps, mapDispatchToProps)(Certificates);
diff --git a/api-server/common/app/routes/Profile/components/HeatMap.jsx b/api-server/common/app/routes/Profile/components/HeatMap.jsx
deleted file mode 100644
index 4629748b087..00000000000
--- a/api-server/common/app/routes/Profile/components/HeatMap.jsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import d3 from 'react-d3';
-import CalHeatMap from 'cal-heatmap';
-import { createSelector } from 'reselect';
-import { connect } from 'react-redux';
-import { Helmet } from 'react-helmet';
-import differenceInCalendarMonths from 'date-fns/difference_in_calendar_months';
-
-import { FullWidthRow } from '../../../helperComponents';
-import { userByNameSelector } from '../../../redux';
-
-function ensureD3() {
- // CalHeatMap requires d3 to be available on window
- if (typeof window !== 'undefined') {
- if ('d3' in window) {
- return;
- } else {
- window.d3 = d3;
- }
- return;
- }
- return;
-}
-
-const mapStateToProps = createSelector(
- userByNameSelector,
- ({ calendar, streak }) => ({ calendar, streak })
-);
-
-const propTypes = {
- calendar: PropTypes.object,
- streak: PropTypes.shape({
- current: PropTypes.number,
- longest: PropTypes.number
- })
-};
-
-class HeatMap extends Component {
- constructor(props) {
- super(props);
-
- this.renderMap = this.renderMap.bind(this);
- }
- componentDidMount() {
- ensureD3();
- this.renderMap();
- }
-
- renderMap() {
- const { calendar = {} } = this.props;
- if (Object.keys(calendar).length === 0) {
- return null;
- }
- const today = new Date();
- const cal = new CalHeatMap();
- const rectSelector = '#cal-heatmap > svg > svg.graph-legend > g > rect.r';
- const calLegendTitles = ['0 items', '1 item', '2 items', '3 or more items'];
- const firstTS = Object.keys(calendar)[0];
- const sevenMonths = 1000 * 60 * 60 * 24 * 210;
- // start should not be earlier than 7 months before now:
- let start = (firstTS * 1000 + sevenMonths < Date.now())
- ? new Date(Date.now() - sevenMonths)
- : new Date(firstTS * 1000);
- const monthsSinceFirstActive = differenceInCalendarMonths(
- today,
- start
- );
- cal.init({
- itemSelector: '#cal-heatmap',
- domain: 'month',
- subDomain: 'day',
- domainDynamicDimension: true,
- domainGutter: 5,
- data: calendar,
- cellSize: 15,
- cellRadius: 3,
- cellPadding: 2,
- tooltip: true,
- range: monthsSinceFirstActive < 12 ? monthsSinceFirstActive + 1 : 12,
- start,
- legendColors: ['#cccccc', '#006400'],
- legend: [1, 2, 3],
- label: {
- position: 'top'
- }
- });
- calLegendTitles.forEach(function(title, i) {
- document
- .querySelector(rectSelector + (i + 1).toString() + '> title')
- .innerHTML = title;
- });
- return null;
- }
-
- render() {
- const { streak = {} } = this.props;
- return (
- freeCodeCamp Certifications
-- { - hasModernCert ? - currentCerts.map(renderCertShowWithUsername) : -
- No certifications have been earned under the current curriculum -
- } - { - hasLegacyCert ? -
-
-
- { - legacyCerts.map(renderCertShowWithUsername) - } -
:
- null
- }
- -
Legacy Certifications
-- { - legacyCerts.map(renderCertShowWithUsername) - } -
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-HeatMap.displayName = 'HeatMap';
-HeatMap.propTypes = propTypes;
-
-export default connect(mapStateToProps)(HeatMap);
diff --git a/api-server/common/app/routes/Profile/components/Portfolio.jsx b/api-server/common/app/routes/Profile/components/Portfolio.jsx
deleted file mode 100644
index 76a66bd95db..00000000000
--- a/api-server/common/app/routes/Profile/components/Portfolio.jsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { createSelector } from 'reselect';
-import { connect } from 'react-redux';
-import { Thumbnail, Media } from 'react-bootstrap';
-
-import { FullWidthRow } from '../../../helperComponents';
-import { userByNameSelector } from '../../../redux';
-
-const mapStateToProps = createSelector(
- userByNameSelector,
- ({ portfolio }) => ({ portfolio })
-);
-
-const propTypes = {
- portfolio: PropTypes.arrayOf(
- PropTypes.shape({
- description: PropTypes.string,
- id: PropTypes.string,
- image: PropTypes.string,
- title: PropTypes.string,
- url: PropTypes.string
- })
- )
-};
-
-function Portfolio({ portfolio = [] }) {
- if (!portfolio.length) {
- return null;
- }
- return (
-
-
- Longest Streak: { streak.longest || 1 }
-
-
- Current Streak: { streak.current || 1 }
-
-
- -
-
-
-
- {
- image && (
-
-
-
-
-
- { title }
-
-
-
-
- ))
- }
-
-
-
- );
-}
-
-Portfolio.displayName = 'Portfolio';
-Portfolio.propTypes = propTypes;
-
-export default connect(mapStateToProps)(Portfolio);
diff --git a/api-server/common/app/routes/Profile/components/SocialIcons.jsx b/api-server/common/app/routes/Profile/components/SocialIcons.jsx
deleted file mode 100644
index f1010b33f72..00000000000
--- a/api-server/common/app/routes/Profile/components/SocialIcons.jsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { createSelector } from 'reselect';
-import { connect } from 'react-redux';
-import { Row, Col } from 'react-bootstrap';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import {
- faLinkedin,
- faGithub,
- faTwitter
-} from '@fortawesome/free-brands-svg-icons';
-import { faLink } from '@fortawesome/free-solid-svg-icons';
-
-import { userByNameSelector } from '../../../redux';
-
-const propTypes = {
- email: PropTypes.string,
- githubProfile: PropTypes.string,
- isGithub: PropTypes.bool,
- isLinkedIn: PropTypes.bool,
- isTwitter: PropTypes.bool,
- isWebsite: PropTypes.bool,
- linkedIn: PropTypes.string,
- show: PropTypes.bool,
- twitter: PropTypes.string,
- website: PropTypes.string
-};
-
-const mapStateToProps = createSelector(
- userByNameSelector,
- ({
- githubProfile,
- isLinkedIn,
- isGithub,
- isTwitter,
- isWebsite,
- linkedIn,
- twitter,
- website
- }) => ({
- githubProfile,
- isLinkedIn,
- isGithub,
- isTwitter,
- isWebsite,
- linkedIn,
- show: (isLinkedIn || isGithub || isTwitter || isWebsite),
- twitter,
- website
- })
-);
-
-function mapDispatchToProps() {
- return {};
-}
-
-function LinkedInIcon(linkedIn) {
- return (
-
- Portfolio
- { - portfolio.map(({ title, url, image, description, id}) => ( -- { description } -
--
Timeline
- { - completedMap.length === 0 ? -- No challenges have been completed yet. - - Get started here. - -
: -| Challenge | -Completed | -
|---|
-
-
-
-
-
- );
- }
-}
-
-Settings.displayName = 'Settings';
-Settings.propTypes = propTypes;
-
-export default connect(
- mapStateToProps,
- mapDispatchToProps
-)(Settings);
diff --git a/api-server/common/app/routes/Settings/ShowSettings.jsx b/api-server/common/app/routes/Settings/ShowSettings.jsx
deleted file mode 100644
index 1bcd62c87b2..00000000000
--- a/api-server/common/app/routes/Settings/ShowSettings.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { Grid } from 'react-bootstrap';
-
-import ns from './ns.json';
-import { showUpdateEmailViewSelector } from './redux';
-import Settings from './Settings.jsx';
-import UpdateEmail from './routes/update-email';
-import ChildContainer from '../../Child-Container.jsx';
-
-const mapStateToProps = state => ({
- showUpdateEmailView: showUpdateEmailViewSelector(state)
-});
-
-const propTypes = {
- showUpdateEmailView: PropTypes.bool
-};
-
-export function ShowSettings({ showUpdateEmailView }) {
- let ChildComponent = Settings;
-
- if (showUpdateEmailView) {
- ChildComponent = UpdateEmail;
- }
-
- return (
- { `Account Settings for ${username}` }
-
-
-
- { onLabel }
-
-
- { offLabel }
-
-
-
- );
-}
-
-ToggleButton.displayName = 'ToggleButton';
-ToggleButton.propTypes = propTypes;
diff --git a/api-server/common/app/routes/Settings/Toggle-Button/index.js b/api-server/common/app/routes/Settings/Toggle-Button/index.js
deleted file mode 100644
index 1428299d5f0..00000000000
--- a/api-server/common/app/routes/Settings/Toggle-Button/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Toggle-Button.jsx';
diff --git a/api-server/common/app/routes/Settings/Toggle-Button/ns.json b/api-server/common/app/routes/Settings/Toggle-Button/ns.json
deleted file mode 100644
index d2fa2a05259..00000000000
--- a/api-server/common/app/routes/Settings/Toggle-Button/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"toggle"
diff --git a/api-server/common/app/routes/Settings/Toggle-Button/toggle.less b/api-server/common/app/routes/Settings/Toggle-Button/toggle.less
deleted file mode 100644
index 4ff123406df..00000000000
--- a/api-server/common/app/routes/Settings/Toggle-Button/toggle.less
+++ /dev/null
@@ -1,21 +0,0 @@
-@ns: toggle;
-
-.@{ns}-container > .btn-group {
- min-width: 180px;
- float: right;
- .btn {
- margin-top: 20px;
- }
- .btn[disabled] {
- opacity: 1;
- }
- @media (max-width: 768px) {
- float: none;
- .btn {
- margin-top: 10px;
- margin-bottom: 20px;
- }
- }
-}
-
-
diff --git a/api-server/common/app/routes/Settings/components/About-Settings.jsx b/api-server/common/app/routes/Settings/components/About-Settings.jsx
deleted file mode 100644
index 214722f5e2e..00000000000
--- a/api-server/common/app/routes/Settings/components/About-Settings.jsx
+++ /dev/null
@@ -1,217 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { createSelector } from 'reselect';
-import { bindActionCreators } from 'redux';
-import { reduxForm } from 'redux-form';
-import {
- Nav,
- NavItem
-} from 'react-bootstrap';
-
-import { FullWidthRow, Spacer } from '../../../helperComponents';
-import ThemeSettings from './ThemeSettings.jsx';
-import Camper from './Camper.jsx';
-import UsernameSettings from './UsernameSettings.jsx';
-import { userSelector, toggleNightMode } from '../../../redux';
-import { updateUserBackend } from '../redux';
-import {
- BlockSaveButton,
- BlockSaveWrapper,
- FormFields,
- maxLength,
- validURL
-} from '../formHelpers';
-
-const max288Char = maxLength(288);
-
-const mapStateToProps = createSelector(
- userSelector,
- (
- {
- about,
- location,
- name,
- picture,
- points,
- theme,
- username
- },
- ) => ({
- about,
- currentTheme: theme,
- initialValues: { name, location, about, picture },
- location,
- name,
- picture,
- points,
- username
- })
-);
-
-const formFields = [ 'name', 'location', 'picture', 'about' ];
-
-function validator(values) {
- const errors = {};
- const {
- about,
- picture
- } = values;
- errors.about = max288Char(about);
- errors.picutre = validURL(picture);
-
-}
-
-function mapDispatchToProps(dispatch) {
- return bindActionCreators({
- toggleNightMode,
- updateUserBackend
- }, dispatch);
-}
-
-const propTypes = {
- about: PropTypes.string,
- currentTheme: PropTypes.string,
- fields: PropTypes.object,
- handleSubmit: PropTypes.func.isRequired,
- location: PropTypes.string,
- name: PropTypes.string,
- picture: PropTypes.string,
- points: PropTypes.number,
- toggleNightMode: PropTypes.func.isRequired,
- updateUserBackend: PropTypes.func.isRequired,
- username: PropTypes.string
-};
-
-class AboutSettings extends PureComponent {
- constructor(props) {
- super(props);
- this.handleSubmit = this.handleSubmit.bind(this);
- this.handleTabSelect = this.handleTabSelect.bind(this);
- this.renderEdit = this.renderEdit.bind(this);
- this.renderPreview = this.renderPreview.bind(this);
-
- this.state = {
- view: 'edit'
- };
- this.show = {
- edit: this.renderEdit,
- preview: this.renderPreview
- };
- }
-
- handleSubmit(values) {
- this.props.updateUserBackend(values);
- }
-
- handleTabSelect(key) {
- this.setState(state => ({
- ...state,
- view: key
- }));
- }
-
- renderEdit() {
- const { fields } = this.props;
- const options = {
- types: {
- about: 'textarea',
- picture: 'url'
- }
- };
- return (
-
-
- );
- }
-
- renderPreview() {
- const {
- fields: {
- picture: { value: picture },
- name: { value: name },
- location: { value: location },
- about: { value: about }
- },
- points,
- username
- } = this.props;
- return (
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-AboutSettings.displayName = 'AboutSettings';
-AboutSettings.propTypes = propTypes;
-
-export default reduxForm(
- {
- form: 'account-settings',
- fields: formFields,
- validate: validator
- },
- mapStateToProps,
- mapDispatchToProps
-)(AboutSettings);
diff --git a/api-server/common/app/routes/Settings/components/Camper.jsx b/api-server/common/app/routes/Settings/components/Camper.jsx
deleted file mode 100644
index f80f444451e..00000000000
--- a/api-server/common/app/routes/Settings/components/Camper.jsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Col, Row } from 'react-bootstrap';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import { faAward } from '@fortawesome/free-solid-svg-icons';
-
-import SocialIcons from '../../Profile/components/SocialIcons.jsx';
-
-const propTypes = {
- about: PropTypes.string,
- location: PropTypes.string,
- name: PropTypes.string,
- picture: PropTypes.string,
- points: PropTypes.number,
- username: PropTypes.string,
- yearsTopContributor: PropTypes.array
-};
-
-function pluralise(word, condition) {
- return condition ? word + 's' : word;
-}
-function joinArray(array) {
- return array.reduce((string, item, index, array) => {
- if (string.length > 0) {
- if (index === array.length - 1) {
- return `${string} and ${item}`;
- } else {
- return `${string}, ${item}`;
- }
- } else {
- return item;
- }
- });
-}
-
-function Camper({
- name,
- username,
- location,
- points,
- picture,
- about,
- yearsTopContributor
-}) {
-
- return (
- -
-
- 
-
-
-
-
- );
-}
-
-Camper.displayName = 'Camper';
-Camper.propTypes = propTypes;
-
-export default Camper;
diff --git a/api-server/common/app/routes/Settings/components/Cert-Settings.jsx b/api-server/common/app/routes/Settings/components/Cert-Settings.jsx
deleted file mode 100644
index a23b1e7069a..00000000000
--- a/api-server/common/app/routes/Settings/components/Cert-Settings.jsx
+++ /dev/null
@@ -1,336 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import _ from 'lodash';
-import { createSelector } from 'reselect';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import { Button } from 'react-bootstrap';
-
-import { FullWidthRow } from '../../../helperComponents';
-import { Form } from '../formHelpers';
-import JSAlgoAndDSForm from './JSAlgoAndDSForm.jsx';
-import SectionHeader from './SectionHeader.jsx';
-import { projectsSelector } from '../../../entities';
-import { claimCert, updateUserBackend } from '../redux';
-import {
- userSelector,
- hardGoTo,
- createErrorObservable
-} from '../../../redux';
-import {
- buildUserProjectsMap,
- jsProjectSuperBlock
-} from '../utils/buildUserProjectsMap';
-
-const mapStateToProps = createSelector(
- userSelector,
- projectsSelector,
- (
- {
- completedChallenges,
- isRespWebDesignCert,
- is2018DataVisCert,
- isFrontEndLibsCert,
- isJsAlgoDataStructCert,
- isApisMicroservicesCert,
- isInfosecQaCert,
- isFrontEndCert,
- isBackEndCert,
- isDataVisCert,
- isFullStackCert,
- username
- },
- projects
- ) => {
- let modernProjects = projects.filter(p => !p.superBlock.includes('legacy'));
- modernProjects.push(modernProjects.shift());
-
- return {
- allProjects: projects,
- legacyProjects: projects.filter(p => p.superBlock.includes('legacy')),
- modernProjects: modernProjects,
- userProjects: projects
- .map(block => buildUserProjectsMap(block, completedChallenges))
- .reduce((projects, current) => ({
- ...projects,
- ...current
- }), {}),
- blockNameIsCertMap: {
- 'Responsive Web Design Projects': isRespWebDesignCert,
- /* eslint-disable max-len */
- 'JavaScript Algorithms and Data Structures Projects': isJsAlgoDataStructCert,
- /* eslint-enable max-len */
- 'Front End Libraries Projects': isFrontEndLibsCert,
- 'Data Visualization Projects': is2018DataVisCert,
- 'APIs and Microservices Projects': isApisMicroservicesCert,
- 'Information Security and Quality Assurance Projects': isInfosecQaCert,
- 'Full Stack Certification': isFullStackCert,
- 'Legacy Front End Projects': isFrontEndCert,
- 'Legacy Back End Projects': isBackEndCert,
- 'Legacy Data Visualization Projects': isDataVisCert
- },
- username
- };
- }
-);
-
-function mapDispatchToProps(dispatch) {
- return bindActionCreators({
- claimCert,
- createError: createErrorObservable,
- hardGoTo,
- updateUserBackend
- }, dispatch);
-}
-
-const projectsTypes = PropTypes.arrayOf(
- PropTypes.shape({
- projectBlockName: PropTypes.string,
- challenges: PropTypes.arrayOf(
- PropTypes.shape({
- dashedName: PropTypes.string,
- id: PropTypes.string,
- title: PropTypes.string
- })
- )
- }),
-);
-
-const propTypes = {
- allProjects: projectsTypes,
- blockNameIsCertMap: PropTypes.objectOf(PropTypes.bool),
- claimCert: PropTypes.func.isRequired,
- createError: PropTypes.func.isRequired,
- hardGoTo: PropTypes.func.isRequired,
- legacyProjects: projectsTypes,
- modernProjects: projectsTypes,
- superBlock: PropTypes.string,
- updateUserBackend: PropTypes.func.isRequired,
- userProjects: PropTypes.objectOf(
- PropTypes.oneOfType(
- [
- // this is really messy, it should be addressed
- // in completedChallenges migration to unify to one type
- PropTypes.string,
- PropTypes.arrayOf(PropTypes.object),
- PropTypes.object
- ]
- )
- ),
- username: PropTypes.string
-};
-
-class CertificationSettings extends PureComponent {
- constructor(props) {
- super(props);
- this.buildProjectForms = this.buildProjectForms.bind(this);
- this.handleSubmit = this.handleSubmit.bind(this);
- }
-
- buildProjectForms({
- projectBlockName,
- challenges,
- superBlock
- }) {
- const {
- blockNameIsCertMap,
- claimCert,
- hardGoTo,
- userProjects,
- username
- } = this.props;
- const isCertClaimed = blockNameIsCertMap[projectBlockName];
- const challengeTitles = challenges
- .map(challenge => challenge.title || 'Unknown Challenge');
- if (superBlock === jsProjectSuperBlock) {
- return (
- @{ username }
- { name &&{ name }
} - { location &&{ location }
} - { about &&{ about }
} - { - typeof points === 'number' ? ( -- { `${points} ${pluralise('point', points !== 1)}` } -
- ) : null - } - { yearsTopContributor.filter(Boolean).length > 0 && - ( -
-
-
- )
- }
- -
-
- { joinArray(yearsTopContributor) } -
--
-
- );
- }
-
- return (
- - Once you've earned the following freeCodeCamp certifications, - you'll be able to claim The Full Stack Developer Certification: -
--
-
- Responsive Web Design -
- Algorithms and Data Structures -
- Front End Libraries -
- Data Visualization -
- APIs and Microservices -
- Information Security and Quality Assurance -
{ projectBlockName }
- {description} - - { - isCertClaimed ? - : - null - } --
-
- Certification Settings
-
-
-
- {
- modernProjects.map(this.buildProjectForms)
- }
-
- Legacy Certification Settings
-
- {
- legacyProjects.map(this.buildProjectForms)
- }
-
- );
- }
-}
-
-CertificationSettings.displayName = 'CertificationSettings';
-CertificationSettings.propTypes = propTypes;
-
-export default connect(
- mapStateToProps,
- mapDispatchToProps
-)(CertificationSettings);
diff --git a/api-server/common/app/routes/Settings/components/DangerZone.jsx b/api-server/common/app/routes/Settings/components/DangerZone.jsx
deleted file mode 100644
index f8f956b0c86..00000000000
--- a/api-server/common/app/routes/Settings/components/DangerZone.jsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Panel, Alert, Button } from 'react-bootstrap';
-import { connect } from 'react-redux';
-
-import { ButtonSpacer, FullWidthRow } from '../../../helperComponents';
-import ResetModal from './ResetModal.jsx';
-import DeleteModal from './DeleteModal.jsx';
-import { resetProgress, deleteAccount } from '../redux';
-
-const propTypes = {
- deleteAccount: PropTypes.func.isRequired,
- resetProgress: PropTypes.func.isRequired
-};
-
-const mapStateToProps = () => ({});
-const mapDispatchToProps = {
- deleteAccount,
- resetProgress
-};
-
-class DangerZone extends PureComponent {
- constructor(props) {
- super(props);
-
- this.state = {
- delete: false,
- reset: false
- };
-
- this.toggleDeleteModal = this.toggleDeleteModal.bind(this);
- this.toggleResetModal = this.toggleResetModal.bind(this);
- }
-
- toggleDeleteModal() {
- return this.setState(state => ({
- ...state,
- delete: !state.delete
- }));
- }
-
- toggleResetModal() {
- return this.setState(state => ({
- ...state,
- reset: !state.reset
- }));
- }
-
- render() {
- const { resetProgress, deleteAccount } = this.props;
- return (
- - Add links to the live demos of your projects as you finish them. - Then, once you have added all 5 projects required for a certification, - you can claim it. -
-
-
- Danger Zone}
- >
-
-
-
-
-
-
-
-
- );
- }
-}
-
-DangerZone.displayName = 'DangerZone';
-DangerZone.propTypes = propTypes;
-
-export default connect(mapStateToProps, mapDispatchToProps)(DangerZone);
diff --git a/api-server/common/app/routes/Settings/components/DeleteModal.jsx b/api-server/common/app/routes/Settings/components/DeleteModal.jsx
deleted file mode 100644
index 9b77378a75f..00000000000
--- a/api-server/common/app/routes/Settings/components/DeleteModal.jsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Modal, Button } from 'react-bootstrap';
-
-const propTypes = {
- delete: PropTypes.func.isRequired,
- onHide: PropTypes.func.isRequired,
- show: PropTypes.bool
-};
-
-function DeleteModal(props) {
- const { show, onHide } = props;
- return (
- - Please be careful! Changes in this section are permanent. -
-- This will really delete all your data, including all your progress - and account information. -
-- We won't be able to recover any of it for you later, - even if you change your mind. -
-- If there's something we could do better, send us an email instead and - we'll do our best: - - team@freecodecamp.org - -
-- - - -
-
-
-
-
-
- );
- }
- return (
- - You do not have an email associated with this account. -
-
-
- Email Settings
-
- {
- isEmailVerified ? null :
-
-
-
- Your email has not been verified.
- To use your email, you must
- verify it here first.
-
-
-
- }
-
-
-
-
-
- Send me Quincy's weekly email
-
-
- updateUserBackend({
- sendQuincyEmail: !sendQuincyEmail
- })
- }
- value={ sendQuincyEmail }
- />
-
-
-
-
- );
- }
-}
-
-EmailSettings.displayName = 'EmailSettings';
-EmailSettings.propTypes = propTypes;
-
-export default reduxForm(
- {
- form: 'email-settings',
- fields: [ 'email' ]
- },
- mapStateToProps,
- mapDispatchToProps
-)(EmailSettings);
diff --git a/api-server/common/app/routes/Settings/components/EmailForm.jsx b/api-server/common/app/routes/Settings/components/EmailForm.jsx
deleted file mode 100644
index 47515898596..00000000000
--- a/api-server/common/app/routes/Settings/components/EmailForm.jsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import React, { PureComponent} from 'react';
-import PropTypes from 'prop-types';
-import { reduxForm } from 'redux-form';
-import {
- Row,
- Col,
- ControlLabel,
- FormControl,
- HelpBlock,
- Alert
-} from 'react-bootstrap';
-import { updateUserBackend } from '../redux';
-import { FullWidthRow, Spacer } from '../../../helperComponents';
-import { BlockSaveButton, BlockSaveWrapper, validEmail } from '../formHelpers';
-
-const propTypes = {
- email: PropTypes.string,
- errors: PropTypes.object,
- fields: PropTypes.objectOf(
- PropTypes.shape({
- name: PropTypes.string.isRequired,
- onChange: PropTypes.func.isRequired,
- value: PropTypes.string.isRequired
- })
- ),
- handleSubmit: PropTypes.func.isRequired,
- updateUserBackend: PropTypes.func.isRequired
-};
-
-function mapStateToProps() {
- return {};
-}
-
-const mapDispatchtoProps = { updateUserBackend };
-
-function validator(values) {
- const errors = {};
- const { email = '', confirmEmail = '' } = values;
-
- errors.email = validEmail(email);
- if (errors.email || errors.confirmEmail) {
- return errors;
- }
- errors.confirmEmail = email.toLowerCase() === confirmEmail.toLowerCase() ?
- null :
- 'Emails should be the same';
-
- return errors;
-}
-
-class EmailForm extends PureComponent {
- constructor(props) {
- super(props);
-
- this.options = {
- required: [ 'confirmEmail', 'email' ],
- types: { confirmemail: 'email', email: 'email' }
- };
- this.handleSubmit = this.handleSubmit.bind(this);
- }
-
- handleSubmit(values) {
- const { updateUserBackend } = this.props;
- const update = {
- email: values.email
- };
- updateUserBackend(update);
- }
-
- render() {
-
- const {
- fields: { email, confirmEmail },
- handleSubmit
- } = this.props;
-
- const disableForm = (email.pristine && confirmEmail.pristine) ||
- (!!email.error || !!confirmEmail.error);
-
- return (
-
- );
- }
-}
-
-EmailForm.displayName = 'EmailForm';
-EmailForm.propTypes = propTypes;
-
-export default reduxForm(
- {
- form: 'email-form',
- fields: [ 'confirmEmail', 'email' ],
- validate: validator
- },
- mapStateToProps,
- mapDispatchtoProps
-)(EmailForm);
diff --git a/api-server/common/app/routes/Settings/components/Honesty.jsx b/api-server/common/app/routes/Settings/components/Honesty.jsx
deleted file mode 100644
index b846aec01a5..00000000000
--- a/api-server/common/app/routes/Settings/components/Honesty.jsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Button, Panel } from 'react-bootstrap';
-import { createSelector } from 'reselect';
-import { connect } from 'react-redux';
-
-import { FullWidthRow } from '../../../helperComponents';
-import SectionHeader from './SectionHeader.jsx';
-import { userSelector } from '../../../redux';
-import academicPolicy from '../../../../resource/academicPolicy';
-import { updateUserBackend } from '../redux';
-
-const propTypes = {
- isHonest: PropTypes.bool,
- policy: PropTypes.arrayOf(PropTypes.string),
- updateUserBackend: PropTypes.func.isRequired
-};
-
-const mapStateToProps = createSelector(
- userSelector,
- ({ isHonest }) => ({
- policy: academicPolicy,
- isHonest
- })
-);
-
-const mapDispatchToProps = { updateUserBackend };
-
-class Honesty extends PureComponent {
- constructor(props) {
- super(props);
- this.state = {
- showHonesty: false
- };
-
- this.handleAgreeClick = this.handleAgreeClick.bind(this);
- }
-
- handleAgreeClick() {
- this.props.updateUserBackend({ isHonest: true });
- }
-
- render() {
- const { policy, isHonest } = this.props;
- const isHonestAgreed = (
- - You have accepted our Academic Honesty Policy. -
-
-
- Academic Honesty Policy
-
-
-
- {
- policy.map(
- (line, i) => (
-
- )
- )
- }
-
- { - isHonest ? - isHonestAgreed : - agreeButton - } -
-
-
- );
- }
-}
-
-
-Honesty.displayName = 'Honesty';
-Honesty.propTypes = propTypes;
-
-export default connect(mapStateToProps, mapDispatchToProps)(Honesty);
diff --git a/api-server/common/app/routes/Settings/components/Internet-Settings.jsx b/api-server/common/app/routes/Settings/components/Internet-Settings.jsx
deleted file mode 100644
index 8c090c7e559..00000000000
--- a/api-server/common/app/routes/Settings/components/Internet-Settings.jsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { createSelector } from 'reselect';
-import { bindActionCreators } from 'redux';
-import { reduxForm } from 'redux-form';
-
-import { FullWidthRow, Spacer } from '../../../helperComponents';
-import { BlockSaveButton, BlockSaveWrapper, FormFields } from '../formHelpers';
-import SectionHeader from './SectionHeader.jsx';
-import { userSelector } from '../../../redux';
-import { updateUserBackend } from '../redux';
-
-const mapStateToProps = createSelector(
- userSelector,
- ({
- githubProfile = '',
- linkedin = '',
- twitter = '',
- website = ''
- }) => ({
- initialValues: {
- githubProfile,
- linkedin,
- twitter,
- personalWebsite: website
- }
- })
-);
-
-const formFields = [
- 'githubProfile',
- 'linkedin',
- 'twitter',
- 'personalWebsite'
-];
-
-function mapDispatchToProps(dispatch) {
- return bindActionCreators({
- updateUserBackend
- }, dispatch);
-}
-
-const propTypes = {
- fields: PropTypes.object,
- githubProfile: PropTypes.string,
- handleSubmit: PropTypes.func.isRequired,
- linkedin: PropTypes.string,
- personalWebsite: PropTypes.string,
- twitter: PropTypes.string,
- updateUserBackend: PropTypes.func.isRequired,
- username: PropTypes.string
-};
-
-class InternetSettings extends PureComponent {
- constructor(props) {
- super(props);
-
- this.handleSubmit = this.handleSubmit.bind(this);
- }
-
- handleSubmit({personalWebsite, ...others}) {
- this.props.updateUserBackend({ ...others, website: personalWebsite });
- }
-
- render() {
- const {
- fields,
- fields: { _meta: { allPristine } },
- handleSubmit
- } = this.props;
- const options = {
- types: formFields.reduce(
- (all, current) => ({ ...all, [current]: 'url' }),
- {}
- ),
- placeholder: false
- };
- return (
- - { - isHonest ? - isHonestAgreed : - agreeButton - } -
-
- Your Internet Presence
-
-
-
-
-
- );
- }
-}
-
-InternetSettings.displayName = 'InternetSettings';
-InternetSettings.propTypes = propTypes;
-
-export default reduxForm(
- {
- form: 'internet-settings',
- fields: formFields
- },
- mapStateToProps,
- mapDispatchToProps
-)(InternetSettings);
diff --git a/api-server/common/app/routes/Settings/components/JSAlgoAndDSForm.jsx b/api-server/common/app/routes/Settings/components/JSAlgoAndDSForm.jsx
deleted file mode 100644
index 3a5c14d9074..00000000000
--- a/api-server/common/app/routes/Settings/components/JSAlgoAndDSForm.jsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import React, { PureComponent } from 'react';
-import { kebabCase, defaultTo } from 'lodash';
-import PropTypes from 'prop-types';
-import { Button } from 'react-bootstrap';
-
-import { FullWidthRow } from '../../../helperComponents';
-import { BlockSaveButton } from '../formHelpers';
-import { Link } from '../../../Router';
-import SolutionViewer from './SolutionViewer.jsx';
-
-const jsFormPropTypes = {
- challenges: PropTypes.arrayOf(PropTypes.string),
- claimCert: PropTypes.func.isRequired,
- hardGoTo: PropTypes.func.isRequired,
- isCertClaimed: PropTypes.bool,
- jsProjects: PropTypes.objectOf(
- PropTypes.oneOfType([
- PropTypes.arrayOf(PropTypes.object),
- PropTypes.string
- ])
- ),
- projectBlockName: PropTypes.string,
- superBlock: PropTypes.string,
- username: PropTypes.string
-};
-
-const jsProjectPath = '/challenges/javascript-algorithms-and-data-structures-' +
- 'projects/';
-
-class JSAlgoAndDSForm extends PureComponent {
- constructor(props) {
- super(props);
-
- this.state = {};
- this.handleSolutionToggle = this.handleSolutionToggle.bind(this);
- this.handleSubmit = this.handleSubmit.bind(this);
- }
-
- handleSolutionToggle(e) {
- e.persist();
- return this.setState(state => ({
- ...state,
- [e.target.id]: !state[e.target.id]
- }));
- }
-
- handleSubmit(e) {
- e.preventDefault();
- const { username, superBlock, isCertClaimed } = this.props;
- if (isCertClaimed) {
- return this.props.hardGoTo(`/certification/${username}/${superBlock}`);
- }
- return this.props.claimCert(superBlock);
- }
-
- render() {
- const {
- projectBlockName,
- challenges = [],
- jsProjects = {},
- isCertClaimed
- } = this.props;
- const completeCount = Object.values(jsProjects)
- .map(val => defaultTo(val, {}))
- .filter(challengeInfo => Object.keys(challengeInfo).length !== 0)
- .length;
-
- return (
- { projectBlockName }
-- To complete this certification, you must first complete the - JavaScript Algorithms and Data Structures project challenges -
--
- {
- challenges.map(challenge => (
-
-
-
{ challenge }
- { - Object.keys(jsProjects[challenge] || {}).length ? -- -: - - - - } -
- {
- this.state[challenge] ?
-
-
- ))
- }
- -
-
-
-
- } -
-
- );
- }
-
- render() {
- const { portfolio = [] } = this.props;
- return (
- - } -
-
- - Share your non-FreeCodeCamp projects, articles or accepted - pull requests. -
-
- Privacy Settings
-
-
-
-
-
- );
-}
-
-PrivacySettings.displayName = 'PrivacySettings';
-PrivacySettings.propTypes = propTypes;
-
-export default connect(mapStateToProps, mapDispatchToProps)(PrivacySettings);
diff --git a/api-server/common/app/routes/Settings/components/ResetModal.jsx b/api-server/common/app/routes/Settings/components/ResetModal.jsx
deleted file mode 100644
index a4c0ffbd290..00000000000
--- a/api-server/common/app/routes/Settings/components/ResetModal.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Modal, Button } from 'react-bootstrap';
-
-const propTypes = {
- onHide: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- show: PropTypes.bool
-};
-
-function ResetModal(props) {
- const { show, onHide } = props;
- return (
- - The settings in this section enable you to control what is shown on{' '} - your freeCodeCamp public portfolio. -
-There is also a button to see what data we hold on your account
-- This will really delete all of your progress, points, completed - challenges, our records of your projects, any certifications you have, - everything. -
-- We won't be able to recover any of it for you later, even if you - change your mind. -
-- - - -
{ children }
--
-
-
-
-
-
-
-
- {
- solutions
- }
-
- );
-}
-
-SolutionViewer.displayName = 'SolutionViewer';
-SolutionViewer.propTypes = {
- files: PropTypes.oneOfType([
- PropTypes.arrayOf(PropTypes.objectOf(PropTypes.string)),
- PropTypes.string
- ])
-};
-
-export default SolutionViewer;
diff --git a/api-server/common/app/routes/Settings/components/ThemeSettings.jsx b/api-server/common/app/routes/Settings/components/ThemeSettings.jsx
deleted file mode 100644
index 314350562bb..00000000000
--- a/api-server/common/app/routes/Settings/components/ThemeSettings.jsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import {
- Row,
- Col,
- ControlLabel
-} from 'react-bootstrap';
-
-import TB from '../Toggle-Button';
-
-const propTypes = {
- currentTheme: PropTypes.string.isRequired,
- toggleNightMode: PropTypes.func.isRequired
-};
-
-export default function ThemeSettings({ currentTheme, toggleNightMode }) {
- return (
- - Night Mode -
-
-
- { action }
-
-
- {
- explain ? {explain} : null
- }
-
- {
- !pristine && renderAlerts(validating, error, isValidUsername)
- }
-
-
-
-
- );
-}
-
-UsernameSettings.displayName = 'UsernameSettings';
-UsernameSettings.propTypes = propTypes;
-
-export default reduxForm(
- {
- form: 'usernameSettings',
- fields: [ 'username' ]
- },
- mapStateToProps,
- mapDispatchToProps
-)(UsernameSettings);
diff --git a/api-server/common/app/routes/Settings/formHelpers/BlockSaveButton.jsx b/api-server/common/app/routes/Settings/formHelpers/BlockSaveButton.jsx
deleted file mode 100644
index c551c87de52..00000000000
--- a/api-server/common/app/routes/Settings/formHelpers/BlockSaveButton.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Button } from 'react-bootstrap';
-
-function BlockSaveButton(props) {
- return (
-
- );
-}
-
-BlockSaveButton.displayName = 'BlockSaveButton';
-BlockSaveButton.propTypes = {
- children: PropTypes.any
-};
-
-export default BlockSaveButton;
diff --git a/api-server/common/app/routes/Settings/formHelpers/BlockSaveWrapper.jsx b/api-server/common/app/routes/Settings/formHelpers/BlockSaveWrapper.jsx
deleted file mode 100644
index d560793e64d..00000000000
--- a/api-server/common/app/routes/Settings/formHelpers/BlockSaveWrapper.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const propTypes = {
- children: PropTypes.node
-};
-
-const style = {
- padding: '0 15px'
-};
-
-function BlockSaveWrapper({ children }) {
- return (
-
- { children }
-
- );
-}
-
-BlockSaveWrapper.displayName = 'BlockSaveWrapper';
-BlockSaveWrapper.propTypes = propTypes;
-
-export default BlockSaveWrapper;
diff --git a/api-server/common/app/routes/Settings/formHelpers/Form.jsx b/api-server/common/app/routes/Settings/formHelpers/Form.jsx
deleted file mode 100644
index c41b47325ab..00000000000
--- a/api-server/common/app/routes/Settings/formHelpers/Form.jsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { reduxForm } from 'redux-form';
-
-import { FormFields, BlockSaveButton } from './';
-
-const propTypes = {
- buttonText: PropTypes.string,
- enableSubmit: PropTypes.bool,
- errors: PropTypes.object,
- fields: PropTypes.objectOf(
- PropTypes.shape({
- name: PropTypes.string.isRequired,
- onChange: PropTypes.func.isRequired,
- value: PropTypes.string.isRequired
- })
- ),
- formFields: PropTypes.arrayOf(PropTypes.string).isRequired,
- handleSubmit: PropTypes.func,
- hideButton: PropTypes.bool,
- id: PropTypes.string.isRequired,
- initialValues: PropTypes.object,
- options: PropTypes.shape({
- ignored: PropTypes.arrayOf(PropTypes.string),
- required: PropTypes.arrayOf(PropTypes.string),
- types: PropTypes.objectOf(PropTypes.string)
- }),
- submit: PropTypes.func.isRequired
-};
-
-function DynamicForm({
- // redux-form
- errors,
- fields,
- handleSubmit,
- fields: { _meta: { allPristine }},
-
- // HOC
- buttonText,
- enableSubmit,
- hideButton,
- id,
- options,
- submit
-}) {
- return (
-
- );
-}
-
-DynamicForm.displayName = 'DynamicForm';
-DynamicForm.propTypes = propTypes;
-
-const DynamicFormWithRedux = reduxForm()(DynamicForm);
-
-export default function Form(props) {
- return (
-
- {
- Object.keys(fields)
- .filter(field => !ignored.includes(field))
- .map(key => fields[key])
- .map(({ name, onChange, value, pristine }) => {
- const key = formId ?
- `${formId}_${_.kebabCase(name)}` :
- _.kebabCase(name);
- const type = name in types ? types[name] : 'text';
- return (
-
-
- { _.startCase(name) }
-
- }
-
-
-
- { errors[name] }
-
- :
- null
- }
-
-
- );
- })
- }
-
- );
-}
-
-FormFields.displayName = 'FormFields';
-FormFields.propTypes = propTypes;
-
-export default FormFields;
diff --git a/api-server/common/app/routes/Settings/formHelpers/index.js b/api-server/common/app/routes/Settings/formHelpers/index.js
deleted file mode 100644
index 29360ee1c60..00000000000
--- a/api-server/common/app/routes/Settings/formHelpers/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { isEmail, isURL } from 'validator';
-
-/** Components **/
-
-export { default as BlockSaveButton } from './BlockSaveButton.jsx';
-export { default as BlockSaveWrapper } from './BlockSaveWrapper.jsx';
-export { default as Form } from './Form.jsx';
-export { default as FormFields } from './FormFields.jsx';
-
-/** Normalise **/
-
-export function lowerAndTrim(str = '') {
- return str.toLowerCase().trim();
-}
-
-/** Validation **/
-
-export function maxLength(max) {
- return value => value && value.length > max ?
- `Must be ${max} characters or less` :
- null;
-}
-
-export function minLength(min) {
- return value => value && value.length < min ?
- `Must be ${min} characters or more` :
- null;
-}
-export function validEmail(email) {
- return isEmail(email) ? null : 'Must be a valid email';
-}
-
-export function validURL(str) {
- return isURL(str) ? null : 'Must be a valid URL';
-}
diff --git a/api-server/common/app/routes/Settings/index.js b/api-server/common/app/routes/Settings/index.js
deleted file mode 100644
index 9ced24862fe..00000000000
--- a/api-server/common/app/routes/Settings/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { types } from './redux';
-
-export { default } from './ShowSettings.jsx';
-
-export const routes = {
- [types.onRouteSettings]: '/settings',
- [types.onRouteUpdateEmail]: '/settings/update-email'
-};
diff --git a/api-server/common/app/routes/Settings/index.less b/api-server/common/app/routes/Settings/index.less
deleted file mode 100644
index 80c7de4d1f3..00000000000
--- a/api-server/common/app/routes/Settings/index.less
+++ /dev/null
@@ -1,2 +0,0 @@
-&{ @import "./settings.less"; }
-&{ @import "./Toggle-Button/toggle.less"; }
diff --git a/api-server/common/app/routes/Settings/ns.json b/api-server/common/app/routes/Settings/ns.json
deleted file mode 100644
index 1beea17991d..00000000000
--- a/api-server/common/app/routes/Settings/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"settings"
diff --git a/api-server/common/app/routes/Settings/redux/certificate-epic.js b/api-server/common/app/routes/Settings/redux/certificate-epic.js
deleted file mode 100644
index afa1725a3c7..00000000000
--- a/api-server/common/app/routes/Settings/redux/certificate-epic.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Observable } from 'rx';
-import { ofType } from 'redux-epic';
-
-import { doActionOnError, fetchUser } from '../../../redux';
-import { makeToast } from '../../../Toasts/redux';
-import { postJSON$ } from '../../../../utils/ajax-stream';
-import {
- types,
- claimCertComplete,
- claimCertError
-} from '../redux';
-
-function certificateEpic(actions$, { getState }) {
- const start = actions$::ofType(types.claimCert.start)
- .flatMap(({ payload: superBlock }) => {
- const {
- app: { csrfToken: _csrf }
- } = getState();
- return postJSON$('/certificate/verify', { _csrf, superBlock });
- })
- .map(claimCertComplete)
- .catch(doActionOnError(error => claimCertError(error)));
-
- const complete = actions$::ofType(types.claimCert.complete)
- .flatMap(({ meta: { message, success }}) => Observable.if(
- () => success,
- Observable.of(fetchUser(), makeToast({ message })),
- Observable.of(makeToast({ message }))
- ));
-
- const error = actions$::ofType(types.claimCert.error)
- .flatMap(error => {
- return Observable.of(
- makeToast({ message: 'Something went wrong updating your account' }),
- { type: 'error', error}
- );
- });
-
- return Observable.merge(start, complete, error);
-}
-
-export default certificateEpic;
diff --git a/api-server/common/app/routes/Settings/redux/danger-zone-epic.js b/api-server/common/app/routes/Settings/redux/danger-zone-epic.js
deleted file mode 100644
index 0d5a0c81380..00000000000
--- a/api-server/common/app/routes/Settings/redux/danger-zone-epic.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Observable } from 'rx';
-import { ofType } from 'redux-epic';
-
-import {
- types,
- resetProgressError,
- deleteAccountError,
- deleteAccountComplete
-} from './';
-import { postJSON$ } from '../../../../utils/ajax-stream';
-import {
- doActionOnError,
- hardGoTo,
- createErrorObservable
-} from '../../../redux';
-
-function dangerZoneEpic(actions$, { getState }) {
- /** Reset Progress **/
- const resetStart = actions$::ofType(types.resetProgress.start)
- .flatMap(() => {
- const { csrfToken: _csrf } = getState().app;
- return postJSON$('/account/reset-progress', { _csrf })
- .map(() => hardGoTo('/'))
- .catch(doActionOnError(error => resetProgressError(error)));
- });
- const resetError = actions$::ofType(types.resetProgress.error)
- .flatMap(createErrorObservable);
-
- /** Delete Account **/
- const deleteStart = actions$::ofType(types.deleteAccount.start)
- .flatMap(() => {
- const { csrfToken: _csrf } = getState().app;
- return postJSON$('/account/delete', { _csrf })
- .map(deleteAccountComplete)
- .catch(doActionOnError(error => deleteAccountError(error)));
- });
-
- const deleteComplete = actions$::ofType(types.deleteAccount.complete)
- .map(() => hardGoTo('/'));
-
- const deleteError = actions$::ofType(types.deleteAccount.error)
- .flatMap(createErrorObservable);
-
- return Observable.merge(
- resetStart,
- resetError,
- deleteStart,
- deleteComplete,
- deleteError
- ).filter(Boolean);
-}
-
-export default dangerZoneEpic;
diff --git a/api-server/common/app/routes/Settings/redux/index.js b/api-server/common/app/routes/Settings/redux/index.js
deleted file mode 100644
index b9b13f7b992..00000000000
--- a/api-server/common/app/routes/Settings/redux/index.js
+++ /dev/null
@@ -1,175 +0,0 @@
-import { isLocationAction } from 'redux-first-router';
-import {
- composeReducers,
- createAction,
- createAsyncTypes,
- createTypes,
- handleActions
-} from 'berkeleys-redux-utils';
-import { identity } from 'lodash';
-
-import certificateEpic from './certificate-epic';
-import dangerZoneEpic from './danger-zone-epic';
-import userUpdateEpic from './update-user-epic';
-import newUsernameEpic from './new-username-epic';
-import ns from '../ns.json';
-import { utils } from '../../../Flash/redux';
-
-export const epics = [
- certificateEpic,
- dangerZoneEpic,
- newUsernameEpic,
- userUpdateEpic
-];
-
-const createActionWithFlash = type => createAction(
- type,
- null,
- utils.createFlashMetaAction
-);
-
-export const types = createTypes([
- createAsyncTypes('claimCert'),
- createAsyncTypes('updateMyEmail'),
- createAsyncTypes('updateUserBackend'),
- createAsyncTypes('deletePortfolio'),
- createAsyncTypes('updateMyPortfolio'),
- createAsyncTypes('updateMyProfileUI'),
- 'updateNewUsernameValidity',
- createAsyncTypes('validateUsername'),
- createAsyncTypes('refetchCompletedChallenges'),
- createAsyncTypes('deleteAccount'),
- createAsyncTypes('resetProgress'),
-
- 'onRouteSettings',
- 'onRouteUpdateEmail'
-], 'settings');
-
-
-export const onRouteSettings = createAction(types.onRouteSettings);
-export const onRouteUpdateEmail = createAction(types.onRouteUpdateEmail);
-
-export const claimCert = createAction(types.claimCert.start);
-export const claimCertComplete = createAction(
- types.claimCert.complete,
- ({ result }) => result,
- identity
-);
-export const claimCertError = createAction(
- types.claimCert.error,
- identity
-);
-
-export const updateUserBackend = createAction(types.updateUserBackend.start);
-export const updateUserBackendComplete = createActionWithFlash(
- types.updateUserBackend.complete
-);
-export const updateUserBackendError = createActionWithFlash(
- types.updateUserBackend.error
-);
-
-export const updateMyEmail = createAction(types.updateMyEmail.start);
-export const updateMyEmailComplete = createActionWithFlash(
- types.updateMyEmail.complete
-);
-export const updateMyEmailError = createActionWithFlash(
- types.updateMyEmail.error
-);
-
-export const updateMyPortfolio = createAction(types.updateMyPortfolio.start);
-export const updateMyPortfolioComplete = createAction(
- types.updateMyPortfolio.complete
-);
-export const updateMyPortfolioError = createAction(
- types.updateMyPortfolio.error
-);
-export const deletePortfolio = createAction(types.deletePortfolio.start);
-export const deletePortfolioError = createAction(types.deletePortfolio.error);
-
-export const updateMyProfileUI = createAction(types.updateMyProfileUI.start);
-export const updateMyProfileUIComplete = createAction(
- types.updateMyProfileUI.complete
-);
-export const updateMyProfileUIError = createAction(
- types.updateMyProfileUI.error
-);
-
-export const resetProgress = createAction(types.resetProgress.start);
-export const resetProgressComplete = createAction(types.resetProgress.complete);
-export const resetProgressError = createAction(
- types.resetProgress.error,
- identity
-);
-
-export const deleteAccount = createAction(types.deleteAccount.start);
-export const deleteAccountComplete = createAction(types.deleteAccount.complete);
-export const deleteAccountError = createAction(
- types.deleteAccount.error,
- identity
-);
-
-export const updateNewUsernameValidity = createAction(
- types.updateNewUsernameValidity
-);
-
-export const refetchCompletedChallenges = createAction(
- types.refetchCompletedChallenges.start
-);
-
-export const validateUsername = createAction(types.validateUsername.start);
-export const validateUsernameError = createAction(
- types.validateUsername.error,
- identity
-);
-
-const defaultState = {
- showUpdateEmailView: false,
- isValidUsername: false,
- validating: false
-};
-
-const getNS = state => state[ns];
-
-export function settingsSelector(state) {
- return getNS(state);
-}
-
-export const showUpdateEmailViewSelector =
- state => getNS(state).showUpdateEmailView;
-
-export default composeReducers(
- ns,
- function settingsRouteReducer(state = defaultState, action) {
- if (isLocationAction(action)) {
- const { type } = action;
- if (type === types.onRouteUpdateEmail) {
- return {
- ...state,
- showUpdateEmailView: true
- };
- }
- if (state.showUpdateEmailView) {
- return {
- ...state,
- showUpdateEmailView: false
- };
- }
- }
- return state;
- },
- handleActions(() => ({
- [types.updateNewUsernameValidity]: (state, { payload }) => ({
- ...state,
- isValidUsername: payload,
- validating: false
- }),
- [types.validateUsername.start]: state => ({
- ...state,
- isValidUsername: false,
- validating: true
- }),
- [types.validateUsername.error]: state => ({ ...state, validating: false })
- }),
- defaultState
-)
-);
diff --git a/api-server/common/app/routes/Settings/redux/new-username-epic.js b/api-server/common/app/routes/Settings/redux/new-username-epic.js
deleted file mode 100644
index b6a70557118..00000000000
--- a/api-server/common/app/routes/Settings/redux/new-username-epic.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Observable } from 'rx';
-import { ofType } from 'redux-epic';
-
-import {
- types,
- updateNewUsernameValidity,
- validateUsernameError
-} from './';
-import { getJSON$ } from '../../../../utils/ajax-stream';
-import {
- doActionOnError,
- createErrorObservable
-} from '../../../redux';
-
-function validateUsernameEpic(actions$) {
- const start = actions$::ofType(types.validateUsername.start)
- .debounce(500)
- .flatMap(({ payload }) =>
- getJSON$(`/api/users/exists?username=${payload}`)
- .map(({ exists }) => updateNewUsernameValidity(!exists))
- .catch(error => doActionOnError(() => validateUsernameError(error)))
- );
-
- const error = actions$::ofType(types.validateUsername.error)
- .flatMap(createErrorObservable);
-
- return Observable.merge(start, error);
-}
-
-export default validateUsernameEpic;
diff --git a/api-server/common/app/routes/Settings/redux/update-user-epic.js b/api-server/common/app/routes/Settings/redux/update-user-epic.js
deleted file mode 100644
index a148871f151..00000000000
--- a/api-server/common/app/routes/Settings/redux/update-user-epic.js
+++ /dev/null
@@ -1,230 +0,0 @@
-import { Observable } from 'rx';
-import { combineEpics, ofType } from 'redux-epic';
-import { pick } from 'lodash';
-import {
- types,
- refetchCompletedChallenges,
- updateUserBackendComplete,
- updateMyPortfolioComplete,
- updateMyProfileUIComplete
-} from './';
-import { makeToast } from '../../../Toasts/redux';
-import {
- doActionOnError,
- usernameSelector,
- userSelector,
- createErrorObservable
-} from '../../../redux';
-import {
- updateUserEmail,
- updateMultipleUserFlags,
- regresPortfolio,
- optoUpdatePortfolio,
- updateLocalProfileUI
-} from '../../../entities';
-
-import { postJSON$ } from '../../../../utils/ajax-stream';
-
-const endpoints = {
- email: '/update-my-email',
- projects: '/update-my-projects',
- username: '/update-my-username'
-};
-
-function backendUserUpdateEpic(actions$, { getState }) {
- const start = actions$::ofType(types.updateUserBackend.start);
- const server = start
- .flatMap(({ payload }) => {
- const userMap = userSelector(getState());
- const { username } = userMap;
- const flagsToCheck = Object.keys(payload);
- const valuesToCheck = pick(userMap, flagsToCheck);
- const oldValues = {
- ...flagsToCheck.reduce((accu, current) => ({ ...accu, [current]: '' })),
- ...valuesToCheck
- };
- const valuesToUpdate = flagsToCheck.reduce((accu, current) => {
- if (payload[current] !== valuesToCheck[current]) {
- return { ...accu, [current]: payload[current] };
- }
- return accu;
- }, {});
- if (!Object.keys(valuesToUpdate).length) {
- return Observable.of(
- makeToast({ message: 'No changes in settings detected' })
- );
- }
- const {
- app: { csrfToken: _csrf }
- } = getState();
- let body = { _csrf };
- let endpoint = '/update-flags';
- const updateKeys = Object.keys(valuesToUpdate);
- if (updateKeys.length === 1 && updateKeys[0] in endpoints) {
- // there is a specific route for this update
- const flag = updateKeys[0];
- endpoint = endpoints[flag];
- body = {
- ...body,
- [flag]: valuesToUpdate[flag]
- };
- } else {
- body = {
- ...body,
- values: valuesToUpdate
- };
- }
- return postJSON$(endpoint, body)
- .map(updateUserBackendComplete)
- .catch(
- doActionOnError(
- () => updateMultipleUserFlags({ username, flags: oldValues })
- )
- );
- });
- const optimistic = start
- .flatMap(({ payload }) => {
- const username = usernameSelector(getState());
- return Observable.of(
- updateMultipleUserFlags({ username, flags: payload })
- );
- });
- const complete = actions$::ofType(types.updateUserBackend.complete)
- .flatMap(({ payload: { message } }) => Observable.if(
- () => message.includes('project'),
- Observable.of(refetchCompletedChallenges(), makeToast({ message })),
- Observable.of(makeToast({ message }))
- )
- );
-
- return Observable.merge(server, optimistic, complete);
-}
-
-function refetchCompletedChallengesEpic(actions$, { getState }) {
- return actions$::ofType(types.refetchCompletedChallenges.start)
- .flatMap(() => {
- const {
- app: { csrfToken: _csrf }
- } = getState();
- const username = usernameSelector(getState());
- return postJSON$('/refetch-user-completed-challenges', { _csrf })
- .map(({ completedChallenges }) =>
- updateMultipleUserFlags({ username, flags: { completedChallenges } })
- )
- .catch(createErrorObservable);
- });
-}
-
-function updateMyPortfolioEpic(actions$, { getState }) {
- const edit = actions$::ofType(types.updateMyPortfolio.start);
- const remove = actions$::ofType(types.deletePortfolio.start);
- const serverEdit = edit
- .flatMap(({ payload }) => {
- const { id } = payload;
- const {
- app: { csrfToken: _csrf, username }
- } = getState();
- return postJSON$('/update-my-portfolio', { _csrf, portfolio: payload })
- .map(updateMyPortfolioComplete)
- .catch(doActionOnError(() => regresPortfolio({ username, id })));
- });
- const optimisticEdit = edit
- .map(({ payload }) => {
- const username = usernameSelector(getState());
- return optoUpdatePortfolio({ username, portfolio: payload });
- });
- const complete = actions$::ofType(types.updateMyPortfolio.complete)
- .flatMap(({ payload: { message } }) =>
- Observable.of(makeToast({ message }))
- );
-
- const serverRemove = remove
- .flatMap(({ payload: { portfolio } }) => {
- const {
- app: { csrfToken: _csrf }
- } = getState();
- return postJSON$('/update-my-portfolio', { _csrf, portfolio })
- .map(updateMyPortfolioComplete)
- .catch(
- doActionOnError(
- () => makeToast({
- message: 'Something went wrong removing a portfolio item.'
- })
- )
- );
- });
- const optimisticRemove = remove
- .flatMap(({ payload: { portfolio: { id } } }) => {
- const username = usernameSelector(getState());
- return Observable.of(regresPortfolio({ username, id }));
- });
-
- return Observable.merge(
- serverEdit,
- optimisticEdit,
- complete,
- serverRemove,
- optimisticRemove
- );
-}
-
-function updateUserEmailEpic(actions, { getState }) {
- return actions::ofType(types.updateMyEmail)
- .flatMap(({ payload: email }) => {
- const {
- app: { user: username, csrfToken: _csrf },
- entities: { user: userMap }
- } = getState();
- const { email: oldEmail } = userMap[username] || {};
- const body = { _csrf, email };
- const optimisticUpdate = Observable.just(
- updateUserEmail(username, email)
- );
- const ajaxUpdate = postJSON$('/update-my-email', body)
- .catch(doActionOnError(() => oldEmail ?
- updateUserEmail(username, oldEmail) :
- null
- ))
- .filter(Boolean);
- return Observable.merge(optimisticUpdate, ajaxUpdate);
- });
-}
-
-function updateMyProfileUIEpic(action$, { getState }) {
- const toggle = action$::ofType(types.updateMyProfileUI.start);
-
- const server = toggle.flatMap(({payload: { profileUI }}) => {
- const state = getState();
- const { csrfToken: _csrf } = state.app;
- const username = usernameSelector(state);
- const oldUI = { ...userSelector(state).profileUI };
- return postJSON$('/update-my-profile-ui', { _csrf, profileUI })
- .map(updateMyProfileUIComplete)
- .catch(
- doActionOnError(
- () => Observable.of(
- makeToast({
- message:
- 'Something went wrong saving your privacy settings, ' +
- 'please try again.'
- }),
- updateLocalProfileUI({username, profileUI: oldUI })
- )
- )
- );
- });
- const optimistic = toggle.flatMap(({payload: { profileUI }}) => {
- const username = usernameSelector(getState());
- return Observable.of(updateLocalProfileUI({username, profileUI}));
- });
-
- return Observable.merge(server, optimistic);
-}
-
-export default combineEpics(
- backendUserUpdateEpic,
- refetchCompletedChallengesEpic,
- updateMyPortfolioEpic,
- updateUserEmailEpic,
- updateMyProfileUIEpic
-);
diff --git a/api-server/common/app/routes/Settings/routes/update-email/Update-Email.jsx b/api-server/common/app/routes/Settings/routes/update-email/Update-Email.jsx
deleted file mode 100644
index d2412447220..00000000000
--- a/api-server/common/app/routes/Settings/routes/update-email/Update-Email.jsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import {
- Button,
- Col,
- FormControl,
- FormGroup,
- HelpBlock,
- Row
-} from 'react-bootstrap';
-import { reduxForm } from 'redux-form';
-import { isEmail } from 'validator';
-
-import { Link } from '../../../../Router';
-import { getValidationState, DOMOnlyProps } from '../../../../utils/form';
-import {
- onRouteSettings,
- updateMyEmail
-} from '../../redux';
-
-const actions = {
- updateMyEmail
-};
-const fields = [
- 'email',
- 'duplicate'
-];
-const validateFields = ({ email, duplicate }) => {
- const errors = {};
-
- if (!isEmail('' + email)) {
- errors.email = 'This email is invalid.';
- }
-
- if (duplicate && email !== duplicate) {
- errors.duplicate = 'This email does not match the one above.';
- }
-
- return errors;
-};
-
-const mapStateToProps = state => {
- const {
- app: { user: username },
- entities: { user: userMap }
- } = state;
- const { email, emailVerified } = userMap[username] || {};
-
- return {
- initialValues: { email },
- isEmailThere: !!email,
- isVerified: !!emailVerified
- };
-};
-
-const propTypes = {
- fields: PropTypes.object.isRequired,
- handleSubmit: PropTypes.func.isRequired,
- isEmailThere: PropTypes.bool,
- isVerified: PropTypes.bool,
- submitting: PropTypes.bool,
- updateMyEmail: PropTypes.func.isRequired
-};
-
-export class UpdateEmail extends React.Component {
- constructor(...props) {
- super(...props);
- this.handleSubmit = this.handleSubmit.bind(this);
- }
-
- handleSubmit(e) {
- e.preventDefault();
- this.props.handleSubmit(({ email }) => this.props.updateMyEmail(email))(e);
- }
-
- render() {
- const {
- isEmailThere,
- isVerified,
- fields: { email, duplicate },
- submitting
- } = this.props;
- const buttonCopy = !isEmailThere || isVerified ?
- 'Update my Email' :
- 'Verify Email';
- return (
-