Merge 9807dda into 62c1aa2

app/app.js

@@ -8,13 +8,6 @@
 // Needed for redux-saga es6 generator support
 import 'babel-polyfill';
 
-/* eslint-disable import/no-unresolved, import/extensions */
-// Load the favicon, the manifest.json file and the .htaccess file
-import 'file?name=[name].[ext]!./favicon.ico';
-import '!file?name=[name].[ext]!./manifest.json';
-import 'file?name=[name].[ext]!./.htaccess';
-/* eslint-enable import/no-unresolved, import/extensions */
-
 // Import all the third party stuff
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -23,15 +16,33 @@ import { applyRouterMiddleware, Router, browserHistory } from 'react-router';
 import { syncHistoryWithStore } from 'react-router-redux';
 import FontFaceObserver from 'fontfaceobserver';
 import { useScroll } from 'react-router-scroll';
+import 'sanitize.css/sanitize.css';
+
 import configureStore from './store';
 
+// Load the favicon, the manifest.json file and the .htaccess file
+/* eslint-disable import/no-webpack-loader-syntax */
+import '!file?name=[name].[ext]!./favicon.ico';
+import '!file?name=[name].[ext]!./manifest.json';
+import 'file?name=[name].[ext]!./.htaccess'; // eslint-disable-line import/extensions
+/* eslint-enable import/no-webpack-loader-syntax */
+
 // Import Language Provider
 import LanguageProvider from 'containers/LanguageProvider';
 
+// Import i18n messages
+import { translationMessages } from './i18n';
+
 // Import CSS reset and Global Styles
-import 'sanitize.css/sanitize.css';
 import './global-styles';
 
+// Import selector for `syncHistoryWithStore`
+import { selectLocationState } from 'containers/App/selectors';
+
+// Import root app and routes
+import App from 'containers/App';
+import createRoutes from './routes';
+
 // Observe loading of Open Sans (to remove open sans, remove the <link> tag in
 // the index.html file and this observer)
 const openSansObserver = new FontFaceObserver('Open Sans', {});
@@ -43,9 +54,6 @@ openSansObserver.load().then(() => {
   document.body.classList.remove('fontLoaded');
 });
 
-// Import i18n messages
-import { translationMessages } from './i18n';
-
 // Create redux store with history
 // this uses the singleton browserHistory provided by react-router
 // Optionally, this could be changed to leverage a created history
@@ -56,14 +64,11 @@ const store = configureStore(initialState, browserHistory);
 // Sync history and store, as the react-router-redux reducer
 // is under the non-default key ("routing"), selectLocationState
 // must be provided for resolving how to retrieve the "route" in the state
-import { selectLocationState } from 'containers/App/selectors';
 const history = syncHistoryWithStore(browserHistory, store, {
   selectLocationState: selectLocationState(),
 });
 
 // Set up the router, wrapping all Routes in the App component
-import App from 'containers/App';
-import createRoutes from './routes';
 const rootRoute = {
   component: App,
   childRoutes: createRoutes(store),

app/components/A/tests/index.test.js

@@ -2,10 +2,10 @@
  * Testing our link component
  */
 
-import A from '../index';
-
-import { shallow } from 'enzyme';
 import React from 'react';
+import { shallow } from 'enzyme';
+
+import A from '../index';
 
 const href = 'http://mxstbr.com/';
 const children = (<h1>Test</h1>);

app/components/Button/tests/A.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import A from '../A';

app/components/Button/tests/StyledButton.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import StyledButton from '../StyledButton';

app/components/Button/tests/Wrapper.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import Wrapper from '../Wrapper';

app/components/Button/tests/index.test.js

@@ -2,10 +2,10 @@
  * Testing our Button component
  */
 
-import Button from '../index';
-
-import { mount } from 'enzyme';
 import React from 'react';
+import { mount } from 'enzyme';
+
+import Button from '../index';
 
 const handleRoute = () => {};
 const href = 'http://mxstbr.com';

app/components/Footer/tests/Wrapper.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import Wrapper from '../Wrapper';

app/components/Footer/tests/index.test.js

@@ -1,5 +1,5 @@
-import { shallow } from 'enzyme';
 import React from 'react';
+import { shallow } from 'enzyme';
 import { FormattedMessage } from 'react-intl';
 
 import messages from '../messages';

app/components/H1/tests/index.test.js

@@ -1,7 +1,7 @@
-import H1 from '../index';
-
-import { shallow } from 'enzyme';
 import React from 'react';
+import { shallow } from 'enzyme';
+
+import H1 from '../index';
 
 describe('<H1 />', () => {
   it('should render a prop', () => {

app/components/H2/tests/index.test.js

@@ -1,7 +1,7 @@
-import H2 from '../index';
-
-import { shallow } from 'enzyme';
 import React from 'react';
+import { shallow } from 'enzyme';
+
+import H2 from '../index';
 
 describe('<H2 />', () => {
   it('should render a prop', () => {

app/components/H3/tests/index.test.js

@@ -1,7 +1,7 @@
-import H3 from '../index';
-
-import { shallow } from 'enzyme';
 import React from 'react';
+import { shallow } from 'enzyme';
+
+import H3 from '../index';
 
 describe('<H3 />', () => {
   it('should render a prop', () => {

app/components/Header/tests/A.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { mount, render } from 'enzyme';
 
 import A from '../A';

app/components/Header/tests/Img.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { mount, render } from 'enzyme';
 
 import Img from '../Img';

app/components/Header/tests/index.test.js

@@ -1,5 +1,5 @@
-import { shallow } from 'enzyme';
 import React from 'react';
+import { shallow } from 'enzyme';
 
 import Header from '../index';
 

app/components/Img/tests/index.test.js

@@ -1,8 +1,7 @@
-import Img from '../index';
-
-
-import { shallow } from 'enzyme';
 import React from 'react';
+import { shallow } from 'enzyme';
+
+import Img from '../index';
 
 const src = 'test.png';
 const alt = 'test';

app/components/IssueIcon/tests/index.test.js

@@ -1,7 +1,7 @@
-import IssueIcon from '../index';
-
-import { shallow } from 'enzyme';
 import React from 'react';
+import { shallow } from 'enzyme';
+
+import IssueIcon from '../index';
 
 describe('<IssueIcon />', () => {
   it('should render a SVG', () => {

app/components/List/tests/Ul.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import Ul from '../Ul';

app/components/List/tests/Wrapper.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import Wrapper from '../Wrapper';

app/components/List/tests/index.test.js

@@ -1,5 +1,5 @@
-import { render } from 'enzyme';
 import React from 'react';
+import { render } from 'enzyme';
 
 import List from '../index';
 import ListItem from 'components/ListItem';

app/components/ListItem/tests/Item.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import Item from '../Item';

app/components/ListItem/tests/Wrapper.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import Wrapper from '../Wrapper';

app/components/ListItem/tests/index.test.js

@@ -1,7 +1,7 @@
-import ListItem from '../index';
-
-import { mount } from 'enzyme';
 import React from 'react';
+import { mount } from 'enzyme';
+
+import ListItem from '../index';
 
 describe('<ListItem />', () => {
   it('should have a className', () => {

app/components/LoadingIndicator/tests/Circle.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { mount } from 'enzyme';
 
 import Circle from '../Circle';

app/components/LoadingIndicator/tests/Wrapper.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import Wrapper from '../Wrapper';

app/components/LoadingIndicator/tests/index.test.js

@@ -1,8 +1,7 @@
-import LoadingIndicator from '../index';
-
+import React from 'react';
 import { render } from 'enzyme';
 
-import React from 'react';
+import LoadingIndicator from '../index';
 
 describe('<LoadingIndicator />', () => {
   it('should render 13 divs', () => {

app/components/Toggle/tests/Select.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import Select from '../Select';

app/components/Toggle/tests/index.test.js

@@ -1,8 +1,8 @@
-import Toggle from '../index';
-
+import React from 'react';
 import { shallow } from 'enzyme';
 import { IntlProvider, defineMessages } from 'react-intl';
-import React from 'react';
+
+import Toggle from '../index';
 
 describe('<Toggle />', () => {
   it('should contain default text', () => {

app/components/ToggleOption/tests/index.test.js

@@ -1,8 +1,8 @@
-import ToggleOption from '../index';
-
+import React from 'react';
 import { shallow } from 'enzyme';
 import { IntlProvider, defineMessages } from 'react-intl';
-import React from 'react';
+
+import ToggleOption from '../index';
 
 describe('<ToggleOption />', () => {
   it('should render default language messages', () => {

app/containers/App/reducer.js

@@ -10,12 +10,13 @@
  *   return state.set('yourStateVariable', true);
  */
 
+import { fromJS } from 'immutable';
+
 import {
   LOAD_REPOS_SUCCESS,
   LOAD_REPOS,
   LOAD_REPOS_ERROR,
 } from './constants';
-import { fromJS } from 'immutable';
 
 // The initial state of the App
 const initialState = fromJS({

app/containers/App/tests/index.test.js

@@ -1,10 +1,10 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+
 import App from '../index';
 import Header from 'components/Header';
 import Footer from 'components/Footer';
 
-import { shallow } from 'enzyme';
-import React from 'react';
-
 describe('<App />', () => {
   it('should render the header', () => {
     const renderedComponent = shallow(

app/containers/App/tests/reducer.test.js

@@ -1,10 +1,11 @@
+import { fromJS } from 'immutable';
+
 import appReducer from '../reducer';
 import {
   loadRepos,
   reposLoaded,
   repoLoadingError,
 } from '../actions';
-import { fromJS } from 'immutable';
 
 describe('appReducer', () => {
   let state;

app/containers/FeaturePage/index.js

@@ -5,9 +5,9 @@
  */
 import React from 'react';
 import Helmet from 'react-helmet';
+import { FormattedMessage } from 'react-intl';
 
 import messages from './messages';
-import { FormattedMessage } from 'react-intl';
 import H1 from 'components/H1';
 import List from './List';
 import ListItem from './ListItem';

app/containers/FeaturePage/tests/List.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import List from '../List';

app/containers/FeaturePage/tests/ListItem.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import ListItem from '../ListItem';

app/containers/FeaturePage/tests/ListItemTitle.test.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import { shallow } from 'enzyme';
 
 import ListItemTitle from '../ListItemTitle';

app/containers/FeaturePage/tests/index.test.js

@@ -1,7 +1,7 @@
-import { shallow } from 'enzyme';
 import React from 'react';
-
+import { shallow } from 'enzyme';
 import { FormattedMessage } from 'react-intl';
+
 import messages from '../messages';
 import FeaturePage from '../index';
 import H1 from 'components/H1';

app/containers/HomePage/reducer.js

@@ -9,11 +9,11 @@
  * case YOUR_ACTION_CONSTANT:
  *   return state.set('yourStateVariable', true);
  */
+import { fromJS } from 'immutable';
 
 import {
   CHANGE_USERNAME,
 } from './constants';
-import { fromJS } from 'immutable';
 
 // The initial state of the App
 const initialState = fromJS({