chore(simple): Remove simple project logic

This commit is contained in:
Stuart Taylor
2018-03-23 17:00:45 +00:00
committed by Mrugesh Mohapatra
parent a8484873d8
commit a048ab5ad3
3 changed files with 4 additions and 22 deletions

View File

@ -29,7 +29,6 @@ const views = {
modern: Modern, modern: Modern,
project: Project, project: Project,
quiz: Quiz, quiz: Quiz,
simple: Project,
step: Step, step: Step,
invalid: NotFound invalid: NotFound
}; };

View File

@ -161,8 +161,7 @@ const submitters = {
video: submitSimpleChallenge, video: submitSimpleChallenge,
quiz: submitSimpleChallenge, quiz: submitSimpleChallenge,
'project.frontEnd': submitProject, 'project.frontEnd': submitProject,
'project.backEnd': submitProject, 'project.backEnd': submitProject
'project.simple': submitSimpleChallenge
}; };
export default function completionEpic(actions, { getState }) { export default function completionEpic(actions, { getState }) {

View File

@ -13,8 +13,6 @@ import {
import { submittingSelector } from './redux'; import { submittingSelector } from './redux';
import { import {
openChallengeModal,
openHelpModal, openHelpModal,
chatRoomSelector, chatRoomSelector,
guideURLSelector guideURLSelector
@ -25,7 +23,6 @@ import {
challengeSelector challengeSelector
} from '../../../../redux'; } from '../../../../redux';
import { import {
simpleProject,
frontEndProject frontEndProject
} from '../../../../utils/challengeTypes'; } from '../../../../utils/challengeTypes';
@ -33,14 +30,10 @@ const propTypes = {
guideUrl: PropTypes.string, guideUrl: PropTypes.string,
helpChatRoom: PropTypes.string.isRequired, helpChatRoom: PropTypes.string.isRequired,
isFrontEnd: PropTypes.bool, isFrontEnd: PropTypes.bool,
isSignedIn: PropTypes.bool,
isSimple: PropTypes.bool,
isSubmitting: PropTypes.bool, isSubmitting: PropTypes.bool,
openChallengeModal: PropTypes.func.isRequired,
openHelpModal: PropTypes.func.isRequired openHelpModal: PropTypes.func.isRequired
}; };
const mapDispatchToProps = { const mapDispatchToProps = {
openChallengeModal,
openHelpModal openHelpModal
}; };
const mapStateToProps = createSelector( const mapStateToProps = createSelector(
@ -50,7 +43,7 @@ const mapStateToProps = createSelector(
chatRoomSelector, chatRoomSelector,
guideURLSelector, guideURLSelector,
( (
{ challengeType = simpleProject }, { challengeType },
showLoading, showLoading,
isSubmitting, isSubmitting,
helpChatRoom, helpChatRoom,
@ -58,9 +51,7 @@ const mapStateToProps = createSelector(
) => ({ ) => ({
guideUrl, guideUrl,
helpChatRoom, helpChatRoom,
isSignedIn: !showLoading,
isSubmitting, isSubmitting,
isSimple: challengeType === simpleProject,
isFrontEnd: challengeType === frontEndProject isFrontEnd: challengeType === frontEndProject
}) })
); );
@ -87,21 +78,14 @@ export class ToolPanel extends PureComponent {
guideUrl, guideUrl,
helpChatRoom, helpChatRoom,
isFrontEnd, isFrontEnd,
isSimple,
isSignedIn,
isSubmitting, isSubmitting,
openHelpModal, openHelpModal
openChallengeModal
} = this.props; } = this.props;
const FormElement = isFrontEnd ? FrontEndForm : BackEndForm; const FormElement = isFrontEnd ? FrontEndForm : BackEndForm;
return ( return (
<div> <div>
{ <FormElement isSubmitting={ isSubmitting }/>
isSimple ?
this.renderSubmitButton(isSignedIn, openChallengeModal) :
<FormElement isSubmitting={ isSubmitting }/>
}
<ButtonSpacer /> <ButtonSpacer />
<Button <Button
block={ true } block={ true }