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

Commitd972754

Browse files
committed
refactor setup module
1 parent56178f4 commitd972754

File tree

12 files changed

+36
-65
lines changed

12 files changed

+36
-65
lines changed

‎lib/modules/setup/Checks/index.js

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
"use strict";
2-
varReact=require('react');
3-
varSystemChecks_1=require('./SystemChecks');
4-
varSetupChecks_1=require('./SetupChecks');
5-
varInstallGuide_1=require('./InstallGuide');
6-
varindex_1=require('../../../components/index');
7-
varstyles={
8-
margin:'5px',
9-
padding:'10px',
10-
};
11-
varChecks=function(_a){
12-
varchecks=_a.checks;
13-
if(!checks){
14-
returnReact.createElement(index_1.ContentCard,{title:'Error Loading Package.json',content:''});
2+
vartypes_1=require('../types');
3+
varverify_1=require('../utils/verify');
4+
var_checks={
5+
passed:false,
6+
system:{
7+
node:false,
8+
npm:false,
9+
xcode:false,
10+
},
11+
setup:{
12+
hasDir:false,
13+
hasPackageJson:false,
14+
hasTutorial:false,
1515
}
16-
return(React.createElement("div",{style:styles},!checks.system.passed
17-
?React.createElement(SystemChecks_1.default,{checks:checks})
18-
:null,!checks.setup.passed
19-
?React.createElement(SetupChecks_1.default,{checks:checks})
20-
:null,React.createElement(InstallGuide_1.default,{checks:checks})));
2116
};
17+
functionchecks(checks,action){
18+
if(checks===void0){checks=_checks;}
19+
switch(action.type){
20+
casetypes_1.SETUP_VERIFY:
21+
var_a=action.payload,dir=_a.dir,packageJson=_a.packageJson;
22+
returnverify_1.default(dir,packageJson);
23+
default:
24+
returnchecks;
25+
}
26+
}
2227
Object.defineProperty(exports,"__esModule",{value:true});
23-
exports.default=Checks;
28+
exports.default=checks;

‎lib/modules/setup/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";
2-
varreducer_1=require('./reducer');
3-
exports.reducer=reducer_1.default;
2+
varchecks_1=require('./checks');
3+
exports.checks=checks_1.default;
44
varpackage_json_1=require('./package-json');
55
exports.packageJson=package_json_1.default;

‎lib/reducers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var window_1 = require('core-coderoad/lib/window');
1313
vareditor_1=require('./modules/editor');
1414
Object.defineProperty(exports,"__esModule",{value:true});
1515
exports.default=redux_1.combineReducers({
16-
alert:alert_1.reducer,checks:setup_1.reducer,editor:editor_1.editor,dir:editor_1.dir,hintPosition:hints_1.reducer,
16+
alert:alert_1.reducer,checks:setup_1.checks,editor:editor_1.editor,dir:editor_1.dir,hintPosition:hints_1.reducer,
1717
packageJson:setup_1.packageJson,page:page_1.page,pagePosition:page_1.pagePosition,progress:progress_1.reducer,route:route_1.reducer,tasks:page_1.tasks,
1818
tutorial:tutorial_1.reducer,tutorials:tutorials_1.reducer,
1919
taskActions:page_1.taskActions,taskPosition:tests_1.taskPosition,taskTests:page_1.taskTests,testRun:tests_1.testRun,windowToggle:window_1.reducer

‎src/modules/setup/reducer.tsrenamed to‎src/modules/setup/checks/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import{SETUP_VERIFY}from'./types';
2-
importsetupVerifyfrom'./utils/verify';
1+
import{SETUP_VERIFY}from'../types';
2+
importsetupVerifyfrom'../utils/verify';
33

44
const_checks:CR.Checks={
55
passed:false,

‎src/modules/setup/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
export{defaultasChecks}from'./Checks';
2-
export{defaultasreducer}from'./reducer';
1+
export{defaultaschecks}from'./checks';
32
export{defaultaspackageJson}from'./package-json';

‎src/modules/window/actions.ts

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

‎src/modules/window/index.ts

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

‎src/modules/window/reducer.ts

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

‎src/modules/window/types.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/reducers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {combineReducers} from 'redux';
22

33
// module reducers
44
import{reducerasalert}from'./modules/alert';
5-
import{reduceraschecks,packageJson}from'./modules/setup';
5+
import{checks,packageJson}from'./modules/setup';
66
import{reducerashintPosition}from'./modules/hints';
77
import{page,pagePosition,tasks,taskActions,taskTests}from'./modules/page';
88
import{reducerasprogress}from'./modules/progress';

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
declare module'core-coderoad/lib/polyfills'{
2+
exportdefaultfunctionloadPolyfills():void;
3+
}
4+
15
declare module'core-coderoad/lib/route'{
26
exportfunctionreducer(route:string,action:Action):string;
37
exportfunctionrouteSet(route:string);
48
}
59

6-
declare module'core-coderoad/lib/polyfills'{
7-
exportdefaultfunctionloadPolyfills():void;
8-
}
9-
1010
declare module'core-coderoad/lib/window'{
1111
exportfunctionreducer(open:boolean,action:Action):boolean;
1212
exportfunctionwindowToggle();

‎tsconfig.json

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,15 @@
9191
"src/modules/page/task-tests/index.ts",
9292
"src/modules/page/tasks/index.ts",
9393
"src/modules/page/types.ts",
94-
"src/modules/polyfills/index.ts",
95-
"src/modules/polyfills/object-values.ts",
9694
"src/modules/progress/actions.ts",
9795
"src/modules/progress/index.ts",
9896
"src/modules/progress/reducer.ts",
9997
"src/modules/progress/types.ts",
10098
"src/modules/progress/utils/local-storage.ts",
101-
"src/modules/route/actions.ts",
102-
"src/modules/route/index.ts",
103-
"src/modules/route/reducer.ts",
104-
"src/modules/route/types.ts",
10599
"src/modules/setup/actions.ts",
100+
"src/modules/setup/checks/index.ts",
106101
"src/modules/setup/index.ts",
107102
"src/modules/setup/package-json/index.ts",
108-
"src/modules/setup/reducer.ts",
109103
"src/modules/setup/types.ts",
110104
"src/modules/setup/utils/action-setup.ts",
111105
"src/modules/setup/utils/action-system.ts",
@@ -135,10 +129,6 @@
135129
"src/modules/tutorials/utils/check.ts",
136130
"src/modules/tutorials/utils/is-tutorial.ts",
137131
"src/modules/tutorials/utils/update.ts",
138-
"src/modules/window/actions.ts",
139-
"src/modules/window/index.ts",
140-
"src/modules/window/reducer.ts",
141-
"src/modules/window/types.ts",
142132
"src/reducers.ts",
143133
"src/store.ts",
144134
"src/subscriptions.ts",
@@ -186,7 +176,6 @@
186176
"src/modules/hints/Hints/HintButton.tsx",
187177
"src/modules/hints/Hints/index.tsx",
188178
"src/modules/page/Continue/index.tsx",
189-
"src/modules/route/RouteButton.tsx",
190179
"src/modules/tutorials/Tutorials/index.tsx",
191180
"src/modules/tutorials/Tutorials/LoadTutorials/index.tsx",
192181
"src/modules/tutorials/Tutorials/SelectTutorial/index.tsx",

0 commit comments

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