From f560bca0976fb82db868c08bf0c9dd99c9ea7b3d Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 13 May 2016 22:34:40 -0700 Subject: [PATCH] Move Old style challenge to classic --- .../routes/challenges/components/{Challenges.jsx => Show.jsx} | 4 ++-- .../components/{Challenge.jsx => classic/Classic.jsx} | 4 ++-- .../app/routes/challenges/components/{ => classic}/Editor.jsx | 0 .../app/routes/challenges/components/{ => classic}/Output.jsx | 0 .../routes/challenges/components/{ => classic}/Preview.jsx | 0 .../routes/challenges/components/{ => classic}/Side-Panel.jsx | 2 +- .../routes/challenges/components/{ => classic}/Test-Suite.jsx | 0 .../routes/challenges/components/{ => classic}/Tool-Panel.jsx | 0 common/app/routes/challenges/index.js | 4 ++-- 9 files changed, 7 insertions(+), 7 deletions(-) rename common/app/routes/challenges/components/{Challenges.jsx => Show.jsx} (94%) rename common/app/routes/challenges/components/{Challenge.jsx => classic/Classic.jsx} (94%) rename common/app/routes/challenges/components/{ => classic}/Editor.jsx (100%) rename common/app/routes/challenges/components/{ => classic}/Output.jsx (100%) rename common/app/routes/challenges/components/{ => classic}/Preview.jsx (100%) rename common/app/routes/challenges/components/{ => classic}/Side-Panel.jsx (97%) rename common/app/routes/challenges/components/{ => classic}/Test-Suite.jsx (100%) rename common/app/routes/challenges/components/{ => classic}/Tool-Panel.jsx (100%) diff --git a/common/app/routes/challenges/components/Challenges.jsx b/common/app/routes/challenges/components/Show.jsx similarity index 94% rename from common/app/routes/challenges/components/Challenges.jsx rename to common/app/routes/challenges/components/Show.jsx index c2914aaefe..f6e0b2e2fb 100644 --- a/common/app/routes/challenges/components/Challenges.jsx +++ b/common/app/routes/challenges/components/Show.jsx @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import PureComponent from 'react-pure-render/component'; -import Challenge from './Challenge.jsx'; +import Classic from './classic/Classic.jsx'; import Step from './step/Step.jsx'; import { fetchChallenge } from '../redux/actions'; import { challengeSelector } from '../redux/selectors'; @@ -38,7 +38,7 @@ export class Challenges extends PureComponent { if (this.props.isStep) { return ; } - return ; + return ; } } diff --git a/common/app/routes/challenges/components/Challenge.jsx b/common/app/routes/challenges/components/classic/Classic.jsx similarity index 94% rename from common/app/routes/challenges/components/Challenge.jsx rename to common/app/routes/challenges/components/classic/Classic.jsx index 5e3e445663..80f6dceeb0 100644 --- a/common/app/routes/challenges/components/Challenge.jsx +++ b/common/app/routes/challenges/components/classic/Classic.jsx @@ -7,8 +7,8 @@ import PureComponent from 'react-pure-render/component'; import Editor from './Editor.jsx'; import SidePanel from './Side-Panel.jsx'; import Preview from './Preview.jsx'; -import { challengeSelector } from '../redux/selectors'; -import { updateFile } from '../redux/actions'; +import { challengeSelector } from '../../redux/selectors'; +import { updateFile } from '../../redux/actions'; const mapStateToProps = createSelector( challengeSelector, diff --git a/common/app/routes/challenges/components/Editor.jsx b/common/app/routes/challenges/components/classic/Editor.jsx similarity index 100% rename from common/app/routes/challenges/components/Editor.jsx rename to common/app/routes/challenges/components/classic/Editor.jsx diff --git a/common/app/routes/challenges/components/Output.jsx b/common/app/routes/challenges/components/classic/Output.jsx similarity index 100% rename from common/app/routes/challenges/components/Output.jsx rename to common/app/routes/challenges/components/classic/Output.jsx diff --git a/common/app/routes/challenges/components/Preview.jsx b/common/app/routes/challenges/components/classic/Preview.jsx similarity index 100% rename from common/app/routes/challenges/components/Preview.jsx rename to common/app/routes/challenges/components/classic/Preview.jsx diff --git a/common/app/routes/challenges/components/Side-Panel.jsx b/common/app/routes/challenges/components/classic/Side-Panel.jsx similarity index 97% rename from common/app/routes/challenges/components/Side-Panel.jsx rename to common/app/routes/challenges/components/classic/Side-Panel.jsx index a59e714099..dde501c45e 100644 --- a/common/app/routes/challenges/components/Side-Panel.jsx +++ b/common/app/routes/challenges/components/classic/Side-Panel.jsx @@ -8,7 +8,7 @@ import { Col, Row } from 'react-bootstrap'; import TestSuite from './Test-Suite.jsx'; import Output from './Output.jsx'; import ToolPanel from './Tool-Panel.jsx'; -import { challengeSelector } from '../redux/selectors'; +import { challengeSelector } from '../../redux/selectors'; const mapStateToProps = createSelector( challengeSelector, diff --git a/common/app/routes/challenges/components/Test-Suite.jsx b/common/app/routes/challenges/components/classic/Test-Suite.jsx similarity index 100% rename from common/app/routes/challenges/components/Test-Suite.jsx rename to common/app/routes/challenges/components/classic/Test-Suite.jsx diff --git a/common/app/routes/challenges/components/Tool-Panel.jsx b/common/app/routes/challenges/components/classic/Tool-Panel.jsx similarity index 100% rename from common/app/routes/challenges/components/Tool-Panel.jsx rename to common/app/routes/challenges/components/classic/Tool-Panel.jsx diff --git a/common/app/routes/challenges/index.js b/common/app/routes/challenges/index.js index f561670dd3..9c56e425c9 100644 --- a/common/app/routes/challenges/index.js +++ b/common/app/routes/challenges/index.js @@ -1,9 +1,9 @@ -import Challenges from './components/Challenges.jsx'; +import Show from './components/Show.jsx'; import ShowMap from './components/map/Show.jsx'; export const challenges = { path: 'challenges(/:dashedName)', - component: Challenges, + component: Show, onEnter(nextState, replace) { // redirect /challenges to /map if (nextState.location.pathname === '/challenges') {