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

Commit43daab2

Browse files
committed
material-ui@beta.1 changes
1 parent8288300 commit43daab2

File tree

13 files changed

+51
-74
lines changed

13 files changed

+51
-74
lines changed

‎lib/components/_components.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ 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/chapter');
9+
exports.Chapter=chapter_1.Chapter;
810
varmenu_1=require('./menu/menu');
911
exports.Menu=menu_1.default;
12+
varprogress_1=require('./progress/progress');
13+
exports.Progress=progress_1.Progress;
1014
varstart_1=require('./start/start');
1115
exports.Start=start_1.Start;
1216
vartutorials_1=require('./tutorials/tutorials');

‎lib/components/checks/checks.js

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
varReact=require('react');
1717
varsetup_checker_1=require('./setup-checker');
18-
varVerticalStep_1=require('material-ui/lib/Stepper/VerticalStep');
19-
varflat_button_1=require('material-ui/lib/flat-button');
18+
varStepper_1=require('material-ui/Stepper');
19+
varFlatButton_1=require('material-ui/FlatButton');
2020
varaction_setup_1=require('../../reducers/checks/action-setup');
2121
varreact_redux_1=require('react-redux');
2222
varstore_1=require('../../store/store');
2323
varAction=require('../../actions/actions');
2424
varfail='✗';
25-
varWelcome=function(_a){
26-
vartrigger=_a.trigger;
27-
return(React.createElement("div",null,React.createElement("p",null,"Tutorials in your Editor"),React.createElement(flat_button_1.default,{style:{font:'2em'},label:'Begin',primary:true,onTouchTap:trigger})));
28-
};
2925
varChecks=(function(_super){
3026
__extends(Checks,_super);
3127
functionChecks(){
@@ -41,24 +37,22 @@ var Checks = (function (_super) {
4137
};
4238
Checks.prototype.render=function(){
4339
var_a=this.props,checks=_a.checks,routeToTutorials=_a.routeToTutorials,verify=_a.verify;
44-
returnReact.createElement("section",{className:'cr-start'},React.createElement("div",{className:'cr-start-header'},checks.passed
45-
?React.createElement(Welcome,{trigger:routeToTutorials})
46-
:React.createElement("p",{className:'tagline'},"Setup"),checks.system.passed ?null :React.createElement(setup_checker_1.default,{title:'Dependency Checks',status:this.getSystemChecks(checks)},React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'Node >= 0.10',actions:[
47-
React.createElement(flat_button_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify})
48-
]},React.createElement("div",null,"Install a newer version of ",React.createElement("a",{href:'https://nodejs.org'},"Node"))),React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'NPM >= 3',actions:[
49-
React.createElement(flat_button_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
50-
]},React.createElement("div",null,"Update your version of NPM.",React.createElement("br",null),"`> npm update -g npm`"))),checks.setup.passed ?null :React.createElement(setup_checker_1.default,{title:'Setup Checks',status:this.getSetupChecks(checks)},React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'working directory',actions:[
51-
React.createElement(flat_button_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
52-
React.createElement(flat_button_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.openDirectory})
53-
]},React.createElement("div",null,"File -> Open (a new folder)")),React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'package.json',actions:[
54-
React.createElement(flat_button_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
55-
React.createElement(flat_button_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.createPackageJson})
56-
]},React.createElement("div",null,"Create a package.json by running",React.createElement("br",null),"`> npm init -y`")),React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'install tutorial',actions:[
57-
React.createElement(flat_button_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
58-
React.createElement(flat_button_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.installTutorial})
59-
]},React.createElement("div",null,"Install a tutorial using npm. For example:",React.createElement("br",null),"`> npm install coderoad-functional-school --save-dev`")))),checks.passed
40+
returnReact.createElement("div",{className:'cr-checks'},React.createElement("p",{className:'tagline'},"Setup"),checks.system.passed ?null :React.createElement(setup_checker_1.default,{title:'Dependency Checks',status:this.getSystemChecks(checks)},React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'Node >= 0.10',actions:[
41+
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify})
42+
]},React.createElement("div",null,"Install a newer version of ",React.createElement("a",{href:'https://nodejs.org'},"Node"))),React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'NPM >= 3',actions:[
43+
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
44+
]},React.createElement("div",null,"Update your version of NPM.",React.createElement("br",null),"`> npm update -g npm`"))),checks.setup.passed ?null :React.createElement(setup_checker_1.default,{title:'Setup Checks',status:this.getSetupChecks(checks)},React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'working directory',actions:[
45+
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
46+
React.createElement(FlatButton_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.openDirectory})
47+
]},React.createElement("div",null,"File -> Open (a new folder)")),React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'package.json',actions:[
48+
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
49+
React.createElement(FlatButton_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.createPackageJson})
50+
]},React.createElement("div",null,"Create a package.json by running",React.createElement("br",null),"`> npm init -y`")),React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'install tutorial',actions:[
51+
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
52+
React.createElement(FlatButton_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.installTutorial})
53+
]},React.createElement("div",null,"Install a tutorial using npm. For example:",React.createElement("br",null),"`> npm install coderoad-functional-school --save-dev`"))),checks.passed
6054
?null
61-
:React.createElement("div",{className:'setup-guide'},React.createElement("span",null,"Check the",React.createElement("a",{href:'https://coderoad.github.io/docs#install'}," ",React.createElement("strong",null,"Install Guide")))),React.createElement("p",{className:'version'},"Beta"));
55+
:React.createElement("div",{className:'setup-guide'},React.createElement("span",null,"Check the",React.createElement("a",{href:'https://coderoad.github.io/docs#install'}," ",React.createElement("strong",null,"Install Guide")))));
6256
};
6357
Checks=__decorate([
6458
react_redux_1.connect(null,function(dispatch){
@@ -71,4 +65,5 @@ var Checks = (function (_super) {
7165
],Checks);
7266
returnChecks;
7367
}(React.Component));
74-
exports.Checks=Checks;
68+
Object.defineProperty(exports,"__esModule",{value:true});
69+
exports.default=Checks;

‎lib/components/start/checks/checks.js

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
varReact=require('react');
1717
varPaper_1=require('material-ui/Paper');
18-
varsetup_checker_1=require('./setup-checker');
19-
varStepper_1=require('material-ui/Stepper');
20-
varFlatButton_1=require('material-ui/FlatButton');
21-
var_components_1=require('../../_components');
22-
varaction_setup_1=require('../../../reducers/checks/action-setup');
2318
varreact_redux_1=require('react-redux');
2419
varstore_1=require('../../../store/store');
2520
varAction=require('../../../actions/actions');
@@ -39,20 +34,7 @@ var Checks = (function (_super) {
3934
};
4035
Checks.prototype.render=function(){
4136
var_a=this.props,checks=_a.checks,verify=_a.verify;
42-
returnReact.createElement(Paper_1.default,{className:'cr-checks'},React.createElement("p",{className:'tagline'},"Setup"),checks.system.passed ?null :React.createElement(setup_checker_1.default,{title:'Dependency Checks',status:this.getSystemChecks(checks)},React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'Node >= 0.10',actions:[
43-
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify})
44-
]},React.createElement("div",null,"Install a newer version of ",React.createElement("a",{href:'https://nodejs.org'},"Node"))),React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'NPM >= 3',actions:[
45-
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
46-
]},React.createElement(_components_1.Markdown,null,"Update your version of NPM."+' '+"`> npm update -g npm`"))),checks.setup.passed ?null :React.createElement(setup_checker_1.default,{title:'Setup Checks',status:this.getSetupChecks(checks)},React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'working directory',actions:[
47-
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
48-
React.createElement(FlatButton_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.openDirectory})
49-
]},React.createElement("div",null,"File -> Open (a new folder)")),React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'package.json',actions:[
50-
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
51-
React.createElement(FlatButton_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.createPackageJson})
52-
]},React.createElement("div",null,"Create a package.json by running",React.createElement("br",null),"`> npm init -y`")),React.createElement(Stepper_1.Step,{orderStepLabel:fail,stepLabel:'install tutorial',actions:[
53-
React.createElement(FlatButton_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
54-
React.createElement(FlatButton_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.installTutorial})
55-
]},React.createElement("div",null,"Install a tutorial using npm. For example:",React.createElement("br",null),"`> npm install coderoad-functional-school --save-dev`"))),checks.passed
37+
returnReact.createElement(Paper_1.default,{className:'cr-checks'},React.createElement("p",{className:'tagline'},"Setup"),checks.passed
5638
?null
5739
:React.createElement("div",{className:'setup-guide'},React.createElement("span",null,"Check the",React.createElement("a",{href:'https://coderoad.github.io/docs#install'}," ",React.createElement("strong",null,"Install Guide")))));
5840
};

‎lib/components/start/checks/setup-checker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var DynamicStepper = (function (_super) {
5151
};
5252
};
5353
DynamicStepper.prototype.render=function(){
54-
returnReact.createElement("div",null,React.createElement("div",{style:styles.header},this.props.title),React.createElement(Stepper_1.default,{activeStep:this.state.activeStep,onStepHeaderTouch:this.selectStep.bind(this),updateCompletedStatus:this.updateCompletedSteps.bind(this),createIcon:this.createIcon},this.props.children));
54+
returnReact.createElement("div",null,React.createElement("div",{style:styles.header},this.props.title),React.createElement(Stepper_1.default,{activeStep:this.state.activeStep,linear:false,orientation:'vertical'},this.props.children));
5555
};
5656
returnDynamicStepper;
5757
}(React.Component));

‎lib/reducers/checks/verify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function verifySetup() {
1515
},
1616
setup:{
1717
dir:!!check_setup_1.hasDirectory(),
18-
packageJson:false,
18+
packageJson:!check_setup_1.hasPackageJson(),
1919
tutorial:!!check_setup_1.hasTutorialDep()
2020
}
2121
};

‎lib/reducers/route/route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
varType=require('../../actions/actionTypes');
3-
vardefaultRoute='start';
3+
vardefaultRoute='tutorials';
44
functionrouteReducer(route,action){
55
if(route===void0){route=defaultRoute;}
66
switch(action.type){

‎src/components/_components.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export {default as Routes} from './routes/routes';
66

77
// Components
88
export{defaultasPage}from'./page/page';
9-
export{defaultasChapter}from'./page/chapter/chapter';
9+
export{Chapter}from'./page/chapter/chapter';
1010
export{defaultasMenu}from'./menu/menu';
11-
export{defaultasProgress}from'./progress/progress';
11+
export{Progress}from'./progress/progress';
1212
export{Start}from'./start/start';
1313
export{Tutorials}from'./tutorials/tutorials';
1414
export{FinalPage}from'./final-page/final-page';

‎src/components/app.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ export default class extends React.Component<{state?: CR.State}, {}> {
1616
render():React.ReactElement<{}>{
1717
conststate=this.props.state;
1818
return(
19-
<sectionclassName='cr'key='main'style={{height}}>
2019
<MuiThemeProvidermuiTheme={muiTheme}>
20+
<sectionclassName='cr'key='main'style={{height}}>
2121
<Menuroute={state.route}position={state.position}/>
2222
<Routesstate={state}ref='route'/>
2323
<Alertalert={state.alert}/>
24-
</MuiThemeProvider>
2524
</section>
25+
</MuiThemeProvider>
2626

2727
);
2828
}

‎src/components/progress/progress.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export const Progress: React.StatelessComponent<{
7373
progress:CR.Progress,position:CR.Position
7474
}>=({progress, position})=>(
7575
<Paperstyle={style}zDepth={1}className='cr-progress'>
76-
{/*}<ProjectDescription project={project} />*/}
7776
<List>
7877
<Subheader>Progress</Subheader>
7978
{progress.chapters.map((chapter:CR.Chapter,chapterIndex:number)=>{
@@ -98,5 +97,6 @@ export const Progress: React.StatelessComponent<{
9897
</ListItem>;
9998
})}
10099
</List>
100+
101101
</Paper>
102102
);

‎src/components/start/checks/checks.tsx

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import*asReactfrom'react';
22
importPaperfrom'material-ui/Paper';
3-
importDynamicStepperfrom'./setup-checker';
4-
import{Step}from'material-ui/Stepper';
3+
//import DynamicStepper from './setup-checker';
4+
import{Step,StepLabel,StepButton,StepContent}from'material-ui/Stepper';
55
importFlatButtonfrom'material-ui/FlatButton';
66
import{Markdown}from'../../_components';
77

@@ -36,33 +36,30 @@ export default class Checks extends React.Component<{
3636

3737
<pclassName='tagline'>Setup</p>
3838

39-
{checks.system.passed ?null :<DynamicSteppertitle='Dependency Checks'status={this.getSystemChecks(checks)}>
40-
<Step
41-
orderStepLabel={fail}
39+
{/*checks.system.passed ? null : <DynamicStepper title='Dependency Checks' status={this.getSystemChecks(checks)}>
40+
<Step>
41+
{/*orderStepLabel={fail}
4242
stepLabel='Node >= 0.10'
4343
actions={[
4444
<FlatButton key={0} primary={true}
4545
label='Verify'
4646
onTouchTap={verify} />
47-
]}>
48-
<div>Install a newer version of<ahref='https://nodejs.org'>Node</a></div>
47+
]} >}
48+
<StepLabel>Node >= 0.10</StepLabel>
49+
<StepContent>Install a newer version of <a href='https://nodejs.org'>Node</a></StepContent>
4950
</Step>
50-
<SteporderStepLabel={fail}
51-
stepLabel='NPM >= 3'
52-
actions={[
53-
<FlatButtonkey={0}primary={true}
54-
label='Verify'
55-
onTouchTap={verify}/>,
5651
57-
]}>
52+
<Step>
53+
<StepLabel>NPM >= 3</StepLabel>
54+
<StepContent>
5855
<Markdown>Update your version of NPM.
59-
`>npmupdate-gnpm`</Markdown>
56+
`> npm update -g npm`</Markdown></StepContent>
6057
</Step>
61-
</DynamicStepper>}
58+
</DynamicStepper>*/}
6259

6360
{/* Setup Checks */}
6461

65-
{checks.setup.passed ? null : <DynamicStepper title='Setup Checks'
62+
{/*checks.setup.passed ? null : <DynamicStepper title='Setup Checks'
6663
status={this.getSetupChecks(checks)}>
6764
<Step orderStepLabel={fail}
6865
stepLabel='working directory'
@@ -105,7 +102,7 @@ export default class Checks extends React.Component<{
105102
`> npm install coderoad-functional-school --save-dev`
106103
</div>
107104
</Step>
108-
</DynamicStepper>}
105+
</DynamicStepper>*/}
109106

110107
{/* Install Guide || Continue */}
111108

‎src/components/start/checks/setup-checker.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ export default class DynamicStepper extends React.Component<{
6161
</div>
6262
<Stepper
6363
activeStep={this.state.activeStep}
64-
onStepHeaderTouch={this.selectStep.bind(this)}
65-
updateCompletedStatus={this.updateCompletedSteps.bind(this)}
66-
createIcon={this.createIcon}>
64+
linear={false}
65+
orientation='vertical'>
6766
{this.props.children}
6867
</Stepper>
6968
</div>;

‎src/reducers/checks/verify.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function verifySetup(): CR.Checks {
2121
},
2222
setup:{
2323
dir:!!hasDirectory(),
24-
packageJson:false,// !!hasPackageJson(),
24+
packageJson:!hasPackageJson(),
2525
tutorial:!!hasTutorialDep()
2626
}
2727
};

‎src/reducers/route/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as Type from '../../actions/actionTypes';
22
import{store}from'../../store/store';
33
import*asActionfrom'../../actions/task-actions';
44

5-
constdefaultRoute:string='start';
5+
constdefaultRoute:string='tutorials';
66

77
exportdefaultfunctionrouteReducer(route=defaultRoute,action:CR.Action):string{
88
switch(action.type){

0 commit comments

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