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

Commit0563867

Browse files
committed
use table with start component & mu-0.15
1 parente5f6d01 commit0563867

File tree

6 files changed

+47
-29
lines changed

6 files changed

+47
-29
lines changed

‎lib/components/page/toolbar.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var Action = require('../../actions/actions');
1919
varlinear_progress_1=require('material-ui/lib/linear-progress');
2020
vartoolbar_1=require('material-ui/lib/toolbar/toolbar');
2121
vartoolbar_group_1=require('material-ui/lib/toolbar/toolbar-group');
22+
varraised_button_1=require('material-ui/lib/raised-button');
2223
varflat_button_1=require('material-ui/lib/flat-button');
2324
vareditor_1=require('../../atom/editor');
2425
varactions_1=require('../../atom/actions');
@@ -39,8 +40,8 @@ var default_1 = (function (_super) {
3940
var_a=this.props,tasks=_a.tasks,taskPosition=_a.taskPosition,callNextPage=_a.callNextPage;
4041
varprogress=taskProgress(taskPosition,tasks.length);
4142
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_1.default,null),onTouchTap:actions_1.toggleDevTools})),React.createElement(toolbar_group_1.default,{float:'right'},taskPosition>=tasks.length ?
42-
React.createElement(flat_button_1.default,{label:'Continue',primary:true,onTouchTap:callNextPage}) :
43-
React.createElement(flat_button_1.default,{label:'Save',secondary:true,onTouchTap:editor_1.save})))));
43+
React.createElement(raised_button_1.default,{label:'Continue',primary:true,onTouchTap:callNextPage}) :
44+
React.createElement(raised_button_1.default,{label:'Save',secondary:true,onTouchTap:editor_1.save})))));
4445
};
4546
default_1=__decorate([
4647
react_redux_1.connect(null,function(dispatch,state){

‎lib/components/progress/progress.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var list_item_1 = require('material-ui/lib/lists/list-item');
2222
varSubheader_1=require('material-ui/lib/Subheader');
2323
var_components_1=require('../_components');
2424
varclassnames=require('classnames');
25-
varcolors_1=require('material-ui/lib/styles/colors');
25+
varColors=require('material-ui/lib/styles/colors');
2626
varcheck_box_1=require('material-ui/lib/svg-icons/toggle/check-box');
2727
varplay_circle_filled_1=require('material-ui/lib/svg-icons/av/play-circle-filled');
2828
varcheck_box_outline_blank_1=require('material-ui/lib/svg-icons/toggle/check-box-outline-blank');
@@ -36,7 +36,7 @@ var ProgressPage = (function (_super) {
3636
returnReact.createElement(check_box_1.default,null);
3737
}
3838
elseif(current){
39-
returnReact.createElement(play_circle_filled_1.default,{color:colors_1.pink500});
39+
returnReact.createElement(play_circle_filled_1.default,{color:Colors.pink500});
4040
}
4141
else{
4242
returnReact.createElement(check_box_outline_blank_1.default,null);

‎lib/components/start/tutorials.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1414
if(typeofReflect==="object"&&typeofReflect.metadata==="function")returnReflect.metadata(k,v);
1515
};
1616
varReact=require('react');
17-
varlist_1=require('material-ui/lib/lists/list');
18-
varlist_item_1=require('material-ui/lib/lists/list-item');
1917
varraised_button_1=require('material-ui/lib/raised-button');
20-
varSubheader_1=require('material-ui/lib/Subheader');
18+
vartable_1=require('material-ui/lib/table/table');
19+
vartable_header_column_1=require('material-ui/lib/table/table-header-column');
20+
vartable_row_1=require('material-ui/lib/table/table-row');
21+
vartable_header_1=require('material-ui/lib/table/table-header');
22+
vartable_row_column_1=require('material-ui/lib/table/table-row-column');
23+
vartable_body_1=require('material-ui/lib/table/table-body');
2124
varreact_redux_1=require('react-redux');
2225
varAction=require('../../actions/actions');
2326
vardefault_1=(function(_super){
@@ -37,9 +40,9 @@ var default_1 = (function (_super) {
3740
default_1.prototype.render=function(){
3841
var_this=this;
3942
var_a=this.props,tutorials=_a.tutorials,loadTutorials=_a.loadTutorials,selectProject=_a.selectProject,toggleAlert=_a.toggleAlert;
40-
return(React.createElement("div",{className:'cr-tutorials'},React.createElement(list_1.default,null,React.createElement(Subheader_1.default,null,"Tutorials"),tutorials.map(function(tutorial,index){
41-
return(React.createElement(list_item_1.default,{key:index,primaryText:_this.trim(tutorial),onClick:selectProject.bind(_this,tutorial)}));
42-
})),React.createElement("br",null),React.createElement(raised_button_1.default,{label:'Load Tutorials',secondary:true,onTouchTap:loadTutorials})));
43+
return(React.createElement("div",{className:'cr-tutorials'},React.createElement(table_1.default,null,React.createElement(table_header_1.default,{displaySelectAll:false,adjustForCheckbox:false},React.createElement(table_row_1.default,null,React.createElement(table_header_column_1.default,null,"Tutorial"),React.createElement(table_header_column_1.default,null,"Version"))),React.createElement(table_body_1.default,{displayRowCheckbox:false},tutorials.map(function(tutorial,index){
44+
return(React.createElement(table_row_1.default,null,React.createElement(table_row_column_1.default,{onClick:selectProject.bind(_this,tutorial)},_this.trim(tutorial)),React.createElement(table_row_column_1.default,null,"v1.0.0"),"/>"));
45+
}))),React.createElement("br",null),React.createElement(raised_button_1.default,{label:'Load Tutorials',secondary:true,onTouchTap:loadTutorials})));
4346
};
4447
default_1=__decorate([
4548
react_redux_1.connect(null,function(dispatch){

‎src/components/page/toolbar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ export default class extends React.Component<{
4343
</ToolbarGroup>
4444

4545
<ToolbarGroupfloat='right'>
46-
{/* add log here */}
4746
{taskPosition>=tasks.length ?
48-
<FlatButtonlabel='Continue'primary={true}onTouchTap={callNextPage}/> :
49-
<FlatButtonlabel='Save'secondary={true}onTouchTap={save}/>}
47+
<RaisedButtonlabel='Continue'primary={true}onTouchTap={callNextPage}/> :
48+
<RaisedButtonlabel='Save'secondary={true}onTouchTap={save}/>
49+
}
5050
</ToolbarGroup>
5151

5252
</Toolbar>

‎src/components/progress/progress.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import ListItem from 'material-ui/lib/lists/list-item';
88
importSubheaderfrom'material-ui/lib/Subheader';
99
import{MarkdownText}from'../_components';
1010
import*asclassnamesfrom'classnames';
11-
import{pink500}from'material-ui/lib/styles/colors';
11+
import*asColorsfrom'material-ui/lib/styles/colors';
1212
importCheckBoxfrom'material-ui/lib/svg-icons/toggle/check-box';
1313
importPlayCircleFilledfrom'material-ui/lib/svg-icons/av/play-circle-filled';
1414
importCheckBoxOutlineBlankfrom'material-ui/lib/svg-icons/toggle/check-box-outline-blank';
@@ -27,7 +27,7 @@ class ProgressPage extends React.Component<{page: CR.Page, itemPosition: CR.Posi
2727
if(completed){
2828
return<CheckBox/>;
2929
}elseif(current){
30-
return<PlayCircleFilledcolor={pink500}/>;
30+
return<PlayCircleFilledcolor={Colors.pink500}/>;
3131
}else{
3232
return<CheckBoxOutlineBlank/>;
3333
}

‎src/components/start/tutorials.tsx

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import*asReactfrom'react';
2-
importListfrom'material-ui/lib/lists/list';
3-
importListItemfrom'material-ui/lib/lists/list-item';
42
importRaisedButtonfrom'material-ui/lib/raised-button';
5-
importSubheaderfrom'material-ui/lib/Subheader';
3+
importTablefrom'material-ui/lib/table/table';
4+
importTableHeaderColumnfrom'material-ui/lib/table/table-header-column';
5+
importTableRowfrom'material-ui/lib/table/table-row';
6+
importTableHeaderfrom'material-ui/lib/table/table-header';
7+
importTableRowColumnfrom'material-ui/lib/table/table-row-column';
8+
importTableBodyfrom'material-ui/lib/table/table-body';
69
import{MarkdownText}from'../_components';
710
import{connect}from'react-redux';
811
import*asActionfrom'../../actions/actions';
@@ -38,18 +41,29 @@ export default class extends React.Component<{
3841
const{tutorials, loadTutorials, selectProject, toggleAlert}=this.props;
3942
return(
4043
<divclassName='cr-tutorials'>
41-
<List>
42-
<Subheader>Tutorials</Subheader>
43-
{/* List of Tutorials */}
44-
{tutorials.map((tutorial:string,index)=>{
45-
return(
46-
<ListItem
47-
key={index}
48-
primaryText={this.trim(tutorial)}
49-
onClick={selectProject.bind(this,tutorial)}/>);
50-
})}
44+
<Table>
45+
<TableHeader
46+
displaySelectAll={false}
47+
adjustForCheckbox={false}>
48+
<TableRow>
49+
<TableHeaderColumn>Tutorial</TableHeaderColumn>
50+
<TableHeaderColumn>Version</TableHeaderColumn>
51+
</TableRow>
52+
</TableHeader>
53+
<TableBodydisplayRowCheckbox={false}>
5154

52-
</List>
55+
{tutorials.map((tutorial:string,index)=>{
56+
return(
57+
<TableRow>
58+
<TableRowColumnonClick={selectProject.bind(this,tutorial)}>{this.trim(tutorial)}</TableRowColumn>
59+
<TableRowColumn>v1.0.0</TableRowColumn>
60+
/>
61+
</TableRow>
62+
);
63+
})
64+
}
65+
</TableBody>
66+
</Table>
5367

5468
<br/>
5569
<RaisedButtonlabel='Load Tutorials'secondary={true}onTouchTap={loadTutorials}/>

0 commit comments

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