Skip to content

Commit 8288300

Browse files
ShMcKShMcK
committed
update module paths for material-ui@beta.
1 parent 37787a2 commit 8288300

File tree

37 files changed

+321
-199
lines changed

37 files changed

+321
-199
lines changed

‎lib/components/alert/alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
var React = require('react');
1717
var react_redux_1 = require('react-redux');
1818
var Action = require('../../actions/actions');
19-
var snackbar_1 = require('material-ui/lib/snackbar');
19+
var snackbar_1 = require('material-ui/snackbar');
2020
var classNames = require('classnames');
2121
var defaultAlert = {
2222
open: false,

‎lib/components/app.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
var React = require('react');
1717
var react_redux_1 = require('react-redux');
1818
var _components_1 = require('./_components');
19+
var theme_1 = require('./theme/theme');
20+
var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
1921
var height = atom.getSize().height;
2022
window.onresize = function () {
2123
height = atom.getSize().height;
@@ -27,7 +29,7 @@ var default_1 = (function (_super) {
2729
}
2830
default_1.prototype.render = function () {
2931
var state = this.props.state;
30-
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})));
32+
return (React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.muiTheme}, 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}))));
3133
};
3234
default_1 = __decorate([
3335
react_redux_1.connect(function (state) {

‎lib/components/final-page/final-page.js

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/components/menu/menu.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ var react_redux_1 = require('react-redux');
1919
var Action = require('../../actions/actions');
2020
var render_1 = require('../render');
2121
var subscriptions_1 = require('../../atom/subscriptions');
22-
var app_bar_1 = require('material-ui/lib/app-bar');
23-
var icon_button_1 = require('material-ui/lib/icon-button');
24-
var close_1 = require('material-ui/lib/svg-icons/navigation/close');
25-
var icon_menu_1 = require('material-ui/lib/menus/icon-menu');
26-
var more_vert_1 = require('material-ui/lib/svg-icons/navigation/more-vert');
27-
var menu_item_1 = require('material-ui/lib/menus/menu-item');
28-
var divider_1 = require('material-ui/lib/divider');
22+
var AppBar_1 = require('material-ui/AppBar');
23+
var IconButton_1 = require('material-ui/IconButton');
24+
var IconMenu_1 = require('material-ui/IconMenu');
25+
var MenuItem_1 = require('material-ui/MenuItem');
26+
var Divider_1 = require('material-ui/Divider');
27+
var more_vert_1 = require('material-ui/svg-icons/navigation/more-vert');
28+
var close_1 = require('material-ui/svg-icons/navigation/close');
2929
var origin = { horizontal: 'right', vertical: 'top' };
3030
var default_1 = (function (_super) {
3131
__extends(default_1, _super);
@@ -48,9 +48,9 @@ var default_1 = (function (_super) {
4848
switch (this.props.route) {
4949
case 'final':
5050
case 'page':
51-
return (React.createElement("div", null, React.createElement(menu_item_1.default, {primaryText: 'progress', onTouchTap: routeToProgress, key: 'progress'}), React.createElement(menu_item_1.default, {primaryText: 'tutorials', onTouchTap: routeToTutorials, key: 'projects'})));
51+
return (React.createElement("div", null, React.createElement(MenuItem_1.default, {primaryText: 'progress', onTouchTap: routeToProgress, key: 'progress'}), React.createElement(MenuItem_1.default, {primaryText: 'tutorials', onTouchTap: routeToTutorials, key: 'projects'})));
5252
case 'progress':
53-
return React.createElement(menu_item_1.default, {primaryText: 'tutorials', onTouchTap: routeToTutorials, key: 'projects'});
53+
return React.createElement(MenuItem_1.default, {primaryText: 'tutorials', onTouchTap: routeToTutorials, key: 'projects'});
5454
default: return null;
5555
}
5656
};
@@ -59,9 +59,9 @@ var default_1 = (function (_super) {
5959
};
6060
default_1.prototype.render = function () {
6161
var quit = this.props.quit;
62-
return React.createElement(app_bar_1.default, {title: 'CodeRoad', className: 'cr-menu-bar', iconElementLeft: React.createElement(icon_button_1.default, {onClick: this.closePanel}, React.createElement(close_1.default, null)), iconElementRight: React.createElement(icon_menu_1.default, {iconButtonElement: React.createElement(icon_button_1.default, null, React.createElement(more_vert_1.default, null)), targetOrigin: origin, anchorOrigin: origin}, this.menuOptions(), window.coderoad.issuesPath
63-
? React.createElement(menu_item_1.default, {key: 'issue', className: 'link'}, React.createElement("a", {href: window.coderoad.issuesPath}, "post issue"))
64-
: null, React.createElement(divider_1.default, null), React.createElement(menu_item_1.default, {key: 'quit', onClick: quit}, "quit"))});
62+
return React.createElement(AppBar_1.default, {title: 'CodeRoad', className: 'cr-menu-bar', iconElementLeft: React.createElement(IconButton_1.default, {onClick: this.closePanel}, React.createElement(close_1.default, null)), iconElementRight: React.createElement(IconMenu_1.default, {iconButtonElement: React.createElement(IconButton_1.default, null, React.createElement(more_vert_1.default, null)), targetOrigin: origin, anchorOrigin: origin}, this.menuOptions(), window.coderoad.issuesPath
63+
? React.createElement(MenuItem_1.default, {key: 'issue', className: 'link'}, React.createElement("a", {href: window.coderoad.issuesPath}, "post issue"))
64+
: null, React.createElement(Divider_1.default, null), React.createElement(MenuItem_1.default, {key: 'quit', onClick: quit}, "quit"))});
6565
};
6666
default_1 = __decorate([
6767
react_redux_1.connect(null, function (dispatch) {

‎lib/components/page/complete/page-complete.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
22
var React = require('react');
3-
var list_item_1 = require('material-ui/lib/lists/list-item');
3+
var List_1 = require('material-ui/List');
44
var _components_1 = require('../../_components');
55
exports.PageCompleteMessage = function (_a) {
66
var page = _a.page;
77
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.Markdown, null, page.onPageComplete))
8+
React.createElement(List_1.ListItem, {key: 'page-complete'}, React.createElement(_components_1.Markdown, null, page.onPageComplete))
99
: null));
1010
};

‎lib/components/page/content.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
"use strict";
22
var React = require('react');
33
var _components_1 = require('../_components');
4-
var card_1 = require('material-ui/lib/card/card');
5-
var card_header_1 = require('material-ui/lib/card/card-header');
6-
var card_text_1 = require('material-ui/lib/card/card-text');
4+
var Card_1 = require('material-ui/Card');
75
exports.PageContent = function (_a) {
86
var page = _a.page;
9-
return (React.createElement(card_1.default, null, React.createElement(card_header_1.default, {title: page.title}), React.createElement(card_text_1.default, null, React.createElement(_components_1.Markdown, null, page.description))));
7+
return (React.createElement(Card_1.Card, null, React.createElement(Card_1.CardHeader, {title: page.title}), React.createElement(Card_1.CardText, null, React.createElement(_components_1.Markdown, null, page.description))));
108
};

‎lib/components/page/edit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
var React = require('react');
33
var path = require('path');
4-
var mode_edit_1 = require('material-ui/lib/svg-icons/editor/mode-edit');
4+
var mode_edit_1 = require('material-ui/svg-icons/editor/mode-edit');
55
var editStyle = { position: 'absolute', top: '10px', right: '10px' };
66
exports.Edit = function (_a) {
77
var editPath = _a.editPath;

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
var React = require('react');
1717
var react_redux_1 = require('react-redux');
1818
var Action = require('../../../actions/actions');
19-
var card_1 = require('material-ui/lib/card/card');
20-
var card_actions_1 = require('material-ui/lib/card/card-actions');
21-
var card_header_1 = require('material-ui/lib/card/card-header');
22-
var card_text_1 = require('material-ui/lib/card/card-text');
23-
var flat_button_1 = require('material-ui/lib/flat-button');
19+
var Card_1 = require('material-ui/Card');
20+
var FlatButton_1 = require('material-ui/FlatButton');
2421
var _components_1 = require('../../_components');
25-
var help_1 = require('material-ui/lib/svg-icons/action/help');
22+
var help_1 = require('material-ui/svg-icons/action/help');
2623
var default_1 = (function (_super) {
2724
__extends(default_1, _super);
2825
function default_1() {
@@ -35,7 +32,7 @@ var default_1 = (function (_super) {
3532
return React.createElement("div", null);
3633
}
3734
var hint = 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.Markdown, null, 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)}))));
35+
return (React.createElement(Card_1.Card, {className: 'cr-task-hints'}, React.createElement(Card_1.CardHeader, {title: 'Hints', avatar: React.createElement(help_1.default, null), actAsExpander: true, showExpandableButton: true}), React.createElement(Card_1.CardText, {className: 'cr-task-hint', expandable: true}, React.createElement(_components_1.Markdown, null, hint)), React.createElement(Card_1.CardActions, {expandable: true}, React.createElement(FlatButton_1.default, {label: 'Previous', disabled: hintPosition < 1, onTouchTap: prevHint.bind(this, hintPosition - 1)}), React.createElement(FlatButton_1.default, {label: 'Next', disabled: hintPosition > hints.length - 2, onTouchTap: nextHint.bind(this, hintPosition + 1)}))));
3936
};
4037
default_1 = __decorate([
4138
react_redux_1.connect(null, function (dispatch, state) {

‎lib/components/page/page.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ var __extends = (this && this.__extends) || function (d, b) {
66
};
77
var React = require('react');
88
var ReactDOM = require('react-dom');
9-
var paper_1 = require('material-ui/lib/paper');
10-
var divider_1 = require('material-ui/lib/divider');
9+
var Paper_1 = require('material-ui/Paper');
10+
var Divider_1 = require('material-ui/Divider');
1111
var content_1 = require('./content');
1212
var task_1 = require('./task/task');
1313
var hint_1 = require('./hint/hint');
@@ -29,7 +29,7 @@ var default_1 = (function (_super) {
2929
var _a = this.props, page = _a.page, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, tasks = _a.tasks, runTests = _a.runTests;
3030
var currentTask = taskPosition <= tasks.length ? tasks[taskPosition] : null;
3131
var allComplete = taskPosition >= tasks.length;
32-
return (React.createElement(paper_1.default, {style: pageStyle, zDepth: 1, className: 'cr-page', ref: 'page'}, React.createElement(content_1.PageContent, {page: page}), React.createElement(divider_1.default, null), React.createElement(task_1.Tasks, {tasks: tasks, taskPosition: taskPosition, runTests: runTests}), React.createElement("div", {className: 'listEnd', ref: 'listEnd'}), React.createElement(hint_1.default, {task: currentTask, hintPosition: hintPosition}), React.createElement(page_complete_1.PageCompleteMessage, {page: page}), React.createElement(toolbar_1.default, {tasks: tasks, taskPosition: taskPosition})));
32+
return (React.createElement(Paper_1.default, {style: pageStyle, zDepth: 1, className: 'cr-page', ref: 'page'}, React.createElement(content_1.PageContent, {page: page}), React.createElement(Divider_1.default, null), React.createElement(task_1.Tasks, {tasks: tasks, taskPosition: taskPosition, runTests: runTests}), React.createElement("div", {className: 'listEnd', ref: 'listEnd'}), React.createElement(hint_1.default, {task: currentTask, hintPosition: hintPosition}), React.createElement(page_complete_1.PageCompleteMessage, {page: page}), React.createElement(toolbar_1.default, {tasks: tasks, taskPosition: taskPosition})));
3333
};
3434
return default_1;
3535
}(React.Component));

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
"use strict";
22
var React = require('react');
33
var _components_1 = require('../../_components');
4-
var list_1 = require('material-ui/lib/lists/list');
5-
var list_item_1 = require('material-ui/lib/lists/list-item');
6-
var Subheader_1 = require('material-ui/lib/Subheader');
7-
var colors_1 = require('material-ui/lib/styles/colors');
8-
var check_box_1 = require('material-ui/lib/svg-icons/toggle/check-box');
9-
var check_box_outline_blank_1 = require('material-ui/lib/svg-icons/toggle/check-box-outline-blank');
10-
var indeterminate_check_box_1 = require('material-ui/lib/svg-icons/toggle/indeterminate-check-box');
4+
var List_1 = require('material-ui/List');
5+
var Subheader_1 = require('material-ui/Subheader');
6+
var colors_1 = require('material-ui/styles/colors');
7+
var check_box_1 = require('material-ui/svg-icons/toggle/check-box');
8+
var check_box_outline_blank_1 = require('material-ui/svg-icons/toggle/check-box-outline-blank');
9+
var indeterminate_check_box_1 = require('material-ui/svg-icons/toggle/indeterminate-check-box');
1110
function visibleTasks(tasks, taskPosition) {
1211
return tasks.slice(0, taskPosition + 1);
1312
}
@@ -36,10 +35,10 @@ var TaskContent = function (_a) {
3635
exports.Task = function (_a) {
3736
var task = _a.task, taskPosition = _a.taskPosition, index = _a.index, runTests = _a.runTests;
3837
var isCompleted = 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})));
38+
return (React.createElement(List_1.ListItem, {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})));
4039
};
4140
exports.Tasks = function (_a) {
4241
var tasks = _a.tasks, taskPosition = _a.taskPosition, runTests = _a.runTests;
4342
var visTasks = visibleTasks(tasks, taskPosition);
44-
return React.createElement(list_1.default, {className: 'cr-tasks'}, React.createElement(Subheader_1.default, null, "Tasks"), visTasks.map(function (task, index) { return React.createElement(exports.Task, {key: index, task: task, taskPosition: taskPosition, index: index, runTests: runTests}); }));
43+
return React.createElement(List_1.List, {className: 'cr-tasks'}, React.createElement(Subheader_1.default, null, "Tasks"), visTasks.map(function (task, index) { return React.createElement(exports.Task, {key: index, task: task, taskPosition: taskPosition, index: index, runTests: runTests}); }));
4544
};

0 commit comments

Comments
 (0)