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

Commitf1888cc

Browse files
committed
refactoring progress
1 parentf151c06 commitf1888cc

File tree

22 files changed

+61
-84
lines changed

22 files changed

+61
-84
lines changed

‎lib/modules/page/Continue/index.jsrenamed to‎lib/components/Page/Continue/index.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
1818
varRaisedButton_1=require('material-ui/RaisedButton');
19-
varactions_1=require('../actions');
19+
varactions_1=require('../../../actions');
2020
varstyles={
2121
zIndex:'10000',
2222
border:'0px',
@@ -34,11 +34,9 @@ var Continue = (function (_super) {
3434
return(React.createElement(RaisedButton_1.default,{style:{styles:styles},label:'Continue',primary:true,onTouchTap:this.props.callNextPage}));
3535
};
3636
Continue=__decorate([
37-
react_redux_1.connect(null,function(dispatch,state){
38-
return{
39-
callNextPage:function(){returndispatch(actions_1.pageNext());}
40-
};
41-
}),
37+
react_redux_1.connect(null,function(dispatch){return({
38+
callNextPage:function(){returndispatch(actions_1.pageNext());}
39+
});}),
4240
__metadata('design:paramtypes',[])
4341
],Continue);
4442
returnContinue;

‎lib/components/Page/PageToolbar/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
varReact=require('react');
33
varToolbar_1=require('material-ui/Toolbar');
44
varindex_1=require('../../index');
5+
varContinue_1=require('../Continue');
56
varstyles={
67
zIndex:'5',
78
position:'relative',
@@ -14,7 +15,7 @@ var styles = {
1415
exports.PageToolbar=function(_a){
1516
vartasks=_a.tasks,taskPosition=_a.taskPosition,children=_a.children;
1617
return(React.createElement("section",{styles:styles},children,React.createElement(Toolbar_1.Toolbar,null,React.createElement(Toolbar_1.ToolbarGroup,{float:'left'},React.createElement(index_1.ToggleDevTools,null)),React.createElement(Toolbar_1.ToolbarGroup,{float:'right'},taskPosition>=tasks.length ?
17-
React.createElement(index_1.Continue,null) :React.createElement(index_1.Save,null)))));
18+
React.createElement(Continue_1.default,null) :React.createElement(index_1.Save,null)))));
1819
};
1920
Object.defineProperty(exports,"__esModule",{value:true});
2021
exports.default=exports.PageToolbar;

‎lib/components/Page/Tasks/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ var Subheader_1 = require('material-ui/Subheader');
1212
varTask_1=require('../Task');
1313
varcolors_1=require('material-ui/styles/colors');
1414
varTasksComplete_1=require('../TasksComplete');
15-
functionvisibleTasks(tasks,taskPosition){
16-
returntasks.slice(0,taskPosition+1);
17-
}
1815
varmargin='10px 5px';
1916
varTasks=(function(_super){
2017
__extends(Tasks,_super);
@@ -24,9 +21,12 @@ var Tasks = (function (_super) {
2421
Tasks.prototype.componentDidUpdate=function(){
2522
ReactDOM.findDOMNode(this.refs.listEnd).scrollIntoView();
2623
};
24+
Tasks.prototype.visibleTasks=function(tasks,taskPosition){
25+
returntasks.slice(0,taskPosition+1);
26+
};
2727
Tasks.prototype.render=function(){
2828
var_a=this.props,tasks=_a.tasks,taskPosition=_a.taskPosition,testRun=_a.testRun,completed=_a.completed,page=_a.page;
29-
varvisTasks=visibleTasks(tasks,taskPosition);
29+
varvisTasks=this.visibleTasks(tasks,taskPosition);
3030
varbackgroundColor=completed ?colors_1.lightGreen200 :'white';
3131
return(React.createElement("div",null,React.createElement(Card_1.Card,{style:{backgroundColor:backgroundColor,margin:margin}},React.createElement(List_1.List,null,React.createElement(Subheader_1.default,null,"Tasks"),visTasks.map(function(task,index){return(React.createElement(Task_1.default,{key:index,index:index,task:task,taskPosition:taskPosition,testRun:testRun}));}))),React.createElement(TasksComplete_1.default,{page:page,completed:completed}),React.createElement("div",{ref:'listEnd'})));
3232
};

‎lib/components/Page/index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var Tasks_1 = require('./Tasks');
2020
varHints_1=require('./Hints');
2121
varPageToolbar_1=require('./PageToolbar');
2222
varProgressBar_1=require('./ProgressBar');
23+
varselectors_1=require('../../selectors');
2324
varstyles={
2425
width:'100%',
2526
overflowY:'scroll',
@@ -37,12 +38,12 @@ var Page = (function (_super) {
3738
};
3839
Page=__decorate([
3940
react_redux_1.connect(function(state){return({
40-
page:state.page,
41-
tasks:state.tasks,
42-
taskPosition:state.taskPosition,
43-
hintPosition:state.hintPosition,
41+
page:selectors_1.pageSelector(state),
42+
tasks:selectors_1.tasksSelector(state),
4443
testRun:state.testRun,
4544
progress:state.progress,
45+
taskPosition:state.taskPosition,
46+
hintPosition:state.hintPosition,
4647
pagePosition:state.pagePosition,
4748
});}),
4849
__metadata('design:paramtypes',[])

‎lib/components/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,3 @@ var Save_1 = require('./common/Save');
2727
exports.Save=Save_1.default;
2828
varToggleDevTools_1=require('./common/ToggleDevTools');
2929
exports.ToggleDevTools=ToggleDevTools_1.default;
30-
varpage_1=require('../modules/page');
31-
exports.Continue=page_1.Continue;

‎lib/modules/package-json/actions.js

Whitespace-only changes.

‎lib/modules/package-json/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"use strict";
2+
varreducer_1=require('./reducer');
3+
exports.reducer=reducer_1.default;

‎lib/modules/package-json/reducer.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
"use strict";
2+
var_pj=null;
3+
functionpackageJson(p,action){
4+
if(p===void0){p=_pj;}
5+
switch(action.type){
6+
default:
7+
returnp;
8+
}
9+
}
10+
Object.defineProperty(exports,"__esModule",{value:true});
11+
exports.default=packageJson;

‎lib/modules/package-json/types.js

Whitespace-only changes.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
"use strict";
2+
varpath_1=require('path');
3+
varfs_1=require('fs');
4+
varnode_file_exists_1=require('node-file-exists');
5+
functionreadPackageJson(dir){
6+
varpathToPJ=path_1.join(dir,'./package.json');
7+
if(!node_file_exists_1.default(pathToPJ)){
8+
returnfalse;
9+
}
10+
try{
11+
returnJSON.parse(fs_1.readFileSync(pathToPJ,'utf8'));
12+
}
13+
catch(e){
14+
returnnull;
15+
}
16+
}
17+
exports.readPackageJson=readPackageJson;

‎lib/modules/page/index.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
"use strict";
2-
varpage_1=require('./page');
3-
exports.page=page_1.default;
42
varpage_position_1=require('./page-position');
53
exports.pagePosition=page_position_1.default;
64
vartask_actions_1=require('./task-actions');
75
exports.taskActions=task_actions_1.default;
86
vartask_tests_1=require('./task-tests');
97
exports.taskTests=task_tests_1.default;
10-
vartasks_1=require('./tasks');
11-
exports.tasks=tasks_1.default;
12-
varContinue_1=require('./Continue');
13-
exports.Continue=Continue_1.default;

‎lib/modules/page/page/index.js

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

‎lib/modules/page/tasks/index.js

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

‎lib/modules/tutorials/reducer.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
"use strict";
22
varcoderoad_cli_1=require('coderoad-cli');
33
vartypes_1=require('./types');
4-
functiontutorials(t,action){
4+
functiontutorialsReducer(t,action){
55
if(t===void0){t=[];}
66
switch(action.type){
77
casetypes_1.TUTORIALS_FIND:
8-
vardir=action.payload.dir;
9-
vartuts=coderoad_cli_1.tutorials(dir);
8+
vartuts=coderoad_cli_1.tutorials(action.payload.dir);
109
returntuts ?tuts :t;
1110
default:
1211
returnt;
1312
}
1413
}
1514
Object.defineProperty(exports,"__esModule",{value:true});
16-
exports.default=tutorials;
15+
exports.default=tutorialsReducer;

‎lib/reducers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var window_1 = require('core-coderoad/lib/window');
1414
Object.defineProperty(exports,"__esModule",{value:true});
1515
exports.default=redux_1.combineReducers({
1616
alert:alert_1.reducer,checks:setup_1.checks,editor:editor_1.reducer,dir:editor_1.dir,hintPosition:hints_1.reducer,
17-
packageJson:setup_1.packageJson,page:page_1.page,pagePosition:page_1.pagePosition,progress:progress_1.reducer,route:route_1.reducer,tasks:page_1.tasks,
17+
packageJson:setup_1.packageJson,pagePosition:page_1.pagePosition,progress:progress_1.reducer,route:route_1.reducer,
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
2020
});

‎lib/selectors.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
"use strict";
2+
varreselect_1=require('reselect');
3+
exports.pageSelector=function(state){returnstate.tutorial.pages[state.pagePosition];};
4+
exports.tasksSelector=reselect_1.createSelector(exports.pageSelector,function(page){returnpage.tasks;});
5+
exports.configSelector=function(state){returnstate.packageJson.config;};

‎src/components/Page/PageToolbar/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import*asReactfrom'react';
22
import{Toolbar,ToolbarGroup}from'material-ui/Toolbar';
3-
import{ToggleDevTools,Save,Continue}from'../../index';
3+
import{ToggleDevTools,Save}from'../../index';
4+
importContinuefrom'../Continue';
45

56
conststyles={
67
zIndex:'5',

‎src/components/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ export {default as ContentCard} from './common/ContentCard';
1313
export{defaultasRouteButton}from'./common/RouteButton';
1414
export{defaultasSave}from'./common/Save';
1515
export{defaultasToggleDevTools}from'./common/ToggleDevTools';
16-
17-
export{Continue}from'../modules/page';

‎src/modules/package-json/reducer.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import{PJ_SAVE}from'./types';
2-
import{readPackageJson,writePackageJson}from'./utils/packageJson';
3-
import{sortPackageJson}from'sort-package-json';
1+
import{readPackageJson}from'./utils/packageJson';
42

53
const_pj=null;
64

‎src/modules/page/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
export{defaultaspagePosition}from'./page-position';
22
export{defaultastaskActions}from'./task-actions';
33
export{defaultastaskTests}from'./task-tests';
4-
5-
export{defaultasContinue}from'./Continue';

‎src/modules/tutorials/reducer.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import{tutorials}from'coderoad-cli';
33
import{TUTORIALS_FIND}from'./types';
44

5-
exportdefaultfunctiontutorials(
5+
exportdefaultfunctiontutorialsReducer(
66
t=[],action:Action
77
):Tutorial.Info[]{
88
switch(action.type){
@@ -12,8 +12,7 @@ export default function tutorials(
1212
/* falls through */
1313

1414
caseTUTORIALS_FIND:
15-
const{dir}=action.payload;
16-
consttuts:Tutorial.Info[]=tutorials(dir);
15+
consttuts=tutorials(action.payload.dir);
1716
returntuts ?tuts :t;
1817

1918
default:

‎src/reducers.ts

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

33
// module reducers
44
import{reducerashintPosition}from'./modules/hints';
5-
import{page,pagePosition,tasks,taskActions,taskTests}from'./modules/page';
5+
import{pagePosition,taskActions,taskTests}from'./modules/page';
66
import{reducerasprogress}from'./modules/progress';
77
import{checks,packageJson}from'./modules/setup';
88
import{testRun,taskPosition}from'./modules/tests';
@@ -16,7 +16,7 @@ import {reducer as windowToggle} from 'core-coderoad/lib/window';
1616

1717
exportdefaultcombineReducers({
1818
alert, checks, editor, dir, hintPosition,
19-
packageJson,page,pagePosition, progress, route, tasks,
19+
packageJson, pagePosition, progress, route,
2020
tutorial, tutorials,
2121
taskActions, taskPosition, taskTests, testRun, windowToggle
2222
});

0 commit comments

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