Skip to content

Commit d76a5d7

Browse files
ShMcKShMcK
committed
load core reducers
1 parent 87f8460 commit d76a5d7

File tree

16 files changed

+51
-91
lines changed

16 files changed

+51
-91
lines changed

‎lib/actions/package.js

-9
This file was deleted.

‎lib/components/AppMenu/issuesLink.js

-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +0,0 @@
1-
"use strict";
2-
var React = require('react');
3-
var MenuItem_1 = require('material-ui/MenuItem');
4-
var store_1 = require('../../store');
5-
function issuesLink() {
6-
var tutorial = store_1.default.getState().tutorial;
7-
if (!tutorial || !tutorial.config || !tutorial.config.issuesPath) {
8-
return null;
9-
}
10-
return (React.createElement(MenuItem_1.default, {key: 'issue', className: 'link'}, React.createElement("a", {href: tutorial.config.issuesPath}, "post issue")));
11-
}
12-
Object.defineProperty(exports, "__esModule", { value: true });
13-
exports.default = issuesLink;

‎lib/components/AppMenu/menuRight.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ var React = require('react');
33
var IconMenu_1 = require('material-ui/IconMenu');
44
var Divider_1 = require('material-ui/Divider');
55
var Quit_1 = require('./Quit');
6-
var issuesLink_1 = require('./issuesLink');
76
var menuIconRight_1 = require('./menuIconRight');
87
var menuRightRouteOptions_1 = require('./menuRightRouteOptions');
98
var origin = {
109
horizontal: 'right',
1110
vertical: 'top',
1211
};
1312
function menuRight(route) {
14-
return (React.createElement(IconMenu_1.default, {iconButtonElement: menuIconRight_1.default(), targetOrigin: origin, anchorOrigin: origin}, menuRightRouteOptions_1.default(route), issuesLink_1.default(), React.createElement(Divider_1.default, null), React.createElement(Quit_1.default, null)));
13+
return (React.createElement(IconMenu_1.default, {iconButtonElement: menuIconRight_1.default(), targetOrigin: origin, anchorOrigin: origin}, menuRightRouteOptions_1.default(route), React.createElement(Divider_1.default, null), React.createElement(Quit_1.default, null)));
1514
}
1615
Object.defineProperty(exports, "__esModule", { value: true });
1716
exports.default = menuRight;

‎lib/components/Start/Checks/SetupChecks.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var React = require('react');
33
var Card_1 = require('material-ui/Card');
44
var FlatButton_1 = require('material-ui/FlatButton');
55
var VerifyButton_1 = require('./VerifyButton');
6-
var action_setup_1 = require('../../../reducers/checks/action-setup');
76
var DynamicStepper_1 = require('./DynamicStepper');
87
var StepCheck_1 = require('./StepCheck');
98
var SetupChecks = function (_a) {
@@ -14,7 +13,7 @@ var SetupChecks = function (_a) {
1413
}
1514
var hasDir = setup.hasDir, hasPackageJson = setup.hasPackageJson, hasTutorial = setup.hasTutorial;
1615
var status = [hasDir, hasPackageJson, hasTutorial];
17-
return (React.createElement(Card_1.Card, {className: 'cr-check'}, React.createElement(Card_1.CardHeader, {title: 'Setup Checks', subtitle: 'CodeRoad requires a brief setup'}), React.createElement(Card_1.CardText, null, React.createElement(DynamicStepper_1.default, {status: status}, React.createElement(StepCheck_1.default, {label: 'open a directory', completed: hasDir}, React.createElement("p", null, "File -> Open (a new folder)"), React.createElement("br", null), React.createElement(FlatButton_1.default, {label: 'Open Directory', secondary: true, onTouchTap: action_setup_1.openDirectory})), React.createElement(StepCheck_1.default, {label: 'package.json', completed: hasPackageJson}, "Create a package.json by running", React.createElement("br", null), React.createElement("code", null, "> npm init -y`"), React.createElement("br", null), React.createElement(FlatButton_1.default, {label: 'Create package.json', secondary: true, onTouchTap: action_setup_1.createPackageJson})), React.createElement(StepCheck_1.default, {label: 'install a tutorial', completed: hasTutorial}, "Install a tutorial using npm. For example:", React.createElement("br", null), React.createElement("code", null, "> npm install --save-dev coderoad-functional-school"), React.createElement("br", null)))), React.createElement(Card_1.CardActions, null, React.createElement(VerifyButton_1.default, null))));
16+
return (React.createElement(Card_1.Card, {className: 'cr-check'}, React.createElement(Card_1.CardHeader, {title: 'Setup Checks', subtitle: 'CodeRoad requires a brief setup'}), React.createElement(Card_1.CardText, null, React.createElement(DynamicStepper_1.default, {status: status}, React.createElement(StepCheck_1.default, {label: 'open a directory', completed: hasDir}, React.createElement("p", null, "File -> Open (a new folder)"), React.createElement("br", null), React.createElement(FlatButton_1.default, {label: 'Open Directory', secondary: true})), React.createElement(StepCheck_1.default, {label: 'package.json', completed: hasPackageJson}, "Create a package.json by running", React.createElement("br", null), React.createElement("code", null, "> npm init -y`"), React.createElement("br", null), React.createElement(FlatButton_1.default, {label: 'Create package.json', secondary: true})), React.createElement(StepCheck_1.default, {label: 'install a tutorial', completed: hasTutorial}, "Install a tutorial using npm. For example:", React.createElement("br", null), React.createElement("code", null, "> npm install --save-dev coderoad-functional-school"), React.createElement("br", null)))), React.createElement(Card_1.CardActions, null, React.createElement(VerifyButton_1.default, null))));
1817
};
1918
Object.defineProperty(exports, "__esModule", { value: true });
2019
exports.default = SetupChecks;

‎lib/components/Start/Checks/SystemChecks.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var Card_1 = require('material-ui/Card');
44
var FlatButton_1 = require('material-ui/FlatButton');
55
var VerifyButton_1 = require('./VerifyButton');
66
var colors_1 = require('material-ui/styles/colors');
7-
var action_system_1 = require('../../../reducers/checks/action-system');
87
var DynamicStepper_1 = require('./DynamicStepper');
98
var StepCheck_1 = require('./StepCheck');
109
var SystemChecks = function (_a) {
@@ -14,7 +13,7 @@ var SystemChecks = function (_a) {
1413
return null;
1514
}
1615
var status = [system.node, system.npm];
17-
return (React.createElement(Card_1.Card, {className: 'cr-check'}, React.createElement(Card_1.CardHeader, {title: 'System Checks', subtitle: 'CodeRoad requires several key dependencies'}), React.createElement(Card_1.CardText, null, React.createElement(DynamicStepper_1.default, {status: status}, React.createElement(StepCheck_1.default, {label: 'Node >= 0.10', completed: system.node}, React.createElement("p", null, "Install a newer version of ", React.createElement("a", {style: { color: colors_1.pink500 }, href: 'https://nodejs.org'}, "NodeJS"))), React.createElement(StepCheck_1.default, {label: 'NPM >= 3', completed: system.npm}, "Update your version of NPM.", React.createElement("br", null), React.createElement("code", null, "> npm update -g npm"), React.createElement("br", null), React.createElement(FlatButton_1.default, {label: 'Update NPM', secondary: true, onTouchTap: action_system_1.updateNpm})), React.createElement(StepCheck_1.default, {label: 'Xcode', completed: system.xcode}, React.createElement("p", null, "Install ", React.createElement("a", {style: { color: colors_1.pink500 }, href: 'https://developer.apple.com/xcode/download/'}, "XCode"))))), React.createElement(Card_1.CardActions, null, React.createElement(VerifyButton_1.default, null))));
16+
return (React.createElement(Card_1.Card, {className: 'cr-check'}, React.createElement(Card_1.CardHeader, {title: 'System Checks', subtitle: 'CodeRoad requires several key dependencies'}), React.createElement(Card_1.CardText, null, React.createElement(DynamicStepper_1.default, {status: status}, React.createElement(StepCheck_1.default, {label: 'Node >= 0.10', completed: system.node}, React.createElement("p", null, "Install a newer version of ", React.createElement("a", {style: { color: colors_1.pink500 }, href: 'https://nodejs.org'}, "NodeJS"))), React.createElement(StepCheck_1.default, {label: 'NPM >= 3', completed: system.npm}, "Update your version of NPM.", React.createElement("br", null), React.createElement("code", null, "> npm update -g npm"), React.createElement("br", null), React.createElement(FlatButton_1.default, {label: 'Update NPM', secondary: true})), React.createElement(StepCheck_1.default, {label: 'Xcode', completed: system.xcode}, React.createElement("p", null, "Install ", React.createElement("a", {style: { color: colors_1.pink500 }, href: 'https://developer.apple.com/xcode/download/'}, "XCode"))))), React.createElement(Card_1.CardActions, null, React.createElement(VerifyButton_1.default, null))));
1817
};
1918
Object.defineProperty(exports, "__esModule", { value: true });
2019
exports.default = SystemChecks;

‎lib/components/Start/Checks/VerifyButton.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
var React = require('react');
1717
var FlatButton_1 = require('material-ui/FlatButton');
18-
var store_1 = require('../../../store');
1918
var actions_1 = require('../../../actions');
2019
var react_redux_1 = require('react-redux');
2120
var VerifyButton = (function (_super) {
@@ -29,7 +28,7 @@ var VerifyButton = (function (_super) {
2928
VerifyButton = __decorate([
3029
react_redux_1.connect(null, function (dispatch) {
3130
return {
32-
verify: function () { return store_1.default.dispatch(actions_1.setupVerify()); }
31+
verify: function () { return dispatch(actions_1.setupVerify()); }
3332
};
3433
}),
3534
__metadata('design:paramtypes', [])

‎lib/reducers/checks/action-setup.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use strict";
22
var path_1 = require('path');
33
var editor_1 = require('../../atom/editor');
4-
var editor_2 = require('../../atom/editor');
54
var packageData = "{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.2\"\n }\n}";
65
function createPackageJson(dir) {
76
var packagePath = path_1.join(dir, 'package.json');
@@ -14,6 +13,6 @@ function createPackageJson(dir) {
1413
}
1514
exports.createPackageJson = createPackageJson;
1615
function openDirectory() {
17-
editor_2.openFolder();
16+
editor_1.openFolder();
1817
}
1918
exports.openDirectory = openDirectory;

‎lib/reducers/index.js

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
11
"use strict";
22
var redux_1 = require('redux');
3-
var alert_1 = require('./alert');
3+
var coderoad_core_1 = require('coderoad-core');
44
var checks_1 = require('./checks');
55
var devTools_toggle_1 = require('./devTools-toggle');
66
var dir_1 = require('./dir');
7-
var task_actions_1 = require('./task-actions');
87
var hint_position_1 = require('./hint-position');
9-
var package_json_1 = require('./package-json');
10-
var page_1 = require('./page');
11-
var page_position_1 = require('./page-position');
128
var progress_1 = require('./progress');
13-
var route_1 = require('./route');
9+
var task_actions_1 = require('./task-actions');
1410
var task_position_1 = require('./task-position');
1511
var task_tests_1 = require('./task-tests');
16-
var tasks_1 = require('./tasks');
1712
var test_run_1 = require('./test-run');
18-
var tutorial_1 = require('./tutorial');
19-
var tutorial_list_1 = require('./tutorial-list');
2013
var window_toggle_1 = require('./window-toggle');
2114
Object.defineProperty(exports, "__esModule", { value: true });
2215
exports.default = redux_1.combineReducers(Object.assign({}, {
23-
alert: alert_1.default, checks: checks_1.default, dir: dir_1.default, devToolsToggle: devTools_toggle_1.default, taskActions: task_actions_1.default, hintPosition: hint_position_1.default,
24-
packageJson: package_json_1.default, page: page_1.default, pagePosition: page_position_1.default, progress: progress_1.default, route: route_1.default, taskPosition: task_position_1.default,
25-
taskTests: task_tests_1.default, tasks: tasks_1.default, testRun: test_run_1.default, tutorial: tutorial_1.default, tutorialList: tutorial_list_1.default, windowToggle: window_toggle_1.default
26-
}));
16+
checks: checks_1.default, devToolsToggle: devTools_toggle_1.default, dir: dir_1.default, hintPosition: hint_position_1.default, progress: progress_1.default,
17+
taskActions: task_actions_1.default, taskPosition: task_position_1.default, taskTests: task_tests_1.default, testRun: test_run_1.default, windowToggle: window_toggle_1.default
18+
}, coderoad_core_1.reducers));

‎src/components/AppMenu/issuesLink.tsx

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
import * as React from 'react';
2-
import MenuItem from 'material-ui/MenuItem';
3-
import store from '../../store';
4-
5-
export default function issuesLink() {
6-
const tutorial = store.getState().tutorial;
7-
if (!tutorial || !tutorial.config || !tutorial.config.issuesPath) {
8-
return null;
9-
}
10-
return (
11-
<MenuItem
12-
key='issue'
13-
className='link'
14-
>
15-
<a href={tutorial.config.issuesPath}>
16-
post issue
17-
</a>
18-
</MenuItem>
19-
);
20-
}
1+
// import * as React from 'react';
2+
// import MenuItem from 'material-ui/MenuItem';
3+
//
4+
// export default function issuesLink() {
5+
// const tutorial = store.getState().tutorial;
6+
// if (!tutorial || !tutorial.config || !tutorial.config.issuesPath) {
7+
// return null;
8+
// }
9+
// return (
10+
// <MenuItem
11+
// key='issue'
12+
// className='link'
13+
// >
14+
// <a href={tutorial.config.issuesPath}>
15+
// post issue
16+
// </a>
17+
// </MenuItem>
18+
// );
19+
// }

‎src/components/AppMenu/menuRight.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import IconMenu from 'material-ui/IconMenu';
33
import Divider from 'material-ui/Divider';
44
import Quit from './Quit';
5-
import issuesLink from './issuesLink';
5+
// import issuesLink from './issuesLink';
66
import menuIconRight from './menuIconRight';
77
import menuRightRouteOptions from './menuRightRouteOptions';
88

@@ -19,7 +19,7 @@ export default function menuRight(route: string) {
1919
anchorOrigin={origin}
2020
>
2121
{menuRightRouteOptions(route)}
22-
{issuesLink()}
22+
{/*issuesLink()*/}
2323
<Divider />
2424
<Quit />
2525
</IconMenu>

‎src/components/Start/Checks/SetupChecks.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {Step, StepLabel, StepContent} from 'material-ui/Stepper';
33
import {Card, CardHeader, CardText, CardActions} from 'material-ui/Card';
44
import FlatButton from 'material-ui/FlatButton';
55
import VerifyButton from './VerifyButton';
6-
import {openDirectory, createPackageJson} from '../../../reducers/checks/action-setup';
6+
// import {openDirectory, createPackageJson} from '../../../reducers/checks/action-setup';
77
import DynamicStepper from './DynamicStepper';
88
import StepCheck from './StepCheck';
99

@@ -32,7 +32,7 @@ const SetupChecks: React.StatelessComponent<{
3232
<FlatButton
3333
label='Open Directory'
3434
secondary={true}
35-
onTouchTap={openDirectory}
35+
/* onTouchTap={openDirectory} */
3636
/>
3737
</StepCheck>
3838

@@ -45,7 +45,7 @@ const SetupChecks: React.StatelessComponent<{
4545
<FlatButton
4646
label='Create package.json'
4747
secondary={true}
48-
onTouchTap={createPackageJson}
48+
/* onTouchTap={createPackageJson} */
4949
/>
5050
</StepCheck>
5151

‎src/components/Start/Checks/SystemChecks.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Card, CardHeader, CardText, CardActions} from 'material-ui/Card';
44
import FlatButton from 'material-ui/FlatButton';
55
import VerifyButton from './VerifyButton';
66
import {pink500} from 'material-ui/styles/colors';
7-
import {updateNpm} from '../../../reducers/checks/action-system';
7+
// import {updateNpm} from '../../../reducers/checks/action-system';
88
import DynamicStepper from './DynamicStepper';
99
import StepCheck from './StepCheck';
1010

@@ -40,7 +40,7 @@ const SystemChecks: React.StatelessComponent<{
4040
<FlatButton
4141
label='Update NPM'
4242
secondary={true}
43-
onTouchTap={updateNpm}
43+
/* onTouchTap={updateNpm} */
4444
/>
4545
</StepCheck>
4646

‎src/components/Start/Checks/VerifyButton.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import * as React from 'react';
22
import FlatButton from 'material-ui/FlatButton';
3-
import store from '../../../store';
43
import {setupVerify} from '../../../actions';
54
import {connect} from 'react-redux';
65

76
@connect(null, (dispatch) => {
87
return {
9-
verify: () => store.dispatch(setupVerify())
8+
verify: () => dispatch(setupVerify())
109
};
1110
})
1211
export default class VerifyButton extends React.Component<{

‎src/components/Start/Welcome/index.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as React from 'react';
22
import {join} from 'path';
33
import {RouteButton} from '../../index';
4-
import store from '../../../store';
54

65
const imagePath = join(
76
__dirname, '../../../../', 'img', 'coderoad.jpg'

‎src/reducers/checks/action-setup.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {join} from 'path';
2-
import {open, set} from '../../atom/editor';
3-
import {openFolder, openTerminal} from '../../atom/editor';
2+
import {open, set, openFolder, openTerminal} from '../../atom/editor';
43
import commandLine from '../../services/command-line';
54
import {setupVerify} from '../../actions';
65

‎src/reducers/index.ts

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
import {combineReducers} from 'redux';
2-
// import {reducers} from 'coderoad-core';
2+
import {reducers} from 'coderoad-core';
33

4-
import alert from './alert';
4+
// import alert from './alert';
55
import checks from './checks';
66
import devToolsToggle from './devTools-toggle';
77
import dir from './dir';
8-
import taskActions from './task-actions';
98
import hintPosition from './hint-position';
10-
import packageJson from './package-json';
11-
import page from './page';
12-
import pagePosition from './page-position';
9+
// import packageJson from './package-json';
10+
// import page from './page';
11+
// import pagePosition from './page-position';
1312
import progress from './progress';
14-
import route from './route';
13+
// import route from './route';
14+
import taskActions from './task-actions';
1515
import taskPosition from './task-position';
1616
import taskTests from './task-tests';
17-
import tasks from './tasks';
17+
// import tasks from './tasks';
1818
import testRun from './test-run';
19-
import tutorial from './tutorial';
20-
import tutorialList from './tutorial-list';
19+
// import tutorial from './tutorial';
20+
// import tutorialList from './tutorial-list';
2121
import windowToggle from './window-toggle';
2222

2323
export default combineReducers(
2424
Object.assign({}, {
25-
alert, checks, dir, devToolsToggle, taskActions, hintPosition,
26-
packageJson, page, pagePosition, progress, route, taskPosition,
27-
taskTests, tasks, testRun, tutorial, tutorialList, windowToggle
28-
})
25+
checks, devToolsToggle, dir, hintPosition, progress,
26+
taskActions, taskPosition, taskTests, testRun, windowToggle
27+
}, reducers)
2928
);

0 commit comments

Comments
 (0)