Merge pull request #5175 from HSLdevcom/stop-page-folder

Add folder for stop page components

app/component/StopInfo.js → app/component/itinerary/StopInfo.js

@@ -2,10 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { FormattedMessage } from 'react-intl';
-import { configShape } from '../util/shapes';
-import { durationToString } from '../util/timeUtils';
-import { isKeyboardSelectionEvent } from '../util/browser';
-import Icon from './Icon';
+import { configShape } from '../../util/shapes';
+import { durationToString } from '../../util/timeUtils';
+import { isKeyboardSelectionEvent } from '../../util/browser';
+import Icon from '../Icon';
 
 export default function StopInfo(
   { intermediateStopCount, toggleFunction, duration, showIntermediateStops },

app/component/itinerary/TransitLeg.js

@@ -41,7 +41,7 @@ import { shouldShowFareInfo } from '../../util/fareUtils';
 import { AlertEntityType, AlertSeverityLevelType } from '../../constants';
 import { legShape, configShape } from '../../util/shapes';
 import ZoneIcon from '../ZoneIcon';
-import StopInfo from '../StopInfo';
+import StopInfo from './StopInfo';
 import InterlineInfo from './InterlineInfo';
 import AlternativeLegsInfo from './AlternativeLegsInfo';
 import LegInfo from './LegInfo';

app/component/DateSelect.js → app/component/stop/DateSelect.js

@@ -4,7 +4,7 @@ import moment from 'moment';
 import { intlShape } from 'react-intl';
 
 import Select from 'react-select';
-import Icon from './Icon';
+import Icon from '../Icon';
 
 function DateSelect(props, context) {
   const [isMenuOpen, setIsMenuOpen] = useState(false);

app/component/FilterTimeTableModal.js → app/component/stop/FilterTimeTableModal.js

@@ -4,12 +4,12 @@ import intersection from 'lodash/intersection';
 import { FormattedMessage, intlShape } from 'react-intl';
 import cx from 'classnames';
 import Modal from '@hsl-fi/modal';
-import Icon from './Icon';
-import routeCompare from '../util/route-compare';
-import withBreakpoint from '../util/withBreakpoint';
-import { isKeyboardSelectionEvent } from '../util/browser';
-import { getRouteMode } from '../util/modeUtils';
-import { stopShape } from '../util/shapes';
+import Icon from '../Icon';
+import routeCompare from '../../util/route-compare';
+import withBreakpoint from '../../util/withBreakpoint';
+import { isKeyboardSelectionEvent } from '../../util/browser';
+import { getRouteMode } from '../../util/modeUtils';
+import { stopShape } from '../../util/shapes';
 
 class FilterTimeTableModal extends React.Component {
   static propTypes = {

app/component/StopAlerts.js → app/component/stop/StopAlerts.js

@@ -1,16 +1,16 @@
 import React from 'react';
 import { intlShape } from 'react-intl';
 import { uniq } from 'lodash';
-import AlertList from './AlertList';
+import AlertList from '../AlertList';
 import {
   getCancelationsForStop,
   getAlertsForObject,
   getServiceAlertsForStation,
-} from '../util/alertUtils';
-import { getRouteMode } from '../util/modeUtils';
-import { epochToTime } from '../util/timeUtils';
-import { stopShape, configShape } from '../util/shapes';
-import { AlertSeverityLevelType, AlertEntityType } from '../constants';
+} from '../../util/alertUtils';
+import { getRouteMode } from '../../util/modeUtils';
+import { epochToTime } from '../../util/timeUtils';
+import { stopShape, configShape } from '../../util/shapes';
+import { AlertSeverityLevelType, AlertEntityType } from '../../constants';
 
 export const isRelevantEntity = (entity, stopIds, routeIds) =>
   // eslint-disable-next-line no-underscore-dangle

app/component/StopAlertsContainer.js → app/component/stop/StopAlertsContainer.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { stopShape } from '../util/shapes';
+import { stopShape } from '../../util/shapes';
 import StopAlerts from './StopAlerts';
 
 const StopAlertsContainer = ({ stop }) => {

app/component/StopCardHeader.js → app/component/stop/StopCardHeader.js

@@ -2,15 +2,15 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { intlShape } from 'react-intl';
 import { matchShape } from 'found';
-import { stopShape, stationShape } from '../util/shapes';
-import CardHeader from './CardHeader';
-import { getJson } from '../util/xhrPromise';
-import { saveSearch } from '../action/SearchActions';
-import { isIOS } from '../util/browser';
-import LazilyLoad, { importLazy } from './LazilyLoad';
+import { stopShape, stationShape } from '../../util/shapes';
+import CardHeader from '../CardHeader';
+import { getJson } from '../../util/xhrPromise';
+import { saveSearch } from '../../action/SearchActions';
+import { isIOS } from '../../util/browser';
+import LazilyLoad, { importLazy } from '../LazilyLoad';
 
 const modules = {
-  FavouriteStopContainer: () => importLazy(import('./FavouriteStopContainer')),
+  FavouriteStopContainer: () => importLazy(import('../FavouriteStopContainer')),
 };
 
 class StopCardHeader extends React.Component {

app/component/StopPageContentContainer.js → app/component/stop/StopPageContentContainer.js

@@ -4,13 +4,18 @@ import { createRefetchContainer, graphql } from 'react-relay';
 import connectToStores from 'fluxible-addons-react/connectToStores';
 import { FormattedMessage, intlShape } from 'react-intl';
 import { matchShape, routerShape, RedirectException } from 'found';
-import { configShape, errorShape, relayShape, stopShape } from '../util/shapes';
-import DepartureListContainer from './DepartureListContainer';
-import Loading from './Loading';
-import Icon from './Icon';
-import ScrollableWrapper from './ScrollableWrapper';
-import { isBrowser } from '../util/browser';
-import { PREFIX_STOPS } from '../util/path';
+import {
+  configShape,
+  errorShape,
+  relayShape,
+  stopShape,
+} from '../../util/shapes';
+import DepartureListContainer from '../DepartureListContainer';
+import Loading from '../Loading';
+import Icon from '../Icon';
+import ScrollableWrapper from '../ScrollableWrapper';
+import { isBrowser } from '../../util/browser';
+import { PREFIX_STOPS } from '../../util/path';
 
 class StopPageContent extends React.Component {
   static propTypes = {

app/component/StopPageHeader.js → app/component/stop/StopPageHeader.js

@@ -4,7 +4,7 @@ import getContext from 'recompose/getContext';
 import compose from 'recompose/compose';
 
 import StopCardHeaderContainer from './StopCardHeaderContainer';
-import withBreakpoint from '../util/withBreakpoint';
+import withBreakpoint from '../../util/withBreakpoint';
 
 const StopPageHeader = compose(
   withBreakpoint,

app/component/StopPageMapContainer.js → app/component/stop/StopPageMapContainer.js

@@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { configShape } from '../util/shapes';
-import StopPageMap from './map/StopPageMap';
+import { configShape } from '../../util/shapes';
+import StopPageMap from '../map/StopPageMap';
 
 function StopPageMapContainer({ stop }) {
   if (!stop) {

app/component/StopPageMeta.js → app/component/stop/StopPageMeta.js

@@ -4,9 +4,9 @@ import { createFragmentContainer, graphql } from 'react-relay';
 import compose from 'recompose/compose';
 import getContext from 'recompose/getContext';
 import mapProps from 'recompose/mapProps';
-import { configShape } from '../util/shapes';
+import { configShape } from '../../util/shapes';
 
-import { generateMetaData } from '../util/metaUtils';
+import { generateMetaData } from '../../util/metaUtils';
 
 const StopPageMeta = compose(
   getContext({ config: configShape, intl: intlShape }),

app/component/StopPageTabContainer.js → app/component/stop/StopPageTabContainer.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { alertShape } from '../util/shapes';
+import { alertShape } from '../../util/shapes';
 import StopPageTabs from './StopPageTabs';
 
 function StopPageTabContainer({ children, stop }) {

app/component/StopPageTabs.js → app/component/stop/StopPageTabs.js

@@ -2,25 +2,25 @@ import cx from 'classnames';
 import React, { useState, useRef } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { matchShape } from 'found';
-import { stopShape } from '../util/shapes';
-import { AlertSeverityLevelType } from '../constants';
+import { stopShape } from '../../util/shapes';
+import { AlertSeverityLevelType } from '../../constants';
 import {
   getCancelationsForStop,
   getAlertsForObject,
   getServiceAlertsForStation,
   getActiveAlertSeverityLevel,
-} from '../util/alertUtils';
-import withBreakpoint from '../util/withBreakpoint';
-import { addAnalyticsEvent } from '../util/analyticsUtils';
-import { unixTime } from '../util/timeUtils';
+} from '../../util/alertUtils';
+import withBreakpoint from '../../util/withBreakpoint';
+import { addAnalyticsEvent } from '../../util/analyticsUtils';
+import { unixTime } from '../../util/timeUtils';
 import {
   PREFIX_DISRUPTION,
   PREFIX_ROUTES,
   PREFIX_STOPS,
   PREFIX_TERMINALS,
   PREFIX_TIMETABLE,
-} from '../util/path';
-import Icon from './Icon';
+} from '../../util/path';
+import Icon from '../Icon';
 
 const Tab = {
   Disruptions: PREFIX_DISRUPTION,

app/component/StopTimetablePage.js → app/component/stop/StopTimetablePage.js

@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { createRefetchContainer, graphql } from 'react-relay';
 import { matchShape, routerShape } from 'found';
-import { unixTime, unixToYYYYMMDD } from '../util/timeUtils';
-import { configShape, relayShape } from '../util/shapes';
-import { prepareServiceDay } from '../util/dateParamUtils';
+import { unixTime, unixToYYYYMMDD } from '../../util/timeUtils';
+import { configShape, relayShape } from '../../util/shapes';
+import { prepareServiceDay } from '../../util/dateParamUtils';
 import TimetableContainer from './TimetableContainer';
 
 class StopTimetablePage extends React.Component {

app/component/TerminalAlertsContainer.js → app/component/stop/TerminalAlertsContainer.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { stationShape } from '../util/shapes';
+import { stationShape } from '../../util/shapes';
 import StopAlerts from './StopAlerts';
 
 const TerminalAlertsContainer = ({ station }) => {

app/component/TerminalPageContentContainer.js → app/component/stop/TerminalPageContentContainer.js

@@ -4,13 +4,13 @@ import { createRefetchContainer, graphql } from 'react-relay';
 import connectToStores from 'fluxible-addons-react/connectToStores';
 import { FormattedMessage } from 'react-intl';
 import { routerShape, RedirectException } from 'found';
-import DepartureListContainer from './DepartureListContainer';
-import Loading from './Loading';
-import Icon from './Icon';
-import ScrollableWrapper from './ScrollableWrapper';
-import { isBrowser } from '../util/browser';
-import { PREFIX_TERMINALS } from '../util/path';
-import { stationShape, errorShape, relayShape } from '../util/shapes';
+import DepartureListContainer from '../DepartureListContainer';
+import Loading from '../Loading';
+import Icon from '../Icon';
+import ScrollableWrapper from '../ScrollableWrapper';
+import { isBrowser } from '../../util/browser';
+import { PREFIX_TERMINALS } from '../../util/path';
+import { stationShape, errorShape, relayShape } from '../../util/shapes';
 
 class TerminalPageContent extends React.Component {
   static propTypes = {

app/component/TerminalPageMapContainer.js → app/component/stop/TerminalPageMapContainer.js

@@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { configShape } from '../util/shapes';
-import StopPageMap from './map/StopPageMap';
+import { configShape } from '../../util/shapes';
+import StopPageMap from '../map/StopPageMap';
 
 const TerminalPageMapContainer = ({ station }) => {
   if (!station) {

app/component/TerminalPageMeta.js → app/component/stop/TerminalPageMeta.js

@@ -4,9 +4,9 @@ import { createFragmentContainer, graphql } from 'react-relay';
 import compose from 'recompose/compose';
 import getContext from 'recompose/getContext';
 import mapProps from 'recompose/mapProps';
-import { configShape } from '../util/shapes';
+import { configShape } from '../../util/shapes';
 
-import { generateMetaData } from '../util/metaUtils';
+import { generateMetaData } from '../../util/metaUtils';
 
 const TerminalPageMeta = compose(
   getContext({ config: configShape, intl: intlShape }),

app/component/TerminalPageTabContainer.js → app/component/stop/TerminalPageTabContainer.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { createFragmentContainer, graphql } from 'react-relay';
-import { alertShape } from '../util/shapes';
+import { alertShape } from '../../util/shapes';
 import StopPageTabs from './StopPageTabs';
 
 function TerminalPageTabContainer({ children, station }) {

app/component/TerminalTimetablePage.js → app/component/stop/TerminalTimetablePage.js

@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { createRefetchContainer, graphql } from 'react-relay';
 import { matchShape, routerShape } from 'found';
-import { configShape, relayShape } from '../util/shapes';
-import { unixTime, unixToYYYYMMDD } from '../util/timeUtils';
-import { prepareServiceDay } from '../util/dateParamUtils';
+import { configShape, relayShape } from '../../util/shapes';
+import { unixTime, unixToYYYYMMDD } from '../../util/timeUtils';
+import { prepareServiceDay } from '../../util/dateParamUtils';
 import TimetableContainer from './TimetableContainer';
 
 class TerminalTimetablePage extends React.Component {

app/component/TimeTableOptionsPanel.js → app/component/stop/TimeTableOptionsPanel.js

@@ -2,10 +2,10 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import uniqBy from 'lodash/uniqBy';
-import Icon from './Icon';
-import { ExtendedRouteTypes } from '../constants';
-import { addAnalyticsEvent } from '../util/analyticsUtils';
-import { stopShape } from '../util/shapes';
+import Icon from '../Icon';
+import { ExtendedRouteTypes } from '../../constants';
+import { addAnalyticsEvent } from '../../util/analyticsUtils';
+import { stopShape } from '../../util/shapes';
 
 const MAX_ROUTEFILTER_LEN = 13;
 

app/component/Timetable.js → app/component/stop/Timetable.js

@@ -8,19 +8,19 @@ import padStart from 'lodash/padStart';
 import { FormattedMessage, intlShape } from 'react-intl';
 import { matchShape, routerShape, RedirectException } from 'found';
 import cx from 'classnames';
-import { configShape } from '../util/shapes';
-import Icon from './Icon';
+import { configShape } from '../../util/shapes';
+import Icon from '../Icon';
 import FilterTimeTableModal from './FilterTimeTableModal';
 import TimeTableOptionsPanel from './TimeTableOptionsPanel';
 import TimetableRow from './TimetableRow';
-import { RealtimeStateType } from '../constants';
-import SecondaryButton from './SecondaryButton';
-import { addAnalyticsEvent } from '../util/analyticsUtils';
+import { RealtimeStateType } from '../../constants';
+import SecondaryButton from '../SecondaryButton';
+import { addAnalyticsEvent } from '../../util/analyticsUtils';
 import DateSelect from './DateSelect';
-import ScrollableWrapper from './ScrollableWrapper';
-import { replaceQueryParams } from '../util/queryUtils';
-import { isBrowser } from '../util/browser';
-import { PREFIX_STOPS } from '../util/path';
+import ScrollableWrapper from '../ScrollableWrapper';
+import { replaceQueryParams } from '../../util/queryUtils';
+import { isBrowser } from '../../util/browser';
+import { PREFIX_STOPS } from '../../util/path';
 
 const mapStopTimes = stoptimesObject =>
   stoptimesObject