Skip to content

Commit a5ad150

Browse files
ShMcKShMcK
committed
move selectors into core
1 parent 46e3bf8 commit a5ad150

File tree

27 files changed

+17
-112
lines changed

27 files changed

+17
-112
lines changed

‎lib/components/Page/Hints/HintButton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var React = require('react');
1717
var react_redux_1 = require('react-redux');
1818
var FlatButton_1 = require('material-ui/FlatButton');
1919
var actions_1 = require('../../../actions');
20-
var selectors_1 = require('../../../selectors');
20+
var selectors_1 = require('core-coderoad/lib/selectors');
2121
var HintButton = (function (_super) {
2222
__extends(HintButton, _super);
2323
function HintButton() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Card_1 = require('material-ui/Card');
1919
var index_1 = require('../../index');
2020
var HintButton_1 = require('./HintButton');
2121
var help_1 = require('material-ui/svg-icons/action/help');
22-
var selectors_1 = require('../../../selectors');
22+
var selectors_1 = require('core-coderoad/lib/selectors');
2323
var styles = {
2424
position: 'relative',
2525
margin: '5px auto 10px',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Toolbar_1 = require('material-ui/Toolbar');
1919
var Save_1 = require('./Save');
2020
var Continue_1 = require('./Continue');
2121
var ToggleDevTools_1 = require('./ToggleDevTools');
22-
var selectors_1 = require('../../../selectors');
22+
var selectors_1 = require('core-coderoad/lib/selectors');
2323
var styles = {
2424
zIndex: '5',
2525
position: 'relative',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var index_1 = require('../../index');
1919
var taskCheckbox_1 = require('./taskCheckbox');
2020
var List_1 = require('material-ui/List');
2121
var colors_1 = require('material-ui/styles/colors');
22-
var selectors_1 = require('../../../selectors');
22+
var selectors_1 = require('core-coderoad/lib/selectors');
2323
var styles = {
2424
task: {
2525
margin: '5px',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var Card_1 = require('material-ui/Card');
2121
var Subheader_1 = require('material-ui/Subheader');
2222
var Task_1 = require('../Task');
2323
var colors_1 = require('material-ui/styles/colors');
24-
var selectors_1 = require('../../../selectors');
24+
var selectors_1 = require('core-coderoad/lib/selectors');
2525
var margin = '10px 5px';
2626
var Tasks = (function (_super) {
2727
__extends(Tasks, _super);
@@ -36,7 +36,7 @@ var Tasks = (function (_super) {
3636
var backgroundColor = completed ? colors_1.lightGreen200 : 'white';
3737
return (React.createElement(Card_1.Card, {style: { backgroundColor: backgroundColor, margin: margin }}, React.createElement(List_1.List, null, React.createElement(Subheader_1.default, null, "Tasks"), tasks.map(function (task, index) {
3838
return React.createElement(Task_1.default, {key: index, index: index});
39-
}), "}"), React.createElement("div", {ref: 'listEnd'})));
39+
})), React.createElement("div", {ref: 'listEnd'})));
4040
};
4141
Tasks = __decorate([
4242
react_redux_1.connect(function (state) { return ({

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var react_redux_1 = require('react-redux');
1818
var Card_1 = require('material-ui/Card');
1919
var index_1 = require('../../index');
2020
var colors_1 = require('material-ui/styles/colors');
21-
var selectors_1 = require('../../../selectors');
21+
var selectors_1 = require('core-coderoad/lib/selectors');
2222
var styles = {
2323
card: {
2424
backgroundColor: colors_1.cyan500,

‎lib/components/Page/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var Hints_1 = require('./Hints');
2121
var PageToolbar_1 = require('./PageToolbar');
2222
var ProgressBar_1 = require('./ProgressBar');
2323
var TasksComplete_1 = require('./TasksComplete');
24-
var selectors_1 = require('../../selectors');
24+
var selectors_1 = require('core-coderoad/lib/selectors');
2525
var styles = {
2626
page: {
2727
width: '100%',

‎lib/selectors/hints.js

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

‎lib/selectors/index.js

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

‎lib/selectors/packageJson.js

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

‎lib/selectors/page.js

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

‎lib/selectors/tasks.js

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

‎src/components/Page/Hints/HintButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import {connect} from 'react-redux';
33
import FlatButton from 'material-ui/FlatButton';
44
import {hintPositionSet} from '../../../actions';
5-
import {hintsSelector} from '../../../selectors';
5+
import {hintsSelector} from 'core-coderoad/lib/selectors';
66

77
@connect(state => ({
88
hintPosition: state.hintPosition,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Card, CardActions, CardHeader, CardText} from 'material-ui/Card';
44
import {Markdown} from '../../index';
55
import HintButton from './HintButton';
66
import Help from 'material-ui/svg-icons/action/help';
7-
import {hintSelector} from '../../../selectors';
7+
import {hintSelector} from 'core-coderoad/lib/selectors';
88

99
const styles = {
1010
position: 'relative',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Toolbar, ToolbarGroup} from 'material-ui/Toolbar';
44
import Save from './Save';
55
import Continue from './Continue';
66
import ToggleDevTools from './ToggleDevTools';
7-
import {taskProgressSelector} from '../../../selectors';
7+
import {taskProgressSelector} from 'core-coderoad/lib/selectors';
88

99
const styles = {
1010
zIndex: '5',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import {connect} from 'react-redux';
33
import LinearProgress from 'material-ui/LinearProgress';
4-
import {taskProgressSelector} from '../../../selectors';
4+
import {taskProgressSelector} from 'core-coderoad/lib/selectors';
55

66
const style = {
77
height: '10px',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Markdown} from '../../index';
44
import TaskCheckbox from './taskCheckbox';
55
import {ListItem} from 'material-ui/List';
66
import {lightGreen200, orange200} from 'material-ui/styles/colors';
7-
import {taskByIndexSelector} from '../../../selectors';
7+
import {taskByIndexSelector} from 'core-coderoad/lib/selectors';
88

99
const styles = {
1010
task: {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {Card} from 'material-ui/Card';
66
import Subheader from 'material-ui/Subheader';
77
import Task from '../Task';
88
import {lightGreen200} from 'material-ui/styles/colors';
9-
import {pageCompletedSelector, visibleTasksSelector} from '../../../selectors';
9+
import {pageCompletedSelector, visibleTasksSelector} from 'core-coderoad/lib/selectors';
1010

1111
const margin = '10px 5px';
1212

@@ -34,7 +34,7 @@ export default class Tasks extends React.Component<{
3434

3535
{tasks.map((task, index: number) => {
3636
return <Task key={index} index={index} />;
37-
})}}
37+
})}
3838

3939
</List>
4040
<div ref='listEnd' />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
33
import {Card, CardText} from 'material-ui/Card';
44
import {Markdown} from '../../index';
55
import {cyan500, grey100} from 'material-ui/styles/colors';
6-
import {pageSelector} from '../../../selectors';
6+
import {pageSelector} from 'core-coderoad/lib/selectors';
77

88
const styles = {
99
card: {

‎src/components/Page/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Hints from './Hints';
88
import PageToolbar from './PageToolbar';
99
import ProgressBar from './ProgressBar';
1010
import TasksComplete from './TasksComplete';
11-
import {pageSelector, taskProgressSelector} from '../../selectors';
11+
import {pageSelector, taskProgressSelector} from 'core-coderoad/lib/selectors';
1212

1313
const styles = {
1414
page: {

‎src/modules/page/actions.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {PAGE_SET} from './types';
22
import {hintPositionSet, routeSet} from '../../actions';
3-
import {tasksSelector} from '../../selectors';
43

54
export function pageNext(): ReduxThunk.ThunkInterface | Action {
65
return (dispatch, getState): void => {

‎src/selectors/hints.ts

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

‎src/selectors/index.ts

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

‎src/selectors/packageJson.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/selectors/page.ts

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

‎src/selectors/tasks.ts

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

‎tsconfig.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@
7777
"src/modules/tutorials/reducer.ts",
7878
"src/modules/tutorials/types.ts",
7979
"src/reducers.ts",
80-
"src/selectors/hints.ts",
81-
"src/selectors/index.ts",
82-
"src/selectors/packageJson.ts",
83-
"src/selectors/page.ts",
84-
"src/selectors/tasks.ts",
8580
"src/store.ts",
8681
"src/subscriptions.ts",
8782
"src/typings.d.ts",

0 commit comments

Comments
 (0)