cleanup old, editor-path actions, expandable components

Author: ShMcK

lib/actions.js

@@ -12,6 +12,9 @@ exports.tutorialLoad = tutorial_1.tutorialLoad;
 exports.tutorialPageAdd = tutorial_1.tutorialPageAdd;
 var window_1 = require('./modules/window');
 exports.windowToggle = window_1.windowToggle;
+var editor_paths_1 = require('./modules/editor-paths');
+exports.editorOpenPage = editor_paths_1.editorOpenPage;
+exports.editorOpenTest = editor_paths_1.editorOpenTest;
 var alert_1 = require('core-coderoad/lib/alert');
 exports.alertOpen = alert_1.alertOpen;
 exports.alertClose = alert_1.alertClose;

lib/components/Page/Hints/index.js

@@ -11,7 +11,7 @@ var Hints = function (_a) {
     var hints = _a.hints;
     return (React.createElement(List_1.List, null, !hints || !hints.length
         ? []
-        : hints.map(function (hint, index) { return React.createElement(List_1.ListItem, {secondaryText: React.createElement("p", null, index + 1, ". ", hint)}); }), React.createElement(AddButton_1.default, null)));
+        : hints.map(function (hint, index) { return (React.createElement(List_1.ListItem, {secondaryText: React.createElement("p", null, index + 1, ". ", hint)})); }), React.createElement(AddButton_1.default, null)));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Hints;

lib/components/Page/Tasks/index.js

@@ -12,16 +12,28 @@ var styles = {
     card: {
         margin: '5px',
     },
+    cardContent: {
+        margin: '0px',
+        padding: '0px',
+    },
     tabBar: {
         backgroundColor: 'black',
     },
     addTask: {
         textAlign: 'center',
     },
+    test: {
+        float: 'right',
+        marginRight: '30px',
+    },
+    title: {
+        float: 'left',
+        marginLeft: '10px',
+    },
 };
 var Tasks = function (_a) {
     var tasks = _a.tasks, page = _a.page, config = _a.config;
-    return (React.createElement("div", null, tasks.map(function (task, index) { return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardTitle, null, "Task ", index + 1, React.createElement(Tests_1.default, {style: { float: 'right' }, tests: task.tests, config: config})), React.createElement(Tabs_1.Tabs, {tabItemContainerStyle: styles.tabBar}, React.createElement(Tabs_1.Tab, {label: 'Description'}, React.createElement(Task_1.default, {key: index.toString(), index: index, task: task})), React.createElement(Tabs_1.Tab, {label: 'Actions'}, React.createElement(TaskActions_1.default, {actions: task.actions})), React.createElement(Tabs_1.Tab, {label: 'Hints'}, React.createElement(Hints_1.default, {hints: task.hints}))))); }), React.createElement(AddButton_1.default, null), React.createElement(TasksComplete_1.default, {page: page})));
+    return (React.createElement("div", null, tasks.map(function (task, index) { return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardHeader, {actAsExpander: true, showExpandableButton: true}, React.createElement("span", {style: styles.title}, "Task ", index + 1), React.createElement(Tests_1.default, {style: styles.test, tests: task.tests, config: config})), React.createElement(Card_1.CardText, {expandable: true, style: styles.cardContent}, React.createElement(Tabs_1.Tabs, {tabItemContainerStyle: styles.tabBar}, React.createElement(Tabs_1.Tab, {label: 'Description'}, React.createElement(Task_1.default, {key: index.toString(), index: index, task: task})), React.createElement(Tabs_1.Tab, {label: 'Actions'}, React.createElement(TaskActions_1.default, {actions: task.actions})), React.createElement(Tabs_1.Tab, {label: 'Hints'}, React.createElement(Hints_1.default, {hints: task.hints})))))); }), React.createElement(AddButton_1.default, null), React.createElement(TasksComplete_1.default, {page: page})));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Tasks;

lib/components/Page/TasksComplete/index.js

@@ -18,7 +18,7 @@ var TasksComplete = function (_a) {
     if (!page.onPageComplete) {
         return null;
     }
-    return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardText, null, React.createElement(index_1.Markdown, {style: styles.text}, page.onPageComplete))));
+    return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardHeader, {actAsExpander: true, showExpandableButton: true}), React.createElement(Card_1.CardText, {expandable: true}, React.createElement(index_1.Markdown, {style: styles.text}, page.onPageComplete))));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = TasksComplete;

lib/components/Page/Tests/index.js

@@ -19,6 +19,11 @@ var path_1 = require('path');
 var actions_1 = require('../../../actions');
 var config_options_1 = require('../../../config-options');
 var FlatButton_1 = require('material-ui/FlatButton');
+var styles = {
+    button: {
+        bottom: '8px',
+    },
+};
 var Tests = (function (_super) {
     __extends(Tests, _super);
     function Tests() {
@@ -28,7 +33,7 @@ var Tests = (function (_super) {
         var _this = this;
         var _a = this.props, tests = _a.tests, config = _a.config, style = _a.style, open = _a.open;
         var suffix = config_options_1.default[config.language].suffix;
-        return (React.createElement("div", {style: style}, tests.map(function (test) { return (React.createElement(FlatButton_1.default, {onClick: open.bind(_this, test.concat('.' + suffix)), label: test, secondary: true})); })));
+        return (React.createElement("div", {style: style}, tests.map(function (test) { return (React.createElement(FlatButton_1.default, {style: styles.button, onClick: open.bind(_this, test.concat('.' + suffix)), label: 'Test', secondary: true})); })));
     };
     Tests = __decorate([
         react_redux_1.connect(null, function (dispatch) {

lib/components/Start/Checks/DynamicStepper.js

@@ -50,7 +50,10 @@ var TopPanel = (function (_super) {
     TopPanel = __decorate([
         react_redux_1.connect(null, function (dispatch) {
             return {
-                pageSet: function (index) { return dispatch(actions_1.pageSet(index)); },
+                pageSet: function (index) {
+                    dispatch(actions_1.pageSet(index));
+                    dispatch(actions_1.editorOpenPage(index));
+                },
                 pageAdd: function () { return dispatch(actions_1.tutorialPageAdd()); }
             };
         }),