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

Commit59d4389

Browse files
committed
refactoring components into modules
1 parent04730d9 commit59d4389

File tree

28 files changed

+42
-41
lines changed

28 files changed

+42
-41
lines changed

‎lib/actions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ exports.setupPackage = actions_7.setupPackage;
2121
varactions_8=require('./modules/tests/actions');
2222
exports.testRun=actions_8.testRun;
2323
exports.testResult=actions_8.testResult;
24-
exports.testSave=actions_8.testSave;
2524
exports.testComplete=actions_8.testComplete;
2625
varactions_9=require('./modules/tutorial/actions');
2726
exports.tutorialSet=actions_9.tutorialSet;

‎lib/components/Page/PageToolbar/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
varReact=require('react');
33
varToolbar_1=require('material-ui/Toolbar');
44
varindex_1=require('../../index');
5-
varSave_1=require('./Save');
65
varContinue_1=require('./Continue');
76
varstyles={
87
zIndex:'5',
@@ -16,7 +15,7 @@ var styles = {
1615
exports.PageToolbar=function(_a){
1716
vartasks=_a.tasks,taskPosition=_a.taskPosition,children=_a.children;
1817
return(React.createElement("section",{styles:styles},children,React.createElement(Toolbar_1.Toolbar,null,React.createElement(Toolbar_1.ToolbarGroup,{float:'left'},React.createElement(index_1.ToggleDevTools,null)),React.createElement(Toolbar_1.ToolbarGroup,{float:'right'},taskPosition>=tasks.length ?
19-
React.createElement(Continue_1.default,null) :React.createElement(Save_1.default,null)))));
18+
React.createElement(Continue_1.default,null) :React.createElement(index_1.Save,null)))));
2019
};
2120
Object.defineProperty(exports,"__esModule",{value:true});
2221
exports.default=exports.PageToolbar;

‎lib/components/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ var tutorials_1 = require('../modules/tutorials');
2525
exports.Tutorials=tutorials_1.Tutorials;
2626
vareditor_1=require('../modules/editor');
2727
exports.ToggleDevTools=editor_1.ToggleDevTools;
28+
vareditor_2=require('../modules/editor');
29+
exports.Save=editor_2.Save;

‎lib/components/Page/PageToolbar/Save/index.jsrenamed to‎lib/modules/editor/Save/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
1818
varRaisedButton_1=require('material-ui/RaisedButton');
19-
varactions_1=require('../../../../actions');
19+
varactions_1=require('../actions');
2020
varstyles={
2121
border:'0px',
2222
boxShadow:'none',
@@ -35,7 +35,7 @@ var Save = (function (_super) {
3535
Save=__decorate([
3636
react_redux_1.connect(null,function(dispatch,state){
3737
return{
38-
save:function(){returndispatch(actions_1.testSave());}
38+
save:function(){returndispatch(actions_1.editorSave());}
3939
};
4040
}),
4141
__metadata('design:paramtypes',[])

‎lib/modules/editor/actions.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ function editorDevToolsToggle() {
44
return{type:types_1.EDITOR_DEVTOOLS_TOGGLE};
55
}
66
exports.editorDevToolsToggle=editorDevToolsToggle;
7+
functioneditorSave(){
8+
return{type:types_1.EDITOR_SAVE};
9+
}
10+
exports.editorSave=editorSave;

‎lib/modules/editor/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ var dir_1 = require('./dir');
55
exports.dir=dir_1.default;
66
varToggleDevTools_1=require('./ToggleDevTools');
77
exports.ToggleDevTools=ToggleDevTools_1.default;
8+
varSave_1=require('./Save');
9+
exports.Save=Save_1.default;
810
varfile_1=require('./actions/file');
911
exports.save=file_1.save;
1012
exports.open=file_1.open;

‎lib/modules/editor/reducer.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ function editor(editor, action) {
77
casetypes_1.EDITOR_DEVTOOLS_TOGGLE:
88
index_1.toggleDevTools();
99
returneditor;
10+
casetypes_1.EDITOR_SAVE:
11+
index_1.save();
12+
returneditor;
1013
default:
1114
returneditor;
1215
}

‎lib/modules/editor/types.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
"use strict";
22
exports.EDITOR_DEVTOOLS_TOGGLE='EDITOR_DEVTOOLS_TOGGLE';
3+
exports.EDITOR_SAVE='EDITOR_SAVE';

‎lib/modules/tests/actions.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,3 @@ function testComplete(result) {
6666
};
6767
}
6868
exports.testComplete=testComplete;
69-
functiontestSave(){
70-
return{type:types_1.TEST_SAVE};
71-
}
72-
exports.testSave=testSave;

‎lib/modules/tests/test-run/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use strict";
22
vartypes_1=require('../types');
33
varrun_1=require('../utils/run');
4-
vareditor_1=require('../../../modules/editor');
54
varpageTimeout=800;
65
varprevious=newDate().getTime();
76
functionrunTest(testRun,action){
@@ -20,8 +19,6 @@ function runTest(testRun, action) {
2019
case'PAGE_SET':
2120
previous=newDate().getTime();
2221
returnfalse;
23-
casetypes_1.TEST_SAVE:
24-
editor_1.save();
2522
default:
2623
returntestRun;
2724
}

‎lib/modules/tests/types.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
exports.TEST_COMPLETE='TEST_COMPLETE';
33
exports.TEST_RESULT='TEST_RESULT';
44
exports.TEST_RUN='TEST_RUN';
5-
exports.TEST_SAVE='TEST_SAVE';

‎lib/modules/tutorials/Tutorials/SelectTutorial/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
18-
varactions_1=require('../../../../actions');
18+
varactions_1=require('../../actions');
1919
varFlatButton_1=require('material-ui/FlatButton');
2020
functiondisplayName(name){
2121
if(name.match(/^coderoad-tutorial-/)){

‎lib/modules/tutorials/actions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
"use strict";
22
vartypes_1=require('./types');
33
varactions_1=require('../../actions');
4+
varactions_2=require('../../actions');
5+
exports.tutorialSet=actions_2.tutorialSet;
46
functiontutorialUpdate(name){
57
returnfunction(dispatch,getState){
68
varalert={

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import*asReactfrom'react';
22
import{Toolbar,ToolbarGroup}from'material-ui/Toolbar';
3-
import{ToggleDevTools}from'../../index';
4-
importSavefrom'./Save';
3+
import{ToggleDevTools,Save}from'../../index';
54
importContinuefrom'./Continue';
65

76
conststyles={

‎src/components/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ export {RouteButton} from '../modules/route';
1212
export{Checks}from'../modules/setup';
1313
export{Tutorials}from'../modules/tutorials';
1414
export{ToggleDevTools}from'../modules/editor';
15+
export{Save}from'../modules/editor';

‎src/components/Page/PageToolbar/Save/index.tsxrenamed to‎src/modules/editor/Save/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
33
importRaisedButtonfrom'material-ui/RaisedButton';
4-
import{testSave}from'../../../../actions';
4+
import{editorSave}from'../actions';
55

66
conststyles={
77
border:'0px',
@@ -13,7 +13,7 @@ const styles = {
1313

1414
@connect(null,(dispatch,state)=>{
1515
return{
16-
save:()=>dispatch(testSave())
16+
save:()=>dispatch(editorSave())
1717
};
1818
})
1919
exportdefaultclassSaveextendsReact.Component<{

‎src/modules/editor/actions.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
import{EDITOR_DEVTOOLS_TOGGLE}from'./types';
1+
import{EDITOR_DEVTOOLS_TOGGLE,EDITOR_SAVE}from'./types';
22

33
exportfunctioneditorDevToolsToggle():Action{
44
return{type:EDITOR_DEVTOOLS_TOGGLE};
55
}
6+
7+
exportfunctioneditorSave():Action{
8+
return{type:EDITOR_SAVE};
9+
}

‎src/modules/editor/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export {default as reducer} from './reducer';
22
export{defaultasdir}from'./dir';
33

44
export{defaultasToggleDevTools}from'./ToggleDevTools';
5+
export{defaultasSave}from'./Save';
56

67
export{save,open,openFolder}from'./actions/file';
78
export{set,insert}from'./actions/write';

‎src/modules/editor/reducer.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import{EDITOR_DEVTOOLS_TOGGLE}from'./types';
2-
import{toggleDevTools}from'./index';
1+
import{EDITOR_DEVTOOLS_TOGGLE,EDITOR_SAVE}from'./types';
2+
import{toggleDevTools,save}from'./index';
33

44
exportdefaultfunctioneditor(
55
editor='atom',action:Action
@@ -10,6 +10,10 @@ export default function editor(
1010
toggleDevTools();
1111
returneditor;
1212

13+
caseEDITOR_SAVE:
14+
save();
15+
returneditor;
16+
1317
default:
1418
returneditor;
1519
}

‎src/modules/editor/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
exportconstEDITOR_DEVTOOLS_TOGGLE='EDITOR_DEVTOOLS_TOGGLE';
2+
exportconstEDITOR_SAVE='EDITOR_SAVE';

‎src/modules/setup/deps.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ components: ContentCard
22

33
atom
44

5-
services: commandLine
6-
7-
tutorials/searchForTutorials
8-
editor/{open, set, openFolder, openTerminal}
5+
modules/tutorials/searchForTutorials
6+
modules/editor/{open, set, openFolder, openTerminal}

‎src/modules/tests/actions.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,3 @@ export function testComplete(result: Test.Result) {
7474
dispatch({type:TEST_COMPLETE});
7575
};
7676
}
77-
78-
exportfunctiontestSave():Action{
79-
return{type:TEST_SAVE};
80-
}

‎src/modules/tests/deps.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
store
22

3-
atom: save
4-
5-
actions: hintPositionSet, alertOpen, progressCompletePage, testComplete
3+
actions: hintPositionSet, alertOpen, progressCompletePage

‎src/modules/tests/test-run/index.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import{TEST_RUN,TEST_COMPLETE,TEST_SAVE}from'../types';
1+
import{TEST_RUN,TEST_COMPLETE}from'../types';
22
importrunTaskTestsfrom'../utils/run';
3-
import{save}from'../../../modules/editor';
43

54
constpageTimeout=800;
65

@@ -27,10 +26,6 @@ export default function runTest(
2726
previous=newDate().getTime();
2827
returnfalse;
2928

30-
caseTEST_SAVE:
31-
save();
32-
/* falls through */
33-
3429
default:
3530
returntestRun;
3631
}

‎src/modules/tests/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
exportconstTEST_COMPLETE='TEST_COMPLETE';
22
exportconstTEST_RESULT='TEST_RESULT';
33
exportconstTEST_RUN='TEST_RUN';
4-
exportconstTEST_SAVE='TEST_SAVE';

‎src/modules/tutorials/Tutorials/SelectTutorial/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
3-
import{tutorialSet}from'../../../../actions';
3+
import{tutorialSet}from'../../actions';
44
importFlatButtonfrom'material-ui/FlatButton';
55

66
functiondisplayName(name:string):string{

‎src/modules/tutorials/actions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import{TUTORIALS_FIND,TUTORIAL_UPDATE}from'./types';
22
import{alertOpen}from'../../actions';
3+
export{tutorialSet}from'../../actions';
34

45
exportfunctiontutorialUpdate(name:string):ReduxThunk.ThunkInterface{
56
return(dispatch,getState)=>{

‎tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
"src/components/Page/index.tsx",
156156
"src/components/Page/PageToolbar/Continue/index.tsx",
157157
"src/components/Page/PageToolbar/index.tsx",
158-
"src/components/Page/PageToolbar/Save/index.tsx",
159158
"src/components/Page/ProgressBar/index.tsx",
160159
"src/components/Page/Task/index.tsx",
161160
"src/components/Page/Task/taskCheckbox.tsx",
@@ -169,6 +168,7 @@
169168
"src/components/Start/index.tsx",
170169
"src/components/Start/Welcome/index.tsx",
171170
"src/modules/alert/Alert.tsx",
171+
"src/modules/editor/Save/index.tsx",
172172
"src/modules/editor/ToggleDevTools/index.tsx",
173173
"src/modules/hints/Hints/HintButton.tsx",
174174
"src/modules/hints/Hints/index.tsx",

0 commit comments

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