From 51d3191ac0cbdde94b7ea674d56c27540e736424 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Fri, 26 May 2017 22:31:39 -0700 Subject: [PATCH] Renames --- frontend/components/AtlasPreview/index.js | 3 -- .../components/AtlasPreviewLoading/index.js | 3 -- .../Collection.js} | 6 ++-- .../Collection.scss} | 0 .../components/DocumentLink/DocumentLink.js | 0 .../components/DocumentLink/DocumentLink.scss | 0 .../components/DocumentLink/index.js | 0 frontend/components/Collection/index.js | 3 ++ .../PreviewLoading.js} | 0 frontend/components/PreviewLoading/index.js | 3 ++ frontend/scenes/Atlas/Atlas.js | 4 +-- frontend/scenes/Dashboard/Dashboard.js | 32 ++++++++----------- frontend/scenes/Document/Document.js | 4 +-- 13 files changed, 27 insertions(+), 31 deletions(-) delete mode 100644 frontend/components/AtlasPreview/index.js delete mode 100644 frontend/components/AtlasPreviewLoading/index.js rename frontend/components/{AtlasPreview/AtlasPreview.js => Collection/Collection.js} (88%) rename frontend/components/{AtlasPreview/AtlasPreview.scss => Collection/Collection.scss} (100%) rename frontend/components/{AtlasPreview => Collection}/components/DocumentLink/DocumentLink.js (100%) rename frontend/components/{AtlasPreview => Collection}/components/DocumentLink/DocumentLink.scss (100%) rename frontend/components/{AtlasPreview => Collection}/components/DocumentLink/index.js (100%) create mode 100644 frontend/components/Collection/index.js rename frontend/components/{AtlasPreviewLoading/AtlasPreviewLoading.js => PreviewLoading/PreviewLoading.js} (100%) create mode 100644 frontend/components/PreviewLoading/index.js diff --git a/frontend/components/AtlasPreview/index.js b/frontend/components/AtlasPreview/index.js deleted file mode 100644 index 3b6f2ba19..000000000 --- a/frontend/components/AtlasPreview/index.js +++ /dev/null @@ -1,3 +0,0 @@ -// @flow -import AtlasPreview from './AtlasPreview'; -export default AtlasPreview; diff --git a/frontend/components/AtlasPreviewLoading/index.js b/frontend/components/AtlasPreviewLoading/index.js deleted file mode 100644 index bbf182bce..000000000 --- a/frontend/components/AtlasPreviewLoading/index.js +++ /dev/null @@ -1,3 +0,0 @@ -// @flow -import AtlasPreviewLoading from './AtlasPreviewLoading'; -export default AtlasPreviewLoading; diff --git a/frontend/components/AtlasPreview/AtlasPreview.js b/frontend/components/Collection/Collection.js similarity index 88% rename from frontend/components/AtlasPreview/AtlasPreview.js rename to frontend/components/Collection/Collection.js index 8665df1ba..4d3f7b6a7 100644 --- a/frontend/components/AtlasPreview/AtlasPreview.js +++ b/frontend/components/Collection/Collection.js @@ -5,11 +5,11 @@ import { Link } from 'react-router-dom'; import DocumentLink from './components/DocumentLink'; -import styles from './AtlasPreview.scss'; +import styles from './Collection.scss'; // import classNames from 'classnames/bind'; // const cx = classNames.bind(styles); -@observer class AtlasPreview extends React.Component { +@observer class Collection extends React.Component { static propTypes = { data: React.PropTypes.object.isRequired, }; @@ -37,4 +37,4 @@ import styles from './AtlasPreview.scss'; } } -export default AtlasPreview; +export default Collection; diff --git a/frontend/components/AtlasPreview/AtlasPreview.scss b/frontend/components/Collection/Collection.scss similarity index 100% rename from frontend/components/AtlasPreview/AtlasPreview.scss rename to frontend/components/Collection/Collection.scss diff --git a/frontend/components/AtlasPreview/components/DocumentLink/DocumentLink.js b/frontend/components/Collection/components/DocumentLink/DocumentLink.js similarity index 100% rename from frontend/components/AtlasPreview/components/DocumentLink/DocumentLink.js rename to frontend/components/Collection/components/DocumentLink/DocumentLink.js diff --git a/frontend/components/AtlasPreview/components/DocumentLink/DocumentLink.scss b/frontend/components/Collection/components/DocumentLink/DocumentLink.scss similarity index 100% rename from frontend/components/AtlasPreview/components/DocumentLink/DocumentLink.scss rename to frontend/components/Collection/components/DocumentLink/DocumentLink.scss diff --git a/frontend/components/AtlasPreview/components/DocumentLink/index.js b/frontend/components/Collection/components/DocumentLink/index.js similarity index 100% rename from frontend/components/AtlasPreview/components/DocumentLink/index.js rename to frontend/components/Collection/components/DocumentLink/index.js diff --git a/frontend/components/Collection/index.js b/frontend/components/Collection/index.js new file mode 100644 index 000000000..c25fbb860 --- /dev/null +++ b/frontend/components/Collection/index.js @@ -0,0 +1,3 @@ +// @flow +import Collection from './Collection'; +export default Collection; diff --git a/frontend/components/AtlasPreviewLoading/AtlasPreviewLoading.js b/frontend/components/PreviewLoading/PreviewLoading.js similarity index 100% rename from frontend/components/AtlasPreviewLoading/AtlasPreviewLoading.js rename to frontend/components/PreviewLoading/PreviewLoading.js diff --git a/frontend/components/PreviewLoading/index.js b/frontend/components/PreviewLoading/index.js new file mode 100644 index 000000000..e02fd34c2 --- /dev/null +++ b/frontend/components/PreviewLoading/index.js @@ -0,0 +1,3 @@ +// @flow +import PreviewLoading from './PreviewLoading'; +export default PreviewLoading; diff --git a/frontend/scenes/Atlas/Atlas.js b/frontend/scenes/Atlas/Atlas.js index 5fc61133f..a14719f67 100644 --- a/frontend/scenes/Atlas/Atlas.js +++ b/frontend/scenes/Atlas/Atlas.js @@ -9,7 +9,7 @@ import _ from 'lodash'; import store from './AtlasStore'; import Layout, { Title } from 'components/Layout'; -import AtlasPreviewLoading from 'components/AtlasPreviewLoading'; +import PreviewLoading from 'components/PreviewLoading'; import CenteredContent from 'components/CenteredContent'; import DocumentList from 'components/DocumentList'; import Divider from 'components/Divider'; @@ -86,7 +86,7 @@ class Atlas extends React.Component { transitionLeaveTimeout={0} > {store.isFetching - ? + ? : collection &&
diff --git a/frontend/scenes/Dashboard/Dashboard.js b/frontend/scenes/Dashboard/Dashboard.js index 5e0944687..ddf38f84d 100644 --- a/frontend/scenes/Dashboard/Dashboard.js +++ b/frontend/scenes/Dashboard/Dashboard.js @@ -7,8 +7,8 @@ import { Flex } from 'reflexbox'; import DashboardStore from './DashboardStore'; import Layout from 'components/Layout'; -import AtlasPreview from 'components/AtlasPreview'; -import AtlasPreviewLoading from 'components/AtlasPreviewLoading'; +import Collection from 'components/Collection'; +import PreviewLoading from 'components/PreviewLoading'; import CenteredContent from 'components/CenteredContent'; type Props = { @@ -34,22 +34,18 @@ class Dashboard extends React.Component { render() { return ( - - - - - {this.store.isFetching - ? - : this.store.collections && - this.store.collections.map(collection => { - return ( - - ); - })} - - - - + + + + {this.store.isFetching + ? + : this.store.collections && + this.store.collections.map(collection => ( + + ))} + + + ); } } diff --git a/frontend/scenes/Document/Document.js b/frontend/scenes/Document/Document.js index 4825a1ae1..686e37f11 100644 --- a/frontend/scenes/Document/Document.js +++ b/frontend/scenes/Document/Document.js @@ -12,7 +12,7 @@ import Menu from './components/Menu'; import Editor from 'components/Editor'; import Layout, { HeaderAction, SaveAction } from 'components/Layout'; import PublishingInfo from 'components/PublishingInfo'; -import AtlasPreviewLoading from 'components/AtlasPreviewLoading'; +import PreviewLoading from 'components/PreviewLoading'; import CenteredContent from 'components/CenteredContent'; const DISCARD_CHANGES = ` @@ -138,7 +138,7 @@ type Props = { {this.store.isFetching && - + } {this.store.document &&