🔨 Better Component Directory Structure

reubn · Dec 19, 2016 · e7e4623 · e7e4623
1 parent 13fcdb4
commit e7e4623
Show file tree

Hide file tree

Showing 39 changed files with 21 additions and 21 deletions.
diff --git a/front/components/FeatureInfo/index.js → ...FeatureInfoContainer/FeatureInfo/index.js b/front/components/FeatureInfo/index.js → ...FeatureInfoContainer/FeatureInfo/index.js
diff --git a/front/components/FeatureInfo/style.css → ...eatureInfoContainer/FeatureInfo/style.css b/front/components/FeatureInfo/style.css → ...eatureInfoContainer/FeatureInfo/style.css
diff --git a/front/components/FeatureInfoContainer/index.js b/front/components/FeatureInfoContainer/index.js
@@ -2,7 +2,7 @@ import {connect} from 'react-redux'
 
 import selectFeatureAction from '../../store/actions/selectFeature'
 
-import FeatureInfo from '../FeatureInfo'
+import FeatureInfo from './FeatureInfo'
 
 const mapStateToProps = ({map: {selected: {selectedFeature, editingFeature}}, aesthetics: {activityTypes, locationCategories}}) => ({feature: selectedFeature, editing: selectedFeature &&editingFeature && editingFeature.id === selectedFeature.id, activityTypes, locationCategories})
 const mapDispatchToProps = {

diff --git a/front/components/LogInOut/index.js → ...nents/LogInOutContainer/LogInOut/index.js b/front/components/LogInOut/index.js → ...nents/LogInOutContainer/LogInOut/index.js
diff --git a/front/components/LogInOut/style.css → ...ents/LogInOutContainer/LogInOut/style.css b/front/components/LogInOut/style.css → ...ents/LogInOutContainer/LogInOut/style.css
diff --git a/front/components/LogInOutContainer/index.js b/front/components/LogInOutContainer/index.js
@@ -3,7 +3,7 @@ import {replace} from 'react-router-redux'
 
 import logoutAction from '../../store/actions/logout'
 
-import LogInOut from '../LogInOut'
+import LogInOut from './LogInOut'
 
 const mapStateToProps = ({user: {loggedIn}}) => ({loggedIn})
 const mapDispatchToProps = {

diff --git a/front/components/Login/index.js → .../components/LoginContainer/Login/index.js b/front/components/Login/index.js → .../components/LoginContainer/Login/index.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import {login, banner} from './style'
 
-import Message from '../Message'
+import Message from '../../Message'
 
 export default class Login extends React.Component {
   constructor(props){

diff --git a/front/components/Login/style.css → ...components/LoginContainer/Login/style.css b/front/components/Login/style.css → ...components/LoginContainer/Login/style.css
diff --git a/front/components/LoginContainer/index.js b/front/components/LoginContainer/index.js
@@ -1,5 +1,5 @@
 import {connect} from 'react-redux'
-import Login from '../Login'
+import Login from './Login'
 import loginFormValidateAction from '../../store/actions/loginFormValidate'
 
 const mapStateToProps = ({user: {id}, loginForm: {valid, errors, loading, redirect}}) => ({signedIn: !!id, valid, errors, loading, redirect})

diff --git a/front/components/Logo/index.js → front/components/LogoContainer/Logo/index.js b/front/components/Logo/index.js → front/components/LogoContainer/Logo/index.js
diff --git a/front/components/Logo/style.css → ...t/components/LogoContainer/Logo/style.css b/front/components/Logo/style.css → ...t/components/LogoContainer/Logo/style.css
diff --git a/front/components/LogoContainer/index.js b/front/components/LogoContainer/index.js
@@ -1,5 +1,5 @@
 import {connect} from 'react-redux'
-import Logo from '../Logo'
+import Logo from './Logo'
 
 const mapStateToProps = ({user: {birthday, loggedIn}}) => ({birthday: birthday.isSame(new Date(), 'd') && loggedIn})
 

diff --git a/front/components/Map/FeaturePopup/index.js → ...ts/MapContainer/Map/FeaturePopup/index.js b/front/components/Map/FeaturePopup/index.js → ...ts/MapContainer/Map/FeaturePopup/index.js
diff --git a/front/components/Map/FeaturePopup/style.css → ...s/MapContainer/Map/FeaturePopup/style.css b/front/components/Map/FeaturePopup/style.css → ...s/MapContainer/Map/FeaturePopup/style.css
diff --git a/front/components/Map/LocationIcon/index.js → ...cationIconContainer/LocationIcon/index.js b/front/components/Map/LocationIcon/index.js → ...cationIconContainer/LocationIcon/index.js
@@ -1,8 +1,8 @@
 import React from 'react'
 import {Marker} from 'react-leaflet'
 
-import mapIcon from '../mapIcon'
-import FeaturePopup from '../FeaturePopup'
+import mapIcon from '../../mapIcon'
+import FeaturePopup from '../../FeaturePopup'
 
 const LocationIcon = ({locationCategories, iconImageSize, displayFeature, selected, selectFeature}) => (
   <Marker

diff --git a/...onents/Map/LocationIconContainer/index.js → ...tainer/Map/LocationIconContainer/index.js b/...onents/Map/LocationIconContainer/index.js → ...tainer/Map/LocationIconContainer/index.js
@@ -1,8 +1,8 @@
 import {connect} from 'react-redux'
 
-import selectFeatureAction from '../../../store/actions/selectFeature'
+import selectFeatureAction from '../../../../store/actions/selectFeature'
 
-import LocationIcon from '../LocationIcon'
+import LocationIcon from './LocationIcon'
 
 const mapStateToProps = ({aesthetics: {locationCategories, iconImageSize}}) => ({locationCategories, iconImageSize})
 const mapDispatchToProps = {

diff --git a/front/components/Map/MapboxGlLayer.js → ...ponents/MapContainer/Map/MapboxGlLayer.js b/front/components/Map/MapboxGlLayer.js → ...ponents/MapContainer/Map/MapboxGlLayer.js
diff --git a/front/components/Map/MoveLine/EditLine.js → ...ap/MoveLineContainer/MoveLine/EditLine.js b/front/components/Map/MoveLine/EditLine.js → ...ap/MoveLineContainer/MoveLine/EditLine.js
diff --git a/...components/Map/MoveLine/Gradient/index.js → ...eLineContainer/MoveLine/Gradient/index.js b/...components/Map/MoveLine/Gradient/index.js → ...eLineContainer/MoveLine/Gradient/index.js
diff --git a/.../Map/MoveLine/Gradient/makeGradientDef.js → ...iner/MoveLine/Gradient/makeGradientDef.js b/.../Map/MoveLine/Gradient/makeGradientDef.js → ...iner/MoveLine/Gradient/makeGradientDef.js
diff --git a/...mponents/Map/MoveLine/GradientPolyline.js → ...ineContainer/MoveLine/GradientPolyline.js b/...mponents/Map/MoveLine/GradientPolyline.js → ...ineContainer/MoveLine/GradientPolyline.js
diff --git a/front/components/Map/MoveLine/index.js → ...r/Map/MoveLineContainer/MoveLine/index.js b/front/components/Map/MoveLine/index.js → ...r/Map/MoveLineContainer/MoveLine/index.js
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import FeaturePopup from '../FeaturePopup'
+import FeaturePopup from '../../FeaturePopup'
 import GradientPolyline from './GradientPolyline'
 import EditLine from './EditLine'
 

diff --git a/...components/Map/MoveLineContainer/index.js → ...pContainer/Map/MoveLineContainer/index.js b/...components/Map/MoveLineContainer/index.js → ...pContainer/Map/MoveLineContainer/index.js
@@ -1,8 +1,8 @@
 import {connect} from 'react-redux'
 
-import selectFeatureAction from '../../../store/actions/selectFeature'
+import selectFeatureAction from '../../../../store/actions/selectFeature'
 
-import MoveLine from '../MoveLine'
+import MoveLine from './MoveLine'
 
 const mapStateToProps = ({aesthetics: {activityTypes}}) => ({activityTypes})
 const mapDispatchToProps = {

diff --git a/front/components/Map/config/index.js → ...mponents/MapContainer/Map/config/index.js b/front/components/Map/config/index.js → ...mponents/MapContainer/Map/config/index.js
diff --git a/front/components/Map/index.js → front/components/MapContainer/Map/index.js b/front/components/Map/index.js → front/components/MapContainer/Map/index.js
@@ -6,13 +6,13 @@ import {Map as LeafletMap} from 'react-leaflet'
 import {} from 'leaflet-editable'
 import mapIcon from './mapIcon'
 
-import KeyCombo from '../KeyCombo'
-import MapNav from '../MapNav'
-import FeatureInfoContainer from '../FeatureInfoContainer'
+import KeyCombo from '../../KeyCombo'
+import MapNav from '../../MapNav'
+import FeatureInfoContainer from '../../FeatureInfoContainer'
 
 import MapboxGlLayer from './MapboxGlLayer'
 
-import Loader from '../Loader'
+import Loader from '../../Loader'
 import MoveLineContainer from './MoveLineContainer'
 import LocationIconContainer from './LocationIconContainer'
 

diff --git a/front/components/Map/init.js → front/components/MapContainer/Map/init.js b/front/components/Map/init.js → front/components/MapContainer/Map/init.js
@@ -1,6 +1,6 @@
 import moment from 'moment'
 
-import Range from '../../models/Range'
+import Range from '../../../models/Range'
 
 export default ({params: {from, to, feature}, location: {action}, selectRange, selectFeature}) => {
   if(!from && !to) return selectRange(new Range({start: moment().subtract(1, 'd')}))

diff --git a/front/components/Map/mapIcon/index.js → ...ponents/MapContainer/Map/mapIcon/index.js b/front/components/Map/mapIcon/index.js → ...ponents/MapContainer/Map/mapIcon/index.js
diff --git a/front/components/Map/mapIcon/style.css → ...onents/MapContainer/Map/mapIcon/style.css b/front/components/Map/mapIcon/style.css → ...onents/MapContainer/Map/mapIcon/style.css
diff --git a/front/components/Map/style.css → front/components/MapContainer/Map/style.css b/front/components/Map/style.css → front/components/MapContainer/Map/style.css
diff --git a/front/components/MapContainer/index.js b/front/components/MapContainer/index.js
@@ -5,7 +5,7 @@ import selectFeatureAction from '../../store/actions/selectFeature'
 import goYesterdayAction from '../../store/actions/goYesterday'
 import goTomorrowAction from '../../store/actions/goTomorrow'
 
-import Map from '../Map'
+import Map from './Map'
 
 const mapStateToProps = ({map: {selected, loading}, user: {homeLocation}}) => ({loading, selected, homeLocation})
 const mapDispatchToProps = {

diff --git a/front/components/RangeSelector/EndDate.js → ...electorContainer/RangeSelector/EndDate.js b/front/components/RangeSelector/EndDate.js → ...electorContainer/RangeSelector/EndDate.js
diff --git a/front/components/RangeSelector/StartDate.js → ...ectorContainer/RangeSelector/StartDate.js b/front/components/RangeSelector/StartDate.js → ...ectorContainer/RangeSelector/StartDate.js
diff --git a/front/components/RangeSelector/index.js → ...eSelectorContainer/RangeSelector/index.js b/front/components/RangeSelector/index.js → ...eSelectorContainer/RangeSelector/index.js
@@ -7,7 +7,7 @@ import moment from 'moment'
 
 import './react-datepicker.css'
 
-import Range from '../../models/Range'
+import Range from '../../../models/Range'
 
 import {rangeSelector, arrow, slash} from './style'
 import StartDate from './StartDate.js'

diff --git a/...onents/RangeSelector/react-datepicker.css → ...tainer/RangeSelector/react-datepicker.css b/...onents/RangeSelector/react-datepicker.css → ...tainer/RangeSelector/react-datepicker.css
diff --git a/front/components/RangeSelector/style.css → ...SelectorContainer/RangeSelector/style.css b/front/components/RangeSelector/style.css → ...SelectorContainer/RangeSelector/style.css
diff --git a/front/components/RangeSelectorContainer/index.js b/front/components/RangeSelectorContainer/index.js
@@ -4,7 +4,7 @@ import selectRangeAction from '../../store/actions/selectRange'
 import goYesterdayAction from '../../store/actions/goYesterday'
 import goTomorrowAction from '../../store/actions/goTomorrow'
 
-import RangeSelector from '../RangeSelector'
+import RangeSelector from './RangeSelector'
 
 const mapStateToProps = ({map: {selected: {range}}, user: {accountStartDay}}) => ({range, accountStartDay})
 const mapDispatchToProps = {

diff --git a/front/components/UpdateButton/index.js → ...dateButtonContainer/UpdateButton/index.js b/front/components/UpdateButton/index.js → ...dateButtonContainer/UpdateButton/index.js
diff --git a/front/components/UpdateButton/style.css → ...ateButtonContainer/UpdateButton/style.css b/front/components/UpdateButton/style.css → ...ateButtonContainer/UpdateButton/style.css
diff --git a/front/components/UpdateButtonContainer/index.js b/front/components/UpdateButtonContainer/index.js
@@ -2,7 +2,7 @@ import {connect} from 'react-redux'
 
 import updateRangeAction from '../../store/actions/updateRange'
 
-import UpdateButton from '../UpdateButton'
+import UpdateButton from './UpdateButton'
 
 const mapStateToProps = ({map: {selected: {range}, updating}}) => ({range, updating})
 const mapDispatchToProps = {