Skip to content

Commit c6efd06

Browse files
ShMcKShMcK
committed
npm scripts for less, tsc
1 parent fa6551f commit c6efd06

File tree

13 files changed

+198
-540
lines changed

13 files changed

+198
-540
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
88
- improved alerts
99
- file paths that map to older versions of NPM
1010
- modular/replaceable test runner
11+
12+
## [0.5.0] - 2016-03-04
13+
### Added
14+
- ui changes
15+
- basic animations
16+
- bug fixes
17+
- @onPageComplete message

‎lib/components/app/app.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 _components_1 = require('../_components');
1919
var ThemeManager = require('material-ui/lib/styles/theme-manager');
2020
var theme_1 = require('../theme/theme');
21+
var react_addons_css_transition_group_1 = require('react-addons-css-transition-group');
2122
var default_1 = (function (_super) {
2223
__extends(default_1, _super);
2324
function default_1() {
@@ -30,7 +31,7 @@ var default_1 = (function (_super) {
3031
};
3132
default_1.prototype.render = function () {
3233
var state = this.props.state;
33-
return (React.createElement("section", {className: 'cr'}, React.createElement(_components_1.Menu, {route: state.route, position: state.position}), React.createElement(_components_1.Router, {state: state}), React.createElement(_components_1.Alert, {alert: state.alert})));
34+
return (React.createElement(react_addons_css_transition_group_1.default, {transitionName: 'example', transitionEnterTimeout: 500, transitionLeaveTimeout: 300}, React.createElement("section", {className: 'cr', key: 'main'}, React.createElement(_components_1.Menu, {route: state.route, position: state.position}), React.createElement(_components_1.Router, {state: state}), React.createElement(_components_1.Alert, {alert: state.alert}))));
3435
};
3536
default_1.childContextTypes = {
3637
muiTheme: React.PropTypes.object,

‎lib/components/page/task.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var React = require('react');
33
var _components_1 = require('../_components');
44
var material_ui_1 = require('material-ui');
5-
var colors_1 = require('material-ui/lib/styles/colors');
5+
var Colors = require('material-ui/lib/styles/colors');
66
var iconPath = 'material-ui/lib/svg-icons/';
77
var Complete = require(iconPath + 'toggle/check-box');
88
var Incomplete = require(iconPath + 'toggle/check-box-outline-blank');
@@ -14,10 +14,10 @@ var TaskCheckbox = function (_a) {
1414
var index = _a.index, taskPosition = _a.taskPosition, runTests = _a.runTests;
1515
var icon = null;
1616
if (index < taskPosition) {
17-
icon = React.createElement(Complete, {color: colors_1.green500});
17+
icon = React.createElement(Complete, {color: Colors.green500});
1818
}
1919
else if (index === taskPosition && runTests) {
20-
icon = React.createElement(RunningTest, {color: colors_1.orange500});
20+
icon = React.createElement(RunningTest, {color: Colors.orange500});
2121
}
2222
else {
2323
icon = React.createElement(Incomplete, null);

‎package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@
3535
"atom": ">=1.0.0 <2.0.0"
3636
},
3737
"dependencies": {
38+
"classnames": "2.2.3",
3839
"highlights": "1.3.1",
3940
"lodash": "4.6.1",
40-
"material-ui": "0.14.4",
4141
"marked": "0.3.5",
42+
"material-ui": "0.14.4",
4243
"react": "0.14.7",
44+
"react-addons-css-transition-group": "^0.14.7",
4345
"react-dom": "0.14.7",
4446
"react-redux": "4.4.0",
45-
"redux": "3.3.1",
4647
"react-tap-event-plugin": "0.2.2",
47-
"classnames": "2.2.3"
48+
"redux": "3.3.1"
4849
},
4950
"devDependencies": {
5051
"ava": "^0.12.0",
@@ -53,6 +54,9 @@
5354
"react-addons-test-utils": "0.14.7"
5455
},
5556
"scripts": {
56-
"test": "ava"
57+
"test": "ava",
58+
"styles": "lessc src/components/_index.less styles/styles.css",
59+
"compile": "tsc",
60+
"build": "npm run styles && npm run compile"
5761
}
5862
}

‎src/components/_index.less

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,22 @@
55
@import './progress/_progress';
66
@import './alert/_alert';
77
@import './projects/_projects';
8+
@import './app/app';
89

910
#crv {
1011
width: 400px;
1112
height: 100%;
1213
overflow: scroll;
13-
font-family: @font-family;
14-
font-size: @font-size;
1514
}
1615

1716
#crv a {
17+
color: black;
1818
text-decoration: none
1919
}
20+
#crv a:hover {
21+
text-decoration: none;
22+
}
2023
#crv a:visited {
21-
color: black;
2224
text-decoration: none;
2325
}
2426

‎src/components/app/app.less

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.example-enter {
2+
opacity: 0.01;
3+
}
4+
5+
.example-enter.example-enter-active {
6+
opacity: 1;
7+
transition: opacity 500ms ease-in;
8+
}
9+
10+
.example-leave {
11+
opacity: 1;
12+
}
13+
14+
.example-leave.example-leave-active {
15+
opacity: 0.01;
16+
transition: opacity 300ms ease-in;
17+
}

‎src/components/app/app.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {connect} from 'react-redux';
44
import {Menu, Router, Alert} from '../_components';
55
import * as ThemeManager from 'material-ui/lib/styles/theme-manager';
66
import Theme from '../theme/theme';
7+
import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
78

89
/**
910
* App Component
@@ -23,11 +24,13 @@ export default class extends React.Component<{state?: CR.State}, {}> {
2324
render(): React.ReactElement<{}> {
2425
const state = this.props.state;
2526
return (
26-
<section className='cr'>
27+
<ReactCSSTransitionGroup transitionName='example' transitionEnterTimeout={500} transitionLeaveTimeout={300}>
28+
<section className='cr' key='main'>
2729
<Menu route={state.route} position={state.position} />
2830
<Router state={state} />
2931
<Alert alert={state.alert} />
3032
</section>
33+
</ReactCSSTransitionGroup>
3134
);
3235
}
3336
};

‎src/components/page/task.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import {MarkdownText} from '../_components';
33
import {List, ListItem} from 'material-ui';
4-
import {green500, orange500} from 'material-ui/lib/styles/colors';
4+
import * as Colors from 'material-ui/lib/styles/colors';
55
const iconPath = 'material-ui/lib/svg-icons/';
66
let Complete = require(iconPath + 'toggle/check-box');
77
let Incomplete = require(iconPath + 'toggle/check-box-outline-blank');
@@ -14,10 +14,10 @@ function visibleTasks(tasks: CR.Task[], taskPosition: number) {
1414
const TaskCheckbox = ({index, taskPosition, runTests}) => {
1515
let icon = null;
1616
if (index < taskPosition) {
17-
icon = <Complete color={green500} />;
17+
icon = <Complete color={Colors.green500} />;
1818
} else if (index === taskPosition && runTests) {
1919
// TODO: loading animation inside of checkbox
20-
icon = <RunningTest color={orange500} />;
20+
icon = <RunningTest color={Colors.orange500} />;
2121
} else {
2222
icon = <Incomplete />;
2323
}

0 commit comments

Comments
 (0)