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

Commitd047d06

Browse files
committed
update to newer version of material-ui, start & progress complete
1 parent479f7ff commitd047d06

File tree

29 files changed

+160
-110
lines changed

29 files changed

+160
-110
lines changed

‎lib/components/alert/alert.js‎

Lines changed: 2 additions & 2 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
varAction=require('../../actions/actions');
19-
varmaterial_ui_1=require('material-ui');
19+
varsnackbar_1=require('material-ui/lib/snackbar');
2020
varclassNames=require('classnames');
2121
vardefaultAlert={
2222
open:false,
@@ -30,7 +30,7 @@ var default_1 = (function (_super) {
3030
default_1.prototype.render=function(){
3131
var_a=this.props,alert=_a.alert,toggleAlert=_a.toggleAlert;
3232
varaction=alert.action,open=alert.open,message=alert.message,duration=alert.duration;
33-
return(React.createElement(material_ui_1.Snackbar,{className:classNames('cr-alert',action),open:open||false,message:message||'',action:action,autoHideDuration:duration||1500,onActionTouchTap:toggleAlert,onRequestClose:toggleAlert}));
33+
return(React.createElement(snackbar_1.default,{className:classNames('cr-alert',action),open:open||false,message:message||'',action:action,autoHideDuration:duration||1500,onActionTouchTap:toggleAlert,onRequestClose:toggleAlert}));
3434
};
3535
default_1=__decorate([
3636
react_redux_1.connect(null,function(dispatch){
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
"use strict";
22
varReact=require('react');
3-
varmaterial_ui_1=require('material-ui');
4-
exports.FinalPage=function(){return(React.createElement(material_ui_1.Paper,null,React.createElement(material_ui_1.Card,null,React.createElement(material_ui_1.CardTitle,{title:'Congratulations!',subtitle:'Tutorial Complete!'}),React.createElement(material_ui_1.CardText,null,"What's next?",React.createElement(material_ui_1.CardActions,null,React.createElement("a",{href:'https://coderoad.github.io/#tutorials'},React.createElement(material_ui_1.FlatButton,{label:'See More Tutorials',disabled:true})),React.createElement("a",{href:'https://coderoad.github.io/build'},React.createElement(material_ui_1.FlatButton,{label:'Learn how to Create a Tutorial'})))))));};
3+
varpaper_1=require('material-ui/lib/paper');
4+
varcard_1=require('material-ui/lib/card/card');
5+
varcard_title_1=require('material-ui/lib/card/card-title');
6+
varcard_text_1=require('material-ui/lib/card/card-text');
7+
varcard_actions_1=require('material-ui/lib/card/card-actions');
8+
varflat_button_1=require('material-ui/lib/flat-button');
9+
exports.FinalPage=function(){return(React.createElement(paper_1.default,null,React.createElement(card_1.default,null,React.createElement(card_title_1.default,{title:'Congratulations!',subtitle:'Tutorial Complete!'}),React.createElement(card_text_1.default,null,"What's next?",React.createElement(card_actions_1.default,null,React.createElement("a",{href:'https://coderoad.github.io/#tutorials'},React.createElement(flat_button_1.default,{label:'See More Tutorials',disabled:true})),React.createElement("a",{href:'https://coderoad.github.io/build'},React.createElement(flat_button_1.default,{label:'Learn how to Create a Tutorial'})))))));};

‎lib/components/menu/menu.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'use strict';
1+
"use strict";
22
var__extends=(this&&this.__extends)||function(d,b){
33
for(varpinb)if(b.hasOwnProperty(p))d[p]=b[p];
44
function__(){this.constructor=d;}
@@ -19,9 +19,13 @@ var react_redux_1 = require('react-redux');
1919
varAction=require('../../actions/actions');
2020
varrender_1=require('../render');
2121
varsubscriptions_1=require('../../atom/subscriptions');
22-
varmaterial_ui_1=require('material-ui');
23-
varMoreVertIcon=require('material-ui/lib/svg-icons/navigation/more-vert');
24-
varNavigationClose=require('material-ui/lib/svg-icons/navigation/close');
22+
varapp_bar_1=require('material-ui/lib/app-bar');
23+
varicon_button_1=require('material-ui/lib/icon-button');
24+
varclose_1=require('material-ui/lib/svg-icons/navigation/close');
25+
varicon_menu_1=require('material-ui/lib/menus/icon-menu');
26+
varmore_vert_1=require('material-ui/lib/svg-icons/navigation/more-vert');
27+
varmenu_item_1=require('material-ui/lib/menus/menu-item');
28+
varorigin={horizontal:'right',vertical:'top'};
2529
vardefault_1=(function(_super){
2630
__extends(default_1,_super);
2731
functiondefault_1(){
@@ -43,19 +47,18 @@ var default_1 = (function (_super) {
4347
switch(this.props.route){
4448
case'final':
4549
case'page':
46-
return(React.createElement("div",null,React.createElement(material_ui_1.MenuItem,{primaryText:'progress',onTouchTap:routeToProgress,key:'progress'}),React.createElement(material_ui_1.MenuItem,{primaryText:'projects',onTouchTap:routeToProjects,key:'projects'})));
50+
return(React.createElement("div",null,React.createElement(menu_item_1.default,{primaryText:'progress',onTouchTap:routeToProgress,key:'progress'}),React.createElement(menu_item_1.default,{primaryText:'projects',onTouchTap:routeToProjects,key:'projects'})));
4751
case'progress':
48-
returnReact.createElement(material_ui_1.MenuItem,{primaryText:'projects',onTouchTap:routeToProjects,key:'projects'});
52+
returnReact.createElement(menu_item_1.default,{primaryText:'projects',onTouchTap:routeToProjects,key:'projects'});
4953
default:returnnull;
5054
}
5155
};
5256
default_1.prototype.closePanel=function(){
5357
render_1.togglePanel();
5458
};
5559
default_1.prototype.render=function(){
56-
varorigin={horizontal:'right',vertical:'top'};
5760
varquit=this.props.quit;
58-
return(React.createElement(material_ui_1.AppBar,{title:'CodeRoad',className:'cr-menu-bar',iconElementLeft:React.createElement(material_ui_1.IconButton,{onTouchTap: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:origin,anchorOrigin:origin},this.menuOptions(),window.coderoad.issuesPath ?React.createElement(material_ui_1.MenuItem,{key:'issue',className:'link'},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',onTouchTap:quit}))}));
61+
returnReact.createElement(app_bar_1.default,{title:'CodeRoad',className:'cr-menu-bar',iconElementLeft:React.createElement(icon_button_1.default,null,React.createElement(close_1.default,null)),iconElementRight:React.createElement(icon_menu_1.default,{iconButtonElement:React.createElement(icon_button_1.default,null,React.createElement(more_vert_1.default,null)),targetOrigin:origin,anchorOrigin:origin},this.menuOptions(),window.coderoad.issuesPath ?React.createElement(menu_item_1.default,{key:'issue',className:'link'},React.createElement("a",{href:window.coderoad.issuesPath},"post issue")) :null)});
5962
};
6063
default_1=__decorate([
6164
react_redux_1.connect(null,function(dispatch){

‎lib/components/page/content.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
"use strict";
22
varReact=require('react');
33
var_components_1=require('../_components');
4-
varmaterial_ui_1=require('material-ui');
4+
varcard_1=require('material-ui/lib/card/card');
5+
varcard_header_1=require('material-ui/lib/card/card-header');
6+
varcard_text_1=require('material-ui/lib/card/card-text');
57
functiondefault_1(_a){
68
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}))));
9+
return(React.createElement(card_1.default,null,React.createElement(card_header_1.default,{title:page.title}),React.createElement(card_text_1.default,null,React.createElement(_components_1.MarkdownText,{text:page.description}))));
810
}
911
Object.defineProperty(exports,"__esModule",{value:true});
1012
exports.default=default_1;

‎lib/components/page/edit.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"use strict";
22
varReact=require('react');
33
varpath=require('path');
4-
varEdit=require('material-ui/lib/svg-icons/editor/mode-edit');
4+
varmode_edit_1=require('material-ui/lib/svg-icons/editor/mode-edit');
55
vareditStyle={position:'absolute',top:'10px',right:'10px'};
66
Object.defineProperty(exports,"__esModule",{value:true});
77
exports.default=function(editPath){
88
if(editPath&&window.coderoad.edit){
99
varrepoPath=path.join(window.coderoad.repo,'edit','master',editPath);
10-
returnReact.createElement("a",{href:repoPath},React.createElement(Edit,{style:editStyle}));
10+
returnReact.createElement("a",{href:repoPath},React.createElement(mode_edit_1.default,{style:editStyle}));
1111
}
1212
};

‎lib/components/page/hint.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
1818
varAction=require('../../actions/actions');
19-
varmaterial_ui_1=require('material-ui');
19+
varcard_1=require('material-ui/lib/card/card');
20+
varcard_actions_1=require('material-ui/lib/card/card-actions');
21+
varcard_header_1=require('material-ui/lib/card/card-header');
22+
varcard_text_1=require('material-ui/lib/card/card-text');
23+
varflat_button_1=require('material-ui/lib/flat-button');
2024
var_components_1=require('../_components');
2125
variconPath='material-ui/lib/svg-icons/';
2226
varHelp=require(iconPath+'action/help');
@@ -32,7 +36,7 @@ var default_1 = (function (_super) {
3236
returnReact.createElement("div",null);
3337
}
3438
varhint=hints[hintPosition];
35-
return(React.createElement(material_ui_1.Card,{className:'cr-task-hints'},React.createElement(material_ui_1.CardHeader,{title:'Hints',avatar:React.createElement(Help,null),actAsExpander:true,showExpandableButton:true}),React.createElement(material_ui_1.CardText,{className:'cr-task-hint',expandable:true},React.createElement(_components_1.MarkdownText,{text:hint})),React.createElement(material_ui_1.CardActions,{expandable:true},React.createElement(material_ui_1.FlatButton,{label:'Previous',disabled:hintPosition<1,onTouchTap:prevHint.bind(this,hintPosition-1)}),React.createElement(material_ui_1.FlatButton,{label:'Next',disabled:hintPosition>hints.length-2,onTouchTap:nextHint.bind(this,hintPosition+1)}))));
39+
return(React.createElement(card_1.default,{className:'cr-task-hints'},React.createElement(card_header_1.default,{title:'Hints',avatar:React.createElement(Help,null),actAsExpander:true,showExpandableButton:true}),React.createElement(card_text_1.default,{className:'cr-task-hint',expandable:true},React.createElement(_components_1.MarkdownText,{text:hint})),React.createElement(card_actions_1.default,{expandable:true},React.createElement(flat_button_1.default,{label:'Previous',disabled:hintPosition<1,onTouchTap:prevHint.bind(this,hintPosition-1)}),React.createElement(flat_button_1.default,{label:'Next',disabled:hintPosition>hints.length-2,onTouchTap:nextHint.bind(this,hintPosition+1)}))));
3640
};
3741
default_1=__decorate([
3842
react_redux_1.connect(null,function(dispatch,state){
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
22
varReact=require('react');
3-
varmaterial_ui_1=require('material-ui');
3+
varlist_item_1=require('material-ui/lib/lists/list-item');
44
var_components_1=require('../_components');
55
exports.PageCompleteMessage=function(_a){
66
varpage=_a.page;
77
return(React.createElement("div",{className:'cr-page-onComplete'},page.completed&&page.onPageComplete ?
8-
React.createElement(material_ui_1.ListItem,{key:'page-complete'},React.createElement(_components_1.MarkdownText,{text:page.onPageComplete}))
8+
React.createElement(list_item_1.default,{key:'page-complete'},React.createElement(_components_1.MarkdownText,{text:page.onPageComplete}))
99
:null));
1010
};

‎lib/components/page/page.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ var __extends = (this && this.__extends) || function (d, b) {
66
};
77
varReact=require('react');
88
varReactDOM=require('react-dom');
9-
varmaterial_ui_1=require('material-ui');
9+
varpaper_1=require('material-ui/lib/paper');
10+
vardivider_1=require('material-ui/lib/divider');
1011
varcontent_1=require('./content');
1112
vartask_1=require('./task');
1213
varhint_1=require('./hint');
@@ -28,7 +29,7 @@ var default_1 = (function (_super) {
2829
var_a=this.props,page=_a.page,taskPosition=_a.taskPosition,hintPosition=_a.hintPosition,tasks=_a.tasks,runTests=_a.runTests;
2930
varcurrentTask=taskPosition<=tasks.length ?tasks[taskPosition] :null;
3031
varallComplete=taskPosition>=tasks.length;
31-
return(React.createElement(material_ui_1.Paper,{style:pageStyle,zDepth:1,className:'cr-page',ref:'page'},React.createElement(content_1.default,{page:page}),React.createElement(material_ui_1.Divider,null),React.createElement(task_1.Tasks,{tasks:tasks,taskPosition:taskPosition,runTests:runTests}),React.createElement("div",{className:'listEnd',ref:'listEnd'}),React.createElement(hint_1.default,{task:currentTask,hintPosition:hintPosition}),React.createElement(page_complete_1.PageCompleteMessage,{page:page}),React.createElement(toolbar_1.default,{tasks:tasks,taskPosition:taskPosition})));
32+
return(React.createElement(paper_1.default,{style:pageStyle,zDepth:1,className:'cr-page',ref:'page'},React.createElement(content_1.default,{page:page}),React.createElement(divider_1.default,null),React.createElement(task_1.Tasks,{tasks:tasks,taskPosition:taskPosition,runTests:runTests}),React.createElement("div",{className:'listEnd',ref:'listEnd'}),React.createElement(hint_1.default,{task:currentTask,hintPosition:hintPosition}),React.createElement(page_complete_1.PageCompleteMessage,{page:page}),React.createElement(toolbar_1.default,{tasks:tasks,taskPosition:taskPosition})));
3233
};
3334
returndefault_1;
3435
}(React.Component));

‎lib/components/page/task.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"use strict";
22
varReact=require('react');
33
var_components_1=require('../_components');
4-
varmaterial_ui_1=require('material-ui');
4+
varlist_1=require('material-ui/lib/lists/list');
5+
varlist_item_1=require('material-ui/lib/lists/list-item');
6+
varSubheader_1=require('material-ui/lib/Subheader');
57
varColors=require('material-ui/lib/styles/colors');
68
variconPath='material-ui/lib/svg-icons/';
79
varComplete=require(iconPath+'toggle/check-box');
@@ -35,10 +37,10 @@ var TaskContent = function (_a) {
3537
exports.Task=function(_a){
3638
vartask=_a.task,taskPosition=_a.taskPosition,index=_a.index,runTests=_a.runTests;
3739
varisCompleted=index<taskPosition;
38-
return(React.createElement(material_ui_1.ListItem,{key:index,className:'cr-task',style:{backgroundColor:isCompleted ?'#c8e6c9' :'inherit'}},React.createElement(TaskCheckbox,{index:index,taskPosition:taskPosition,runTests:runTests}),React.createElement(TaskIndex,{index:index}),React.createElement(TaskContent,{task:task})));
40+
return(React.createElement(list_item_1.default,{key:index,className:'cr-task',style:{backgroundColor:isCompleted ?'#c8e6c9' :'inherit'}},React.createElement(TaskCheckbox,{index:index,taskPosition:taskPosition,runTests:runTests}),React.createElement(TaskIndex,{index:index}),React.createElement(TaskContent,{task:task})));
3941
};
4042
exports.Tasks=function(_a){
4143
vartasks=_a.tasks,taskPosition=_a.taskPosition,runTests=_a.runTests;
4244
varvisTasks=visibleTasks(tasks,taskPosition);
43-
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});}));
45+
returnReact.createElement(list_1.default,{className:'cr-tasks'},React.createElement(Subheader_1.default,null,"Tasks"),visTasks.map(function(task,index){returnReact.createElement(exports.Task,{key:index,task:task,taskPosition:taskPosition,index:index,runTests:runTests});}));
4446
};

‎lib/components/page/toolbar.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
1818
varAction=require('../../actions/actions');
19-
varmaterial_ui_1=require('material-ui');
19+
varlinear_progress_1=require('material-ui/lib/linear-progress');
20+
vartoolbar_1=require('material-ui/lib/toolbar/toolbar');
21+
vartoolbar_group_1=require('material-ui/lib/toolbar/toolbar-group');
22+
varraised_button_1=require('material-ui/lib/raised-button');
23+
varflat_button_1=require('material-ui/lib/flat-button');
2024
vareditor_1=require('../../atom/editor');
2125
varactions_1=require('../../atom/actions');
2226
varCode=require('material-ui/lib/svg-icons/action/code');
2327
varProgressBar=function(_a){
2428
varprogress=_a.progress;
25-
returnReact.createElement(material_ui_1.LinearProgress,{mode:'determinate',value:progress,style:{height:'10px'}});
29+
returnReact.createElement(linear_progress_1.default,{mode:'determinate',value:progress,style:{height:'10px'}});
2630
};
2731
functiontaskProgress(current,max){
2832
return(current/max)*100;
@@ -36,15 +40,15 @@ var default_1 = (function (_super) {
3640
var_a=this.props,callNextPage=_a.callNextPage,showHint=_a.showHint,taskPosition=_a.taskPosition,tasks=_a.tasks;
3741
switch(true){
3842
casetaskPosition>=tasks.length:
39-
returnReact.createElement(material_ui_1.RaisedButton,{label:'Continue',primary:true,onTouchTap:callNextPage});
43+
returnReact.createElement(raised_button_1.default,{label:'Continue',primary:true,onTouchTap:callNextPage});
4044
default:
41-
returnReact.createElement(material_ui_1.RaisedButton,{label:'Save',secondary:true,onTouchTap:editor_1.save});
45+
returnReact.createElement(raised_button_1.default,{label:'Save',secondary:true,onTouchTap:editor_1.save});
4246
}
4347
};
4448
default_1.prototype.render=function(){
4549
var_a=this.props,tasks=_a.tasks,taskPosition=_a.taskPosition;
4650
varprogress=taskProgress(taskPosition,tasks.length);
47-
return(React.createElement("section",{className:'cr-page-toolbar'},React.createElement(ProgressBar,{progress:progress}),React.createElement(material_ui_1.Toolbar,null,React.createElement(material_ui_1.ToolbarGroup,{float:'left'},React.createElement(material_ui_1.FlatButton,{icon:React.createElement(Code,null),onTouchTap:actions_1.toggleDevTools})),React.createElement(material_ui_1.ToolbarGroup,{float:'right'},this.getButton()))));
51+
return(React.createElement("section",{className:'cr-page-toolbar'},React.createElement(ProgressBar,{progress:progress}),React.createElement(toolbar_1.default,null,React.createElement(toolbar_group_1.default,{float:'left'},React.createElement(flat_button_1.default,{icon:React.createElement(Code,null),onTouchTap:actions_1.toggleDevTools})),React.createElement(toolbar_group_1.default,{float:'right'},this.getButton()))));
4852
};
4953
default_1=__decorate([
5054
react_redux_1.connect(null,function(dispatch,state){

0 commit comments

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