Skip to content

Commit 9556b2d

Browse files
ShMcKShMcK
committed
add setup button
1 parent c2aaaba commit 9556b2d

File tree

14 files changed

+46
-21
lines changed

14 files changed

+46
-21
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [0.5.7] - in progress
66
- @action(openConsole)
7+
- style improvements
8+
- bug fixes
79

810
## [0.5.6] - 2016-03-12
911
- fixes for Windows

‎lib/components/start/setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var default_1 = (function (_super) {
1515
}
1616
default_1.prototype.render = function () {
1717
var warning = this.props.warning;
18-
return (React.createElement("div", {className: 'cr-setup'}, React.createElement(material_ui_1.List, {subheader: 'Setup'}, React.createElement(material_ui_1.ListItem, {key: warning.key, onClick: warning.click}, React.createElement("h4", null, warning.title), React.createElement(_components_1.MarkdownText, {text: warning.text}))), !!warning.verify ? React.createElement(material_ui_1.RaisedButton, {label: "Verify " + warning.verify, secondary: true, onTouchTap: setup_checks_1.verifySetupComplete}) : null, React.createElement("br", null), React.createElement("br", null), React.createElement("div", {className: 'setup-guide'}, React.createElement("span", null, "Check the", React.createElement("a", {href: 'https://coderoad.github.io/docs/#install'}, " Install Guide")))));
18+
return (React.createElement("div", {className: 'cr-setup'}, React.createElement(material_ui_1.List, {subheader: 'Setup'}, React.createElement(material_ui_1.ListItem, {key: warning.key}, React.createElement("h4", null, warning.title), React.createElement(_components_1.MarkdownText, {text: warning.text}))), React.createElement("br", null), !!warning.button ? React.createElement("div", {class: 'cr-setup-action'}, React.createElement(material_ui_1.RaisedButton, {primary: true, label: warning.button, onTouchTap: warning.click}), React.createElement("br", null), React.createElement("br", null)) : null, !!warning.verify ? React.createElement("div", {class: 'cr-setup-action'}, React.createElement(material_ui_1.RaisedButton, {label: "Verify " + warning.verify, secondary: true, onTouchTap: setup_checks_1.verifySetupComplete}), React.createElement("br", null), React.createElement("br", null)) : null, 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"))))));
1919
};
2020
;
2121
return default_1;

‎lib/reducers/task-tests/concat-tests.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ function unlink(targetFile) {
99
});
1010
}
1111
function concatTests(targetFile, files) {
12-
console.log('files', files);
1312
unlink(targetFile).then(function () {
1413
files.forEach(function (test) {
1514
return new Promise(function (resolve) {

‎lib/services/loaders.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
"use strict";
2+
var vm = require('vm');
3+
var fs = require('fs');
4+
var path = require('path');
5+
function load(pathToContext) {
6+
var absPath = path.join(process.env.DIR, pathToContext);
7+
var context = fs.readFileSync(absPath, 'utf8');
8+
vm.runInThisContext(context);
9+
}
10+
function getLoaders() {
11+
window.load = load;
12+
}
13+
Object.defineProperty(exports, "__esModule", { value: true });
14+
exports.default = getLoaders;

‎lib/services/setup-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var path = require('path');
33
var editor_1 = require('../atom/editor');
44
var setup_checks_1 = require('./setup-checks');
5-
var packageData = "{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.1.9\"\n }\n}";
5+
var packageData = "{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.1\"\n }\n}";
66
function createPackageJson() {
77
var packagePath = path.join(window.coderoad.dir, 'package.json');
88
return new Promise(function (resolve, reject) {

‎lib/services/setup-checks.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function hasDirectory() {
2525
title: 'Create an Atom Project',
2626
click: setup_actions_1.openDirectory,
2727
text: 'Start by opening a folder to work in.\nFile > Open',
28+
button: 'Open Folder',
2829
verify: null
2930
});
3031
}
@@ -42,6 +43,7 @@ function hasPackageJson() {
4243
title: 'Create a `package.json` file',
4344
click: setup_actions_1.createPackageJson,
4445
text: 'Open a terminal in this directory and run:\n`npm init` or `npm init --y`.\n',
46+
button: 'Create Package.json',
4547
verify: 'Package.json created'
4648
});
4749
}
@@ -58,6 +60,7 @@ function hasTutorialDep() {
5860
key: 'noTutorialDep',
5961
title: 'Install a Tutorial',
6062
click: setup_actions_1.installTutorial,
63+
button: 'Install functional-school',
6164
text: 'In terminal in this project directory run:\n`npm i --save coderoad-functional-school`',
6265
verify: 'Tutorial Installed'
6366
});

‎package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,19 @@
4545
"material-ui": "0.14.4",
4646
"react": "0.14.7",
4747
"react-dom": "0.14.7",
48-
"react-redux": "4.4.0",
49-
"react-scrollbar": "^0.4.0",
48+
"react-redux": "4.4.1",
5049
"react-tap-event-plugin": "0.2.2",
5150
"redux": "3.3.1"
5251
},
5352
"devDependencies": {
54-
"ava": "^0.12.0",
53+
"ava": "^0.13.0",
5554
"enzyme": "2.1.0",
5655
"jsdom": "8.1.0",
57-
"react-addons-test-utils": "0.14.7"
56+
"react-addons-test-utils": "0.14.7",
57+
"tsc": "^1.20150623.0"
5858
},
5959
"scripts": {
6060
"test": "ava",
61-
"compile": "tsc",
62-
"build": "npm run compile"
61+
"compile": "tsc"
6362
}
6463
}

‎src/actions/actionTypes.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
/**
2-
* Action Types
3-
*/
4-
5-
61
// Project
72
export const SET_PROJECT = 'SET_PROJECT';
83
export const SETUP_WARNING = 'SETUP_WARNING';

‎src/components/start/_start.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
}
2323
}
2424
.cr-setup {
25+
.cr-setup-action {
26+
padding: 10px auto;
27+
margin-bottom: 10px;
28+
}
2529
.setupGuide {
2630
margin: 0 auto;
2731
padding: 20px;

‎src/components/start/setup.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,24 @@ export default class extends React.Component<{warning: CR.SetupWarning}, {}> {
99
return (
1010
<div className='cr-setup'>
1111
<List subheader='Setup'>
12-
<ListItem key={warning.key}
13-
onClick={warning.click}>
12+
<ListItem key={warning.key}>
1413
<h4>{warning.title}</h4>
1514
<MarkdownText text={warning.text} />
1615
</ListItem>
1716
</List>
18-
{!!warning.verify ? <RaisedButton label={`Verify ${warning.verify}`} secondary={true} onTouchTap={verifySetupComplete} /> : null}
17+
<br />
18+
{!!warning.button ? <div class='cr-setup-action'>
19+
<RaisedButton primary={true} label={warning.button} onTouchTap={warning.click}/>
20+
<br /><br />
21+
</div> : null}
22+
23+
{!!warning.verify ? <div class='cr-setup-action'>
24+
<RaisedButton label={`Verify ${warning.verify}`} secondary={true} onTouchTap={verifySetupComplete} /><br /><br />
25+
</div> : null}
1926

20-
<br/><br/>
2127
<div className='setup-guide'>
2228
<span>Check the
23-
<a href='https://coderoad.github.io/docs/#install'> Install Guide</a></span>
29+
<a href='https://coderoad.github.io/docs/#install'> <strong>Install Guide</strong></a></span>
2430
</div>
2531
</div>);
2632
};

‎src/reducers/task-tests/concat-tests.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ function unlink(targetFile) {
1010
}
1111

1212
export function concatTests(targetFile: string, files: any): string {
13-
console.log('files', files);
1413
// delete previous file
1514
unlink(targetFile).then(function () {
1615
// load tests in order

‎src/services/setup-actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {verifySetupComplete} from './setup-checks';
77
const packageData = `{
88
"name": "demo",
99
"dependencies": {
10-
"coderoad-functional-school": "^0.1.9"
10+
"coderoad-functional-school": "^0.2.1"
1111
}
1212
}`;
1313

‎src/services/setup-checks.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ function hasDirectory(): Promise<CR.SetupWarning> {
2828
title: 'Create an Atom Project',
2929
click: openDirectory,
3030
text: 'Start by opening a folder to work in.\nFile > Open',
31+
button: 'Open Folder',
3132
verify: null
3233
});
3334
} else {
@@ -46,6 +47,7 @@ function hasPackageJson(): Promise<CR.SetupWarning> {
4647
title: 'Create a `package.json` file',
4748
click: createPackageJson,
4849
text: 'Open a terminal in this directory and run:\n`npm init` or `npm init --y`.\n',
50+
button: 'Create Package.json',
4951
verify: 'Package.json created'
5052
});
5153
}
@@ -64,6 +66,7 @@ function hasTutorialDep(): Promise<CR.SetupWarning> {
6466
key: 'noTutorialDep',
6567
title: 'Install a Tutorial',
6668
click: installTutorial,
69+
button: 'Install functional-school',
6770
text: 'In terminal in this project directory run:\n`npm i --save coderoad-functional-school`',
6871
verify: 'Tutorial Installed'
6972
});

‎src/typings/cr/cr.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ declare namespace CR {
126126
click: () => void;
127127
text: string;
128128
verify?: string;
129+
button?: string;
129130
}
130131

131132
interface TestRunnerOptions {}

0 commit comments

Comments
 (0)