Merge pull request #4 from Bouncey/chore/moveTemplates

Chore/move templates
This commit is contained in:
Stuart Taylor
2018-04-08 23:19:50 +01:00
committed by Mrugesh Mohapatra
parent b1cc6ff6cd
commit b546d8ed92
42 changed files with 13 additions and 17 deletions

View File

@ -9,16 +9,12 @@ const views = {
// backend: BackEnd, // backend: BackEnd,
classic: path.resolve( classic: path.resolve(
__dirname, __dirname,
'./src/templates/Challenges/views/classic/Show.js' './src/templates/Challenges/classic/Show.js'
), ),
// modern: Modern, // modern: Modern,
project: path.resolve( project: path.resolve(__dirname, './src/templates/Challenges/project/Show.js')
__dirname,
'./src/templates/Challenges/views/project/Show.js'
),
// quiz: Quiz, // quiz: Quiz,
// simple: Project, // simple: Project,
step: path.resolve(__dirname, './src/templates/Challenges/views/step/Show.js')
// invalid: NotFound // invalid: NotFound
}; };

View File

@ -4,7 +4,7 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import MonacoEditor from 'react-monaco-editor'; import MonacoEditor from 'react-monaco-editor';
import { executeChallenge, updateFile } from '../../redux'; import { executeChallenge, updateFile } from '../redux';
const propTypes = { const propTypes = {
contents: PropTypes.string, contents: PropTypes.string,

View File

@ -12,14 +12,14 @@ import Preview from '../components/Preview';
import SidePanel from '../components/Side-Panel'; import SidePanel from '../components/Side-Panel';
import CompletionModal from '../components/CompletionModal'; import CompletionModal from '../components/CompletionModal';
import { challengeTypes } from '../../../../../utils/challengeTypes'; import { challengeTypes } from '../../../../utils/challengeTypes';
import { ChallengeNode } from '../../../../redux/propTypes'; import { ChallengeNode } from '../../../redux/propTypes';
import { import {
createFiles, createFiles,
challengeFilesSelector, challengeFilesSelector,
initTests, initTests,
updateChallengeMeta updateChallengeMeta
} from '../../redux'; } from '../redux';
import './classic.css'; import './classic.css';

View File

@ -5,14 +5,14 @@ import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { Button, Modal } from 'react-bootstrap'; import { Button, Modal } from 'react-bootstrap';
import GreenPass from '../../icons/GreenPass'; import GreenPass from './icons/GreenPass';
import { import {
closeModal, closeModal,
submitChallenge, submitChallenge,
isCompletionModalOpenSelector, isCompletionModalOpenSelector,
successMessageSelector successMessageSelector
} from '../../redux'; } from '../redux';
const mapStateToProps = createSelector( const mapStateToProps = createSelector(
isCompletionModalOpenSelector, isCompletionModalOpenSelector,

View File

@ -11,15 +11,15 @@ import ChallengeTitle from './Challenge-Title';
import ChallengeDescription from './Challenge-Description'; import ChallengeDescription from './Challenge-Description';
import TestSuite from './Test-Suite'; import TestSuite from './Test-Suite';
import Output from './Output'; import Output from './Output';
import Spacer from '../../../../components/util/Spacer'; import Spacer from '../../../components/util/Spacer';
import { import {
consoleOutputSelector, consoleOutputSelector,
challengeTestsSelector, challengeTestsSelector,
executeChallenge, executeChallenge,
initConsole initConsole
} from '../../redux'; } from '../redux';
import { descriptionRegex } from '../../../../../utils'; import { descriptionRegex } from '../../../../utils';
const mapStateToProps = createSelector( const mapStateToProps = createSelector(
consoleOutputSelector, consoleOutputSelector,

View File

@ -1,8 +1,8 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import GreenPass from '../../icons/GreenPass'; import GreenPass from './icons/GreenPass';
import RedFail from '../../icons/RedFail'; import RedFail from './icons/RedFail';
import './test-suite.css'; import './test-suite.css';