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

Commit479f7ff

Browse files
committed
cleanup and prepare for setup changes
1 parent132814c commit479f7ff

File tree

13 files changed

+21
-91
lines changed

13 files changed

+21
-91
lines changed

‎lib/actions/tutorials.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('./actionTypes');
3-
vartutorials_1=require('../services/tutorials');
3+
vartutorials_1=require('../services/setup/tutorials');
44
functionloadTutorials(){
55
vartutorials=[];
66
varpackageJson=tutorials_1.loadRootPackageJson();

‎lib/components/_components.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
"use strict";
22
varapp_1=require('./app');
33
exports.App=app_1.default;
4-
vartheme_1=require('./theme/theme');
5-
exports.Theme=theme_1.default;
64
varroutes_1=require('./routes/routes');
75
exports.Routes=routes_1.default;
86
varpage_1=require('./page/page');
@@ -11,8 +9,6 @@ var chapter_1 = require('./page/chapter');
119
exports.Chapter=chapter_1.default;
1210
varmenu_1=require('./menu/menu');
1311
exports.Menu=menu_1.default;
14-
varaccount_1=require('./account/account');
15-
exports.Account=account_1.default;
1612
varprogress_1=require('./progress/progress');
1713
exports.Progress=progress_1.default;
1814
varstart_1=require('./start/start');

‎lib/components/app.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
1818
var_components_1=require('./_components');
19-
varThemeDecorator=require('material-ui/lib/styles/theme-decorator');
20-
varThemeManager=require('material-ui/lib/styles/theme-manager');
2119
varheight=atom.getSize().height;
2220
window.onresize=function(){
2321
height=atom.getSize().height;
@@ -29,11 +27,9 @@ var default_1 = (function (_super) {
2927
}
3028
default_1.prototype.render=function(){
3129
varstate=this.props.state;
32-
console.log(state);
3330
return(React.createElement("section",{className:'cr',key:'main',style:{height:height}},React.createElement(_components_1.Menu,{route:state.route,position:state.position}),React.createElement(_components_1.Routes,{state:state,ref:'route'}),React.createElement(_components_1.Alert,{alert:state.alert})));
3431
};
3532
default_1=__decorate([
36-
ThemeDecorator(ThemeManager.getMuiTheme(_components_1.Theme)),
3733
react_redux_1.connect(function(state){
3834
return{state:state};
3935
}),

‎lib/components/theme/theme.js

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +0,0 @@
1-
"use strict";
2-
varColors=require('material-ui/lib/styles/colors');
3-
varColorManipulator=require('material-ui/lib/utils/color-manipulator');
4-
varspacing_1=require('material-ui/lib/styles/spacing');
5-
varzIndex_1=require('material-ui/lib/styles/zIndex');
6-
Object.defineProperty(exports,"__esModule",{value:true});
7-
exports.default={
8-
spacing:spacing_1.default,
9-
zIndex:zIndex_1.default,
10-
fontFamily:'Roboto, sans-serif',
11-
palette:{
12-
primary1Color:Colors.teal400,
13-
primary2Color:Colors.teal700,
14-
primary3Color:Colors.lightBlack,
15-
accent1Color:Colors.pinkA200,
16-
accent2Color:Colors.grey100,
17-
accent3Color:Colors.grey500,
18-
textColor:Colors.darkBlack,
19-
alternateTextColor:Colors.white,
20-
canvasColor:Colors.white,
21-
borderColor:Colors.grey300,
22-
disabledColor:ColorManipulator.fade(Colors.darkBlack,0.3),
23-
pickerHeaderColor:Colors.cyan500
24-
}
25-
};

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
"dependencies": {
4141
"classnames":"2.2.3",
4242
"highlights":"1.3.1",
43-
"lodash":"4.7.0",
43+
"lodash":"4.9.0",
4444
"marked":"0.3.5",
4545
"material-ui":"0.14.4",
46-
"react":"0.14.8",
47-
"react-dom":"0.14.8",
48-
"react-redux":"4.4.1",
46+
"react":"15.0.1",
47+
"react-dom":"15.0.1",
48+
"react-redux":"4.4.2",
4949
"react-tap-event-plugin":"0.2.2",
50-
"redux":"3.3.1"
50+
"redux":"3.4.0"
5151
},
5252
"scripts": {
5353
"test":"ava",

‎src/actions/tutorials.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as path from 'path';
44
import*asfsfrom'fs';
55
import*asTypefrom'./actionTypes';
66
import{fileExists}from'../services/exists';
7-
import{loadRootPackageJson,searchForTutorials}from'../services/tutorials';
7+
import{loadRootPackageJson,searchForTutorials}from'../services/setup/tutorials';
88

99
exportfunctionloadTutorials():CR.Action{
1010
lettutorials=[];

‎src/components/_components.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Root App
22
export{defaultasApp}from'./app';
3-
export{defaultasTheme}from'./theme/theme';
43

54
// Router
65
export{defaultasRoutes}from'./routes/routes';
@@ -9,7 +8,6 @@ export {default as Routes} from './routes/routes';
98
export{defaultasPage}from'./page/page';
109
export{defaultasChapter}from'./page/chapter';
1110
export{defaultasMenu}from'./menu/menu';
12-
export{defaultasAccount}from'./account/account';
1311
export{defaultasProgress}from'./progress/progress';
1412
export{Start}from'./start/start';
1513
export{FinalPage}from'./final-page/final-page';

‎src/components/account/account.tsx

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

‎src/components/account/login.tsx

Whitespace-only changes.

‎src/components/account/signup.tsx

Whitespace-only changes.

‎src/components/app.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
3-
import{Menu,Routes,Alert,Theme}from'./_components';
4-
import*asThemeDecoratorfrom'material-ui/lib/styles/theme-decorator';
5-
import*asThemeManagerfrom'material-ui/lib/styles/theme-manager';
3+
import{Menu,Routes,Alert}from'./_components';
4+
//import{muiTheme}from './theme/theme';
5+
//importMuiThemeProviderfrom 'material-ui/lib/MuiThemeProvider';
66

77
letheight:number=atom.getSize().height;
88
window.onresize=function(){
99
height=atom.getSize().height;
1010
};
1111

12-
@ThemeDecorator(ThemeManager.getMuiTheme(Theme))
1312
@connect((state:CR.State)=>{
1413
return{ state};
1514
})
1615
exportdefaultclassextendsReact.Component<{state?:CR.State},{}>{
1716
render():React.ReactElement<{}>{
1817
conststate=this.props.state;
19-
console.log(state);
2018
return(
2119
<sectionclassName='cr'key='main'style={{height}}>
2220
<Menuroute={state.route}position={state.position}/>
2321
<Routesstate={state}ref='route'/>
2422
<Alertalert={state.alert}/>
2523
</section>
26-
2724
);
2825
}
2926
};

‎src/components/theme/theme.ts

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
1-
import*asColorsfrom'material-ui/lib/styles/colors';
2-
import*asColorManipulatorfrom'material-ui/lib/utils/color-manipulator';
3-
importSpacingfrom'material-ui/lib/styles/spacing';
4-
importzIndexfrom'material-ui/lib/styles/zIndex';
5-
6-
exportdefault{
7-
spacing:Spacing,
8-
zIndex:zIndex,
9-
fontFamily:'Roboto, sans-serif',
10-
palette:{
11-
primary1Color:Colors.teal400,
12-
primary2Color:Colors.teal700,
13-
primary3Color:Colors.lightBlack,
14-
accent1Color:Colors.pinkA200,
15-
accent2Color:Colors.grey100,
16-
accent3Color:Colors.grey500,
17-
textColor:Colors.darkBlack,
18-
alternateTextColor:Colors.white,
19-
canvasColor:Colors.white,
20-
borderColor:Colors.grey300,
21-
disabledColor:ColorManipulator.fade(Colors.darkBlack,0.3),
22-
pickerHeaderColor:Colors.cyan500
23-
}
24-
};
1+
// import {cyan500} from 'material-ui/lib/styles/colors';
2+
// import getMuiTheme from 'material-ui/lib/styles/getMuiTheme';
3+
//
4+
// export const muiTheme = getMuiTheme({
5+
// palette: {
6+
// textColor: cyan500,
7+
// },
8+
// appBar: {
9+
// height: 33
10+
// }
11+
// });

‎tsconfig.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@
9898
"src/services/write.ts",
9999
"src/store/initialState.ts",
100100
"src/store/store.ts",
101-
"src/components/account/account.tsx",
102-
"src/components/account/login.tsx",
103-
"src/components/account/signup.tsx",
104101
"src/components/alert/alert.tsx",
105102
"src/components/app.tsx",
106103
"src/components/final-page/final-page.tsx",

0 commit comments

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