From 9031a717f76a869fd58fee4202d70f9564db4424 Mon Sep 17 00:00:00 2001 From: JubbeArt Date: Sun, 15 Jul 2018 00:23:44 +0200 Subject: [PATCH] Put react-components into logical folders according to the page they're used on --- src/App.js | 26 ------------------- src/index.js | 25 +++++++++++++++--- src/pages/{About.js => about/index.js} | 0 src/{components => pages/common}/Header.js | 2 +- src/{components => pages/common}/Post.js | 0 src/{containers => pages/common}/StatusBox.js | 0 src/pages/index.js | 3 --- src/pages/{Search.js => search/index.js} | 0 .../subreddit}/SubredditPagination.js | 0 .../subreddit}/SubredditSort.js | 0 .../{Subreddit.js => subreddit/index.js} | 2 +- src/{components => pages/thread}/Comment.js | 0 .../thread}/CommentInfo.js | 0 .../thread}/CommentSection.js | 6 ++--- src/{components => pages/thread}/SortBy.js | 0 .../thread}/ThreadInfo.js | 0 src/pages/{Thread.js => thread/index.js} | 4 +-- 17 files changed, 29 insertions(+), 39 deletions(-) delete mode 100644 src/App.js rename src/pages/{About.js => about/index.js} (100%) rename src/{components => pages/common}/Header.js (88%) rename src/{components => pages/common}/Post.js (100%) rename src/{containers => pages/common}/StatusBox.js (100%) delete mode 100644 src/pages/index.js rename src/pages/{Search.js => search/index.js} (100%) rename src/{components => pages/subreddit}/SubredditPagination.js (100%) rename src/{components => pages/subreddit}/SubredditSort.js (100%) rename src/pages/{Subreddit.js => subreddit/index.js} (98%) rename src/{components => pages/thread}/Comment.js (100%) rename src/{components => pages/thread}/CommentInfo.js (100%) rename src/{components => pages/thread}/CommentSection.js (96%) rename src/{components => pages/thread}/SortBy.js (100%) rename src/{components => pages/thread}/ThreadInfo.js (100%) rename src/pages/{Thread.js => thread/index.js} (97%) diff --git a/src/App.js b/src/App.js deleted file mode 100644 index 03c8f1e..0000000 --- a/src/App.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from 'react' -import { - BrowserRouter, - Switch, - Route -} from 'react-router-dom' - -import Header from 'components/Header' -import { About, Thread, Subreddit } from 'pages' - -export default () => ( - - -
-
- - - - - - - -
- - -) diff --git a/src/index.js b/src/index.js index aa91d9f..008dbde 100644 --- a/src/index.js +++ b/src/index.js @@ -2,12 +2,31 @@ import 'babel-polyfill' import React from 'react' import ReactDOM from 'react-dom' import { Provider } from 'react-redux' -import { store } from 'state' -import App from 'App' +import { BrowserRouter, Switch, Route } from 'react-router-dom' + +import { store } from './state' + +import Header from './pages/common/Header' +import About from './pages/about' +import Subreddit from './pages/subreddit' +import Thread from './pages/thread' ReactDOM.render( - + + +
+
+ + + + + + + +
+ + , document.getElementById('app') ) diff --git a/src/pages/About.js b/src/pages/about/index.js similarity index 100% rename from src/pages/About.js rename to src/pages/about/index.js diff --git a/src/components/Header.js b/src/pages/common/Header.js similarity index 88% rename from src/components/Header.js rename to src/pages/common/Header.js index 5ca7877..96cc729 100644 --- a/src/components/Header.js +++ b/src/pages/common/Header.js @@ -1,6 +1,6 @@ import React from 'react' import { Link } from 'react-router-dom' -import StatusBox from 'containers/StatusBox' +import StatusBox from './StatusBox' export default () => (
diff --git a/src/components/Post.js b/src/pages/common/Post.js similarity index 100% rename from src/components/Post.js rename to src/pages/common/Post.js diff --git a/src/containers/StatusBox.js b/src/pages/common/StatusBox.js similarity index 100% rename from src/containers/StatusBox.js rename to src/pages/common/StatusBox.js diff --git a/src/pages/index.js b/src/pages/index.js deleted file mode 100644 index 80d8edf..0000000 --- a/src/pages/index.js +++ /dev/null @@ -1,3 +0,0 @@ -export { default as About } from './About' -export { default as Subreddit } from './Subreddit' -export { default as Thread } from './Thread' diff --git a/src/pages/Search.js b/src/pages/search/index.js similarity index 100% rename from src/pages/Search.js rename to src/pages/search/index.js diff --git a/src/components/SubredditPagination.js b/src/pages/subreddit/SubredditPagination.js similarity index 100% rename from src/components/SubredditPagination.js rename to src/pages/subreddit/SubredditPagination.js diff --git a/src/components/SubredditSort.js b/src/pages/subreddit/SubredditSort.js similarity index 100% rename from src/components/SubredditSort.js rename to src/pages/subreddit/SubredditSort.js diff --git a/src/pages/Subreddit.js b/src/pages/subreddit/index.js similarity index 98% rename from src/pages/Subreddit.js rename to src/pages/subreddit/index.js index b41a8c2..472de16 100644 --- a/src/pages/Subreddit.js +++ b/src/pages/subreddit/index.js @@ -2,7 +2,7 @@ import React from 'react' import { Link } from 'react-router-dom' import { getRemovedThreadIDs } from 'api/removeddit' import { getThreads } from 'api/reddit' -import Post from 'components/Post' +import Post from '../common/Post' const getSubredditForAPI = props => { const { subreddit = 'all' } = props.match.params diff --git a/src/components/Comment.js b/src/pages/thread/Comment.js similarity index 100% rename from src/components/Comment.js rename to src/pages/thread/Comment.js diff --git a/src/components/CommentInfo.js b/src/pages/thread/CommentInfo.js similarity index 100% rename from src/components/CommentInfo.js rename to src/pages/thread/CommentInfo.js diff --git a/src/components/CommentSection.js b/src/pages/thread/CommentSection.js similarity index 96% rename from src/components/CommentSection.js rename to src/pages/thread/CommentSection.js index 5886cc5..6a38849 100644 --- a/src/components/CommentSection.js +++ b/src/pages/thread/CommentSection.js @@ -1,7 +1,7 @@ import React from 'react' -import Comment from 'components/Comment' -import CommentInfo from 'components/CommentInfo' -import SortBy from 'components/SortBy' +import Comment from './Comment' +import CommentInfo from './CommentInfo' +import SortBy from './SortBy' import { connect } from 'react-redux' import { SORT_TOP, SORT_BOTTOM, SORT_NEW, SORT_OLD, diff --git a/src/components/SortBy.js b/src/pages/thread/SortBy.js similarity index 100% rename from src/components/SortBy.js rename to src/pages/thread/SortBy.js diff --git a/src/components/ThreadInfo.js b/src/pages/thread/ThreadInfo.js similarity index 100% rename from src/components/ThreadInfo.js rename to src/pages/thread/ThreadInfo.js diff --git a/src/pages/Thread.js b/src/pages/thread/index.js similarity index 97% rename from src/pages/Thread.js rename to src/pages/thread/index.js index 43288cf..1e9ec77 100644 --- a/src/pages/Thread.js +++ b/src/pages/thread/index.js @@ -1,6 +1,6 @@ import React from 'react' -import Post from 'components/Post' -import CommentSection from 'components/CommentSection' +import Post from '../common/Post' +import CommentSection from './CommentSection' import { getPost, getComments as getRedditComments