Merge branch 'master' into jw-react-upgrade

website/src/actions.js

@@ -1,7 +1,6 @@
-import get from 'lodash/get';
 import axios from 'axios';
 // import {replace} from 'connected-react-router';
-
+import get from 'lodash/get';
 import {SDOW_API_URL} from './resources/constants';
 
 // Router location changed action from react-router-dom.

website/src/components/ErrorMessage.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import styled from 'styled-components';
 
 const P = styled.p`

website/src/components/Loading.js

@@ -1,10 +1,7 @@
 import React, {Component} from 'react';
-
-import {Fact, Wrapper, LoadingIndicator} from './Loading.styles.js';
-
+import {getRandomWikipediaFact, getWikipediaPageUrl} from '../utils';
 import StyledLink from './common/StyledLink';
-
-import {getWikipediaPageUrl, getRandomWikipediaFact} from '../utils';
+import {Fact, LoadingIndicator, Wrapper} from './Loading.styles.js';
 
 class Loading extends Component {
   constructor() {

website/src/components/NavLinks.js

@@ -1,6 +1,5 @@
 import React from 'react';
-
-import {Wrapper, TextLink, TextLinkInternal} from './NavLinks.styles';
+import {TextLink, TextLinkInternal, Wrapper} from './NavLinks.styles';
 
 const NavLinks = ({handleOpenModal}) => (
   <Wrapper>

website/src/components/NavLinks.styles.js

@@ -1,5 +1,5 @@
-import styled from 'styled-components';
 import {Link} from 'react-router-dom';
+import styled from 'styled-components';
 
 export const Wrapper = styled.div`
   position: absolute;

website/src/components/PageInput.js

@@ -1,18 +1,14 @@
-import get from 'lodash/get';
+import axios from 'axios';
+import debounce from 'lodash/debounce';
 import filter from 'lodash/filter';
 import forEach from 'lodash/forEach';
-import debounce from 'lodash/debounce';
-import axios from 'axios';
+import get from 'lodash/get';
 import React from 'react';
 import Autosuggest from 'react-autosuggest';
-
+import {WIKIPEDIA_API_URL} from '../resources/constants';
 import {getRandomPageTitle} from '../utils';
-
-import PageInputSuggestion from './PageInputSuggestion';
-
 import {AutosuggestWrapper} from './PageInput.styles';
-
-import {WIKIPEDIA_API_URL} from '../resources/constants';
+import PageInputSuggestion from './PageInputSuggestion';
 
 // Autosuggest component helpers.
 const getSuggestionValue = (suggestion) => suggestion.title;

website/src/components/PageInputSuggestion.js

@@ -1,8 +1,6 @@
 import React from 'react';
-
-import {Description, InnerWrapper, Image, Title, Wrapper} from './PageInputSuggestion.styles';
-
 import defaultPageThumbnail from '../images/defaultPageThumbnail.png';
+import {Description, Image, InnerWrapper, Title, Wrapper} from './PageInputSuggestion.styles';
 
 const PageInputSuggestion = ({title, description, thumbnailUrl}) => {
   const descriptionContent = description ? <Description>{description}</Description> : null;

website/src/components/Results.js

@@ -1,17 +1,14 @@
 import React, {Component} from 'react';
-
-import ResultsList from './ResultsList';
-import ResultsGraph from './ResultsGraph';
+import {getNumberWithCommas, getWikipediaPageUrl} from '../utils';
 import StyledLink from './common/StyledLink';
-
 import {
   ResultsMessage,
-  TwitterButtonWrapper,
-  TwitterButton,
   TwitterBirdSvg,
+  TwitterButton,
+  TwitterButtonWrapper,
 } from './Results.styles';
-
-import {getNumberWithCommas, getWikipediaPageUrl} from '../utils';
+import ResultsGraph from './ResultsGraph';
+import ResultsList from './ResultsList';
 
 class Results extends Component {
   /**

website/src/components/ResultsGraph.js

@@ -1,14 +1,12 @@
+import * as d3 from 'd3';
+import debounce from 'lodash/debounce';
+import forEach from 'lodash/forEach';
 import map from 'lodash/map';
-import some from 'lodash/some';
 import range from 'lodash/range';
-import forEach from 'lodash/forEach';
-import debounce from 'lodash/debounce';
-import * as d3 from 'd3';
+import some from 'lodash/some';
 // import {findDOMNode} from 'react-dom';
 import React, {Component} from 'react';
-
 import {getWikipediaPageUrl} from '../utils';
-
 import {
   GraphSvg,
   GraphWrapper,
@@ -362,7 +360,4 @@ class Graph extends Component {
   }
 }
 
-// TODO: add prop types
-Graph.propTypes = {};
-
 export default Graph;

website/src/components/ResultsGraph.styles.js

@@ -1,5 +1,4 @@
 import styled from 'styled-components';
-
 import Button from './common/Button';
 
 export const GraphWrapper = styled.div`

website/src/components/ResultsList.js

@@ -1,21 +1,19 @@
 import * as d3 from 'd3';
 import React from 'react';
 import LazyLoad from 'react-lazyload';
-
+import defaultPageThumbnail from '../images/defaultPageThumbnail.png';
 import {
-  ResultsListHeader,
   PageDescription,
   PageImage,
+  PageInnerWrapper,
   PageTitle,
   PageWrapper,
-  PageInnerWrapper,
+  ResultsListHeader,
   ResultsListItemWrapper,
-  ResultsListWrapper,
   ResultsListOtherPathsText,
+  ResultsListWrapper,
 } from './ResultsList.styles';
 
-import defaultPageThumbnail from '../images/defaultPageThumbnail.png';
-
 const ResultListItem = ({pages}) => {
   const color = d3.scaleOrdinal(d3.schemeCategory10);
 

website/src/components/blog/Blog/index.js

@@ -1,21 +1,18 @@
 import React from 'react';
 import {Helmet} from 'react-helmet';
-
 import Logo from '../../common/Logo';
 import StyledLink from '../../common/StyledLink';
 import NewsletterSignupForm from '../NewsletterSignupForm';
-
+import posts from '../posts/index.json';
 import {
-  Title,
-  Wrapper,
-  Divider,
   BlogPostCardWrapper,
   BlogPostDate,
   BlogPostDescription,
+  Divider,
+  Title,
+  Wrapper,
 } from './index.styles';
 
-import posts from '../posts/index.json';
-
 const BlogPostCard = ({id, date, title, description}) => (
   <BlogPostCardWrapper>
     <StyledLink href={`/blog/${id}`}>{title}</StyledLink>

website/src/components/blog/BlogPost/index.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import Loadable from 'react-loadable';
-import {useParams, Redirect} from 'react-router-dom';
-
+import {Redirect, useParams} from 'react-router-dom';
 import Logo from '../../common/Logo';
 
 const AsyncSearchResultsAnalysisPost = Loadable({

website/src/components/blog/NewsletterSignupForm/index.js

@@ -1,6 +1,5 @@
 import React, {Component} from 'react';
-
-import {Wrapper, Intro, Form, FormInput, HiddenBotInput, SubscribeButton} from './index.styles';
+import {Form, FormInput, HiddenBotInput, Intro, SubscribeButton, Wrapper} from './index.styles';
 
 class NewsletterSignupForm extends Component {
   constructor(props) {

website/src/components/blog/posts/SearchResultsAnalysisPost/data.js

@@ -1,7 +1,6 @@
 import React from 'react';
-import StyledLink from '../../../common/StyledLink';
-
 import {getNumberWithCommas, getWikipediaPageUrl} from '../../../../utils';
+import StyledLink from '../../../common/StyledLink';
 
 export const totalSearches = 503498;
 export const uniqueSearches = 377135;

website/src/components/blog/posts/SearchResultsAnalysisPost/index.js

@@ -1,28 +1,23 @@
 import React from 'react';
 import {Helmet} from 'react-helmet';
-
-import Table from '../../../charts/Table';
+import {getNumberWithCommas} from '../../../../utils';
 import BarChart from '../../../charts/BarChart';
+import Table from '../../../charts/Table';
 import StyledLink from '../../../common/StyledLink';
-import NewsletterSignupForm from '../../NewsletterSignupForm';
-
 import {
-  P,
-  Image,
-  Title,
   Divider,
-  Subtitle,
+  Image,
+  P,
   SectionTitle,
   Stat,
   StatsWrapper,
+  Subtitle,
+  Title,
   Wrapper,
 } from '../../BlogPost/index.styles';
-
-import {getNumberWithCommas} from '../../../../utils';
-
-import elevenDegreesOfSeparationSearchImage from './elevenDegreesOfSeparationSearch.png';
-
+import NewsletterSignupForm from '../../NewsletterSignupForm';
 import * as data from './data';
+import elevenDegreesOfSeparationSearchImage from './elevenDegreesOfSeparationSearch.png';
 
 const title = 'Insights On Hitler And More From The First 500,000 Searches';
 

website/src/components/charts/BarChart/index.js

@@ -1,8 +1,7 @@
-import debounce from 'lodash/debounce';
 import * as d3 from 'd3';
+import debounce from 'lodash/debounce';
 import React, {Component} from 'react';
-
-import {BarChartWrapper, BarChartSvg} from './index.styles';
+import {BarChartSvg, BarChartWrapper} from './index.styles';
 
 const DEFAULT_CHART_HEIGHT = 300;
 

website/src/components/charts/Table/index.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import {TableWrapper} from './index.styles';
 
 const Table = ({headers, rows}) => {

website/src/components/common/Logo/index.js

@@ -1,7 +1,6 @@
 import React from 'react';
-import styled from 'styled-components';
 import {Link} from 'react-router-dom';
-
+import styled from 'styled-components';
 import logo from '../../../images/logo.png';
 import logo2x from '../../../images/[email protected]';
 

website/src/configureStore.js

@@ -1,7 +1,7 @@
-import thunk from 'redux-thunk';
+// import {routerMiddleware} from 'connected-react-router';
 import {createBrowserHistory} from 'history';
 import {applyMiddleware, compose, createStore} from 'redux';
-
+import thunk from 'redux-thunk';
 import createRootReducer from './reducers';
 
 export const history = createBrowserHistory();

website/src/containers/ErrorMessageContainer.js

@@ -1,5 +1,4 @@
 import {connect} from 'react-redux';
-
 import ErrorMessage from '../components/ErrorMessage';
 
 const mapStateToProps = ({errorMessage}) => ({errorMessage});

website/src/containers/LoadingContainer.js

@@ -1,5 +1,4 @@
 import {connect} from 'react-redux';
-
 import Loading from '../components/Loading';
 
 const mapStateToProps = ({isFetchingResults}) => ({isFetchingResults});

website/src/containers/ResultsContainer.js

@@ -1,5 +1,4 @@
 import {connect} from 'react-redux';
-
 import Results from '../components/Results';
 
 const mapStateToProps = ({results, isFetchingResults}) => ({

website/src/containers/SourcePageInputContainer.js

@@ -1,7 +1,5 @@
 import {connect} from 'react-redux';
-
-import {setSourcePageTitle, setSourcePagePlaceholderText} from '../actions';
-
+import {setSourcePagePlaceholderText, setSourcePageTitle} from '../actions';
 import PageInput from '../components/PageInput';
 
 const mapStateToProps = ({sourcePageTitle, sourcePagePlaceholderText}) => ({

website/src/containers/SwapInputValuesButton.js

@@ -1,7 +1,5 @@
 import {connect} from 'react-redux';
-
 import {setSourcePageTitle, setTargetPageTitle} from '../actions';
-
 import SwapInputValuesButton from '../components/SwapInputValuesButton';
 
 const mapStateToProps = ({sourcePageTitle, targetPageTitle}) => ({

website/src/containers/TargetPageInputContainer.js

@@ -1,7 +1,5 @@
 import {connect} from 'react-redux';
-
-import {setTargetPageTitle, setTargetPagePlaceholderText} from '../actions';
-
+import {setTargetPagePlaceholderText, setTargetPageTitle} from '../actions';
 import PageInput from '../components/PageInput';
 
 const mapStateToProps = ({targetPageTitle, targetPagePlaceholderText}) => ({

website/src/index.js

@@ -1,20 +1,16 @@
+import Particles from '@tsparticles/react';
+// import {ConnectedRouter} from 'connected-react-router';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {Provider} from 'react-redux';
 import Loadable from 'react-loadable';
-import Particles from '@tsparticles/react';
+import {Provider} from 'react-redux';
+import {Route, Switch} from 'react-router-dom';
 import {ThemeProvider} from 'styled-components';
-import {Router, Route, Switch} from 'react-router-dom';
-// import {ConnectedRouter} from 'connected-react-router';
+import Home from './components/Home';
 import configureStore, {history} from './configureStore.js';
-
 import registerServiceWorker from './registerServiceWorker';
-
-import Home from './components/Home';
-
-import theme from './resources/theme.json';
 import particlesConfig from './resources/particles.config.json';
-
+import theme from './resources/theme.json';
 import './index.css';
 
 // Load fonts

website/src/reducers/index.js

@@ -1,8 +1,7 @@
+// import {connectRouter} from 'connected-react-router';
 // import get from 'lodash/get';
 // import queryString from 'query-string';
 import {combineReducers} from 'redux';
-// import {connectRouter} from 'connected-react-router';
-
 import * as actions from '../actions';
 
 const defaultResults = {paths: null};

website/src/utils.js

@@ -1,5 +1,4 @@
 import clone from 'lodash/clone';
-
 import pageTitles from './resources/pageTitles.json';
 import wikipediaFacts from './resources/wikipediaFacts.json';