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

Commit9c18bfe

Browse files
committed
refactor checks
1 parent9ccb263 commit9c18bfe

File tree

10 files changed

+27
-25
lines changed

10 files changed

+27
-25
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ var DynamicStepper_1 = require('./DynamicStepper');
88
varStepCheck_1=require('./StepCheck');
99
varSetupChecks=function(_a){
1010
varchecks=_a.checks;
11-
if(checks.setup.passed){
11+
varsetup=checks.setup;
12+
if(setup.passed){
1213
returnnull;
1314
}
14-
var_b=checks.setup,dir=_b.dir,packageJson=_b.packageJson,tutorial=_b.tutorial;
15+
vardir=setup.dir,packageJson=setup.packageJson,tutorial=setup.tutorial;
1516
varstatus=[dir,packageJson,tutorial];
1617
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: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_1.default,{label:'package.json',completed: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_1.default,{label:'install a tutorial',completed: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(Card_1.CardActions,null,React.createElement(VerifyButton_1.default,null))));
1718
};

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ var DynamicStepper_1 = require('./DynamicStepper');
99
varStepCheck_1=require('./StepCheck');
1010
varSystemChecks=function(_a){
1111
varchecks=_a.checks;
12-
if(checks.system.passed){
12+
varsystem=checks.system;
13+
if(system.passed){
1314
returnnull;
1415
}
15-
varstatus=[checks.system.node,checks.system.npm];
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: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_1.default,{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(StepCheck_1.default,{label:'Xcode',completed:checks.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+
varstatus=[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))));
1718
};
1819
Object.defineProperty(exports,"__esModule",{value:true});
1920
exports.default=SystemChecks;

‎lib/reducers/checks/verify.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
varcheck_system_1=require('./check-system');
33
varstore_1=require('../../store');
44
varcheck_1=require('../tutorial-list/check');
5-
varresult=function(x){returnx;};
65
functionallTrue(obj){
76
returnObject.values(obj).every(function(x){returnx===true;});
87
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import StepCheck from './StepCheck';
1010
constSetupChecks:React.StatelessComponent<{
1111
checks:CR.Checks
1212
}>=({checks})=>{
13-
if(checks.setup.passed){
13+
const{setup}=checks;
14+
if(setup.passed){
1415
returnnull;
1516
}
16-
const{dir, packageJson, tutorial}=checks.setup;
17+
const{dir, packageJson, tutorial}=setup;
1718
conststatus=[dir,packageJson,tutorial];
1819
return(
1920
<CardclassName='cr-check'>

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import StepCheck from './StepCheck';
1111
constSystemChecks:React.StatelessComponent<{
1212
checks:CR.Checks
1313
}>=({checks})=>{
14-
if(checks.system.passed){
14+
const{system}=checks;
15+
if(system.passed){
1516
returnnull;
1617
}
17-
conststatus=[checks.system.node,checks.system.npm];
18+
conststatus=[system.node,system.npm];
1819
return(
1920
<CardclassName='cr-check'>
2021
<CardHeader
@@ -25,14 +26,14 @@ const SystemChecks: React.StatelessComponent<{
2526
<DynamicStepperstatus={status}>
2627
<StepCheck
2728
label='Node >= 0.10'
28-
completed={checks.system.node}
29+
completed={system.node}
2930
>
3031
<p>Install a newer version of<astyle={{color:pink500}}href='https://nodejs.org'>NodeJS</a></p>
3132
</StepCheck>
3233

3334
<StepCheck
3435
label='NPM >= 3'
35-
completed={checks.system.npm}
36+
completed={system.npm}
3637
>
3738
Update your version of NPM.<br/>
3839
<code>>npmupdate-gnpm</code><br/>
@@ -45,7 +46,7 @@ const SystemChecks: React.StatelessComponent<{
4546

4647
<StepCheck
4748
label='Xcode'
48-
completed={checks.system.xcode}
49+
completed={system.xcode}
4950
>
5051
<p>Install<astyle={{color:pink500}}href='https://developer.apple.com/xcode/download/'>XCode</a></p>
5152
</StepCheck>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ export function createPackageJson(): Promise<void> {
1717
constpackagePath=join(dir,'package.json');
1818
returnnewPromise((resolve,reject)=>{
1919
open(packagePath);
20-
setTimeout(function(){
20+
setTimeout(()=>{
2121
resolve();
2222
});
23-
}).then(function(){
23+
}).then(()=>{
2424
set(packageData);
2525
store.dispatch(setupVerify());
2626
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import {setupVerify} from '../../actions';
55
exportfunctionupdateNpm():void{
66
commandLine('npm','update -g npm')
77
.then((res)=>{
8-
store.dispatch(setupVerify());
9-
});
8+
store.dispatch(setupVerify());
9+
});
1010
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ function minVersion(command: string, minVersion: string): Promise<boolean> {
1313
returnfalse;
1414
}
1515
// two digits, ex: 0.10
16-
letmins=matchVersions(minVersion);
16+
constmins=matchVersions(minVersion);
1717
if(!!mins){
18-
letresMins=matchVersions(res);
19-
letfirstDigit=parseInt(resMins[1],10);
20-
letfirstVersion=parseInt(mins[1],10);
18+
constresMins=matchVersions(res);
19+
constfirstDigit=parseInt(resMins[1],10);
20+
constfirstVersion=parseInt(mins[1],10);
2121
returnfirstDigit>firstVersion||
2222
firstDigit===firstVersion&&parseInt(resMins[2],10)>=parseInt(firstVersion[2],10);
2323
}else{

‎src/reducers/checks/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import{SETUP_VERIFY}from'../../actions/_types';
22
importsetupVerifyfrom'./verify';
33

4-
const_checks={
4+
const_checks:CR.Checks={
55
passed:false,
66
system:{
77
node:false,

‎src/reducers/checks/verify.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@ import {npmMinVersion, nodeMinVersion, requiresXCode} from './check-system';
22
importstorefrom'../../store';
33
import{searchForTutorials}from'../tutorial-list/check';
44

5-
constresult=x=>x;
65
functionallTrue(obj:Object):boolean{
76
returnObject.values(obj).every(x=>x===true);
87
}
98

109
exportdefaultfunctionsetupVerify():CR.Checks{
11-
letdir=!!store.getState().dir;
10+
constdir=!!store.getState().dir;
1211
letpackageJson=false;
1312
lettutorial=false;
1413

15-
letpj=store.getState().packageJson;
14+
constpj:PackageJson=store.getState().packageJson;
1615

1716
if(dir){
1817
packageJson=!!pj;

0 commit comments

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