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

Commita9cf0ff

Browse files
committed
refactor checks into reducers
1 parente7f12ef commita9cf0ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+484
-232
lines changed

‎lib/actions/actionTypes.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
exports.SET_PROJECT='SET_PROJECT';
3-
exports.SETUP_WARNING='SETUP_WARNING';
3+
exports.VERIFY_SETUP='VERIFY_SETUP';
44
exports.LOAD_TUTORIALS='LOAD_TUTORIALS';
55
exports.SET_ROUTE='SET_ROUTE';
66
exports.SET_PAGE='SET_PAGE';

‎lib/actions/actions.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ function setProject() {
66
return{type:Type.SET_PROJECT};
77
}
88
exports.setProject=setProject;
9-
functionsetupWarning(warning){
10-
return{type:Type.SETUP_WARNING,payload:{warning:warning}};
9+
functionverifySetup(){
10+
return{type:Type.VERIFY_SETUP};
1111
}
12-
exports.setupWarning=setupWarning;
12+
exports.verifySetup=verifySetup;
1313
functionsetProgress(){
1414
return{type:Type.SET_PROGRESS};
1515
}

‎lib/atom/main.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ var render_1 = require('../components/render');
33
varpolyfills_1=require('../services/polyfills');
44
varsubscriptions_1=require('./subscriptions');
55
vareditor_1=require('./editor');
6-
varsetup_1=require('../services/setup/setup');
6+
varstore_1=require('../store/store');
7+
varAction=require('../actions/actions');
78
varMain=(function(){
89
functionMain(){
910
window.coderoad={
1011
dir:null
1112
};
1213
polyfills_1.default();
1314
editor_1.setAtomGlobals();
14-
setup_1.verifySetupComplete();
15+
store_1.store.dispatch(Action.verifySetup());
1516
this.root=render_1.initRoot();
1617
}
1718
Main.prototype.activate=function(){

‎lib/components/start/setup.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ var _components_1 = require('../_components');
88
varsetup_1=require('../../services/setup/setup');
99
exports.SetupGuide=function(_a){
1010
varwarning=_a.warning;
11-
return(React.createElement("div",{className:'cr-setup'},React.createElement(list_1.default,null,React.createElement(Subheader_1.default,null,"Setup"),React.createElement(list_item_1.default,{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(raised_button_1.default,{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(raised_button_1.default,{label:"Verify "+warning.verify,secondary:true,onTouchTap:setup_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"))))));
11+
return(React.createElement("div",{className:'cr-setup'},React.createElement(list_1.default,null,React.createElement(Subheader_1.default,null,"Setup"),React.createElement(list_item_1.default,{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(raised_button_1.default,{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(raised_button_1.default,{label:"Verify "+warning.verify,secondary:true,onTouchTap:setup_1.verifySetupComplete}),React.createElement("br",null),React.createElement("br",null)) :null));
1212
};

‎lib/components/start/start.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
"use strict";
2+
vartutorials_1=require('../tutorials/tutorials');
3+
functionhasDirectory(){
4+
returnnewPromise(function(resolve,reject){
5+
varhasDirectory=!!window.coderoad.dir;
6+
if(!hasDirectory){
7+
resolve(true);
8+
}
9+
else{
10+
resolve(true);
11+
}
12+
});
13+
}
14+
exports.hasDirectory=hasDirectory;
15+
functionhasPackageJson(){
16+
returnnewPromise(function(resolve,reject){
17+
varhasPackageJson=tutorials_1.packageJsonExists();
18+
if(!hasPackageJson){
19+
resolve(true);
20+
}
21+
resolve(true);
22+
});
23+
}
24+
exports.hasPackageJson=hasPackageJson;
25+
functionhasTutorialDep(){
26+
returnnewPromise(function(resolve,reject){
27+
varpackageJson=hasPackageJson ?tutorials_1.loadRootPackageJson() :null;
28+
varhasTutorialDep=!!packageJson&&_tutorialInstalled(packageJson.dependencies)||
29+
_tutorialInstalled(packageJson.devDependencies);
30+
if(!hasTutorialDep){
31+
resolve(true);
32+
}
33+
resolve(true);
34+
});
35+
}
36+
exports.hasTutorialDep=hasTutorialDep;
37+
function_hasKeys(obj){
38+
returnObject.keys(obj).length>0;
39+
}
40+
function_tutorialInstalled(location){
41+
return!!location&&_hasKeys(location)&&
42+
tutorials_1.searchForTutorials(location).length>0;
43+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
"use strict";
2+
varcommand_line_1=require('../../services/command-line');
3+
functionnpmVersionThreeOrLater(){
4+
varminVersion=3;
5+
returnnewPromise(function(resolve,reject){
6+
varthreeOrLater=command_line_1.default('npm','-v').then(function(res){returnparseInt(res,10)>=minVersion;});
7+
if(!threeOrLater){
8+
resolve(false);
9+
}
10+
else{
11+
resolve(true);
12+
}
13+
});
14+
}
15+
exports.npmVersionThreeOrLater=npmVersionThreeOrLater;

‎lib/reducers/checks/checks.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
"use strict";
2+
varType=require('../../actions/actionTypes');
3+
varsetup_1=require('./setup');
4+
vardefaultChecks={
5+
passed:false,
6+
system:{
7+
node:false,
8+
npm:false
9+
},
10+
setup:{
11+
dir:false,
12+
packageJson:false,
13+
tutorial:false
14+
}
15+
};
16+
functionchecksReducer(checks,action){
17+
if(checks===void0){checks=defaultChecks;}
18+
switch(action.type){
19+
caseType.VERIFY_SETUP:
20+
returnsetup_1.default();
21+
default:
22+
returnchecks;
23+
}
24+
}
25+
Object.defineProperty(exports,"__esModule",{value:true});
26+
exports.default=checksReducer;
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
"use strict";
2+
varpath=require('path');
3+
vareditor_1=require('../../atom/editor');
4+
varactions_1=require('../../atom/actions');
5+
varsetup_1=require('./setup');
6+
varpackageData="{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.1\"\n }\n}";
7+
functioncreatePackageJson(){
8+
varpackagePath=path.join(window.coderoad.dir,'package.json');
9+
returnnewPromise(function(resolve,reject){
10+
editor_1.open(packagePath);
11+
setTimeout(function(){
12+
resolve();
13+
});
14+
}).then(function(){
15+
editor_1.set(packageData);
16+
setup_1.verifySetupComplete();
17+
});
18+
}
19+
exports.createPackageJson=createPackageJson;
20+
functionopenDirectory(){
21+
returnactions_1.openFolder();
22+
}
23+
exports.openDirectory=openDirectory;
24+
functioninstallTutorial(){
25+
returnactions_1.openTerminal();
26+
}
27+
exports.installTutorial=installTutorial;

‎lib/reducers/checks/setup.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
"use strict";
2+
varcheck_system_1=require('./check-system');
3+
varcheck_setup_1=require('./check-setup');
4+
functionallTrue(obj){
5+
returnObject.values(obj).every(function(x){returnx===true;});
6+
}
7+
functionverified(checks){
8+
returnallTrue(checks.system)&&allTrue(checks.setup);
9+
}
10+
functionresult(x){
11+
returnx;
12+
}
13+
functionverifySetup(){
14+
varchecks={
15+
system:{
16+
node:true,
17+
npm:check_system_1.npmVersionThreeOrLater().then(result)
18+
},
19+
setup:{
20+
dir:check_setup_1.hasDirectory().then(result),
21+
packageJson:check_setup_1.hasPackageJson().then(result),
22+
tutorial:check_setup_1.hasTutorialDep().then(result)
23+
}
24+
};
25+
checks.passed=verified(checks);
26+
returnchecks;
27+
}
28+
Object.defineProperty(exports,"__esModule",{value:true});
29+
exports.default=verifySetup;

0 commit comments

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