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

Commitbc22661

Browse files
committed
restructure with connected components
1 parent339fe6a commitbc22661

File tree

52 files changed

+388
-389
lines changed

Some content is hidden

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

52 files changed

+388
-389
lines changed

‎lib/components/common/Alert.jsrenamed to‎lib/components/Alert/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ var Alert = (function (_super) {
3636
return(React.createElement(Snackbar_1.default,{style:styles,bodyStyle:{color:color},open:open,message:message||'',action:action||'',autoHideDuration:duration||2000,onActionTouchTap:close,onRequestClose:close}));
3737
};
3838
Alert=__decorate([
39-
react_redux_1.connect(null,function(dispatch){
40-
return{
41-
close:function(){returndispatch(actions_1.alertClose());}
42-
};
43-
}),
39+
react_redux_1.connect(function(state){return({
40+
alert:state.alert,
41+
});},function(dispatch){return({
42+
close:function(){returndispatch(actions_1.alertClose());},
43+
});}),
4444
__metadata('design:paramtypes',[])
4545
],Alert);
4646
returnAlert;

‎lib/components/App.js

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function__(){this.constructor=d;}
55
d.prototype=b===null ?Object.create(b) :(__.prototype=b.prototype,new__());
66
};
7-
var__assign=(this&&this.__assign)||Object.assign||function(t){
8-
for(vars,i=1,n=arguments.length;i<n;i++){
9-
s=arguments[i];
10-
for(varpins)if(Object.prototype.hasOwnProperty.call(s,p))
11-
t[p]=s[p];
12-
}
13-
returnt;
14-
};
157
var__decorate=(this&&this.__decorate)||function(decorators,target,key,desc){
168
varc=arguments.length,r=c<3 ?target :desc===null ?desc=Object.getOwnPropertyDescriptor(target,key) :desc,d;
179
if(typeofReflect==="object"&&typeofReflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);
@@ -32,13 +24,13 @@ var App = (function (_super) {
3224
_super.apply(this,arguments);
3325
}
3426
App.prototype.render=function(){
35-
varstore=this.props.store;
36-
return(React.createElement("section",null,React.createElement(Drawer_1.default,{width:400,openSecondary:true,open:store.windowToggle},React.createElement("div",{className:'cr-bg'},React.createElement(index_1.AppMenu,__assign({},store)),React.createElement(Routes_1.default,__assign({},store)))),React.createElement(index_1.Alert,__assign({},store))));
27+
varwindowToggle=this.props.windowToggle;
28+
return(React.createElement("section",null,React.createElement(Drawer_1.default,{width:400,openSecondary:true,open:windowToggle},React.createElement("div",{className:'cr-bg'},React.createElement(index_1.AppMenu,null),React.createElement(Routes_1.default,null))),React.createElement(index_1.Alert,null)));
3729
};
3830
App=__decorate([
39-
react_redux_1.connect(function(store){
40-
return{store:store};
41-
}),
31+
react_redux_1.connect(function(state){return({
32+
windowToggle:state.windowToggle,
33+
});}),
4234
__metadata('design:paramtypes',[])
4335
],App);
4436
returnApp;

‎lib/components/AppMenu/CloseWindow.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var React = require('react');
1717
varreact_redux_1=require('react-redux');
1818
varIconButton_1=require('material-ui/IconButton');
1919
varclose_1=require('material-ui/svg-icons/navigation/close');
20+
varactions_1=require('../../actions');
2021
varCloseWindow=(function(_super){
2122
__extends(CloseWindow,_super);
2223
functionCloseWindow(){
@@ -26,11 +27,9 @@ var CloseWindow = (function (_super) {
2627
return(React.createElement(IconButton_1.default,{onClick:this.props.windowToggle},React.createElement(close_1.default,{color:'white'})));
2728
};
2829
CloseWindow=__decorate([
29-
react_redux_1.connect(null,function(dispatch){
30-
return{
31-
windowToggle:function(){returndispatch({type:'WINDOW_TOGGLE'});}
32-
};
33-
}),
30+
react_redux_1.connect(null,function(dispatch){return({
31+
windowToggle:function(){returndispatch(actions_1.windowToggle());},
32+
});}),
3433
__metadata('design:paramtypes',[])
3534
],CloseWindow);
3635
returnCloseWindow;

‎lib/components/AppMenu/MenuLink/index.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ var MenuLink = (function (_super) {
3131
return(React.createElement(MenuItem_1.default,{style:styles,primaryText:title ?title :route,onTouchTap:routeTo.bind(this,route),key:route}));
3232
};
3333
MenuLink=__decorate([
34-
react_redux_1.connect(null,function(dispatch){
35-
return{
36-
routeTo:function(route){returndispatch(actions_1.routeSet(route));},
37-
};
38-
}),
34+
react_redux_1.connect(null,function(dispatch){return({
35+
routeTo:function(route){returndispatch(actions_1.routeSet(route));},
36+
});}),
3937
__metadata('design:paramtypes',[])
4038
],MenuLink);
4139
returnMenuLink;

‎lib/components/AppMenu/index.js

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,42 @@
11
"use strict";
2+
var__extends=(this&&this.__extends)||function(d,b){
3+
for(varpinb)if(b.hasOwnProperty(p))d[p]=b[p];
4+
function__(){this.constructor=d;}
5+
d.prototype=b===null ?Object.create(b) :(__.prototype=b.prototype,new__());
6+
};
7+
var__decorate=(this&&this.__decorate)||function(decorators,target,key,desc){
8+
varc=arguments.length,r=c<3 ?target :desc===null ?desc=Object.getOwnPropertyDescriptor(target,key) :desc,d;
9+
if(typeofReflect==="object"&&typeofReflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);
10+
elsefor(vari=decorators.length-1;i>=0;i--)if(d=decorators[i])r=(c<3 ?d(r) :c>3 ?d(target,key,r) :d(target,key))||r;
11+
returnc>3&&r&&Object.defineProperty(target,key,r),r;
12+
};
13+
var__metadata=(this&&this.__metadata)||function(k,v){
14+
if(typeofReflect==="object"&&typeofReflect.metadata==="function")returnReflect.metadata(k,v);
15+
};
216
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
318
varAppBar_1=require('material-ui/AppBar');
419
varCloseWindow_1=require('./CloseWindow');
520
varmenuRight_1=require('./menuRight');
621
varstyles={
7-
zIndex:'1 !important'
8-
};
9-
varAppMenu=function(_a){
10-
varroute=_a.route;
11-
return(React.createElement(AppBar_1.default,{title:'CodeRoad',className:'cr-menu-bar',style:{styles:styles},iconElementLeft:React.createElement(CloseWindow_1.default,null),iconElementRight:menuRight_1.default(route)}));
22+
zIndex:'1',
1223
};
24+
varAppMenu=(function(_super){
25+
__extends(AppMenu,_super);
26+
functionAppMenu(){
27+
_super.apply(this,arguments);
28+
}
29+
AppMenu.prototype.render=function(){
30+
varroute=this.props.route;
31+
return(React.createElement(AppBar_1.default,{title:'CodeRoad',className:'cr-menu-bar',style:{styles:styles},iconElementLeft:React.createElement(CloseWindow_1.default,null),iconElementRight:menuRight_1.default(route)}));
32+
};
33+
AppMenu=__decorate([
34+
react_redux_1.connect(function(state){return({
35+
route:state.route,
36+
});}),
37+
__metadata('design:paramtypes',[])
38+
],AppMenu);
39+
returnAppMenu;
40+
}(React.Component));
1341
Object.defineProperty(exports,"__esModule",{value:true});
1442
exports.default=AppMenu;

‎lib/components/Common/RouteButton.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ var RouteButton = (function (_super) {
2727
return(React.createElement(RaisedButton_1.default,{label:label,style:style||{},onTouchTap:routeTo.bind(this,route),secondary:true}));
2828
};
2929
RouteButton=__decorate([
30-
react_redux_1.connect(null,function(dispatch){
31-
return{
32-
routeTo:function(route){returndispatch(actions_1.routeSet(route));}
33-
};
34-
}),
30+
react_redux_1.connect(null,function(dispatch){return({
31+
routeTo:function(route){returndispatch(actions_1.routeSet(route));},
32+
});}),
3533
__metadata('design:paramtypes',[])
3634
],RouteButton);
3735
returnRouteButton;

‎lib/components/Page/Hints/HintButton.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ var HintButton = (function (_super) {
3232
}
3333
};
3434
HintButton=__decorate([
35-
react_redux_1.connect(null,function(dispatch,state){
36-
return{
37-
hintSet:function(position){returndispatch(actions_1.hintPositionSet(position));},
38-
};
39-
}),
35+
react_redux_1.connect(null,function(dispatch){return({
36+
hintSet:function(position){returndispatch(actions_1.hintPositionSet(position));},
37+
});}),
4038
__metadata('design:paramtypes',[])
4139
],HintButton);
4240
returnHintButton;

‎lib/components/Page/index.js

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
"use strict";
2+
var__extends=(this&&this.__extends)||function(d,b){
3+
for(varpinb)if(b.hasOwnProperty(p))d[p]=b[p];
4+
function__(){this.constructor=d;}
5+
d.prototype=b===null ?Object.create(b) :(__.prototype=b.prototype,new__());
6+
};
7+
var__decorate=(this&&this.__decorate)||function(decorators,target,key,desc){
8+
varc=arguments.length,r=c<3 ?target :desc===null ?desc=Object.getOwnPropertyDescriptor(target,key) :desc,d;
9+
if(typeofReflect==="object"&&typeofReflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);
10+
elsefor(vari=decorators.length-1;i>=0;i--)if(d=decorators[i])r=(c<3 ?d(r) :c>3 ?d(target,key,r) :d(target,key))||r;
11+
returnc>3&&r&&Object.defineProperty(target,key,r),r;
12+
};
13+
var__metadata=(this&&this.__metadata)||function(k,v){
14+
if(typeofReflect==="object"&&typeofReflect.metadata==="function")returnReflect.metadata(k,v);
15+
};
216
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
318
varindex_1=require('../index');
419
varTasks_1=require('./Tasks');
520
varHints_1=require('./Hints');
@@ -9,11 +24,30 @@ var styles = {
924
width:'100%',
1025
overflowY:'scroll',
1126
};
12-
varPage=function(_a){
13-
varpage=_a.page,taskPosition=_a.taskPosition,hintPosition=_a.hintPosition,tasks=_a.tasks,testRun=_a.testRun,progress=_a.progress,pagePosition=_a.pagePosition;
14-
vartask=taskPosition<=tasks.length ?tasks[taskPosition] :null;
15-
varcompleted=progress.pages[pagePosition];
16-
return(React.createElement("section",{style:styles,className:'cr-page'},React.createElement(index_1.ContentCard,{title:page.title,content:page.description}),React.createElement(Tasks_1.default,{tasks:tasks,taskPosition:taskPosition,testRun:testRun,completed:completed,page:page}),React.createElement(PageToolbar_1.default,{tasks:tasks,taskPosition:taskPosition},React.createElement(Hints_1.default,{task:task,hintPosition:hintPosition}),React.createElement(ProgressBar_1.default,{taskLength:tasks.length,taskPosition:taskPosition,completed:completed}))));
17-
};
27+
varPage=(function(_super){
28+
__extends(Page,_super);
29+
functionPage(){
30+
_super.apply(this,arguments);
31+
}
32+
Page.prototype.render=function(){
33+
var_a=this.props,page=_a.page,tasks=_a.tasks,taskPosition=_a.taskPosition,hintPosition=_a.hintPosition,testRun=_a.testRun,progress=_a.progress,pagePosition=_a.pagePosition;
34+
vartask=taskPosition<=tasks.length ?tasks[taskPosition] :null;
35+
varcompleted=progress.pages[pagePosition];
36+
return(React.createElement("section",{style:styles,className:'cr-page'},React.createElement(index_1.ContentCard,{title:page.title,content:page.description}),React.createElement(Tasks_1.default,{tasks:tasks,taskPosition:taskPosition,testRun:testRun,completed:completed,page:page}),React.createElement(PageToolbar_1.default,{tasks:tasks,taskPosition:taskPosition},React.createElement(Hints_1.default,{task:task,hintPosition:hintPosition}),React.createElement(ProgressBar_1.default,{taskLength:tasks.length,taskPosition:taskPosition,completed:completed}))));
37+
};
38+
Page=__decorate([
39+
react_redux_1.connect(function(state){return({
40+
page:state.page,
41+
tasks:state.tasks,
42+
taskPosition:state.taskPosition,
43+
hintPosition:state.hintPosition,
44+
testRun:state.testRun,
45+
progress:state.progress,
46+
pagePosition:state.pagePosition,
47+
});}),
48+
__metadata('design:paramtypes',[])
49+
],Page);
50+
returnPage;
51+
}(React.Component));
1852
Object.defineProperty(exports,"__esModule",{value:true});
1953
exports.default=Page;

‎lib/components/Progress/ProgressPage/index.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,12 @@ var ProgressPage = (function (_super) {
3737
};
3838
;
3939
ProgressPage=__decorate([
40-
react_redux_1.connect(null,function(dispatch){
41-
return{
42-
selectPage:function(pagePosition){
43-
dispatch(actions_1.pageSet(pagePosition));
44-
dispatch(actions_1.routeSet('page'));
45-
}
46-
};
47-
}),
40+
react_redux_1.connect(null,function(dispatch){return({
41+
selectPage:function(pagePosition){
42+
dispatch(actions_1.pageSet(pagePosition));
43+
dispatch(actions_1.routeSet('page'));
44+
},
45+
});}),
4846
__metadata('design:paramtypes',[])
4947
],ProgressPage);
5048
returnProgressPage;

‎lib/components/Progress/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,15 @@ var Progress = (function (_super) {
3838
};
3939
Progress.prototype.render=function(){
4040
var_a=this.props,progress=_a.progress,pagePosition=_a.pagePosition,info=_a.info,tutorial=_a.tutorial;
41-
return(React.createElement(Paper_1.default,{style:styles.page},React.createElement(List_1.List,{style:styles.list},React.createElement(Subheader_1.default,null,info.name),tutorial.pages.map(function(page,index){return(React.createElement(ProgressPage_1.default,{key:index,index:index,page:page,pagePosition:pagePosition,progress:progress}));}))));
41+
return(React.createElement(Paper_1.default,{style:styles.page},React.createElement(List_1.List,{style:styles.list},React.createElement(Subheader_1.default,null,info.title),tutorial.pages.map(function(page,index){return(React.createElement(ProgressPage_1.default,{key:index,index:index,page:page,pagePosition:pagePosition,progress:progress}));}))));
4242
};
4343
Progress=__decorate([
44-
react_redux_1.connect(null,function(dispatch){
44+
react_redux_1.connect(function(state){return({
45+
progress:state.progress,
46+
pagePosition:state.pagePosition,
47+
info:state.tutorial.info,
48+
tutorial:state.tutorial
49+
});},function(dispatch){
4550
return{
4651
progressLoad:function(){returndispatch(actions_1.progressLoad());}
4752
};

‎lib/components/Routes/index.js

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function__(){this.constructor=d;}
55
d.prototype=b===null ?Object.create(b) :(__.prototype=b.prototype,new__());
66
};
7-
var__assign=(this&&this.__assign)||Object.assign||function(t){
8-
for(vars,i=1,n=arguments.length;i<n;i++){
9-
s=arguments[i];
10-
for(varpins)if(Object.prototype.hasOwnProperty.call(s,p))
11-
t[p]=s[p];
12-
}
13-
returnt;
7+
var__decorate=(this&&this.__decorate)||function(decorators,target,key,desc){
8+
varc=arguments.length,r=c<3 ?target :desc===null ?desc=Object.getOwnPropertyDescriptor(target,key) :desc,d;
9+
if(typeofReflect==="object"&&typeofReflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);
10+
elsefor(vari=decorators.length-1;i>=0;i--)if(d=decorators[i])r=(c<3 ?d(r) :c>3 ?d(target,key,r) :d(target,key))||r;
11+
returnc>3&&r&&Object.defineProperty(target,key,r),r;
12+
};
13+
var__metadata=(this&&this.__metadata)||function(k,v){
14+
if(typeofReflect==="object"&&typeofReflect.metadata==="function")returnReflect.metadata(k,v);
1415
};
1516
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
1618
varindex_1=require('../index');
1719
varRoutes=(function(_super){
1820
__extends(Routes,_super);
@@ -22,19 +24,25 @@ var Routes = (function (_super) {
2224
Routes.prototype.render=function(){
2325
switch(this.props.route){
2426
case'page':
25-
returnReact.createElement(index_1.Page,__assign({},this.props));
27+
returnReact.createElement(index_1.Page,null);
2628
case'progress':
27-
returnReact.createElement(index_1.Progress,__assign({},this.props,{info:this.props.tutorial.info}));
29+
returnReact.createElement(index_1.Progress,null);
2830
case'start':
29-
returnReact.createElement(index_1.Start,__assign({},this.props));
31+
returnReact.createElement(index_1.Start,null);
3032
case'tutorials':
31-
returnReact.createElement(index_1.Tutorials,__assign({},this.props));
33+
returnReact.createElement(index_1.Tutorials,null);
3234
case'final':
3335
returnReact.createElement(index_1.FinalPage,null);
3436
default:
3537
throw'Error: Route not found.';
3638
}
3739
};
40+
Routes=__decorate([
41+
react_redux_1.connect(function(state){return({
42+
route:state.route,
43+
});}),
44+
__metadata('design:paramtypes',[])
45+
],Routes);
3846
returnRoutes;
3947
}(React.Component));
4048
Object.defineProperty(exports,"__esModule",{value:true});

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ var VerifyButton = (function (_super) {
2626
return(React.createElement(FlatButton_1.default,{label:'Verify Setup Complete',primary:true,onTouchTap:this.props.verify}));
2727
};
2828
VerifyButton=__decorate([
29-
react_redux_1.connect(null,function(dispatch){
30-
return{
31-
verify:function(){returndispatch(actions_1.setupVerify());}
32-
};
33-
}),
29+
react_redux_1.connect(null,function(dispatch){return({
30+
verify:function(){returndispatch(actions_1.setupVerify());},
31+
});}),
3432
__metadata('design:paramtypes',[])
3533
],VerifyButton);
3634
returnVerifyButton;

0 commit comments

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