ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit 12fde38132e9a692399725d674f18c7e6afec71e
parent 03f20e71e2de3f7b0ee3a7e9d221a23a658d160f
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Tue, 23 Sep 2014 22:16:44 +0400

Update double-arrow syntax in .jsx files. Closes #16

Diffstat:
Mconfig/karma.js | 2++
Mconfig/webpack.js | 8+++++++-
Mpackage.json | 2++
Msrc/components/Navbar.jsx | 19++++++++-----------
Msrc/components/NavbarSpec.jsx | 6+++++-
Msrc/layouts/Default.jsx | 31++++++++++++++-----------------
Msrc/pages/Home.jsx | 59++++++++++++++++++++++++++++-------------------------------
Msrc/pages/Privacy.jsx | 91++++++++++++++++++++++++++++++++++++++-----------------------------------------
8 files changed, 110 insertions(+), 108 deletions(-)

diff --git a/config/karma.js b/config/karma.js @@ -8,6 +8,8 @@ * http://karma-runner.github.io/0.12/config/configuration-file.html */ +'use strict'; + var webpackConfig = require('./webpack.js')(/* release */ false); module.exports = function (config) { diff --git a/config/webpack.js b/config/webpack.js @@ -8,6 +8,8 @@ * http://webpack.github.io/docs/configuration */ +'use strict'; + var webpack = require('webpack'); module.exports = function (release) { @@ -43,7 +45,7 @@ module.exports = function (release) { module: { preLoaders: [ { - test: '\\.js$', + test: /\.js$/, exclude: 'node_modules', loader: 'jshint' } @@ -55,6 +57,10 @@ module.exports = function (release) { loader: 'style!css' }, { + test: /\.less$/, + loader: 'style!css!less' + }, + { test: /\.gif/, loader: 'url-loader?limit=10000&mimetype=image/gif' }, diff --git a/package.json b/package.json @@ -29,6 +29,8 @@ "gulp-plumber": "^0.6.5", "gulp-uglify": "^1.0.1", "gulp-util": "^3.0.1", + "jshint": "^2.5.6", + "jshint-loader": "^0.8.0", "jshint-stylish": "^1.0.0", "jsx-loader": "^0.11.0", "karma": "^0.12.23", diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx @@ -8,18 +8,15 @@ var React = require('react'); var {Link} = require('react-router'); var Navbar = React.createClass({ - render: () => { - return ( - <div className="navbar-top"> - <div className="container"> - <Link className="navbar-brand row" to="home"> - <img src="/images/logo-small.png" width="38" height="38" alt="React" /> - {' Facebook React Starter Kit'} - </Link> - </div> + render: () => + <div className="navbar-top"> + <div className="container"> + <Link className="navbar-brand row" to="home"> + <img src="/images/logo-small.png" width="38" height="38" alt="React" /> + {' Facebook React Starter Kit'} + </Link> </div> - ); - } + </div> }); module.exports = Navbar; diff --git a/src/components/NavbarSpec.jsx b/src/components/NavbarSpec.jsx @@ -1,3 +1,7 @@ +/** + * @jsx React.DOM + */ + 'use strict'; describe('Navbar', () => { @@ -5,7 +9,7 @@ describe('Navbar', () => { beforeEach(() => { Navbar = require('./Navbar.jsx'); - component = Navbar(); + component = new Navbar(); }); it('should create a new instance of Navbar', () => { diff --git a/src/layouts/Default.jsx b/src/layouts/Default.jsx @@ -9,26 +9,23 @@ var {Link} = require('react-router'); var Navbar = require('../components/Navbar.jsx'); var DefaultLayout = React.createClass({ - render: () => { - return ( - <div> - <Navbar /> - <div className="jumbotron"> - <div className="container text-center"> - <h1>React</h1> - <p>Complex web apps made easy</p> - </div> + render: () => + <div> + <Navbar /> + <div className="jumbotron"> + <div className="container text-center"> + <h1>React</h1> + <p>Complex web apps made easy</p> </div> - <this.props.activeRouteHandler /> - <div className="navbar-footer"> - <div className="container"> - <p className="text-muted"> - &copy; KriaSoft • <Link to="home">Home</Link> • <Link to="privacy">Privacy</Link></p> - </div> + </div> + <this.props.activeRouteHandler /> + <div className="navbar-footer"> + <div className="container"> + <p className="text-muted"> + &copy; KriaSoft • <Link to="home">Home</Link> • <Link to="privacy">Privacy</Link></p> </div> </div> - ); - } + </div> }); module.exports = DefaultLayout; diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx @@ -7,40 +7,37 @@ var React = require('react'); var HomePage = React.createClass({ - render: () => { - return ( - <div className="container"> - <div className="row"> - <div className="col-sm-4"> - <h3>Runtime Components</h3> - <dl> - <dt><a href="https://facebook.github.io/react/">React</a></dt> - <dd>A JavaScript library for building user interfaces, developed by Facebook</dd> - <dt><a href="https://github.com/rackt/react-router">React-Router</a></dt> - <dd>A complete routing library for React</dd> - <dt><a href="http://getbootstrap.com/">Bootstrap</a></dt> - <dd>CSS framework for developing responsive, mobile first interfaces</dd> + render: () => + <div className="container"> + <div className="row"> + <div className="col-sm-4"> + <h3>Runtime Components</h3> + <dl> + <dt><a href="https://facebook.github.io/react/">React</a></dt> + <dd>A JavaScript library for building user interfaces, developed by Facebook</dd> + <dt><a href="https://github.com/rackt/react-router">React-Router</a></dt> + <dd>A complete routing library for React</dd> + <dt><a href="http://getbootstrap.com/">Bootstrap</a></dt> + <dd>CSS framework for developing responsive, mobile first interfaces</dd> + </dl> + </div> + <div className="col-sm-4"> + <h3>Development Tools</h3> + <dl> + <dt><a href="http://gulpjs.com">Gulp</a></dt> + <dd>JavaScript streaming build system and task automation</dd> + <dt><a href="http://webpack.github.io/">Webpack</a></dt> + <dd>Compiles front-end source code into modules / bundles</dd> + <dt><a href="http://www.browsersync.io/">BrowserSync</a></dt> + <dd>A lightweight HTTP server for development</dd> </dl> - </div> - <div className="col-sm-4"> - <h3>Development Tools</h3> - <dl> - <dt><a href="http://gulpjs.com">Gulp</a></dt> - <dd>JavaScript streaming build system and task automation</dd> - <dt><a href="http://webpack.github.io/">Webpack</a></dt> - <dd>Compiles front-end source code into modules / bundles</dd> - <dt><a href="http://www.browsersync.io/">BrowserSync</a></dt> - <dd>A lightweight HTTP server for development</dd> - </dl> - </div> - <div className="col-sm-4"> - <h3>Fork me on GitHub</h3> - <p><a href="https://github.com/kriasoft/react-starter-kit">github.com/kriasoft/react-starter-kit</a></p> - </div> + </div> + <div className="col-sm-4"> + <h3>Fork me on GitHub</h3> + <p><a href="https://github.com/kriasoft/react-starter-kit">github.com/kriasoft/react-starter-kit</a></p> </div> </div> - ); - } + </div> }); module.exports = HomePage; diff --git a/src/pages/Privacy.jsx b/src/pages/Privacy.jsx @@ -7,53 +7,50 @@ var React = require('react'); var PrivacyPage = React.createClass({ - render: () => { - return ( - <div className="container"> - <h2>Privacy Policy</h2> - <p> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean consequat tortor fermentum mi - fermentum dignissim. Nullam vel ipsum ut ligula elementum lobortis. Maecenas aliquam, massa laoreet - lacinia pretium, nisi urna venenatis tortor, nec imperdiet tellus libero efficitur metus. Fusce - semper posuere ligula, et facilisis metus bibendum interdum. Mauris at mauris sit amet sem pharetra - commodo a eu leo. Nam at est non risus cursus maximus. Nam feugiat augue libero, id consectetur - tortor bibendum non. Quisque nec fringilla lorem. Nullam efficitur vulputate mauris, nec maximus leo - dignissim id. - </p> - <p> - In hac habitasse platea dictumst. Duis sagittis dui ac ex suscipit maximus. Morbi pellentesque - venenatis felis sed convallis. Nulla varius, nibh vitae placerat tempus, mauris sem elementum ipsum, - eget sollicitudin nisl est vel purus. Fusce malesuada odio velit, non cursus leo fermentum id. Cras - pharetra sodales fringilla. Etiam quis est a dolor egestas pellentesque. Maecenas non scelerisque - purus, congue cursus arcu. Donec vel dapibus mi. Mauris maximus posuere placerat. Sed et libero eu - nibh tristique mollis a eget lectus. Donec interdum augue sollicitudin vehicula hendrerit. Vivamus - justo orci, molestie ac sollicitudin ac, lobortis at tellus. Etiam rhoncus ullamcorper risus eu - tempor. Sed porttitor, neque ac efficitur gravida, arcu lacus pharetra dui, in consequat elit tellus - auctor nulla. Donec placerat elementum diam, vitae imperdiet lectus luctus at. - </p> - <p> - Nullam eu feugiat mi. Quisque nec tristique nisl, dignissim dictum leo. Nam non quam nisi. Donec - rutrum turpis ac diam blandit, id pulvinar mauris suscipit. Pellentesque tincidunt libero ultricies - risus iaculis, sit amet consequat velit blandit. Fusce quis varius nulla. Nullam nisi nisi, suscipit - ut magna quis, feugiat porta nibh. Sed id enim lectus. Suspendisse elementum justo sapien, sit amet - consequat orci accumsan et. Aliquam ornare ullamcorper sem sed finibus. Nullam ac lacus pulvinar, - egestas felis ut, accumsan est. - </p> - <p> - Pellentesque sagittis vehicula sem quis luctus. Proin sodales magna in lorem hendrerit aliquam. - Integer eu varius orci. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere - cubilia Curae; Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia - Curae; Ut at mauris nibh. Suspendisse maximus ac eros at vestibulum. - </p> - <p> - Interdum et malesuada fames ac ante ipsum primis in faucibus. Quisque egestas tortor et dui - consequat faucibus. Nunc vitae odio ornare, venenatis ligula a, vulputate nisl. Aenean congue varius - ex, sit amet bibendum odio posuere at. Nulla facilisi. In finibus, nulla vitae tincidunt ornare, - sapien nulla fermentum mauris, sed consectetur tortor arcu eget arcu. Vestibulum vel quam enim. - </p> - </div> - ); - } + render: () => + <div className="container"> + <h2>Privacy Policy</h2> + <p> + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean consequat tortor fermentum mi + fermentum dignissim. Nullam vel ipsum ut ligula elementum lobortis. Maecenas aliquam, massa laoreet + lacinia pretium, nisi urna venenatis tortor, nec imperdiet tellus libero efficitur metus. Fusce + semper posuere ligula, et facilisis metus bibendum interdum. Mauris at mauris sit amet sem pharetra + commodo a eu leo. Nam at est non risus cursus maximus. Nam feugiat augue libero, id consectetur + tortor bibendum non. Quisque nec fringilla lorem. Nullam efficitur vulputate mauris, nec maximus leo + dignissim id. + </p> + <p> + In hac habitasse platea dictumst. Duis sagittis dui ac ex suscipit maximus. Morbi pellentesque + venenatis felis sed convallis. Nulla varius, nibh vitae placerat tempus, mauris sem elementum ipsum, + eget sollicitudin nisl est vel purus. Fusce malesuada odio velit, non cursus leo fermentum id. Cras + pharetra sodales fringilla. Etiam quis est a dolor egestas pellentesque. Maecenas non scelerisque + purus, congue cursus arcu. Donec vel dapibus mi. Mauris maximus posuere placerat. Sed et libero eu + nibh tristique mollis a eget lectus. Donec interdum augue sollicitudin vehicula hendrerit. Vivamus + justo orci, molestie ac sollicitudin ac, lobortis at tellus. Etiam rhoncus ullamcorper risus eu + tempor. Sed porttitor, neque ac efficitur gravida, arcu lacus pharetra dui, in consequat elit tellus + auctor nulla. Donec placerat elementum diam, vitae imperdiet lectus luctus at. + </p> + <p> + Nullam eu feugiat mi. Quisque nec tristique nisl, dignissim dictum leo. Nam non quam nisi. Donec + rutrum turpis ac diam blandit, id pulvinar mauris suscipit. Pellentesque tincidunt libero ultricies + risus iaculis, sit amet consequat velit blandit. Fusce quis varius nulla. Nullam nisi nisi, suscipit + ut magna quis, feugiat porta nibh. Sed id enim lectus. Suspendisse elementum justo sapien, sit amet + consequat orci accumsan et. Aliquam ornare ullamcorper sem sed finibus. Nullam ac lacus pulvinar, + egestas felis ut, accumsan est. + </p> + <p> + Pellentesque sagittis vehicula sem quis luctus. Proin sodales magna in lorem hendrerit aliquam. + Integer eu varius orci. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere + cubilia Curae; Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia + Curae; Ut at mauris nibh. Suspendisse maximus ac eros at vestibulum. + </p> + <p> + Interdum et malesuada fames ac ante ipsum primis in faucibus. Quisque egestas tortor et dui + consequat faucibus. Nunc vitae odio ornare, venenatis ligula a, vulputate nisl. Aenean congue varius + ex, sit amet bibendum odio posuere at. Nulla facilisi. In finibus, nulla vitae tincidunt ornare, + sapien nulla fermentum mauris, sed consectetur tortor arcu eget arcu. Vestibulum vel quam enim. + </p> + </div> }); module.exports = PrivacyPage;