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

Commit892f346

Browse files
committed
hint progress...
1 parentadbdb4f commit892f346

File tree

22 files changed

+206
-121
lines changed

22 files changed

+206
-121
lines changed

‎lib/components/account/account.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ var default_1 = (function (_super) {
1111
_super.apply(this,arguments);
1212
}
1313
default_1.prototype.render=function(){
14-
return(React.createElement("section",{className:'cr-account'},React.createElement("h3",null,"Account")));
14+
return(React.createElement("section",{className:'cr-account'},
15+
React.createElement("h3",null,"Account")
16+
));
1517
};
1618
returndefault_1;
1719
}(React.Component));

‎lib/components/app/app.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ var default_1 = (function (_super) {
3030
};
3131
default_1.prototype.render=function(){
3232
varstate=this.props.state;
33-
return(React.createElement("section",{className:'cr'},React.createElement(_components_1.Menu,{route:state.route,position:state.position}),React.createElement(_components_1.Router,{state:state}),React.createElement(_components_1.Alert,{alert:state.alert})));
33+
return(React.createElement("section",{className:'cr'},
34+
React.createElement(_components_1.Menu,{route:state.route,position:state.position}),
35+
React.createElement(_components_1.Router,{state:state}),
36+
React.createElement(_components_1.Alert,{alert:state.alert})));
3437
};
3538
default_1.childContextTypes={
3639
muiTheme:React.PropTypes.object,

‎lib/components/menu/menu.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ var default_1 = (function (_super) {
3939
default_1.prototype.menuOptions=function(){
4040
switch(this.props.route){
4141
case'page':
42-
return(React.createElement("div",null,React.createElement(material_ui_1.MenuItem,{primaryText:'progress',onClick:this.props.routeToProgress}),React.createElement(material_ui_1.MenuItem,{primaryText:'projects',onClick:this.props.routeToProjects})));
42+
return(React.createElement("div",null,
43+
React.createElement(material_ui_1.MenuItem,{primaryText:'progress',onClick:this.props.routeToProgress}),
44+
React.createElement(material_ui_1.MenuItem,{primaryText:'projects',onClick:this.props.routeToProjects})));
4345
case'progress':
4446
returnReact.createElement(material_ui_1.MenuItem,{primaryText:'projects',onClick:this.props.routeToProjects});
4547
default:returnnull;
@@ -49,7 +51,17 @@ var default_1 = (function (_super) {
4951
render_1.togglePanel();
5052
};
5153
default_1.prototype.render=function(){
52-
return(React.createElement(material_ui_1.AppBar,{title:'CodeRoad',className:'cr-menu-bar',iconElementLeft:React.createElement(material_ui_1.IconButton,{onClick:this.closePanel},React.createElement(NavigationClose,null)),iconElementRight:React.createElement(material_ui_1.IconMenu,{iconButtonElement:React.createElement(material_ui_1.IconButton,null,React.createElement(MoreVertIcon,null)),targetOrigin:{horizontal:'right',vertical:'top'},anchorOrigin:{horizontal:'right',vertical:'top'}},this.menuOptions(),window.coderoad.issuesPath ?React.createElement(material_ui_1.MenuItem,null,React.createElement("a",{href:window.coderoad.issuesPath},"post issue")) :null,React.createElement(material_ui_1.Divider,null),React.createElement(material_ui_1.MenuItem,{primaryText:'quit',onClick:this.props.quit}))}));
54+
return(React.createElement(material_ui_1.AppBar,{title:'CodeRoad',className:'cr-menu-bar',iconElementLeft:React.createElement(material_ui_1.IconButton,{onClick:this.closePanel},
55+
React.createElement(NavigationClose,null)
56+
),iconElementRight:React.createElement(material_ui_1.IconMenu,{iconButtonElement:React.createElement(material_ui_1.IconButton,null,
57+
React.createElement(MoreVertIcon,null)
58+
),targetOrigin:{horizontal:'right',vertical:'top'},anchorOrigin:{horizontal:'right',vertical:'top'}},
59+
this.menuOptions(),
60+
window.coderoad.issuesPath ?React.createElement(material_ui_1.MenuItem,null,
61+
React.createElement("a",{href:window.coderoad.issuesPath},"post issue")
62+
) :null,
63+
React.createElement(material_ui_1.Divider,null),
64+
React.createElement(material_ui_1.MenuItem,{primaryText:'quit',onClick:this.props.quit}))}));
5365
};
5466
default_1=__decorate([
5567
react_redux_1.connect(null,function(dispatch){

‎lib/components/page/chapter.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ var _components_1 = require('../_components');
44
Object.defineProperty(exports,"__esModule",{value:true});
55
exports.default=function(_a){
66
varchapter=_a.chapter;
7-
return(React.createElement("section",{className:'cr-chapter'},React.createElement(_components_1.MarkdownText,{text:chapter.title})));
7+
return(React.createElement("section",{className:'cr-chapter'},
8+
React.createElement(_components_1.MarkdownText,{text:chapter.title})
9+
));
810
};

‎lib/components/page/content.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ var _components_1 = require('../_components');
44
varmaterial_ui_1=require('material-ui');
55
functiondefault_1(_a){
66
varpage=_a.page;
7-
return(React.createElement(material_ui_1.Card,null,React.createElement(material_ui_1.CardHeader,{title:page.title}),React.createElement(material_ui_1.CardText,null,React.createElement(_components_1.MarkdownText,{text:page.description}))));
7+
return(React.createElement(material_ui_1.Card,null,
8+
React.createElement(material_ui_1.CardHeader,{title:page.title}),
9+
React.createElement(material_ui_1.CardText,null,
10+
React.createElement(_components_1.MarkdownText,{text:page.description})
11+
)));
812
}
913
Object.defineProperty(exports,"__esModule",{value:true});
1014
exports.default=default_1;

‎lib/components/page/edit.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
66
exports.default=function(editPath){
77
if(editPath&&window.coderoad.edit){
88
varrepoPath=path.join(window.coderoad.repo,'edit','master',editPath);
9-
returnReact.createElement("a",{href:repoPath},React.createElement(Edit,{style:{position:'absolute',top:'10px',right:'10px'}}));
9+
returnReact.createElement("a",{href:repoPath},
10+
React.createElement(Edit,{style:{position:'absolute',top:'10px',right:'10px'}})
11+
);
1012
}
1113
};

‎lib/components/page/hint.js

Lines changed: 52 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,57 @@
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');
18+
varAction=require('../../actions/actions');
319
varmaterial_ui_1=require('material-ui');
420
var_components_1=require('../_components');
5-
functionhintsShown(task,hintPosition){
6-
if(hintPosition>-1&&task.hints&&task.hints.length>0){
7-
returntask.hints.slice(0,hintPosition+1);
21+
vardefault_1=(function(_super){
22+
__extends(default_1,_super);
23+
functiondefault_1(){
24+
_super.apply(this,arguments);
825
}
9-
returnnull;
10-
}
11-
exports.TaskHint=function(_a){
12-
varhint=_a.hint,index=_a.index;
13-
return(React.createElement(material_ui_1.ListItem,{className:'cr-task-hint',key:'hint'+index},React.createElement("div",{class:'cr-task-hint-box'},React.createElement("span",{className:'cr-task-hint-index'},index+1,"."),React.createElement("div",{className:'cr-task-hint-description'},React.createElement(_components_1.MarkdownText,{text:hint})))));
14-
};
15-
exports.TaskHints=function(_a){
16-
vartask=_a.task,hintPosition=_a.hintPosition;
17-
varhints=hintsShown(task,hintPosition);
18-
return(React.createElement("div",{className:'cr-task-hints'},hints ?hints.map(function(hint,index){returnReact.createElement(exports.TaskHint,{hint:hint,index:index});}) :null));
19-
};
26+
default_1.prototype.render=function(){
27+
var_a=this.props,task=_a.task,hintPosition=_a.hintPosition,nextHint=_a.nextHint,prevHint=_a.prevHint;
28+
varhints=task&&task.hints ?task.hints :null;
29+
console.log(hintPosition);
30+
if(hintPosition<0||!hints||!hints.length){
31+
returnReact.createElement("div",null);
32+
}
33+
else{
34+
varhint=hints[hintPosition];
35+
return(React.createElement(material_ui_1.Card,{className:'cr-task-hints'},
36+
React.createElement(material_ui_1.CardHeader,{title:'Hints',actAsExpander:true,showExpandableButton:true}),
37+
React.createElement(material_ui_1.CardText,{className:'cr-task-hint',expandable:true},
38+
React.createElement(_components_1.MarkdownText,{text:hint})
39+
),
40+
React.createElement(material_ui_1.CardActions,{expandable:true},
41+
hintPosition>0 ?React.createElement(material_ui_1.FlatButton,{label:'Previous',onClick:prevHint.bind(this,hintPosition-1)}) :null,
42+
hintPosition<task.hints.length-1 ?React.createElement(material_ui_1.FlatButton,{label:'Next',onClick:nextHint.bind(this,hintPosition+1)}) :null)));
43+
}
44+
};
45+
default_1=__decorate([
46+
react_redux_1.connect(null,function(dispatch,state){
47+
return{
48+
nextHint:function(position){returndispatch(Action.setHintPosition(position));},
49+
prevHint:function(position){returndispatch(Action.setHintPosition(position));}
50+
};
51+
}),
52+
__metadata('design:paramtypes',[])
53+
],default_1);
54+
returndefault_1;
55+
}(React.Component));
56+
Object.defineProperty(exports,"__esModule",{value:true});
57+
exports.default=default_1;

‎lib/components/page/page-complete.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ var _components_1 = require('../_components');
55
exports.PageCompleteMessage=function(_a){
66
varpage=_a.page;
77
return(React.createElement("div",{className:'cr-task-onComplete-description'},page.completed&&page.onPageComplete ?
8-
React.createElement(material_ui_1.ListItem,{className:'cr-task-onComplete',key:'page-complete'},React.createElement(_components_1.MarkdownText,{text:page.onPageComplete}))
8+
React.createElement(material_ui_1.ListItem,{className:'cr-task-onComplete',key:'page-complete'},
9+
React.createElement(_components_1.MarkdownText,{text:page.onPageComplete})
10+
)
911
:null));
1012
};

‎lib/components/page/page.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,14 @@ var default_1 = (function (_super) {
4949
var_a=this.props,page=_a.page,taskPosition=_a.taskPosition,hintPosition=_a.hintPosition,tasks=_a.tasks,runTests=_a.runTests;
5050
varcurrentTask=taskPosition<=tasks.length ?tasks[taskPosition] :null;
5151
varallComplete=taskPosition>=tasks.length;
52-
return(React.createElement(material_ui_2.Paper,{style:style,zDepth:1,className:'cr-page'},React.createElement(content_1.default,{page:page}),React.createElement(material_ui_1.Divider,null),React.createElement(material_ui_1.List,{subheader:'Tasks',className:'cr-page-list',ref:'tasks'},React.createElement(task_1.Tasks,{tasks:tasks,taskPosition:taskPosition,runTests:runTests}),React.createElement(hint_1.TaskHints,{task:currentTask,hintPosition:hintPosition}),React.createElement(page_complete_1.PageCompleteMessage,{page:page}),React.createElement("div",{ref:'listEnd'})),React.createElement(toolbar_1.default,{tasks:tasks,taskPosition:taskPosition,hintPosition:hintPosition})));
52+
return(React.createElement(material_ui_2.Paper,{style:style,zDepth:1,className:'cr-page'},
53+
React.createElement(content_1.default,{page:page}),
54+
React.createElement(material_ui_1.Divider,null),
55+
React.createElement(task_1.Tasks,{tasks:tasks,taskPosition:taskPosition,runTests:runTests}),
56+
React.createElement(hint_1.default,{task:currentTask,hintPosition:hintPosition}),
57+
React.createElement(page_complete_1.PageCompleteMessage,{page:page}),
58+
React.createElement("div",{ref:'listEnd'}),
59+
React.createElement(toolbar_1.default,{tasks:tasks,taskPosition:taskPosition,hintPosition:hintPosition})));
5360
};
5461
default_1=__decorate([
5562
react_redux_1.connect(null,function(dispatch,state){

‎lib/components/page/task.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@ var TaskCheckbox = function (_a) {
2626
};
2727
varTaskIndex=function(_a){
2828
varindex=_a.index;
29-
return(React.createElement("span",{className:'cr-task-index'},index+1,"."));
29+
return(React.createElement("span",{className:'cr-task-index'},
30+
index+1,
31+
"."));
3032
};
3133
varTaskContent=function(_a){
3234
vartask=_a.task;
33-
return(React.createElement("div",{className:'cr-task-description'},React.createElement(_components_1.MarkdownText,{text:task.description})));
35+
return(React.createElement("div",{className:'cr-task-description'},
36+
React.createElement(_components_1.MarkdownText,{text:task.description})
37+
));
3438
};
3539
exports.Task=function(_a){
3640
vartask=_a.task,taskPosition=_a.taskPosition,index=_a.index,runTests=_a.runTests;
@@ -41,10 +45,13 @@ exports.Task = function (_a) {
4145
elseif(index===taskPosition){
4246
taskClass+='isCurrentTask';
4347
}
44-
return(React.createElement(material_ui_1.ListItem,{key:index,className:taskClass},React.createElement(TaskCheckbox,{index:index,taskPosition:taskPosition,runTests:runTests}),React.createElement(TaskIndex,{index:index}),React.createElement(TaskContent,{task:task})));
48+
return(React.createElement(material_ui_1.ListItem,{key:index,className:taskClass},
49+
React.createElement(TaskCheckbox,{index:index,taskPosition:taskPosition,runTests:runTests}),
50+
React.createElement(TaskIndex,{index:index}),
51+
React.createElement(TaskContent,{task:task})));
4552
};
4653
exports.Tasks=function(_a){
4754
vartasks=_a.tasks,taskPosition=_a.taskPosition,runTests=_a.runTests;
4855
varvisTasks=visibleTasks(tasks,taskPosition);
49-
returnReact.createElement("div",{className:'cr-tasks'},visTasks.map(function(task,index){returnReact.createElement(exports.Task,{key:'task'+index,task:task,taskPosition:taskPosition,index:index,runTests:runTests});}));
56+
returnReact.createElement(material_ui_1.List,{subheader:'Tasks',className:'cr-tasks'},visTasks.map(function(task,index){returnReact.createElement(exports.Task,{key:index,task:task,taskPosition:taskPosition,index:index,runTests:runTests});}));
5057
};

‎lib/components/page/toolbar.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,18 @@ var default_1 = (function (_super) {
4848
varcurrentTask=taskPosition<=tasks.length ?tasks[taskPosition] :null;
4949
varprogress=taskProgress(taskPosition,tasks.length);
5050
varallComplete=taskPosition>=tasks.length;
51-
return(React.createElement("section",{className:'cr-page-toolbar'},React.createElement(ProgressBar,{progress:progress}),React.createElement(material_ui_1.Toolbar,null,currentTask&&currentTask.hints&&currentTask.hints.length ?
52-
React.createElement(material_ui_1.ToolbarGroup,{float:'left'},hintPosition<=currentTask.hints.length-2 ?
53-
React.createElement(material_ui_1.FlatButton,{className:'cr-task-showHint',icon:React.createElement(InfoOutline,null),onClick:showHint.bind(this,currentTask,hintPosition)})
54-
:React.createElement(material_ui_1.FlatButton,{className:'cr-task-showHint-disabled',icon:React.createElement(Info,null),disabled:true}))
55-
:null,React.createElement(material_ui_1.ToolbarGroup,{float:'right'},allComplete ?
56-
React.createElement(material_ui_1.RaisedButton,{label:'Continue',primary:true,onClick:callNextPage})
57-
:
58-
React.createElement(material_ui_1.RaisedButton,{label:'Run',secondary:true,onClick:callRunTests})))));
51+
return(React.createElement("section",{className:'cr-page-toolbar'},
52+
React.createElement(ProgressBar,{progress:progress}),
53+
React.createElement(material_ui_1.Toolbar,null,
54+
currentTask&&currentTask.hints&&currentTask.hints.length ?
55+
React.createElement(material_ui_1.ToolbarGroup,{float:'left'},hintPosition<=currentTask.hints.length-2 ?
56+
React.createElement(material_ui_1.FlatButton,{className:'cr-task-showHint',icon:React.createElement(InfoOutline,null),onClick:showHint.bind(this,currentTask,hintPosition)})
57+
:React.createElement(material_ui_1.FlatButton,{className:'cr-task-showHint-disabled',icon:React.createElement(Info,null),disabled:true}))
58+
:null,
59+
React.createElement(material_ui_1.ToolbarGroup,{float:'right'},allComplete ?
60+
React.createElement(material_ui_1.RaisedButton,{label:'Continue',primary:true,onClick:callNextPage})
61+
:
62+
React.createElement(material_ui_1.RaisedButton,{label:'Run',secondary:true,onClick:callRunTests})))));
5963
};
6064
default_1=__decorate([
6165
react_redux_1.connect(null,function(dispatch,state){

0 commit comments

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