Rename ./components/basic to ./components. Move back src/c/b/styles t…

…o src/styles

src/components/basic/AddCardLink.js → src/components/AddCardLink.js

@@ -1,4 +1,4 @@
 import React from 'react'
-import {AddCardLink} from './styles/Base'
+import {AddCardLink} from 'styles/Base'
 
 export default ({onClick, t}) => <AddCardLink onClick={onClick}>{t('Click to add card')}</AddCardLink>

src/components/basic/Card.js → src/components/Card.js

@@ -8,7 +8,7 @@ import {
   CardTitle,
   Detail,
   Footer
-} from './styles/Base'
+} from 'styles/Base'
 import Tag from './Card/Tag'
 import DeleteButton from './widgets/DeleteButton'
 

src/components/basic/Card/Tag.js → src/components/Card/Tag.js

@@ -1,6 +1,6 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import {TagSpan} from '../styles/Base'
+import {TagSpan} from 'styles/Base'
 
 class Tag extends Component {
   render() {

src/components/basic/Lane/LaneFooter.js → src/components/Lane/LaneFooter.js

@@ -1,10 +1,10 @@
 import React from 'react'
 
-import {LaneFooter} from 'components/basic/styles/Base'
+import {LaneFooter} from 'styles/Base'
 
 import {
   CollapseBtn,
   ExpandBtn,
-} from 'components/basic/styles/Elements'
+} from 'styles/Elements'
 
 export default ({onClick, collapsed}) => <LaneFooter onClick={onClick}>{collapsed ? <ExpandBtn /> : <CollapseBtn />}</LaneFooter>

src/components/basic/Lane/LaneHeader.js → src/components/Lane/LaneHeader.js

@@ -1,8 +1,8 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import EditableLabel from 'components/basic/widgets/EditableLabel'
+import EditableLabel from 'components/widgets/EditableLabel'
 
-import {Title, LaneHeader, RightContent } from 'components/basic/styles/Base'
+import {Title, LaneHeader, RightContent } from 'styles/Base'
 import LaneMenu from './LaneHeader/LaneMenu'
 
 const LaneHeaderComponent = ({

src/components/basic/Lane/LaneHeader/LaneMenu.js → src/components/Lane/LaneHeader/LaneMenu.js

@@ -10,7 +10,7 @@ import React from 'react'
 	  LaneMenuItem,
 	  GenDelButton,
 	  MenuButton,
-  } from 'components/basic/styles/Elements'
+  } from 'styles/Elements'
 
 	const LaneMenu = ({t, onDelete}) => {
 	  return (

src/components/basic/Loader.js → src/components/Loader.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {LoaderDiv, LoadingBar} from './styles/Loader'
+import {LoaderDiv, LoadingBar} from 'styles/Loader'
 
 const Loader = () => (
   <LoaderDiv>

src/components/basic/NewCardForm.js → src/components/NewCardForm.js

@@ -7,8 +7,8 @@ import {
   CardTitle,
   CardWrapper,
   Detail
-} from './styles/Base'
-import {AddButton, CancelButton} from './styles/Elements'
+} from 'styles/Base'
+import {AddButton, CancelButton} from 'styles/Elements'
 import EditableLabel from './widgets/EditableLabel'
 
 class NewCardForm extends Component {

src/components/basic/NewLaneForm.js → src/components/NewLaneForm.js

@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import {LaneTitle, NewLaneButtons, Section} from './styles/Base'
-import {AddButton, CancelButton} from './styles/Elements'
+import {LaneTitle, NewLaneButtons, Section} from 'styles/Base'
+import {AddButton, CancelButton} from 'styles/Elements'
 import EditableLabel from './widgets/EditableLabel'
 
 class NewLaneForm extends Component {

src/components/basic/NewLaneSection.js → src/components/NewLaneSection.js

@@ -1,6 +1,6 @@
 import React from 'react'
-import {NewLaneSection} from './styles/Base'
-import {AddLaneLink} from './styles/Elements'
+import {NewLaneSection} from 'styles/Base'
+import {AddLaneLink} from 'styles/Elements'
 
 export default ({t, onClick}) => (
   <NewLaneSection>

src/components/basic/index.js → src/components/index.js

@@ -6,7 +6,7 @@ import NewLaneForm from './NewLaneForm'
 import NewCardForm from './NewCardForm'
 import AddCardLink from './AddCardLink'
 import NewLaneSection from './NewLaneSection'
-import {GlobalStyle, Section, BoardWrapper, ScrollableLane } from './styles/Base'
+import {GlobalStyle, Section, BoardWrapper, ScrollableLane } from 'styles/Base'
 
 export default {
   GlobalStyle,

src/components/basic/widgets/DeleteButton.js → src/components/widgets/DeleteButton.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {DeleteWrapper, DelButton} from '../styles/Elements'
+import {DeleteWrapper, DelButton} from 'styles/Elements'
 
 const DeleteButton = props => {
   return (

src/index.js

@@ -5,7 +5,7 @@ import Container from './dnd/Container'
 import Lane from './controllers/Lane'
 import BoardController from './controllers/Board'
 
-import DefaultComponents from 'components/basic'
+import DefaultComponents from 'components'
 
 export {
   Board,

stories/CustomCard.story.js

@@ -1,9 +1,9 @@
 import React from 'react'
 import {storiesOf} from '@storybook/react'
-import {MovableCardWrapper } from 'components/basic/styles/Base'
+import {MovableCardWrapper } from 'styles/Base'
 
 import Board from '../src'
-import Tag from 'components/basic/Card/Tag'
+import Tag from 'components/Card/Tag'
 
 const CustomCard = ({onClick, className, name, cardStyle, body, dueOn, cardColor, subTitle, tagStyle, escalationText, tags}) => {
   return (

stories/CustomCardWithDrag.story.js

@@ -2,7 +2,7 @@ import React, {Component} from 'react'
 import {storiesOf} from '@storybook/react'
 import update from 'immutability-helper'
 
-import {MovableCardWrapper } from 'components/basic/styles/Base'
+import {MovableCardWrapper } from 'styles/Base'
 import debug from './helpers/debug'
 
 import Board from '../src'