From b546d8ed9281bac005b17fcbdb7979db262e82cc Mon Sep 17 00:00:00 2001 From: Stuart Taylor Date: Sun, 8 Apr 2018 23:19:50 +0100 Subject: [PATCH] Merge pull request #4 from Bouncey/chore/moveTemplates Chore/move templates --- packages/learn/gatsby-node.js | 8 ++------ .../templates/Challenges/{views => }/Modern/Editor.jsx | 0 .../src/templates/Challenges/{views => }/Modern/Show.jsx | 0 .../src/templates/Challenges/{views => }/Modern/index.js | 0 .../src/templates/Challenges/{views => }/Modern/ns.json | 0 .../templates/Challenges/{views => }/backend/Back-End.jsx | 0 .../src/templates/Challenges/{views => }/backend/Show.jsx | 0 .../src/templates/Challenges/{views => }/backend/index.js | 0 .../templates/Challenges/{views => }/classic/Editor.js | 2 +- .../src/templates/Challenges/{views => }/classic/Show.js | 6 +++--- .../templates/Challenges/{views => }/classic/classic.css | 0 .../src/templates/Challenges/{views => }/classic/index.js | 0 .../{views => }/components/Challenge-Description.js | 0 .../Challenges/{views => }/components/Challenge-Title.js | 0 .../Challenges/{views => }/components/CompletionModal.js | 4 ++-- .../Challenges/{views => }/components/Help-Modal.jsx | 0 .../templates/Challenges/{views => }/components/Output.js | 0 .../Challenges/{views => }/components/Preview.js | 0 .../Challenges/{views => }/components/Side-Panel.js | 6 +++--- .../Challenges/{views => }/components/Solution-Input.jsx | 0 .../Challenges/{views => }/components/Test-Suite.js | 4 ++-- .../Challenges/{views => }/components/Tool-Panel.js | 0 .../Challenges/{ => components}/icons/GreenPass.js | 0 .../Challenges/{ => components}/icons/RedFail.js | 0 .../Challenges/{views => }/components/preview.css | 0 .../Challenges/{views => }/components/test-suite.css | 0 .../templates/Challenges/{views => }/project/Forms.jsx | 0 .../templates/Challenges/{views => }/project/Project.jsx | 0 .../src/templates/Challenges/{views => }/project/Show.js | 0 .../Challenges/{views => }/project/Side-Panel.jsx | 0 .../Challenges/{views => }/project/Tool-Panel.jsx | 0 .../src/templates/Challenges/{views => }/project/index.js | 0 .../src/templates/Challenges/{views => }/project/ns.json | 0 .../Challenges/{views => }/project/redux/index.js | 0 .../{views => }/project/redux/project-normalizer.js | 0 .../src/templates/Challenges/{views => }/quiz/Choice.jsx | 0 .../src/templates/Challenges/{views => }/quiz/Quiz.jsx | 0 .../src/templates/Challenges/{views => }/quiz/Show.jsx | 0 .../src/templates/Challenges/{views => }/quiz/index.js | 0 .../src/templates/Challenges/{views => }/quiz/ns.json | 0 .../src/templates/Challenges/{views => }/quiz/quiz.less | 0 .../templates/Challenges/{views => }/quiz/redux/index.js | 0 42 files changed, 13 insertions(+), 17 deletions(-) rename packages/learn/src/templates/Challenges/{views => }/Modern/Editor.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/Modern/Show.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/Modern/index.js (100%) rename packages/learn/src/templates/Challenges/{views => }/Modern/ns.json (100%) rename packages/learn/src/templates/Challenges/{views => }/backend/Back-End.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/backend/Show.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/backend/index.js (100%) rename packages/learn/src/templates/Challenges/{views => }/classic/Editor.js (97%) rename packages/learn/src/templates/Challenges/{views => }/classic/Show.js (96%) rename packages/learn/src/templates/Challenges/{views => }/classic/classic.css (100%) rename packages/learn/src/templates/Challenges/{views => }/classic/index.js (100%) rename packages/learn/src/templates/Challenges/{views => }/components/Challenge-Description.js (100%) rename packages/learn/src/templates/Challenges/{views => }/components/Challenge-Title.js (100%) rename packages/learn/src/templates/Challenges/{views => }/components/CompletionModal.js (97%) rename packages/learn/src/templates/Challenges/{views => }/components/Help-Modal.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/components/Output.js (100%) rename packages/learn/src/templates/Challenges/{views => }/components/Preview.js (100%) rename packages/learn/src/templates/Challenges/{views => }/components/Side-Panel.js (95%) rename packages/learn/src/templates/Challenges/{views => }/components/Solution-Input.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/components/Test-Suite.js (93%) rename packages/learn/src/templates/Challenges/{views => }/components/Tool-Panel.js (100%) rename packages/learn/src/templates/Challenges/{ => components}/icons/GreenPass.js (100%) rename packages/learn/src/templates/Challenges/{ => components}/icons/RedFail.js (100%) rename packages/learn/src/templates/Challenges/{views => }/components/preview.css (100%) rename packages/learn/src/templates/Challenges/{views => }/components/test-suite.css (100%) rename packages/learn/src/templates/Challenges/{views => }/project/Forms.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/project/Project.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/project/Show.js (100%) rename packages/learn/src/templates/Challenges/{views => }/project/Side-Panel.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/project/Tool-Panel.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/project/index.js (100%) rename packages/learn/src/templates/Challenges/{views => }/project/ns.json (100%) rename packages/learn/src/templates/Challenges/{views => }/project/redux/index.js (100%) rename packages/learn/src/templates/Challenges/{views => }/project/redux/project-normalizer.js (100%) rename packages/learn/src/templates/Challenges/{views => }/quiz/Choice.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/quiz/Quiz.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/quiz/Show.jsx (100%) rename packages/learn/src/templates/Challenges/{views => }/quiz/index.js (100%) rename packages/learn/src/templates/Challenges/{views => }/quiz/ns.json (100%) rename packages/learn/src/templates/Challenges/{views => }/quiz/quiz.less (100%) rename packages/learn/src/templates/Challenges/{views => }/quiz/redux/index.js (100%) diff --git a/packages/learn/gatsby-node.js b/packages/learn/gatsby-node.js index 4349ac8e42..67c6de4704 100644 --- a/packages/learn/gatsby-node.js +++ b/packages/learn/gatsby-node.js @@ -9,16 +9,12 @@ const views = { // backend: BackEnd, classic: path.resolve( __dirname, - './src/templates/Challenges/views/classic/Show.js' + './src/templates/Challenges/classic/Show.js' ), // modern: Modern, - project: path.resolve( - __dirname, - './src/templates/Challenges/views/project/Show.js' - ), + project: path.resolve(__dirname, './src/templates/Challenges/project/Show.js') // quiz: Quiz, // simple: Project, - step: path.resolve(__dirname, './src/templates/Challenges/views/step/Show.js') // invalid: NotFound }; diff --git a/packages/learn/src/templates/Challenges/views/Modern/Editor.jsx b/packages/learn/src/templates/Challenges/Modern/Editor.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/Modern/Editor.jsx rename to packages/learn/src/templates/Challenges/Modern/Editor.jsx diff --git a/packages/learn/src/templates/Challenges/views/Modern/Show.jsx b/packages/learn/src/templates/Challenges/Modern/Show.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/Modern/Show.jsx rename to packages/learn/src/templates/Challenges/Modern/Show.jsx diff --git a/packages/learn/src/templates/Challenges/views/Modern/index.js b/packages/learn/src/templates/Challenges/Modern/index.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/Modern/index.js rename to packages/learn/src/templates/Challenges/Modern/index.js diff --git a/packages/learn/src/templates/Challenges/views/Modern/ns.json b/packages/learn/src/templates/Challenges/Modern/ns.json similarity index 100% rename from packages/learn/src/templates/Challenges/views/Modern/ns.json rename to packages/learn/src/templates/Challenges/Modern/ns.json diff --git a/packages/learn/src/templates/Challenges/views/backend/Back-End.jsx b/packages/learn/src/templates/Challenges/backend/Back-End.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/backend/Back-End.jsx rename to packages/learn/src/templates/Challenges/backend/Back-End.jsx diff --git a/packages/learn/src/templates/Challenges/views/backend/Show.jsx b/packages/learn/src/templates/Challenges/backend/Show.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/backend/Show.jsx rename to packages/learn/src/templates/Challenges/backend/Show.jsx diff --git a/packages/learn/src/templates/Challenges/views/backend/index.js b/packages/learn/src/templates/Challenges/backend/index.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/backend/index.js rename to packages/learn/src/templates/Challenges/backend/index.js diff --git a/packages/learn/src/templates/Challenges/views/classic/Editor.js b/packages/learn/src/templates/Challenges/classic/Editor.js similarity index 97% rename from packages/learn/src/templates/Challenges/views/classic/Editor.js rename to packages/learn/src/templates/Challenges/classic/Editor.js index 4b34146da7..38f335a30a 100644 --- a/packages/learn/src/templates/Challenges/views/classic/Editor.js +++ b/packages/learn/src/templates/Challenges/classic/Editor.js @@ -4,7 +4,7 @@ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import MonacoEditor from 'react-monaco-editor'; -import { executeChallenge, updateFile } from '../../redux'; +import { executeChallenge, updateFile } from '../redux'; const propTypes = { contents: PropTypes.string, diff --git a/packages/learn/src/templates/Challenges/views/classic/Show.js b/packages/learn/src/templates/Challenges/classic/Show.js similarity index 96% rename from packages/learn/src/templates/Challenges/views/classic/Show.js rename to packages/learn/src/templates/Challenges/classic/Show.js index 17ff38c038..6ba7da87a2 100644 --- a/packages/learn/src/templates/Challenges/views/classic/Show.js +++ b/packages/learn/src/templates/Challenges/classic/Show.js @@ -12,14 +12,14 @@ import Preview from '../components/Preview'; import SidePanel from '../components/Side-Panel'; import CompletionModal from '../components/CompletionModal'; -import { challengeTypes } from '../../../../../utils/challengeTypes'; -import { ChallengeNode } from '../../../../redux/propTypes'; +import { challengeTypes } from '../../../../utils/challengeTypes'; +import { ChallengeNode } from '../../../redux/propTypes'; import { createFiles, challengeFilesSelector, initTests, updateChallengeMeta -} from '../../redux'; +} from '../redux'; import './classic.css'; diff --git a/packages/learn/src/templates/Challenges/views/classic/classic.css b/packages/learn/src/templates/Challenges/classic/classic.css similarity index 100% rename from packages/learn/src/templates/Challenges/views/classic/classic.css rename to packages/learn/src/templates/Challenges/classic/classic.css diff --git a/packages/learn/src/templates/Challenges/views/classic/index.js b/packages/learn/src/templates/Challenges/classic/index.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/classic/index.js rename to packages/learn/src/templates/Challenges/classic/index.js diff --git a/packages/learn/src/templates/Challenges/views/components/Challenge-Description.js b/packages/learn/src/templates/Challenges/components/Challenge-Description.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/Challenge-Description.js rename to packages/learn/src/templates/Challenges/components/Challenge-Description.js diff --git a/packages/learn/src/templates/Challenges/views/components/Challenge-Title.js b/packages/learn/src/templates/Challenges/components/Challenge-Title.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/Challenge-Title.js rename to packages/learn/src/templates/Challenges/components/Challenge-Title.js diff --git a/packages/learn/src/templates/Challenges/views/components/CompletionModal.js b/packages/learn/src/templates/Challenges/components/CompletionModal.js similarity index 97% rename from packages/learn/src/templates/Challenges/views/components/CompletionModal.js rename to packages/learn/src/templates/Challenges/components/CompletionModal.js index ff0a2f1072..55ffb0a7a6 100644 --- a/packages/learn/src/templates/Challenges/views/components/CompletionModal.js +++ b/packages/learn/src/templates/Challenges/components/CompletionModal.js @@ -5,14 +5,14 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import { Button, Modal } from 'react-bootstrap'; -import GreenPass from '../../icons/GreenPass'; +import GreenPass from './icons/GreenPass'; import { closeModal, submitChallenge, isCompletionModalOpenSelector, successMessageSelector -} from '../../redux'; +} from '../redux'; const mapStateToProps = createSelector( isCompletionModalOpenSelector, diff --git a/packages/learn/src/templates/Challenges/views/components/Help-Modal.jsx b/packages/learn/src/templates/Challenges/components/Help-Modal.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/Help-Modal.jsx rename to packages/learn/src/templates/Challenges/components/Help-Modal.jsx diff --git a/packages/learn/src/templates/Challenges/views/components/Output.js b/packages/learn/src/templates/Challenges/components/Output.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/Output.js rename to packages/learn/src/templates/Challenges/components/Output.js diff --git a/packages/learn/src/templates/Challenges/views/components/Preview.js b/packages/learn/src/templates/Challenges/components/Preview.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/Preview.js rename to packages/learn/src/templates/Challenges/components/Preview.js diff --git a/packages/learn/src/templates/Challenges/views/components/Side-Panel.js b/packages/learn/src/templates/Challenges/components/Side-Panel.js similarity index 95% rename from packages/learn/src/templates/Challenges/views/components/Side-Panel.js rename to packages/learn/src/templates/Challenges/components/Side-Panel.js index f1fff08ea8..4f15cab458 100644 --- a/packages/learn/src/templates/Challenges/views/components/Side-Panel.js +++ b/packages/learn/src/templates/Challenges/components/Side-Panel.js @@ -11,15 +11,15 @@ import ChallengeTitle from './Challenge-Title'; import ChallengeDescription from './Challenge-Description'; import TestSuite from './Test-Suite'; import Output from './Output'; -import Spacer from '../../../../components/util/Spacer'; +import Spacer from '../../../components/util/Spacer'; import { consoleOutputSelector, challengeTestsSelector, executeChallenge, initConsole -} from '../../redux'; -import { descriptionRegex } from '../../../../../utils'; +} from '../redux'; +import { descriptionRegex } from '../../../../utils'; const mapStateToProps = createSelector( consoleOutputSelector, diff --git a/packages/learn/src/templates/Challenges/views/components/Solution-Input.jsx b/packages/learn/src/templates/Challenges/components/Solution-Input.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/Solution-Input.jsx rename to packages/learn/src/templates/Challenges/components/Solution-Input.jsx diff --git a/packages/learn/src/templates/Challenges/views/components/Test-Suite.js b/packages/learn/src/templates/Challenges/components/Test-Suite.js similarity index 93% rename from packages/learn/src/templates/Challenges/views/components/Test-Suite.js rename to packages/learn/src/templates/Challenges/components/Test-Suite.js index a31aa9b183..3a0fc7e034 100644 --- a/packages/learn/src/templates/Challenges/views/components/Test-Suite.js +++ b/packages/learn/src/templates/Challenges/components/Test-Suite.js @@ -1,8 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; -import GreenPass from '../../icons/GreenPass'; -import RedFail from '../../icons/RedFail'; +import GreenPass from './icons/GreenPass'; +import RedFail from './icons/RedFail'; import './test-suite.css'; diff --git a/packages/learn/src/templates/Challenges/views/components/Tool-Panel.js b/packages/learn/src/templates/Challenges/components/Tool-Panel.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/Tool-Panel.js rename to packages/learn/src/templates/Challenges/components/Tool-Panel.js diff --git a/packages/learn/src/templates/Challenges/icons/GreenPass.js b/packages/learn/src/templates/Challenges/components/icons/GreenPass.js similarity index 100% rename from packages/learn/src/templates/Challenges/icons/GreenPass.js rename to packages/learn/src/templates/Challenges/components/icons/GreenPass.js diff --git a/packages/learn/src/templates/Challenges/icons/RedFail.js b/packages/learn/src/templates/Challenges/components/icons/RedFail.js similarity index 100% rename from packages/learn/src/templates/Challenges/icons/RedFail.js rename to packages/learn/src/templates/Challenges/components/icons/RedFail.js diff --git a/packages/learn/src/templates/Challenges/views/components/preview.css b/packages/learn/src/templates/Challenges/components/preview.css similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/preview.css rename to packages/learn/src/templates/Challenges/components/preview.css diff --git a/packages/learn/src/templates/Challenges/views/components/test-suite.css b/packages/learn/src/templates/Challenges/components/test-suite.css similarity index 100% rename from packages/learn/src/templates/Challenges/views/components/test-suite.css rename to packages/learn/src/templates/Challenges/components/test-suite.css diff --git a/packages/learn/src/templates/Challenges/views/project/Forms.jsx b/packages/learn/src/templates/Challenges/project/Forms.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/Forms.jsx rename to packages/learn/src/templates/Challenges/project/Forms.jsx diff --git a/packages/learn/src/templates/Challenges/views/project/Project.jsx b/packages/learn/src/templates/Challenges/project/Project.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/Project.jsx rename to packages/learn/src/templates/Challenges/project/Project.jsx diff --git a/packages/learn/src/templates/Challenges/views/project/Show.js b/packages/learn/src/templates/Challenges/project/Show.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/Show.js rename to packages/learn/src/templates/Challenges/project/Show.js diff --git a/packages/learn/src/templates/Challenges/views/project/Side-Panel.jsx b/packages/learn/src/templates/Challenges/project/Side-Panel.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/Side-Panel.jsx rename to packages/learn/src/templates/Challenges/project/Side-Panel.jsx diff --git a/packages/learn/src/templates/Challenges/views/project/Tool-Panel.jsx b/packages/learn/src/templates/Challenges/project/Tool-Panel.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/Tool-Panel.jsx rename to packages/learn/src/templates/Challenges/project/Tool-Panel.jsx diff --git a/packages/learn/src/templates/Challenges/views/project/index.js b/packages/learn/src/templates/Challenges/project/index.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/index.js rename to packages/learn/src/templates/Challenges/project/index.js diff --git a/packages/learn/src/templates/Challenges/views/project/ns.json b/packages/learn/src/templates/Challenges/project/ns.json similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/ns.json rename to packages/learn/src/templates/Challenges/project/ns.json diff --git a/packages/learn/src/templates/Challenges/views/project/redux/index.js b/packages/learn/src/templates/Challenges/project/redux/index.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/redux/index.js rename to packages/learn/src/templates/Challenges/project/redux/index.js diff --git a/packages/learn/src/templates/Challenges/views/project/redux/project-normalizer.js b/packages/learn/src/templates/Challenges/project/redux/project-normalizer.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/project/redux/project-normalizer.js rename to packages/learn/src/templates/Challenges/project/redux/project-normalizer.js diff --git a/packages/learn/src/templates/Challenges/views/quiz/Choice.jsx b/packages/learn/src/templates/Challenges/quiz/Choice.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/quiz/Choice.jsx rename to packages/learn/src/templates/Challenges/quiz/Choice.jsx diff --git a/packages/learn/src/templates/Challenges/views/quiz/Quiz.jsx b/packages/learn/src/templates/Challenges/quiz/Quiz.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/quiz/Quiz.jsx rename to packages/learn/src/templates/Challenges/quiz/Quiz.jsx diff --git a/packages/learn/src/templates/Challenges/views/quiz/Show.jsx b/packages/learn/src/templates/Challenges/quiz/Show.jsx similarity index 100% rename from packages/learn/src/templates/Challenges/views/quiz/Show.jsx rename to packages/learn/src/templates/Challenges/quiz/Show.jsx diff --git a/packages/learn/src/templates/Challenges/views/quiz/index.js b/packages/learn/src/templates/Challenges/quiz/index.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/quiz/index.js rename to packages/learn/src/templates/Challenges/quiz/index.js diff --git a/packages/learn/src/templates/Challenges/views/quiz/ns.json b/packages/learn/src/templates/Challenges/quiz/ns.json similarity index 100% rename from packages/learn/src/templates/Challenges/views/quiz/ns.json rename to packages/learn/src/templates/Challenges/quiz/ns.json diff --git a/packages/learn/src/templates/Challenges/views/quiz/quiz.less b/packages/learn/src/templates/Challenges/quiz/quiz.less similarity index 100% rename from packages/learn/src/templates/Challenges/views/quiz/quiz.less rename to packages/learn/src/templates/Challenges/quiz/quiz.less diff --git a/packages/learn/src/templates/Challenges/views/quiz/redux/index.js b/packages/learn/src/templates/Challenges/quiz/redux/index.js similarity index 100% rename from packages/learn/src/templates/Challenges/views/quiz/redux/index.js rename to packages/learn/src/templates/Challenges/quiz/redux/index.js