Skip to content

Commit d047d06

Browse files
ShMcKShMcK
committed
update to newer version of material-ui, start & progress complete
1 parent 479f7ff commit d047d06

File tree

29 files changed

+160
-110
lines changed

29 files changed

+160
-110
lines changed

‎lib/components/alert/alert.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
var React = require('react');
1717
var react_redux_1 = require('react-redux');
1818
var Action = require('../../actions/actions');
19-
var material_ui_1 = require('material-ui');
19+
var snackbar_1 = require('material-ui/lib/snackbar');
2020
var classNames = require('classnames');
2121
var defaultAlert = {
2222
open: false,
@@ -30,7 +30,7 @@ var default_1 = (function (_super) {
3030
default_1.prototype.render = function () {
3131
var _a = this.props, alert = _a.alert, toggleAlert = _a.toggleAlert;
3232
var action = alert.action, open = alert.open, message = alert.message, duration = alert.duration;
33-
return (React.createElement(material_ui_1.Snackbar, {className: classNames('cr-alert', action), open: open || false, message: message || '', action: action, autoHideDuration: duration || 1500, onActionTouchTap: toggleAlert, onRequestClose: toggleAlert}));
33+
return (React.createElement(snackbar_1.default, {className: classNames('cr-alert', action), open: open || false, message: message || '', action: action, autoHideDuration: duration || 1500, onActionTouchTap: toggleAlert, onRequestClose: toggleAlert}));
3434
};
3535
default_1 = __decorate([
3636
react_redux_1.connect(null, function (dispatch) {

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
"use strict";
22
var React = require('react');
3-
var material_ui_1 = require('material-ui');
4-
exports.FinalPage = function () { return (React.createElement(material_ui_1.Paper, null, React.createElement(material_ui_1.Card, null, React.createElement(material_ui_1.CardTitle, {title: 'Congratulations!', subtitle: 'Tutorial Complete!'}), React.createElement(material_ui_1.CardText, null, "What's next?", React.createElement(material_ui_1.CardActions, null, React.createElement("a", {href: 'https://coderoad.github.io/#tutorials'}, React.createElement(material_ui_1.FlatButton, {label: 'See More Tutorials', disabled: true})), React.createElement("a", {href: 'https://coderoad.github.io/build'}, React.createElement(material_ui_1.FlatButton, {label: 'Learn how to Create a Tutorial'}))))))); };
3+
var paper_1 = require('material-ui/lib/paper');
4+
var card_1 = require('material-ui/lib/card/card');
5+
var card_title_1 = require('material-ui/lib/card/card-title');
6+
var card_text_1 = require('material-ui/lib/card/card-text');
7+
var card_actions_1 = require('material-ui/lib/card/card-actions');
8+
var flat_button_1 = require('material-ui/lib/flat-button');
9+
exports.FinalPage = function () { return (React.createElement(paper_1.default, null, React.createElement(card_1.default, null, React.createElement(card_title_1.default, {title: 'Congratulations!', subtitle: 'Tutorial Complete!'}), React.createElement(card_text_1.default, null, "What's next?", React.createElement(card_actions_1.default, null, React.createElement("a", {href: 'https://coderoad.github.io/#tutorials'}, React.createElement(flat_button_1.default, {label: 'See More Tutorials', disabled: true})), React.createElement("a", {href: 'https://coderoad.github.io/build'}, React.createElement(flat_button_1.default, {label: 'Learn how to Create a Tutorial'}))))))); };

‎lib/components/menu/menu.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'use strict';
1+
"use strict";
22
var __extends = (this && this.__extends) || function (d, b) {
33
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
44
function __() { this.constructor = d; }
@@ -19,9 +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 material_ui_1 = require('material-ui');
23-
var MoreVertIcon = require('material-ui/lib/svg-icons/navigation/more-vert');
24-
var NavigationClose = require('material-ui/lib/svg-icons/navigation/close');
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 origin = { horizontal: 'right', vertical: 'top' };
2529
var default_1 = (function (_super) {
2630
__extends(default_1, _super);
2731
function default_1() {
@@ -43,19 +47,18 @@ var default_1 = (function (_super) {
4347
switch (this.props.route) {
4448
case 'final':
4549
case 'page':
46-
return (React.createElement("div", null, React.createElement(material_ui_1.MenuItem, {primaryText: 'progress', onTouchTap: routeToProgress, key: 'progress'}), React.createElement(material_ui_1.MenuItem, {primaryText: 'projects', onTouchTap: routeToProjects, key: 'projects'})));
50+
return (React.createElement("div", null, React.createElement(menu_item_1.default, {primaryText: 'progress', onTouchTap: routeToProgress, key: 'progress'}), React.createElement(menu_item_1.default, {primaryText: 'projects', onTouchTap: routeToProjects, key: 'projects'})));
4751
case 'progress':
48-
return React.createElement(material_ui_1.MenuItem, {primaryText: 'projects', onTouchTap: routeToProjects, key: 'projects'});
52+
return React.createElement(menu_item_1.default, {primaryText: 'projects', onTouchTap: routeToProjects, key: 'projects'});
4953
default: return null;
5054
}
5155
};
5256
default_1.prototype.closePanel = function () {
5357
render_1.togglePanel();
5458
};
5559
default_1.prototype.render = function () {
56-
var origin = { horizontal: 'right', vertical: 'top' };
5760
var quit = this.props.quit;
58-
return (React.createElement(material_ui_1.AppBar, {title: 'CodeRoad', className: 'cr-menu-bar', iconElementLeft: React.createElement(material_ui_1.IconButton, {onTouchTap: this.closePanel}, React.createElement(NavigationClose, null)), iconElementRight: React.createElement(material_ui_1.IconMenu, {iconButtonElement: React.createElement(material_ui_1.IconButton, null, React.createElement(MoreVertIcon, null)), targetOrigin: origin, anchorOrigin: origin}, this.menuOptions(), window.coderoad.issuesPath ? React.createElement(material_ui_1.MenuItem, {key: 'issue', className: 'link'}, React.createElement("a", {href: window.coderoad.issuesPath}, "post issue")) : null, React.createElement(material_ui_1.Divider, null), React.createElement(material_ui_1.MenuItem, {primaryText: 'quit', onTouchTap: quit}))}));
61+
return React.createElement(app_bar_1.default, {title: 'CodeRoad', className: 'cr-menu-bar', iconElementLeft: React.createElement(icon_button_1.default, null, 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 ? React.createElement(menu_item_1.default, {key: 'issue', className: 'link'}, React.createElement("a", {href: window.coderoad.issuesPath}, "post issue")) : null)});
5962
};
6063
default_1 = __decorate([
6164
react_redux_1.connect(null, function (dispatch) {

‎lib/components/page/content.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
"use strict";
22
var React = require('react');
33
var _components_1 = require('../_components');
4-
var material_ui_1 = require('material-ui');
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');
57
function default_1(_a) {
68
var page = _a.page;
7-
return (React.createElement(material_ui_1.Card, null, React.createElement(material_ui_1.CardHeader, {title: page.title}), React.createElement(material_ui_1.CardText, null, React.createElement(_components_1.MarkdownText, {text: page.description}))));
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.MarkdownText, {text: page.description}))));
810
}
911
Object.defineProperty(exports, "__esModule", { value: true });
1012
exports.default = default_1;

‎lib/components/page/edit.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"use strict";
22
var React = require('react');
33
var path = require('path');
4-
var Edit = require('material-ui/lib/svg-icons/editor/mode-edit');
4+
var mode_edit_1 = require('material-ui/lib/svg-icons/editor/mode-edit');
55
var editStyle = { position: 'absolute', top: '10px', right: '10px' };
66
Object.defineProperty(exports, "__esModule", { value: true });
77
exports.default = function (editPath) {
88
if (editPath && window.coderoad.edit) {
99
var repoPath = path.join(window.coderoad.repo, 'edit', 'master', editPath);
10-
return React.createElement("a", {href: repoPath}, React.createElement(Edit, {style: editStyle}));
10+
return React.createElement("a", {href: repoPath}, React.createElement(mode_edit_1.default, {style: editStyle}));
1111
}
1212
};

‎lib/components/page/hint.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ 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 material_ui_1 = require('material-ui');
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');
2024
var _components_1 = require('../_components');
2125
var iconPath = 'material-ui/lib/svg-icons/';
2226
var Help = require(iconPath + 'action/help');
@@ -32,7 +36,7 @@ var default_1 = (function (_super) {
3236
return React.createElement("div", null);
3337
}
3438
var hint = hints[hintPosition];
35-
return (React.createElement(material_ui_1.Card, {className: 'cr-task-hints'}, React.createElement(material_ui_1.CardHeader, {title: 'Hints', avatar: React.createElement(Help, null), actAsExpander: true, showExpandableButton: true}), React.createElement(material_ui_1.CardText, {className: 'cr-task-hint', expandable: true}, React.createElement(_components_1.MarkdownText, {text: hint})), React.createElement(material_ui_1.CardActions, {expandable: true}, React.createElement(material_ui_1.FlatButton, {label: 'Previous', disabled: hintPosition < 1, onTouchTap: prevHint.bind(this, hintPosition - 1)}), React.createElement(material_ui_1.FlatButton, {label: 'Next', disabled: hintPosition > hints.length - 2, onTouchTap: nextHint.bind(this, hintPosition + 1)}))));
39+
return (React.createElement(card_1.default, {className: 'cr-task-hints'}, React.createElement(card_header_1.default, {title: 'Hints', avatar: React.createElement(Help, null), actAsExpander: true, showExpandableButton: true}), React.createElement(card_text_1.default, {className: 'cr-task-hint', expandable: true}, React.createElement(_components_1.MarkdownText, {text: 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)}))));
3640
};
3741
default_1 = __decorate([
3842
react_redux_1.connect(null, function (dispatch, state) {

‎lib/components/page/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 material_ui_1 = require('material-ui');
3+
var list_item_1 = require('material-ui/lib/lists/list-item');
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(material_ui_1.ListItem, {key: 'page-complete'}, React.createElement(_components_1.MarkdownText, {text: page.onPageComplete}))
8+
React.createElement(list_item_1.default, {key: 'page-complete'}, React.createElement(_components_1.MarkdownText, {text: page.onPageComplete}))
99
: null));
1010
};

‎lib/components/page/page.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ var __extends = (this && this.__extends) || function (d, b) {
66
};
77
var React = require('react');
88
var ReactDOM = require('react-dom');
9-
var material_ui_1 = require('material-ui');
9+
var paper_1 = require('material-ui/lib/paper');
10+
var divider_1 = require('material-ui/lib/divider');
1011
var content_1 = require('./content');
1112
var task_1 = require('./task');
1213
var hint_1 = require('./hint');
@@ -28,7 +29,7 @@ var default_1 = (function (_super) {
2829
var _a = this.props, page = _a.page, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, tasks = _a.tasks, runTests = _a.runTests;
2930
var currentTask = taskPosition <= tasks.length ? tasks[taskPosition] : null;
3031
var allComplete = taskPosition >= tasks.length;
31-
return (React.createElement(material_ui_1.Paper, {style: pageStyle, zDepth: 1, className: 'cr-page', ref: 'page'}, React.createElement(content_1.default, {page: page}), React.createElement(material_ui_1.Divider, 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.default, {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})));
3233
};
3334
return default_1;
3435
}(React.Component));

‎lib/components/page/task.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"use strict";
22
var React = require('react');
33
var _components_1 = require('../_components');
4-
var material_ui_1 = require('material-ui');
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');
57
var Colors = require('material-ui/lib/styles/colors');
68
var iconPath = 'material-ui/lib/svg-icons/';
79
var Complete = require(iconPath + 'toggle/check-box');
@@ -35,10 +37,10 @@ var TaskContent = function (_a) {
3537
exports.Task = function (_a) {
3638
var task = _a.task, taskPosition = _a.taskPosition, index = _a.index, runTests = _a.runTests;
3739
var isCompleted = index < taskPosition;
38-
return (React.createElement(material_ui_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})));
40+
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})));
3941
};
4042
exports.Tasks = function (_a) {
4143
var tasks = _a.tasks, taskPosition = _a.taskPosition, runTests = _a.runTests;
4244
var visTasks = visibleTasks(tasks, taskPosition);
43-
return React.createElement(material_ui_1.List, {subheader: 'Tasks', className: 'cr-tasks'}, visTasks.map(function (task, index) { return React.createElement(exports.Task, {key: index, task: task, taskPosition: taskPosition, index: index, runTests: runTests}); }));
45+
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}); }));
4446
};

‎lib/components/page/toolbar.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ 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 material_ui_1 = require('material-ui');
19+
var linear_progress_1 = require('material-ui/lib/linear-progress');
20+
var toolbar_1 = require('material-ui/lib/toolbar/toolbar');
21+
var toolbar_group_1 = require('material-ui/lib/toolbar/toolbar-group');
22+
var raised_button_1 = require('material-ui/lib/raised-button');
23+
var flat_button_1 = require('material-ui/lib/flat-button');
2024
var editor_1 = require('../../atom/editor');
2125
var actions_1 = require('../../atom/actions');
2226
var Code = require('material-ui/lib/svg-icons/action/code');
2327
var ProgressBar = function (_a) {
2428
var progress = _a.progress;
25-
return React.createElement(material_ui_1.LinearProgress, {mode: 'determinate', value: progress, style: { height: '10px' }});
29+
return React.createElement(linear_progress_1.default, {mode: 'determinate', value: progress, style: { height: '10px' }});
2630
};
2731
function taskProgress(current, max) {
2832
return (current / max) * 100;
@@ -36,15 +40,15 @@ var default_1 = (function (_super) {
3640
var _a = this.props, callNextPage = _a.callNextPage, showHint = _a.showHint, taskPosition = _a.taskPosition, tasks = _a.tasks;
3741
switch (true) {
3842
case taskPosition >= tasks.length:
39-
return React.createElement(material_ui_1.RaisedButton, {label: 'Continue', primary: true, onTouchTap: callNextPage});
43+
return React.createElement(raised_button_1.default, {label: 'Continue', primary: true, onTouchTap: callNextPage});
4044
default:
41-
return React.createElement(material_ui_1.RaisedButton, {label: 'Save', secondary: true, onTouchTap: editor_1.save});
45+
return React.createElement(raised_button_1.default, {label: 'Save', secondary: true, onTouchTap: editor_1.save});
4246
}
4347
};
4448
default_1.prototype.render = function () {
4549
var _a = this.props, tasks = _a.tasks, taskPosition = _a.taskPosition;
4650
var progress = taskProgress(taskPosition, tasks.length);
47-
return (React.createElement("section", {className: 'cr-page-toolbar'}, React.createElement(ProgressBar, {progress: progress}), React.createElement(material_ui_1.Toolbar, null, React.createElement(material_ui_1.ToolbarGroup, {float: 'left'}, React.createElement(material_ui_1.FlatButton, {icon: React.createElement(Code, null), onTouchTap: actions_1.toggleDevTools})), React.createElement(material_ui_1.ToolbarGroup, {float: 'right'}, this.getButton()))));
51+
return (React.createElement("section", {className: 'cr-page-toolbar'}, React.createElement(ProgressBar, {progress: progress}), React.createElement(toolbar_1.default, null, React.createElement(toolbar_group_1.default, {float: 'left'}, React.createElement(flat_button_1.default, {icon: React.createElement(Code, null), onTouchTap: actions_1.toggleDevTools})), React.createElement(toolbar_group_1.default, {float: 'right'}, this.getButton()))));
4852
};
4953
default_1 = __decorate([
5054
react_redux_1.connect(null, function (dispatch, state) {

0 commit comments

Comments
 (0)