Skip to content

Commit 68ad356

Browse files
ShMcKShMcK
committed
fix order of setup checks
1 parent 56e2ffb commit 68ad356

File tree

13 files changed

+44
-176
lines changed

13 files changed

+44
-176
lines changed

‎lib/components/start/checks/checks.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
"use strict";
22
var React = require('react');
33
var steps_1 = require('./steps');
4-
var verify_1 = require('./verify');
54
exports.Checks = function (_a) {
65
var checks = _a.checks;
7-
return (React.createElement("div", {className: 'cr-checks'}, React.createElement(steps_1.SystemChecks, {checks: checks}), React.createElement(steps_1.SetupChecks, {checks: checks}), React.createElement("br", null), React.createElement(verify_1.VerifyButton, null), React.createElement("br", null), React.createElement(steps_1.InstallGuide, {show: checks.passed})));
6+
return (React.createElement("div", {className: 'cr-checks'}, React.createElement(steps_1.SystemChecks, {checks: checks}), React.createElement(steps_1.SetupChecks, {checks: checks}), React.createElement(steps_1.InstallGuide, {show: checks.passed})));
87
};

‎lib/components/start/checks/steps.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var Stepper_1 = require('material-ui/Stepper');
44
var Card_1 = require('material-ui/Card');
55
var FlatButton_1 = require('material-ui/FlatButton');
66
var setup_checker_1 = require('./setup-checker');
7+
var verify_1 = require('./verify');
78
var FontIcon_1 = require('material-ui/FontIcon');
89
var warning_1 = require('material-ui/svg-icons/alert/warning');
910
var colors_1 = require('material-ui/styles/colors');
@@ -22,7 +23,7 @@ exports.SystemChecks = function (_a) {
2223
return null;
2324
}
2425
var status = [system.node, system.npm];
25-
return React.createElement(Card_1.Card, {className: 'cr-check'}, React.createElement(Card_1.CardHeader, {title: 'System Checks'}), React.createElement(setup_checker_1.default, {status: status}, React.createElement(StepCheck, {label: 'Node >= 0.10', completed: checks.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, {label: 'NPM >= 3', completed: checks.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}))));
26+
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(setup_checker_1.default, {status: status}, React.createElement(StepCheck, {label: 'Node >= 0.10', completed: checks.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, {label: 'NPM >= 3', completed: checks.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(Card_1.CardActions, null, React.createElement(verify_1.VerifyButton, null)));
2627
};
2728
exports.SetupChecks = function (_a) {
2829
var checks = _a.checks;
@@ -31,7 +32,7 @@ exports.SetupChecks = function (_a) {
3132
return null;
3233
}
3334
var status = [setup.dir, setup.packageJson, setup.tutorial];
34-
return React.createElement(Card_1.Card, {className: 'cr-check'}, React.createElement(Card_1.CardHeader, {title: 'Setup Checks'}), React.createElement(setup_checker_1.default, {status: status}, React.createElement(StepCheck, {label: 'open a directory', completed: checks.setup.dir}, 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, {label: 'package.json', completed: checks.setup.packageJson}, "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, {label: 'install a tutorial', completed: checks.setup.tutorial}, "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(FlatButton_1.default, {label: 'install functional-school demo', secondary: true, onTouchTap: action_setup_1.installTutorial}))));
35+
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(setup_checker_1.default, {status: status}, React.createElement(StepCheck, {label: 'open a directory', completed: checks.setup.dir}, 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, {label: 'package.json', completed: checks.setup.packageJson}, "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, {label: 'install a tutorial', completed: checks.setup.tutorial}, "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(FlatButton_1.default, {label: 'install functional-school demo', secondary: true, onTouchTap: action_setup_1.installTutorial})))), React.createElement(Card_1.CardActions, null, React.createElement(verify_1.VerifyButton, null)));
3536
};
3637
exports.InstallGuide = function (_a) {
3738
var show = _a.show;

‎lib/components/start/checks/verify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var VerifyButton = (function (_super) {
2424
_super.apply(this, arguments);
2525
}
2626
VerifyButton.prototype.render = function () {
27-
return React.createElement(FlatButton_1.default, {label: 'Check Again', secondary: true, onTouchTap: this.props.verify});
27+
return React.createElement(FlatButton_1.default, {label: 'Verify Setup Complete', primtary: true, onTouchTap: this.props.verify});
2828
};
2929
VerifyButton = __decorate([
3030
react_redux_1.connect(null, function (dispatch) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@ function openDirectory() {
2323
}
2424
exports.openDirectory = openDirectory;
2525
function installTutorial() {
26-
actions_1.openTerminal();
2726
}
2827
exports.installTutorial = installTutorial;

‎lib/reducers/checks/verify.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,28 @@ function allTrue(obj) {
66
return Object.values(obj).every(function (x) { return x === true; });
77
}
88
function verifySetup() {
9-
var hasDir = !!check_setup_1.hasDirectory();
9+
var dir = !!check_setup_1.hasDirectory();
10+
var packageJson = false;
11+
var tutorial = false;
12+
if (dir) {
13+
packageJson = !!check_setup_1.hasPackageJson();
14+
}
15+
if (dir && packageJson) {
16+
tutorial = check_setup_1.hasTutorialDep();
17+
}
1018
var checks = {
1119
system: {
1220
node: !!check_system_1.nodeMinVersion(),
1321
npm: !!check_system_1.npmMinVersion()
1422
},
1523
setup: {
16-
dir: hasDir,
17-
packageJson: hasDir ? !!check_setup_1.hasPackageJson() : false,
18-
tutorial: hasDir ? !!check_setup_1.hasTutorialDep() : false
24+
dir: dir, packageJson: packageJson, tutorial: tutorial
1925
}
2026
};
2127
checks.system.passed = allTrue(checks.system);
2228
checks.setup.passed = allTrue(checks.setup);
2329
checks.passed = checks.system.passed && checks.setup.passed;
24-
console.log('checks', checks);
30+
console.log(checks);
2531
return checks;
2632
}
2733
Object.defineProperty(exports, "__esModule", { value: true });

‎src/components/checks/checks.tsx

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎src/components/start/checks/checks.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
import * as React from 'react';
22
import {SystemChecks, SetupChecks, InstallGuide} from './steps';
3-
import {VerifyButton} from './verify';
3+
44

55
export const Checks: React.StatelessComponent<{
66
checks: CR.Checks
77
}> = ({checks}) => (
88
<div className='cr-checks'>
99
<SystemChecks checks={checks} />
1010
<SetupChecks checks={checks} />
11-
<br />
12-
<VerifyButton />
13-
<br />
11+
1412
<InstallGuide show={checks.passed} />
1513
</div>
1614
);

‎src/components/start/checks/steps.tsx

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import * as React from 'react';
22
import {Step, StepLabel, StepContent} from 'material-ui/Stepper';
3-
import {Card, CardHeader} from 'material-ui/Card';
3+
import {Card, CardHeader, CardText, CardActions} from 'material-ui/Card';
44
import FlatButton from 'material-ui/FlatButton';
55
import DynamicStepper from './setup-checker';
6+
import {VerifyButton} from './verify';
67

78
import FontIcon from 'material-ui/FontIcon';
89
import WarningIcon from 'material-ui/svg-icons/alert/warning';
@@ -11,7 +12,6 @@ import {red500, pink500} from 'material-ui/styles/colors';
1112
import {openDirectory, createPackageJson, installTutorial} from '../../../reducers/checks/action-setup';
1213
import {updateNpm} from '../../../reducers/checks/action-system';
1314

14-
1515
const StepCheck: React.StatelessComponent<{
1616
completed: boolean, label: string, children?: any
1717
}> = ({completed, label, children}) => (
@@ -37,7 +37,9 @@ export const SystemChecks: React.StatelessComponent<{
3737
}
3838
const status = [system.node, system.npm];
3939
return <Card className='cr-check'>
40-
<CardHeader title='System Checks' />
40+
<CardHeader title='System Checks'
41+
subtitle='CodeRoad requires several key dependencies'/>
42+
<CardText>
4143
<DynamicStepper status={status}>
4244
<StepCheck label='Node >= 0.10'
4345
completed={checks.system.node}>
@@ -51,6 +53,8 @@ export const SystemChecks: React.StatelessComponent<{
5153
<FlatButton label='Update NPM' secondary={true} onTouchTap={updateNpm} />
5254
</StepCheck>
5355
</DynamicStepper>
56+
</CardText>
57+
<CardActions><VerifyButton /></CardActions>
5458
</Card>;
5559
};
5660

@@ -64,7 +68,9 @@ export const SetupChecks: React.StatelessComponent<{
6468
}
6569
const status = [setup.dir, setup.packageJson, setup.tutorial];
6670
return <Card className='cr-check'>
67-
<CardHeader title='Setup Checks' />
71+
<CardHeader title='Setup Checks'
72+
subtitle='CodeRoad requires a brief setup' />
73+
<CardText>
6874
<DynamicStepper status={status}>
6975
<StepCheck label='open a directory'
7076
completed={checks.setup.dir}>
@@ -86,6 +92,8 @@ export const SetupChecks: React.StatelessComponent<{
8692
<FlatButton label='install functional-school demo' secondary={true} onTouchTap={installTutorial} />
8793
</StepCheck>
8894
</DynamicStepper>
95+
</CardText>
96+
<CardActions><VerifyButton /></CardActions>
8997
</Card>;
9098
};
9199

‎src/components/start/checks/verify.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ export class VerifyButton extends React.Component<{
1313
verify?: any
1414
}, {}> {
1515
render() {
16-
return <FlatButton label='Check Again' secondary={true} onTouchTap={this.props.verify} />;
16+
return <FlatButton label='Verify Setup Complete' primtary={true} onTouchTap={this.props.verify} />;
1717
}
1818
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ export function openDirectory(): void {
2929
}
3030

3131
export function installTutorial(): void {
32-
openTerminal();
32+
3333
}

‎src/reducers/checks/verify.js

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/reducers/checks/verify.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,30 @@ function allTrue(obj: Object): boolean {
1111
}
1212

1313
export default function verifySetup(): CR.Checks {
14-
let hasDir = !!hasDirectory();
14+
let dir = !!hasDirectory();
15+
let packageJson = false;
16+
let tutorial = false;
17+
18+
if (dir) {
19+
packageJson = !!hasPackageJson();
20+
}
21+
if (dir && packageJson) {
22+
tutorial = hasTutorialDep();
23+
}
1524

1625
let checks: CR.Checks = {
1726
system: {
1827
node: !!nodeMinVersion(),
1928
npm: !!npmMinVersion()
2029
},
2130
setup: {
22-
dir: hasDir,
23-
packageJson: hasDir ? !!hasPackageJson() : false,
24-
tutorial: hasDir ? !!hasTutorialDep() : false
31+
dir, packageJson, tutorial
2532
}
2633
};
2734

2835
checks.system.passed = allTrue(checks.system);
2936
checks.setup.passed = allTrue(checks.setup);
3037
checks.passed = checks.system.passed && checks.setup.passed;
31-
console.log('checks', checks);
38+
console.log(checks);
3239
return checks;
3340
}

‎tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
"src/store/store.ts",
102102
"src/components/alert/alert.tsx",
103103
"src/components/app.tsx",
104-
"src/components/checks/checks.tsx",
105104
"src/components/final-page/final-page.tsx",
106105
"src/components/markdown/markdown.tsx",
107106
"src/components/menu/menu.tsx",

0 commit comments

Comments
 (0)