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

Commitdba399d

Browse files
committed
component refactor, img load
1 parent4c66dce commitdba399d

File tree

22 files changed

+205
-27
lines changed

22 files changed

+205
-27
lines changed

‎lib/components/_components.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ var routes_1 = require('./routes/routes');
55
exports.Routes=routes_1.default;
66
varpage_1=require('./page/page');
77
exports.Page=page_1.default;
8-
varchapter_1=require('./page/chapter');
9-
exports.Chapter=chapter_1.default;
108
varmenu_1=require('./menu/menu');
119
exports.Menu=menu_1.default;
1210
varprogress_1=require('./progress/progress');
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
'use strict';
2+
varReact=require('react');
3+
var_components_1=require('../_components');
4+
Object.defineProperty(exports,"__esModule",{value:true});
5+
exports.default=function(_a){
6+
varchapter=_a.chapter;
7+
return(React.createElement("section",{className:'cr-chapter'},React.createElement(_components_1.MarkdownText,{text:chapter.title})));
8+
};
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
"use strict";
2+
varReact=require('react');
3+
varlist_item_1=require('material-ui/lib/lists/list-item');
4+
var_components_1=require('../../_components');
5+
exports.PageCompleteMessage=function(_a){
6+
varpage=_a.page;
7+
return(React.createElement("div",{className:'cr-page-onComplete'},page.completed&&page.onPageComplete ?
8+
React.createElement(list_item_1.default,{key:'page-complete'},React.createElement(_components_1.MarkdownText,{text:page.onPageComplete}))
9+
:null));
10+
};

‎lib/components/page/hint/hint.js

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
"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+
};
16+
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
18+
varAction=require('../../../actions/actions');
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');
24+
var_components_1=require('../../_components');
25+
varhelp_1=require('material-ui/lib/svg-icons/action/help');
26+
vardefault_1=(function(_super){
27+
__extends(default_1,_super);
28+
functiondefault_1(){
29+
_super.apply(this,arguments);
30+
}
31+
default_1.prototype.render=function(){
32+
var_a=this.props,task=_a.task,hintPosition=_a.hintPosition,nextHint=_a.nextHint,prevHint=_a.prevHint;
33+
varhints=task&&task.hints ?task.hints :null;
34+
if(hintPosition<0||!hints||!hints.length){
35+
returnReact.createElement("div",null);
36+
}
37+
varhint=hints[hintPosition];
38+
return(React.createElement(card_1.default,{className:'cr-task-hints'},React.createElement(card_header_1.default,{title:'Hints',avatar:React.createElement(help_1.default,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)}))));
39+
};
40+
default_1=__decorate([
41+
react_redux_1.connect(null,function(dispatch,state){
42+
return{
43+
nextHint:function(position){returndispatch(Action.setHintPosition(position));},
44+
prevHint:function(position){returndispatch(Action.setHintPosition(position));}
45+
};
46+
}),
47+
__metadata('design:paramtypes',[])
48+
],default_1);
49+
returndefault_1;
50+
}(React.Component));
51+
Object.defineProperty(exports,"__esModule",{value:true});
52+
exports.default=default_1;

‎lib/components/page/page.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ var ReactDOM = require('react-dom');
99
varpaper_1=require('material-ui/lib/paper');
1010
vardivider_1=require('material-ui/lib/divider');
1111
varcontent_1=require('./content');
12-
vartask_1=require('./task');
13-
varhint_1=require('./hint');
14-
varpage_complete_1=require('./page-complete');
15-
vartoolbar_1=require('./toolbar');
12+
vartask_1=require('./task/task');
13+
varhint_1=require('./hint/hint');
14+
varpage_complete_1=require('./complete/page-complete');
15+
vartoolbar_1=require('./toolbar/toolbar');
1616
varpageStyle={
1717
height:'100%',
1818
width:'100%'

‎lib/components/page/task/task.js

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
"use strict";
2+
varReact=require('react');
3+
var_components_1=require('../../_components');
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');
7+
varcolors_1=require('material-ui/lib/styles/colors');
8+
varcheck_box_1=require('material-ui/lib/svg-icons/toggle/check-box');
9+
varcheck_box_outline_blank_1=require('material-ui/lib/svg-icons/toggle/check-box-outline-blank');
10+
varindeterminate_check_box_1=require('material-ui/lib/svg-icons/toggle/indeterminate-check-box');
11+
functionvisibleTasks(tasks,taskPosition){
12+
returntasks.slice(0,taskPosition+1);
13+
}
14+
varTaskCheckbox=function(_a){
15+
varindex=_a.index,taskPosition=_a.taskPosition,runTests=_a.runTests;
16+
varicon=null;
17+
if(index<taskPosition){
18+
icon=React.createElement(check_box_1.default,{color:colors_1.green500});
19+
}
20+
elseif(index===taskPosition&&runTests){
21+
icon=React.createElement(indeterminate_check_box_1.default,{color:colors_1.orange500});
22+
}
23+
else{
24+
icon=React.createElement(check_box_outline_blank_1.default,null);
25+
}
26+
returnReact.createElement("span",{className:'cr-task-checkbox'},icon);
27+
};
28+
varTaskIndex=function(_a){
29+
varindex=_a.index;
30+
return(React.createElement("span",{className:'cr-task-index'},index+1,"."));
31+
};
32+
varTaskContent=function(_a){
33+
vartask=_a.task;
34+
return(React.createElement("div",{className:'cr-task-description'},React.createElement(_components_1.MarkdownText,{text:task.description})));
35+
};
36+
exports.Task=function(_a){
37+
vartask=_a.task,taskPosition=_a.taskPosition,index=_a.index,runTests=_a.runTests;
38+
varisCompleted=index<taskPosition;
39+
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})));
40+
};
41+
exports.Tasks=function(_a){
42+
vartasks=_a.tasks,taskPosition=_a.taskPosition,runTests=_a.runTests;
43+
varvisTasks=visibleTasks(tasks,taskPosition);
44+
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});}));
45+
};
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
"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+
};
16+
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
18+
varAction=require('../../../actions/actions');
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');
24+
vareditor_1=require('../../../atom/editor');
25+
varactions_1=require('../../../atom/actions');
26+
varcode_1=require('material-ui/lib/svg-icons/action/code');
27+
varProgressBar=function(_a){
28+
varprogress=_a.progress;
29+
returnReact.createElement(linear_progress_1.default,{mode:'determinate',value:progress,style:{height:'10px'}});
30+
};
31+
functiontaskProgress(current,max){
32+
return(current/max)*100;
33+
}
34+
vardefault_1=(function(_super){
35+
__extends(default_1,_super);
36+
functiondefault_1(){
37+
_super.apply(this,arguments);
38+
}
39+
default_1.prototype.render=function(){
40+
var_a=this.props,tasks=_a.tasks,taskPosition=_a.taskPosition,callNextPage=_a.callNextPage;
41+
varprogress=taskProgress(taskPosition,tasks.length);
42+
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 ?
43+
React.createElement(raised_button_1.default,{label:'Continue',primary:true,onTouchTap:callNextPage}) :
44+
React.createElement(flat_button_1.default,{label:'Save',secondary:true,onTouchTap:editor_1.save})))));
45+
};
46+
default_1=__decorate([
47+
react_redux_1.connect(null,function(dispatch,state){
48+
return{
49+
callNextPage:function(){returndispatch(Action.nextPage());},
50+
toggleLog:function(){returndispatch(Action.toggleLog());}
51+
};
52+
}),
53+
__metadata('design:paramtypes',[])
54+
],default_1);
55+
returndefault_1;
56+
}(React.Component));
57+
Object.defineProperty(exports,"__esModule",{value:true});
58+
exports.default=default_1;

‎lib/components/start/start.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ var checks_1 = require('./checks/checks');
1919
varreact_redux_1=require('react-redux');
2020
varstore_1=require('../../store/store');
2121
varAction=require('../../actions/actions');
22+
varpath=require('path');
2223
varWelcome=(function(_super){
2324
__extends(Welcome,_super);
2425
functionWelcome(){
2526
_super.apply(this,arguments);
2627
}
2728
Welcome.prototype.render=function(){
28-
returnReact.createElement("div",{class:'cr-welcome'},React.createElement(flat_button_1.default,{label:'Start',onTouchTap:this.props.routeToTutorials}));
29+
returnReact.createElement("div",{class:'cr-welcome'},React.createElement("img",{src:path.resolve(__dirname,'../../../','styles','coderoad.jpg')}),React.createElement(flat_button_1.default,{label:'Start',onTouchTap:this.props.routeToTutorials}));
2930
};
3031
Welcome=__decorate([
3132
react_redux_1.connect(null,function(dispatch){

‎src/components/_app.less

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
@import'ui-variables';
22
@import'./routes/_routes';
33
@import'./menu/_menu';
4-
@import'./page/_chapter';
54
@import'./page/_page';
6-
@import'./page/_task';
75
@import'./progress/_progress';
86
@import'./alert/_alert';
97
@import'./tutorials/_tutorials';

‎src/components/page/_page.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@import'task/_task';
2+
@import'chapter/_chapter';
3+
14
.cr-page {
25
position:relative;
36
overflow-y:scroll;

‎src/components/page/page-complete.tsxrenamed to‎src/components/page/complete/page-complete.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import*asReactfrom'react';
22
importListItemfrom'material-ui/lib/lists/list-item';
3-
import{MarkdownText}from'../_components';
3+
import{MarkdownText}from'../../_components';
44

55
exportconstPageCompleteMessage=({page})=>(
66
<divclassName='cr-page-onComplete'>

‎src/components/page/hint.tsxrenamed to‎src/components/page/hint/hint.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
3-
import*asActionfrom'../../actions/actions';
3+
import*asActionfrom'../../../actions/actions';
44
importCardfrom'material-ui/lib/card/card';
55
importCardActionsfrom'material-ui/lib/card/card-actions';
66
importCardHeaderfrom'material-ui/lib/card/card-header';
77
importCardTextfrom'material-ui/lib/card/card-text';
88
importFlatButtonfrom'material-ui/lib/flat-button';
9-
import{MarkdownText}from'../_components';
9+
import{MarkdownText}from'../../_components';
1010
importHelpfrom'material-ui/lib/svg-icons/action/help';
1111

1212
@connect(null,(dispatch,state)=>{

‎src/components/page/page.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import * as ReactDOM from 'react-dom';
33
importPaperfrom'material-ui/lib/paper';
44
importDividerfrom'material-ui/lib/divider';
55
importPageContentfrom'./content';
6-
import{Tasks}from'./task';
7-
importHintsfrom'./hint';
8-
import{PageCompleteMessage}from'./page-complete';
9-
importPageToolbarfrom'./toolbar';
6+
import{Tasks}from'./task/task';
7+
importHintsfrom'./hint/hint';
8+
import{PageCompleteMessage}from'./complete/page-complete';
9+
importPageToolbarfrom'./toolbar/toolbar';
1010

1111
constpageStyle={
1212
height:'100%',
File renamed without changes.

‎src/components/page/task.tsxrenamed to‎src/components/page/task/task.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import*asReactfrom'react';
2-
import{MarkdownText}from'../_components';
2+
import{MarkdownText}from'../../_components';
33
importListfrom'material-ui/lib/lists/list';
44
importListItemfrom'material-ui/lib/lists/list-item';
55
importSubheaderfrom'material-ui/lib/Subheader';

‎src/components/page/toolbar.tsxrenamed to‎src/components/page/toolbar/toolbar.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
3-
import*asActionfrom'../../actions/actions';
3+
import*asActionfrom'../../../actions/actions';
44
importLinearProgressfrom'material-ui/lib/linear-progress';
55
importToolbarfrom'material-ui/lib/toolbar/toolbar';
66
importToolbarGroupfrom'material-ui/lib/toolbar/toolbar-group';
77
importRaisedButtonfrom'material-ui/lib/raised-button';
88
importFlatButtonfrom'material-ui/lib/flat-button';
9-
import{save}from'../../atom/editor';
10-
import{toggleDevTools}from'../../atom/actions';
11-
import{store}from'../../store/store';
9+
import{save}from'../../../atom/editor';
10+
import{toggleDevTools}from'../../../atom/actions';
11+
import{store}from'../../../store/store';
1212
importCodefrom'material-ui/lib/svg-icons/action/code';
1313

1414
constProgressBar=({progress})=><LinearProgressmode='determinate'

‎src/components/start/_start.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
&-header {
77
display:block;
88
height:500px;
9-
background-color:lightblue;
109
padding-top:100px;
10+
text-align:center;
11+
color:#f8f8f8;
1112
.title {
1213
color:white;
1314
font-size:2em;

‎src/components/start/start.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import Checks from './checks/checks';
44
import{connect}from'react-redux';
55
import{store}from'../../store/store';
66
import*asActionfrom'../../actions/actions';
7+
import*aspathfrom'path';
8+
9+
constheaderImg=path.resolve(__dirname,'../../../','styles','coderoad.jpg');
710

811
@connect(null,(dispatch)=>{
912
return{
@@ -15,6 +18,7 @@ class Welcome extends React.Component<{
1518
},{}>{
1619
render(){
1720
return<divclass='cr-welcome'>
21+
<imgsrc={headerImg}/>
1822
<FlatButtonlabel='Start'onTouchTap={this.props.routeToTutorials}/>
1923
</div>;
2024
}

‎styles/coderoad.jpg

25.7 KB
Loading

‎tsconfig.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@
104104
"src/components/final-page/final-page.tsx",
105105
"src/components/markdown/markdown.tsx",
106106
"src/components/menu/menu.tsx",
107-
"src/components/page/chapter.tsx",
107+
"src/components/page/chapter/chapter.tsx",
108+
"src/components/page/complete/page-complete.tsx",
108109
"src/components/page/content.tsx",
109110
"src/components/page/edit.tsx",
110-
"src/components/page/hint.tsx",
111-
"src/components/page/page-complete.tsx",
111+
"src/components/page/hint/hint.tsx",
112112
"src/components/page/page.tsx",
113-
"src/components/page/task.tsx",
114-
"src/components/page/toolbar.tsx",
113+
"src/components/page/task/task.tsx",
114+
"src/components/page/toolbar/toolbar.tsx",
115115
"src/components/progress/progress.tsx",
116116
"src/components/render.tsx",
117117
"src/components/routes/routes.tsx",

0 commit comments

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