Move building (sidebar) and map components to nested dirs

app/src/frontend/app.tsx

@@ -6,12 +6,12 @@ import { parse } from 'query-string';
 import '../../node_modules/bootstrap/dist/css/bootstrap.min.css';
 import './app.css';
 
-import BuildingEdit from './building-edit';
+import BuildingEdit from './building/building-edit';
-import BuildingView from './building-view';
+import BuildingView from './building/building-view';
-import ColouringMap from './map';
+import ColouringMap from './map/map';
 import Header from './header';
-import MultiEdit from './multi-edit';
+import MultiEdit from './building/multi-edit';
-import Overview from './overview';
+import Overview from './building/overview';
 
 import AboutPage from './pages/about';
 import ContributorAgreementPage from './pages/contributor-agreement';

app/src/frontend/building/building-edit.tsx

@@ -2,11 +2,11 @@ import React, { Component, Fragment } from 'react';
 import { Link, NavLink, Redirect } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
-import ErrorBox from './components/error-box';
+import ErrorBox from '../components/error-box';
-import InfoBox from './components/info-box';
+import InfoBox from '../components/info-box';
 import Sidebar from './sidebar';
-import Tooltip from './components/tooltip';
+import Tooltip from '../components/tooltip';
-import { SaveIcon } from './components/icons';
+import { SaveIcon } from '../components/icons';
 
 import CONFIG from './fields-config.json';
 

app/src/frontend/building/building-view.tsx

@@ -3,10 +3,10 @@ import { Link, NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
-import Tooltip from './components/tooltip';
+import Tooltip from '../components/tooltip';
-import InfoBox from './components/info-box';
+import InfoBox from '../components/info-box';
-import { EditIcon } from './components/icons';
+import { EditIcon } from '../components/icons';
-import { sanitiseURL } from './helpers';
+import { sanitiseURL } from '../helpers';
 
 import CONFIG from './fields-config.json';
 

app/src/frontend/building/multi-edit.tsx

@@ -5,8 +5,8 @@ import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
 import CONFIG from './fields-config.json';
-import InfoBox from './components/info-box';
+import InfoBox from '../components/info-box';
-import { sanitiseURL } from './helpers';
+import { sanitiseURL } from '../helpers';
 
 const MultiEdit = (props) => {
     if (!props.user){

app/src/frontend/building/overview.tsx

@@ -3,7 +3,7 @@ import { NavLink, Redirect } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
-import { EditIcon } from './components/icons';
+import { EditIcon } from '../components/icons';
 import CONFIG from './fields-config.json';
 
 const Overview = (props) => {

app/src/frontend/building/sidebar.tsx

@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import './sidebar.css';
-import { BackIcon } from './components/icons';
+import { BackIcon } from '../components/icons';
 
 const Sidebar = (props) => (
     <div id="legend" className="info-container">

app/src/frontend/map/legend.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import './legend.css';
-import { MinorLogo } from './components/logo';
+import { MinorLogo } from '../components/logo';
 
 const LEGEND_CONFIG = {
     location: {

app/src/frontend/map/map.tsx

@@ -2,12 +2,12 @@ import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Map, TileLayer, ZoomControl, AttributionControl } from 'react-leaflet-universal';
 
-import '../../node_modules/leaflet/dist/leaflet.css'
+import '../../../node_modules/leaflet/dist/leaflet.css'
 import './map.css'
 
-import { HelpIcon } from './components/icons';
+import { HelpIcon } from '../components/icons';
 import Legend from './legend';
-import { parseCategoryURL } from '../parse';
+import { parseCategoryURL } from '../../parse';
 import SearchBox from './search-box';
 import ThemeSwitcher from './theme-switcher';
 

app/src/frontend/map/search-box.tsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import './search-box.css';
-import { SearchIcon } from './components/icons';
+import { SearchIcon } from '../components/icons';
 /**
  * Search for location
  */

app/src/frontend/pages/about.css

@@ -33,11 +33,11 @@
 }
 .carousel-control.next {
     right: -1em;
-    background-image: url('images/arrow-next.png');
+    background-image: url('../images/arrow-next.png');
 }
 .carousel-control.back {
     left: -1em;
-    background-image: url('images/arrow-back.png');
+    background-image: url('../images/arrow-back.png');
 }
 .carousel-content {
     padding: 0;