Skip to content

Commit 1fea2a8

Browse files
ShMcKShMcK
committed
add AddButton
1 parent d32ef7a commit 1fea2a8

File tree

13 files changed

+69
-17
lines changed

13 files changed

+69
-17
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
"use strict";
2+
var React = require('react');
3+
var FlatButton_1 = require('material-ui/FlatButton');
4+
var styles = {
5+
textAlign: 'center',
6+
};
7+
var AddButton = function (_a) {
8+
var callback = _a.callback;
9+
return (React.createElement("div", {style: styles}, React.createElement(FlatButton_1.default, {label: '+', primary: true, onClick: callback})));
10+
};
11+
Object.defineProperty(exports, "__esModule", { value: true });
12+
exports.default = AddButton;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"use strict";
22
var React = require('react');
33
var List_1 = require('material-ui/List');
4+
var AddButton_1 = require('../AddButton');
45
var styles = {
56
add: {
67
textAlign: 'center',
@@ -10,7 +11,7 @@ var Hints = function (_a) {
1011
var hints = _a.hints;
1112
return (React.createElement(List_1.List, null, !hints || !hints.length
1213
? []
13-
: hints.map(function (hint, index) { return React.createElement(List_1.ListItem, {secondaryText: React.createElement("p", null, index + 1, ". ", hint)}); }), React.createElement(List_1.ListItem, {secondaryText: React.createElement("p", {style: styles.add}, "+")})));
14+
: 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)));
1415
};
1516
Object.defineProperty(exports, "__esModule", { value: true });
1617
exports.default = Hints;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var __extends = (this && this.__extends) || function (d, b) {
77
var React = require('react');
88
var Stepper_1 = require('material-ui/Stepper');
99
var index_1 = require('../../index');
10+
var AddButton_1 = require('../AddButton');
1011
var TaskActions = (function (_super) {
1112
__extends(TaskActions, _super);
1213
function TaskActions(props) {
@@ -30,7 +31,7 @@ var TaskActions = (function (_super) {
3031
return obj;
3132
});
3233
return (React.createElement(Stepper_1.Stepper, {activeStep: stepIndex, linear: false, orientation: 'vertical'}, actionList.map(function (a, index) { return (React.createElement(Stepper_1.Step, null, React.createElement(Stepper_1.StepButton, {onClick: function () { return _this.setState({ stepIndex: index }); }}, a.action + (a.singleLine ? ' ' + a.content : '')), React.createElement(Stepper_1.StepContent, null, a.singleLine ? ''
33-
: React.createElement(index_1.Markdown, null, '```js\n' + a.content + '\n```')))); })));
34+
: React.createElement(index_1.Markdown, null, '```js\n' + a.content + '\n```')))); }), React.createElement(AddButton_1.default, null)));
3435
};
3536
return TaskActions;
3637
}(React.Component));

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,21 @@ var TasksComplete_1 = require('../TasksComplete');
77
var Tests_1 = require('../Tests');
88
var TaskActions_1 = require('../TaskActions');
99
var Hints_1 = require('../Hints');
10+
var AddButton_1 = require('../AddButton');
1011
var styles = {
1112
card: {
1213
margin: '5px',
1314
},
1415
tabBar: {
1516
backgroundColor: 'black',
16-
}
17+
},
18+
addTask: {
19+
textAlign: 'center',
20+
},
1721
};
1822
var Tasks = function (_a) {
1923
var tasks = _a.tasks, page = _a.page, config = _a.config;
20-
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(TasksComplete_1.default, {page: page})));
24+
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})));
2125
};
2226
Object.defineProperty(exports, "__esModule", { value: true });
2327
exports.default = Tasks;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var colors_1 = require('material-ui/styles/colors');
66
var styles = {
77
card: {
88
backgroundColor: colors_1.cyan500,
9-
margin: '10px 5px',
9+
margin: '5px',
1010
},
1111
text: {
1212
color: colors_1.grey100,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ var react_redux_1 = require('react-redux');
1818
var path_1 = require('path');
1919
var actions_1 = require('../../../actions');
2020
var config_options_1 = require('../../../config-options');
21+
var FlatButton_1 = require('material-ui/FlatButton');
2122
var Tests = (function (_super) {
2223
__extends(Tests, _super);
2324
function Tests() {
@@ -27,7 +28,7 @@ var Tests = (function (_super) {
2728
var _this = this;
2829
var _a = this.props, tests = _a.tests, config = _a.config, style = _a.style, open = _a.open;
2930
var suffix = config_options_1.default[config.language].suffix;
30-
return (React.createElement("div", {style: style}, tests.map(function (test) { return (React.createElement("button", {onClick: open.bind(_this, test.concat('.' + suffix))}, test)); })));
31+
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})); })));
3132
};
3233
Tests = __decorate([
3334
react_redux_1.connect(null, function (dispatch) {

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import * as React from 'react';
2+
import FlatButton from 'material-ui/FlatButton';
3+
4+
const styles = {
5+
textAlign: 'center',
6+
};
7+
8+
const AddButton: React.StatelessComponent<{
9+
callback?: any
10+
}> = ({callback}) => (
11+
<div style={styles}>
12+
<FlatButton
13+
label='+'
14+
primary={true}
15+
onClick={callback}
16+
/>
17+
</div>
18+
);
19+
export default AddButton;

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as React from 'react';
22
import {List, ListItem} from 'material-ui/List';
33
import FontIcon from 'material-ui/FontIcon';
4+
import AddButton from '../AddButton';
45

56
const styles = {
67
add: {
@@ -14,12 +15,13 @@ const Hints: React.StatelessComponent<{
1415
<List>
1516
{!hints || !hints.length
1617
? []
17-
: hints.map((hint, index) => <ListItem secondaryText={
18-
<p>{index + 1}. {hint}</p>
19-
} />)}
20-
<ListItem secondaryText={
21-
<p style={styles.add}>+</p>
22-
} />
18+
: hints.map((hint, index) => (
19+
<ListItem secondaryText={
20+
<p>{index + 1}. {hint}</p>
21+
} />
22+
))
23+
}
24+
<AddButton />
2325
</List>
2426
);
2527
export default Hints;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
Step, Stepper, StepButton, StepContent, StepLabel
44
} from 'material-ui/Stepper';
55
import {Markdown} from '../../index';
6+
import AddButton from '../AddButton';
67

78
export default class TaskActions extends React.Component<{
89
actions: string[]
@@ -47,6 +48,7 @@ export default class TaskActions extends React.Component<{
4748
</StepContent>
4849
</Step>
4950
))}
51+
<AddButton />
5052
</Stepper>
5153
);
5254
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@ import TasksComplete from '../TasksComplete';
1010
import Tests from '../Tests';
1111
import TaskActions from '../TaskActions';
1212
import Hints from '../Hints';
13+
import AddButton from '../AddButton';
1314

1415
const styles = {
1516
card: {
1617
margin: '5px',
1718
},
1819
tabBar: {
1920
backgroundColor: 'black',
20-
}
21+
},
22+
addTask: {
23+
textAlign: 'center',
24+
},
2125
};
2226

2327
const Tasks: React.StatelessComponent<{
@@ -56,6 +60,8 @@ const Tasks: React.StatelessComponent<{
5660
</Card>)
5761
)}
5862

63+
<AddButton />
64+
5965
<TasksComplete
6066
page={page}
6167
/>

0 commit comments

Comments
 (0)