* 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
170 lines
3.6 KiB
JavaScript
170 lines
3.6 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { reduxForm } from 'redux-form';
|
|
import {
|
|
Button,
|
|
FormGroup,
|
|
FormControl
|
|
} from 'react-bootstrap';
|
|
|
|
import { showProjectSubmit } from './redux';
|
|
import SolutionInput from '../../Solution-Input.jsx';
|
|
import { submitChallenge } from '../../redux';
|
|
import {
|
|
isValidURL,
|
|
makeRequired,
|
|
createFormValidator,
|
|
getValidationState
|
|
} from '../../../../utils/form';
|
|
|
|
const propTypes = {
|
|
fields: PropTypes.object,
|
|
handleSubmit: PropTypes.func,
|
|
isSignedIn: PropTypes.bool,
|
|
isSubmitting: PropTypes.bool,
|
|
resetForm: PropTypes.func,
|
|
showProjectSubmit: PropTypes.func,
|
|
submitChallenge: PropTypes.func
|
|
};
|
|
|
|
const bindableActions = {
|
|
submitChallenge,
|
|
showProjectSubmit
|
|
};
|
|
const frontEndFields = [ 'solution' ];
|
|
const backEndFields = [
|
|
'solution',
|
|
'githubLink'
|
|
];
|
|
|
|
const fieldValidators = {
|
|
solution: makeRequired(isValidURL)
|
|
};
|
|
|
|
const backEndFieldValidators = {
|
|
...fieldValidators,
|
|
githubLink: makeRequired(isValidURL)
|
|
};
|
|
|
|
export function _FrontEndForm({
|
|
fields,
|
|
handleSubmit,
|
|
submitChallenge,
|
|
resetForm,
|
|
isSubmitting,
|
|
showProjectSubmit
|
|
}) {
|
|
const buttonCopy = isSubmitting ?
|
|
'Submit and go to my next challenge' :
|
|
"I've completed this challenge";
|
|
return (
|
|
<form
|
|
name='NewFrontEndProject'
|
|
onSubmit={
|
|
handleSubmit((value) => {
|
|
submitChallenge(value);
|
|
resetForm('NewFrontEndProject');
|
|
})
|
|
}
|
|
>
|
|
{
|
|
isSubmitting ?
|
|
<SolutionInput
|
|
placeholder='https://codepen/your-project'
|
|
{ ...fields }
|
|
/> :
|
|
null
|
|
}
|
|
<Button
|
|
block={ true }
|
|
bsStyle='primary'
|
|
className='btn-big'
|
|
onClick={ isSubmitting ? null : showProjectSubmit }
|
|
type={ isSubmitting ? 'submit' : null }
|
|
>
|
|
{ buttonCopy } (ctrl + enter)
|
|
</Button>
|
|
</form>
|
|
);
|
|
}
|
|
|
|
_FrontEndForm.propTypes = propTypes;
|
|
|
|
export const FrontEndForm = reduxForm(
|
|
{
|
|
form: 'NewFrontEndProject',
|
|
fields: frontEndFields,
|
|
validate: createFormValidator(fieldValidators)
|
|
},
|
|
null,
|
|
bindableActions
|
|
)(_FrontEndForm);
|
|
|
|
export function _BackEndForm({
|
|
fields: { solution, githubLink },
|
|
handleSubmit,
|
|
submitChallenge,
|
|
resetForm,
|
|
isSubmitting,
|
|
showProjectSubmit
|
|
}) {
|
|
const buttonCopy = isSubmitting ?
|
|
'Submit and go to my next challenge' :
|
|
"I've completed this challenge";
|
|
return (
|
|
<form
|
|
name='NewBackEndProject'
|
|
onSubmit={
|
|
handleSubmit((values) => {
|
|
submitChallenge(values);
|
|
resetForm('NewBackEndProject');
|
|
})
|
|
}
|
|
>
|
|
{
|
|
isSubmitting ?
|
|
<SolutionInput
|
|
placeholder='https://your-app.com'
|
|
solution={ solution }
|
|
/> :
|
|
null
|
|
}
|
|
{ isSubmitting ?
|
|
<FormGroup
|
|
controlId='githubLink'
|
|
validationState={ getValidationState(githubLink) }
|
|
>
|
|
<FormControl
|
|
name='githubLink'
|
|
placeholder='https://github.com/your-username/your-project'
|
|
type='url'
|
|
{ ...githubLink }
|
|
/>
|
|
</FormGroup> :
|
|
null
|
|
}
|
|
<Button
|
|
block={ true }
|
|
bsStyle='primary'
|
|
className='btn-big'
|
|
onClick={ isSubmitting ? null : showProjectSubmit }
|
|
type={ isSubmitting ? 'submit' : null }
|
|
>
|
|
{ buttonCopy } (ctrl + enter)
|
|
</Button>
|
|
</form>
|
|
);
|
|
}
|
|
|
|
_BackEndForm.propTypes = propTypes;
|
|
|
|
export const BackEndForm = reduxForm(
|
|
{
|
|
form: 'NewBackEndProject',
|
|
fields: backEndFields,
|
|
validate: createFormValidator(backEndFieldValidators)
|
|
},
|
|
null,
|
|
bindableActions
|
|
)(_BackEndForm);
|