Skip to content

Commit bd95826

Browse files
ShMcKShMcK
committed
check actions
1 parent d3f666c commit bd95826

File tree

9 files changed

+68
-77
lines changed

9 files changed

+68
-77
lines changed

‎lib/components/checks/checks.js

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
var React = require('react');
1717
var paper_1 = require('material-ui/lib/paper');
18-
var raised_button_1 = require('material-ui/lib/raised-button');
1918
var setup_checker_1 = require('./setup-checker');
2019
var VerticalStep_1 = require('material-ui/lib/Stepper/VerticalStep');
2120
var flat_button_1 = require('material-ui/lib/flat-button');
22-
var setup_actions_1 = require('../../reducers/checks/setup-actions');
21+
var action_setup_1 = require('../../reducers/checks/action-setup');
2322
var react_redux_1 = require('react-redux');
2423
var store_1 = require('../../store/store');
2524
var Action = require('../../actions/actions');
25+
var style = {
26+
icon: {
27+
backgroundColor: 'red'
28+
}
29+
};
2630
var Checks = (function (_super) {
2731
__extends(Checks, _super);
2832
function Checks() {
@@ -38,22 +42,22 @@ var Checks = (function (_super) {
3842
};
3943
Checks.prototype.render = function () {
4044
var _a = this.props, checks = _a.checks, routeToTutorials = _a.routeToTutorials, verify = _a.verify;
41-
return React.createElement(paper_1.default, {className: 'cr-start'}, React.createElement("div", {className: 'cr-start-header'}, React.createElement("p", {className: 'tagline'}, "Setup"), checks.system.passed ? null : React.createElement(setup_checker_1.default, {title: 'Dependency Checks', status: this.getSystemChecks(checks)}, React.createElement(VerticalStep_1.default, {orderStepLabel: '1', stepLabel: 'Node >= 0.10', actions: [
42-
React.createElement(raised_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify})
43-
]}, React.createElement("div", null, "Install a newer version of ", React.createElement("a", {href: 'https://nodejs.org'}, "Node"))), React.createElement(VerticalStep_1.default, {orderStepLabel: '2', stepLabel: 'NPM >= 3', actions: [
44-
React.createElement(raised_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify})
45-
]}, React.createElement("div", null, "Update your version of NPM.", React.createElement("br", null), "`> npm update -g npm`"))), checks.setup.passed ? null : React.createElement(setup_checker_1.default, {title: 'Setup Checks', status: this.getSetupChecks(checks)}, React.createElement(VerticalStep_1.default, {orderStepLabel: '1', stepLabel: 'working directory', actions: [
46-
React.createElement(raised_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
47-
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: setup_actions_1.openDirectory})
48-
]}, React.createElement("div", null, "File -> Open (a new folder)")), React.createElement(VerticalStep_1.default, {orderStepLabel: '2', stepLabel: 'package.json', actions: [
49-
React.createElement(raised_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
50-
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: setup_actions_1.createPackageJson})
51-
]}, React.createElement("div", null, "Create a package.json by running", React.createElement("br", null), "`> npm init -y`")), React.createElement(VerticalStep_1.default, {orderStepLabel: '3', stepLabel: 'install tutorial', actions: [
52-
React.createElement(raised_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
53-
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: setup_actions_1.installTutorial})
54-
]}, React.createElement("div", null, "Install a tutorial using npm. For example:", React.createElement("br", null), "`> npm install coderoad-functional-school --save-dev`"))), checks.passed
45+
return React.createElement(paper_1.default, {className: 'cr-start'}, React.createElement("div", {className: 'cr-start-header'}, React.createElement("p", {className: 'tagline'}, "Setup"), checks.system.passed ? null : React.createElement(setup_checker_1.default, {title: 'Dependency Checks', status: this.getSystemChecks(checks)}, React.createElement(VerticalStep_1.default, {style: style, orderStepLabel: '✗', stepLabel: 'Node >= 0.10', actions: [
46+
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify})
47+
]}, React.createElement("div", null, "Install a newer version of ", React.createElement("a", {href: 'https://nodejs.org'}, "Node"))), React.createElement(VerticalStep_1.default, {orderStepLabel: '✗', stepLabel: 'NPM >= 3', actions: [
48+
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
49+
]}, React.createElement("div", null, "Update your version of NPM.", React.createElement("br", null), "`> npm update -g npm`"))), checks.setup.passed ? null : React.createElement(setup_checker_1.default, {title: 'Setup Checks', status: this.getSetupChecks(checks)}, React.createElement(VerticalStep_1.default, {orderStepLabel: '✗', stepLabel: 'working directory', actions: [
50+
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
51+
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.openDirectory})
52+
]}, React.createElement("div", null, "File -> Open (a new folder)")), React.createElement(VerticalStep_1.default, {orderStepLabel: '✗', stepLabel: 'package.json', actions: [
53+
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
54+
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.createPackageJson})
55+
]}, React.createElement("div", null, "Create a package.json by running", React.createElement("br", null), "`> npm init -y`")), React.createElement(VerticalStep_1.default, {orderStepLabel: '✗', stepLabel: 'install tutorial', actions: [
56+
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
57+
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.installTutorial})
58+
]}, React.createElement("div", null, "Install a tutorial using npm. For example:", React.createElement("br", null), "`> npm install coderoad-functional-school --save-dev`")))), checks.passed
5559
? React.createElement(flat_button_1.default, {label: 'Begin', primary: true, onTouchTap: routeToTutorials})
56-
: React.createElement("div", {className: 'setup-guide'}, React.createElement("span", null, "Check the", React.createElement("a", {href: 'https://coderoad.github.io/docs#install'}, " ", React.createElement("strong", null, "Install Guide"))))), React.createElement("p", {className: 'version'}, "Beta"));
60+
: React.createElement("div", {className: 'setup-guide'}, React.createElement("span", null, "Check the", React.createElement("a", {href: 'https://coderoad.github.io/docs#install'}, " ", React.createElement("strong", null, "Install Guide")))), React.createElement("p", {className: 'version'}, "Beta"));
5761
};
5862
Checks = __decorate([
5963
react_redux_1.connect(null, function (dispatch) {

‎lib/reducers/checks/setup-actions.js renamed to ‎lib/reducers/checks/action-setup.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ function createPackageJson() {
1919
}
2020
exports.createPackageJson = createPackageJson;
2121
function openDirectory() {
22-
return actions_1.openFolder();
22+
actions_1.openFolder();
2323
}
2424
exports.openDirectory = openDirectory;
2525
function installTutorial() {
26-
return actions_1.openTerminal();
26+
actions_1.openTerminal();
2727
}
2828
exports.installTutorial = installTutorial;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"use strict";
2+
function updateNpm() {
3+
return;
4+
}
5+
exports.updateNpm = updateNpm;

‎lib/reducers/checks/setup.js

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

‎src/components/checks/_checks.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
color: white;
66
&-header {
77
display: block;
8-
height: 300px;
8+
height: 500px;
99
background-color: lightblue;
1010
padding-top: 100px;
1111
.title {

‎src/components/checks/checks.tsx

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
import * as React from 'react';
22
import Paper from 'material-ui/lib/paper';
3-
import RaisedButton from 'material-ui/lib/raised-button';
43
import DynamicStepper from './setup-checker';
54
import Step from 'material-ui/lib/Stepper/VerticalStep';
65
import FlatButton from 'material-ui/lib/flat-button';
76

8-
import {openDirectory, createPackageJson, installTutorial} from '../../reducers/checks/setup-actions';
7+
import {openDirectory, createPackageJson, installTutorial} from '../../reducers/checks/action-setup';
8+
import {updateNpm} from '../../reducers/checks/action-system';
99
import {connect} from 'react-redux';
1010
import {store} from '../../store/store';
1111
import * as Action from '../../actions/actions';
1212

13+
const style = {
14+
icon: {
15+
backgroundColor: 'red'
16+
}
17+
};
18+
1319
@connect(null, (dispatch) => {
1420
return {
1521
routeToTutorials: () => store.dispatch(Action.setRoute('tutorials')),
@@ -36,23 +42,23 @@ export class Checks extends React.Component<{
3642
{/* System Checks */}
3743

3844
{checks.system.passed ? null : <DynamicStepper title='Dependency Checks' status={this.getSystemChecks(checks)}>
39-
<Step orderStepLabel='1'
45+
<Step style={style}
46+
orderStepLabel='✗'
4047
stepLabel='Node >= 0.10'
4148
actions={[
42-
<RaisedButton key={0} primary={true}
49+
<FlatButton key={0} primary={true}
4350
label='Verify'
44-
onTouchTap={verify}
45-
/>
51+
onTouchTap={verify} />
4652
]} >
4753
<div>Install a newer version of <a href='https://nodejs.org'>Node</a></div>
4854
</Step>
49-
<Step orderStepLabel='2'
55+
<Step orderStepLabel='✗'
5056
stepLabel='NPM >= 3'
5157
actions={[
52-
<RaisedButton key={0} primary={true}
58+
<FlatButton key={0} primary={true}
5359
label='Verify'
54-
onTouchTap={verify}
55-
/>
60+
onTouchTap={verify} />,
61+
5662
]} >
5763
<div>
5864
Update your version of NPM.<br />
@@ -65,10 +71,10 @@ export class Checks extends React.Component<{
6571
6672
{checks.setup.passed ? null : <DynamicStepper title='Setup Checks'
6773
status={this.getSetupChecks(checks)}>
68-
<Step orderStepLabel='1'
74+
<Step orderStepLabel='✗'
6975
stepLabel='working directory'
7076
actions={[
71-
<RaisedButton key={0} primary={true}
77+
<FlatButton key={0} primary={true}
7278
label='Verify'
7379
onTouchTap={verify} />,
7480
<FlatButton key={1} secondary={true}
@@ -77,10 +83,10 @@ export class Checks extends React.Component<{
7783
]} >
7884
<div>File -> Open (a new folder)</div>
7985
</Step>
80-
<Step orderStepLabel='2'
86+
<Step orderStepLabel='✗'
8187
stepLabel='package.json'
8288
actions={[
83-
<RaisedButton key={0} primary={true}
89+
<FlatButton key={0} primary={true}
8490
label='Verify'
8591
onTouchTap={verify} />,
8692
<FlatButton key={1} secondary={true}
@@ -91,10 +97,10 @@ export class Checks extends React.Component<{
9197
Create a package.json by running<br />
9298
`> npm init -y`</div>
9399
</Step>
94-
<Step orderStepLabel='3'
100+
<Step orderStepLabel='✗'
95101
stepLabel='install tutorial'
96102
actions={[
97-
<RaisedButton key={0} primary={true}
103+
<FlatButton key={0} primary={true}
98104
label='Verify'
99105
onTouchTap={verify} />,
100106
<FlatButton key={1} secondary={true}
@@ -110,14 +116,14 @@ export class Checks extends React.Component<{
110116

111117
{/* Install Guide || Continue */}
112118

113-
{checks.passed
114-
? <FlatButton label='Begin' primary={true} onTouchTap={routeToTutorials}/>
115-
: <div className='setup-guide'>
116-
<span>Check the
117-
<a href='https://coderoad.github.io/docs#install'> <strong>Install Guide</strong></a></span>
118-
</div>}
119-
120119
</div>
120+
121+
{checks.passed
122+
? <FlatButton label='Begin' primary={true} onTouchTap={routeToTutorials}/>
123+
: <div className='setup-guide'>
124+
<span>Check the
125+
<a href='https://coderoad.github.io/docs#install'> <strong>Install Guide</strong></a></span>
126+
</div>}
121127
<p className='version'>Beta</p>
122128
</Paper>;
123129
}

‎src/reducers/checks/setup-actions.ts renamed to ‎src/reducers/checks/action-setup.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const packageData = `{
1111
}
1212
}`;
1313

14-
export function createPackageJson() {
14+
export function createPackageJson(): Promise<void> {
1515
const packagePath = path.join(window.coderoad.dir, 'package.json');
1616
return new Promise((resolve, reject) => {
1717
open(packagePath);
@@ -24,10 +24,10 @@ export function createPackageJson() {
2424
});
2525
}
2626

27-
export function openDirectory() {
28-
return openFolder();
27+
export function openDirectory(): void {
28+
openFolder();
2929
}
3030

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function updateNpm(): void {
2+
return;
3+
}

‎tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,11 @@
6363
"src/components/remove-later.ts",
6464
"src/components/theme/theme.ts",
6565
"src/reducers/alert/alert.ts",
66+
"src/reducers/checks/action-setup.ts",
67+
"src/reducers/checks/action-system.ts",
6668
"src/reducers/checks/check-setup.ts",
6769
"src/reducers/checks/check-system.ts",
6870
"src/reducers/checks/checks.ts",
69-
"src/reducers/checks/setup-actions.ts",
7071
"src/reducers/checks/verify.ts",
7172
"src/reducers/editor-actions/action-helpers.ts",
7273
"src/reducers/editor-actions/actions.ts",

0 commit comments

Comments
 (0)