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

Commitf4b5f92

Browse files
committed
onPageComplete component
1 parent88de366 commitf4b5f92

File tree

8 files changed

+62
-20
lines changed

8 files changed

+62
-20
lines changed
Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
"use strict";
22
varReact=require('react');
3-
varList_1=require('material-ui/List');
3+
varCard_1=require('material-ui/Card');
44
varindex_1=require('../../index');
5+
varcolors_1=require('material-ui/styles/colors');
6+
varstyles={
7+
backgroundColor:colors_1.cyan500,
8+
position:'fixed',
9+
bottom:'20px',
10+
padding:'10px 15px 30px',
11+
right:'0px',
12+
margin:'0',
13+
width:'400px',
14+
};
515
exports.PageComplete=function(_a){
616
varpage=_a.page;
717
return(React.createElement("div",{className:'cr-page-onComplete'},page.completed&&page.onPageComplete
8-
?React.createElement(List_1.ListItem,{key:'page-complete'},React.createElement(index_1.Markdown,null,page.onPageComplete))
18+
?React.createElement(Card_1.Card,{style:styles},React.createElement(Card_1.CardText,null,React.createElement(index_1.Markdown,null,page.onPageComplete)))
919
:null));
1020
};

‎lib/components/Page/ProgressBar.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
"use strict";
22
varReact=require('react');
33
varLinearProgress_1=require('material-ui/LinearProgress');
4+
varstyle={
5+
height:'10px'
6+
};
47
exports.ProgressBar=function(_a){
5-
vartaskPosition=_a.taskPosition,taskCount=_a.taskCount;
8+
vartaskPosition=_a.taskPosition,taskCount=_a.taskCount,completed=_a.completed;
69
varprogress=(taskPosition/taskCount)*100;
7-
return(React.createElement(LinearProgress_1.default,{mode:'determinate',value:progress,style:{height:'10px'}}));
10+
if(completed){
11+
returnnull;
12+
}
13+
return(React.createElement(LinearProgress_1.default,{mode:'determinate',value:progress,style:style}));
814
};

‎lib/components/Page/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var Page = (function (_super) {
3737
vartask=taskPosition<=tasks.length ?tasks[taskPosition] :null;
3838
varallComplete=taskPosition>=tasks.length;
3939
console.log('page',page);
40-
return(React.createElement("section",{className:'cr-page'},React.createElement(PageContent_1.PageContent,__assign({},this.props)),React.createElement(Tasks_1.Tasks,__assign({},this.props,{completed:page.completed})),React.createElement("div",{className:'listEnd',ref:'listEnd'}),React.createElement(PageComplete_1.PageComplete,__assign({},this.props)),React.createElement(Hints_1.Hints,{task:task,hintPosition:hintPosition}),React.createElement(PageToolbar_1.PageToolbar,__assign({},this.props),React.createElement(ProgressBar_1.ProgressBar,{taskPosition:taskPosition,taskCount:tasks.length}))));
40+
return(React.createElement("section",{className:'cr-page'},React.createElement(PageContent_1.PageContent,__assign({},this.props)),React.createElement(Tasks_1.Tasks,__assign({},this.props,{completed:page.completed})),React.createElement("div",{className:'listEnd',ref:'listEnd'}),React.createElement(PageComplete_1.PageComplete,__assign({},this.props)),React.createElement(Hints_1.Hints,{task:task,hintPosition:hintPosition}),React.createElement(PageToolbar_1.PageToolbar,__assign({},this.props),React.createElement(ProgressBar_1.ProgressBar,{taskPosition:taskPosition,taskCount:tasks.length,completed:page.completed}))));
4141
};
4242
returnPage;
4343
}(React.Component));

‎src/components/Page/PageComplete/_page-complete.less

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

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,28 @@
11
import*asReactfrom'react';
2-
import{ListItem}from'material-ui/List';
2+
import{Card,CardText}from'material-ui/Card';
33
import{Markdown}from'../../index';
4+
import{cyan500}from'material-ui/styles/colors';
5+
6+
conststyles={
7+
backgroundColor:cyan500,
8+
position:'fixed',
9+
bottom:'20px',
10+
padding:'10px 15px 30px',
11+
right:'0px',
12+
margin:'0',
13+
width:'400px',
14+
};
415

516
exportconstPageComplete:React.StatelessComponent<{
617
page:CR.Page
718
}>=({page})=>(
819
<divclassName='cr-page-onComplete'>
920
{page.completed&&page.onPageComplete
10-
?<ListItemkey='page-complete'>
11-
<Markdown>{page.onPageComplete}</Markdown>
12-
</ListItem>
21+
?<Cardstyle={styles}>
22+
<CardText>
23+
<Markdown>{page.onPageComplete}</Markdown>
24+
</CardText>
25+
</Card>
1326
:null
1427
}
1528
</div>

‎src/components/Page/ProgressBar.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
import*asReactfrom'react';
22
importLinearProgressfrom'material-ui/LinearProgress';
33

4+
conststyle={
5+
height:'10px'
6+
};
7+
48
exportconstProgressBar:React.StatelessComponent<{
5-
taskPosition:number,taskCount:number
6-
}>=({taskPosition, taskCount})=>{
9+
taskPosition:number,taskCount:number,completed:boolean
10+
}>=({taskPosition, taskCount, completed})=>{
711
constprogress:number=(taskPosition/taskCount)*100;
12+
if(completed){
13+
returnnull;
14+
}
815
return(
916
<LinearProgress
1017
mode='determinate'
1118
value={progress}
12-
style={{height:'10px'}}
19+
style={style}
1320
/>
1421
);
1522
};

‎src/components/Page/index.tsx

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,23 @@ render() {
3434
<sectionclassName='cr-page'>
3535
<PageContent{...this.props}/>
3636

37-
<Tasks{...this.props}completed={page.completed}/>
38-
<divclassName='listEnd'ref='listEnd'/>
37+
<Tasks
38+
{...this.props}
39+
completed={page.completed}
40+
/>
3941

42+
<divclassName='listEnd'ref='listEnd'/>
4043
<PageComplete{...this.props}/>
41-
<Hintstask={task}hintPosition={hintPosition}/>
44+
<Hints
45+
task={task}
46+
hintPosition={hintPosition}
47+
/>
4248
<PageToolbar{...this.props}>
43-
<ProgressBartaskPosition={taskPosition}taskCount={tasks.length}/>
49+
<ProgressBar
50+
taskPosition={taskPosition}
51+
taskCount={tasks.length}
52+
completed={page.completed}
53+
/>
4454
</PageToolbar>
4555
</section>
4656
);

‎src/components/page/_page.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import'Tasks/_tasks';
22
@import'Chapter/_chapter';
33
@import'PageToolbar/_toolbar';
4-
@import'PageComplete/_page-complete';
54
@import'Hints/_hints';
65

76
.cr-page {

0 commit comments

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