Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit64855a1

Browse files
committed
cleanup setup process
1 parent2ee64af commit64855a1

File tree

12 files changed

+30
-22
lines changed

12 files changed

+30
-22
lines changed

‎lib/components/start/setup.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ var __extends = (this && this.__extends) || function (d, b) {
77
varReact=require('react');
88
varmaterial_ui_1=require('material-ui');
99
var_components_1=require('../_components');
10+
varsetup_checks_1=require('../../services/setup-checks');
1011
vardefault_1=(function(_super){
1112
__extends(default_1,_super);
1213
functiondefault_1(){
1314
_super.apply(this,arguments);
1415
}
1516
default_1.prototype.render=function(){
1617
varwarning=this.props.warning;
17-
return(React.createElement("div",{className:'cr-setup'},React.createElement(material_ui_1.List,{subheader:'Setup'},React.createElement(material_ui_1.ListItem,{key:warning.key,primaryText:warning.title,onClick:warning.click},React.createElement(_components_1.MarkdownText,{text:warning.text}))),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,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")))));
1819
};
1920
;
2021
returndefault_1;

‎lib/components/start/start.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ var setup_1 = require('./setup');
55
vartutorials_1=require('./tutorials');
66
exports.Start=function(_a){
77
vartutorials=_a.tutorials,warning=_a.warning;
8-
return(React.createElement(material_ui_1.Paper,{className:'cr-start'},React.createElement("div",{className:'cr-start-header'},React.createElement("span",{className:'title'},"CodeRoad"),React.createElement("p",{className:'tagline'},"Tutorials in the Editor"),React.createElement("p",{className:'notes'},"Beta"),!warning ?React.createElement(tutorials_1.default,{tutorials:tutorials}) :React.createElement(setup_1.default,{warning:warning}))));
8+
return(React.createElement(material_ui_1.Paper,{className:'cr-start'},React.createElement("div",{className:'cr-start-header'},React.createElement("span",{className:'title'},"CodeRoad"),React.createElement("p",{className:'tagline'},"Tutorials in the Editor"),React.createElement("p",{className:'version'},"Beta"),!warning ?React.createElement(tutorials_1.default,{tutorials:tutorials}) :React.createElement(setup_1.default,{warning:warning}))));
99
};

‎lib/services/setup-actions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ function openDirectory() {
2121
}
2222
exports.openDirectory=openDirectory;
2323
functioninstallTutorial(){
24+
return;
2425
}
2526
exports.installTutorial=installTutorial;

‎lib/services/setup-checks.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ function verifySetupComplete() {
1313
_base_1.store.dispatch(Action.loadTutorials());
1414
})
1515
.catch(function(warning){
16-
console.log(warning);
1716
_base_1.store.dispatch(Action.setupWarning(warning));
1817
});
1918
}
@@ -26,7 +25,8 @@ function hasDirectory() {
2625
key:'noProject',
2726
title:'Create an Atom Project',
2827
click:setup_actions_1.openDirectory,
29-
text:'File > Open > a workspace folder'
28+
text:'Start by opening a folder to work in.\nFile > Open',
29+
verify:null
3030
});
3131
}
3232
else{
@@ -42,7 +42,8 @@ function hasPackageJson() {
4242
key:'noPackageJson',
4343
title:'Create a `package.json` file',
4444
click:setup_actions_1.createPackageJson,
45-
text:'`npm init`'
45+
text:'Open a terminal in this directory and run:\n`npm init` or `npm init --y`.\n',
46+
verify:'Package.json created'
4647
});
4748
}
4849
resolve();
@@ -57,8 +58,9 @@ function hasTutorialDep() {
5758
reject({
5859
key:'noTutorialDep',
5960
title:'Install a Tutorial',
60-
click:null,
61-
text:'`npm i --save coderoad-functional-school`'
61+
click:setup_actions_1.installTutorial,
62+
text:'In terminal in this project directory run:\n`npm i --save coderoad-functional-school`',
63+
verify:'Tutorial Installed'
6264
});
6365
}
6466
resolve();

‎src/components/start/_start.less

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
&-start {
33
height:100%;
44
text-align:center;
5+
color:white;
56
&-header {
67
display:block;
78
height:300px;
@@ -12,11 +13,9 @@
1213
font-size:2em;
1314
}
1415
.tagline {
15-
color:white;
1616
font-size:1.5em;
1717
}
18-
.notes {
19-
padding-top:10px;
18+
.version {
2019
font-size:1em;
2120
}
2221
}

‎src/components/start/setup.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import*asReactfrom'react';
22
import{List,ListItem,RaisedButton}from'material-ui';
33
import{MarkdownText}from'../_components';
4+
import{verifySetupComplete}from'../../services/setup-checks';
45

56
exportdefaultclassextendsReact.Component<{warning:CR.SetupWarning},{}>{
67
render(){
@@ -9,11 +10,12 @@ export default class extends React.Component<{warning: CR.SetupWarning}, {}> {
910
<divclassName='cr-setup'>
1011
<Listsubheader='Setup'>
1112
<ListItemkey={warning.key}
12-
primaryText={warning.title}
1313
onClick={warning.click}>
14+
<h4>{warning.title}</h4>
1415
<MarkdownTexttext={warning.text}/>
1516
</ListItem>
1617
</List>
18+
{!!warning.verify ?<RaisedButtonlabel={`Verify${warning.verify}`}secondary={true}onTouchTap={verifySetupComplete}/> :null}
1719

1820
<br/><br/>
1921
<divclassName='setup-guide'>

‎src/components/start/start.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const Start = ({tutorials, warning}) => (
99
<divclassName='cr-start-header'>
1010
<spanclassName='title'>CodeRoad</span>
1111
<pclassName='tagline'>Tutorials in the Editor</p>
12-
<pclassName='notes'>Beta</p>
12+
<pclassName='version'>Beta</p>
1313

1414
{!warning ?<Tutorialstutorials={tutorials}/> :<SetupGuidewarning={warning}/>}
1515

‎src/services/setup-actions.ts

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

3131
exportfunctioninstallTutorial(){
32-
// TODO
32+
return;
3333
}

‎src/services/setup-checks.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{fileExists}from'./exists';
22
import{packageJsonExists,loadRootPackageJson,searchForTutorials}from'./tutorials';
3-
import{createPackageJson,openDirectory}from'./setup-actions';
3+
import{createPackageJson,openDirectory,installTutorial}from'./setup-actions';
44
import*aspathfrom'path';
55
import{store}from'../_base';
66
import*asActionfrom'../actions/actions';
@@ -15,7 +15,6 @@ export function verifySetupComplete() {
1515
store.dispatch(Action.loadTutorials());
1616
})
1717
.catch((warning:CR.SetupWarning)=>{
18-
console.log(warning);
1918
store.dispatch(Action.setupWarning(warning));
2019
});
2120
}
@@ -29,7 +28,8 @@ function hasDirectory(): Promise<CR.SetupWarning> {
2928
key:'noProject',
3029
title:'Create an Atom Project',
3130
click:openDirectory,
32-
text:'File > Open > a workspace folder'
31+
text:'Start by opening a folder to work in.\nFile > Open',
32+
verify:null
3333
});
3434
}else{
3535
resolve();
@@ -46,7 +46,8 @@ function hasPackageJson(): Promise<CR.SetupWarning> {
4646
key:'noPackageJson',
4747
title:'Create a `package.json` file',
4848
click:createPackageJson,
49-
text:'`npm init`'
49+
text:'Open a terminal in this directory and run:\n`npm init` or `npm init --y`.\n',
50+
verify:'Package.json created'
5051
});
5152
}
5253
resolve();
@@ -63,8 +64,9 @@ function hasTutorialDep(): Promise<CR.SetupWarning> {
6364
reject({
6465
key:'noTutorialDep',
6566
title:'Install a Tutorial',
66-
click:null,
67-
text:'`npm i --save coderoad-functional-school`'
67+
click:installTutorial,
68+
text:'In terminal in this project directory run:\n`npm i --save coderoad-functional-school`',
69+
verify:'Tutorial Installed'
6870
});
6971
}
7072
resolve();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ declare namespace CR {
123123
title:string;
124124
click:()=>void;
125125
text:string;
126+
verify?:string;
126127
}
127128

128129
interfaceTestRunnerOptions{}

‎src/typings/tsd.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
/// <reference path="text-buffer/text-buffer.d.ts" />
1616
/// <reference path="react/react-addons-css-transition-group.d.ts" />
1717
/// <reference path="marked/marked" />
18+
/// <reference path="enpeem/enpeem" />
1819
/// <reference path="cr/cr.d.ts" />
1920
/// <reference path="cr/globals.d.ts" />

‎styles/styles.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ atom-panel-container > atom-panel > #crv {
125125
.cr-start {
126126
height:100%;
127127
text-align: center;
128+
color: white;
128129
}
129130
.cr-start-header {
130131
display: block;
@@ -137,11 +138,9 @@ atom-panel-container > atom-panel > #crv {
137138
font-size:2em;
138139
}
139140
.cr-start-header .tagline {
140-
color: white;
141141
font-size:1.5em;
142142
}
143-
.cr-start-header .notes {
144-
padding-top:10px;
143+
.cr-start-header .version {
145144
font-size:1em;
146145
}
147146
.cr-setup .setupGuide {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp