Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Sidebar) sidebar is a module, not a collection #987

Merged
merged 1 commit into from
Dec 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ const SidebarVariationsExamples = () => (
<ComponentExample
title='Left Overlay'
description='Sidebar attached to the left of the pushable container overlayed on the pusher.'
examplePath='collections/Sidebar/Overlay/SidebarLeftOverlay'
examplePath='modules/Sidebar/Overlay/SidebarLeftOverlay'
/>
<ComponentExample
title='Right Overlay'
description='Sidebar attached to the right of the pushable container overlayed on the pusher.'
examplePath='collections/Sidebar/Overlay/SidebarRightOverlay'
examplePath='modules/Sidebar/Overlay/SidebarRightOverlay'
/>
<ComponentExample
title='Top Overlay'
description='Sidebar attached to the top of the pushable container overlayed on the pusher.'
examplePath='collections/Sidebar/Overlay/SidebarTopOverlay'
examplePath='modules/Sidebar/Overlay/SidebarTopOverlay'
/>
<ComponentExample
title='Bottom Overlay'
description='Sidebar attached to the bottom of the pushable container overlayed on the pusher.'
examplePath='collections/Sidebar/Overlay/SidebarBottomOverlay'
examplePath='modules/Sidebar/Overlay/SidebarBottomOverlay'
/>
</ExampleSection>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ const SidebarVariationsExamples = () => (
<ComponentExample
title='Left Push'
description='Sidebar attached to the left of the pushable container pushing the pusher.'
examplePath='collections/Sidebar/Push/SidebarLeftPush'
examplePath='modules/Sidebar/Push/SidebarLeftPush'
/>
<ComponentExample
title='Right Push'
description='Sidebar attached to the right of the pushable container pushing the pusher.'
examplePath='collections/Sidebar/Push/SidebarRightPush'
examplePath='modules/Sidebar/Push/SidebarRightPush'
/>
<ComponentExample
title='Top Push'
description='Sidebar attached to the top of the pushable container pushing the pusher.'
examplePath='collections/Sidebar/Push/SidebarTopPush'
examplePath='modules/Sidebar/Push/SidebarTopPush'
/>
<ComponentExample
title='Bottom Push'
description='Sidebar attached to the bottom of the pushable container pushing the pusher.'
examplePath='collections/Sidebar/Push/SidebarBottomPush'
examplePath='modules/Sidebar/Push/SidebarBottomPush'
/>
</ExampleSection>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ const SidebarVariationsExamples = () => (
<ComponentExample
title='Left Scale Down'
description='Sidebar attached to the left of the pushable container scaling down the pusher.'
examplePath='collections/Sidebar/ScaleDown/SidebarLeftScaleDown'
examplePath='modules/Sidebar/ScaleDown/SidebarLeftScaleDown'
/>
<ComponentExample
title='Right Scale Down'
description='Sidebar attached to the right of the pushable container scaling down the pusher.'
examplePath='collections/Sidebar/ScaleDown/SidebarRightScaleDown'
examplePath='modules/Sidebar/ScaleDown/SidebarRightScaleDown'
/>
<ComponentExample
title='Top Scale Down'
description='Sidebar attached to the top of the pushable container scaling down the pusher.'
examplePath='collections/Sidebar/ScaleDown/SidebarTopScaleDown'
examplePath='modules/Sidebar/ScaleDown/SidebarTopScaleDown'
/>
<ComponentExample
title='Bottom Scale Down'
description='Sidebar attached to the bottom of the pushable container scaling down the pusher.'
examplePath='collections/Sidebar/ScaleDown/SidebarBottomScaleDown'
examplePath='modules/Sidebar/ScaleDown/SidebarBottomScaleDown'
/>
</ExampleSection>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ const SidebarVariationsExamples = () => (
<ComponentExample
title='Left Slide Along'
description='Sidebar attached to the left of the pushable container sliding along the pusher.'
examplePath='collections/Sidebar/SlideAlong/SidebarLeftSlideAlong'
examplePath='modules/Sidebar/SlideAlong/SidebarLeftSlideAlong'
/>
<ComponentExample
title='Right Slide Along'
description='Sidebar attached to the right of the pushable container sliding along the pusher.'
examplePath='collections/Sidebar/SlideAlong/SidebarRightSlideAlong'
examplePath='modules/Sidebar/SlideAlong/SidebarRightSlideAlong'
/>
</ExampleSection>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ const SidebarVariationsExamples = () => (
<ComponentExample
title='Left Slide Out'
description='Sidebar attached to the left of the pushable container sliding out from the pusher.'
examplePath='collections/Sidebar/SlideOut/SidebarLeftSlideOut'
examplePath='modules/Sidebar/SlideOut/SidebarLeftSlideOut'
/>
<ComponentExample
title='Right Slide Out'
description='Sidebar attached to the right of the pushable container sliding out from the pusher.'
examplePath='collections/Sidebar/SlideOut/SidebarRightSlideOut'
examplePath='modules/Sidebar/SlideOut/SidebarRightSlideOut'
/>
</ExampleSection>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ const SidebarVariationsExamples = () => (
<ComponentExample
title='Left Uncover'
description='Sidebar attached to the left of the pushable container uncovering by the pusher.'
examplePath='collections/Sidebar/Uncover/SidebarLeftUncover'
examplePath='modules/Sidebar/Uncover/SidebarLeftUncover'
/>
<ComponentExample
title='Right Uncover'
description='Sidebar attached to the right of the pushable container uncovered by the pusher.'
examplePath='collections/Sidebar/Uncover/SidebarRightUncover'
examplePath='modules/Sidebar/Uncover/SidebarRightUncover'
/>
</ExampleSection>
)
Expand Down
8 changes: 4 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ export { default as MessageHeader } from './collections/Message/MessageHeader'
export { default as MessageItem } from './collections/Message/MessageItem'
export { default as MessageList } from './collections/Message/MessageList'

export { default as Sidebar } from './collections/Sidebar'
export { default as SidebarPushable } from './collections/Sidebar/SidebarPushable'
export { default as SidebarPusher } from './collections/Sidebar/SidebarPusher'

export { default as Table } from './collections/Table'
export { default as TableBody } from './collections/Table/TableBody'
export { default as TableCell } from './collections/Table/TableCell'
Expand Down Expand Up @@ -137,6 +133,10 @@ export { default as SearchCategory } from './modules/Search/SearchCategory'
export { default as SearchResult } from './modules/Search/SearchResult'
export { default as SearchResults } from './modules/Search/SearchResults'

export { default as Sidebar } from './modules/Sidebar'
export { default as SidebarPushable } from './modules/Sidebar/SidebarPushable'
export { default as SidebarPusher } from './modules/Sidebar/SidebarPusher'

// Views
export { default as Card } from './views/Card/Card'
export { default as CardContent } from './views/Card/CardContent'
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import _ from 'lodash'

import Sidebar from 'src/collections/Sidebar/Sidebar'
import Sidebar from 'src/modules/Sidebar/Sidebar'
import * as common from 'test/specs/commonTests'

describe('Sidebar', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import SidebarPushable from 'src/collections/Sidebar/SidebarPushable'
import SidebarPushable from 'src/modules/Sidebar/SidebarPushable'
import * as common from 'test/specs/commonTests'

describe('SidebarPushable', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import SidebarPusher from 'src/collections/Sidebar/SidebarPusher'
import SidebarPusher from 'src/modules/Sidebar/SidebarPusher'
import * as common from 'test/specs/commonTests'

describe('SidebarPusher', () => {
Expand Down