From 2aa71ae94146e03edc7681e06be013630ed3ecdc Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 15 Nov 2016 15:23:09 -0500 Subject: [PATCH] Refactored to use src/routes --- .../main_view.js => routes/channel/channel.js} | 8 ++++---- .../channel/channel_container.js} | 4 ++-- src/{routes.js => routes/index.js} | 10 +++++----- .../login_view.js => routes/login/login.js} | 4 ++-- src/{containers => routes/login}/login_container.js | 4 ++-- .../select_server/select_server.js} | 4 ++-- .../select_server}/select_server_container.js | 2 +- .../select_team/select_team.js} | 2 +- .../select_team}/select_team_container.js | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) rename src/{components/main_view.js => routes/channel/channel.js} (93%) rename src/{containers/main_container.js => routes/channel/channel_container.js} (90%) rename src/{routes.js => routes/index.js} (84%) rename src/{components/login_view.js => routes/login/login.js} (98%) rename src/{containers => routes/login}/login_container.js (92%) rename src/{components/select_server_view.js => routes/select_server/select_server.js} (97%) rename src/{containers => routes/select_server}/select_server_container.js (90%) rename src/{components/select_team_view.js => routes/select_team/select_team.js} (97%) rename src/{containers => routes/select_team}/select_team_container.js (90%) diff --git a/src/components/main_view.js b/src/routes/channel/channel.js similarity index 93% rename from src/components/main_view.js rename to src/routes/channel/channel.js index cfc22af07..2e34ba2c5 100644 --- a/src/components/main_view.js +++ b/src/routes/channel/channel.js @@ -6,12 +6,12 @@ import React from 'react'; import PureRenderMixin from 'react-addons-pure-render-mixin'; import Drawer from 'react-native-drawer'; -import ChannelSidebar from './channel_sidebar.js'; -import Loading from './loading.js'; -import RightSidebarMenu from './right_sidebar_menu.js'; +import ChannelSidebar from 'components/channel_sidebar.js'; +import Loading from 'components/loading.js'; +import RightSidebarMenu from 'components/right_sidebar_menu.js'; import {StatusBar, Text, TouchableHighlight, View} from 'react-native'; -export default class MainView extends React.Component { +export default class Channel extends React.Component { static propTypes = { actions: React.PropTypes.object.isRequired, currentTeam: React.PropTypes.object, diff --git a/src/containers/main_container.js b/src/routes/channel/channel_container.js similarity index 90% rename from src/containers/main_container.js rename to src/routes/channel/channel_container.js index 843fd614a..805eca6a1 100644 --- a/src/containers/main_container.js +++ b/src/routes/channel/channel_container.js @@ -4,7 +4,7 @@ import {bindActionCreators} from 'redux'; import {connect} from 'react-redux'; import {fetchMyChannelsAndMembers} from 'actions/channels.js'; -import MainView from 'components/main_view.js'; +import Channel from './channel.js'; function mapStateToProps(state, ownProps) { let currentChannel; @@ -39,4 +39,4 @@ function mapDispatchToProps(dispatch) { }; } -export default connect(mapStateToProps, mapDispatchToProps)(MainView); +export default connect(mapStateToProps, mapDispatchToProps)(Channel); diff --git a/src/routes.js b/src/routes/index.js similarity index 84% rename from src/routes.js rename to src/routes/index.js index 3e930c77a..51037fe81 100644 --- a/src/routes.js +++ b/src/routes/index.js @@ -4,10 +4,10 @@ import React, {Component} from 'react'; import {Scene, Router} from 'react-native-router-flux'; -import LoginContainer from 'containers/login_container'; -import SelectServerContainer from 'containers/select_server_container'; -import SelectTeamContainer from 'containers/select_team_container'; -import MainContainer from 'containers/main_container.js'; +import LoginContainer from './login/login_container.js'; +import SelectServerContainer from './select_server/select_server_container.js'; +import SelectTeamContainer from './select_team/select_team_container.js'; +import ChannelContainer from './channel/channel_container.js'; import Logout from 'components/logout'; import * as logout from 'actions/logout'; @@ -45,7 +45,7 @@ class Routes extends Component { /> diff --git a/src/components/login_view.js b/src/routes/login/login.js similarity index 98% rename from src/components/login_view.js rename to src/routes/login/login.js index 5b9b036df..0a8cabf33 100644 --- a/src/components/login_view.js +++ b/src/routes/login/login.js @@ -14,7 +14,7 @@ import logo from 'images/logo.png'; import {injectIntl, intlShape} from 'react-intl'; -class LoginView extends Component { +class Login extends Component { static propTypes = { intl: intlShape.isRequired, clientConfig: PropTypes.object.isRequired, @@ -129,4 +129,4 @@ class LoginView extends Component { } } -export default injectIntl(LoginView); +export default injectIntl(Login); diff --git a/src/containers/login_container.js b/src/routes/login/login_container.js similarity index 92% rename from src/containers/login_container.js rename to src/routes/login/login_container.js index dfdb87a5d..887b6e9e7 100644 --- a/src/containers/login_container.js +++ b/src/routes/login/login_container.js @@ -5,7 +5,7 @@ import {bindActionCreators} from 'redux'; import {connect} from 'react-redux'; import * as loginActions from 'actions/login'; import {getClientConfig} from 'actions/general'; -import LoginView from 'components/login_view'; +import Login from './login.js'; function mapStateToProps(state) { return { @@ -23,4 +23,4 @@ function mapDispatchToProps(dispatch) { }; } -export default connect(mapStateToProps, mapDispatchToProps)(LoginView); +export default connect(mapStateToProps, mapDispatchToProps)(Login); diff --git a/src/components/select_server_view.js b/src/routes/select_server/select_server.js similarity index 97% rename from src/components/select_server_view.js rename to src/routes/select_server/select_server.js index 011b9acb6..d9fbcbb78 100644 --- a/src/components/select_server_view.js +++ b/src/routes/select_server/select_server.js @@ -17,7 +17,7 @@ import logo from 'images/logo.png'; import {injectIntl, intlShape} from 'react-intl'; -class SelectServerView extends Component { +class SelectServer extends Component { static propTypes = { intl: intlShape.isRequired, ping: React.PropTypes.object.isRequired, @@ -85,4 +85,4 @@ class SelectServerView extends Component { } } -export default injectIntl(SelectServerView); +export default injectIntl(SelectServer); diff --git a/src/containers/select_server_container.js b/src/routes/select_server/select_server_container.js similarity index 90% rename from src/containers/select_server_container.js rename to src/routes/select_server/select_server_container.js index 4cdb40b14..0250e8ff2 100644 --- a/src/containers/select_server_container.js +++ b/src/routes/select_server/select_server_container.js @@ -4,7 +4,7 @@ import {bindActionCreators} from 'redux'; import {connect} from 'react-redux'; import {getPing} from 'actions/general'; -import SelectServerView from 'components/select_server_view'; +import SelectServerView from './select_server.js'; function mapStateToProps(state) { return { diff --git a/src/components/select_team_view.js b/src/routes/select_team/select_team.js similarity index 97% rename from src/components/select_team_view.js rename to src/routes/select_team/select_team.js index 76e786082..01993e500 100644 --- a/src/components/select_team_view.js +++ b/src/routes/select_team/select_team.js @@ -14,7 +14,7 @@ import {GlobalStyles} from 'styles'; import logo from 'images/logo.png'; import FormattedText from 'components/formatted_text'; -export default class SelectTeamView extends Component { +export default class SelectTeam extends Component { static propTypes = { clientConfig: PropTypes.object.isRequired, teams: PropTypes.object.isRequired, diff --git a/src/containers/select_team_container.js b/src/routes/select_team/select_team_container.js similarity index 90% rename from src/containers/select_team_container.js rename to src/routes/select_team/select_team_container.js index 3774c7b63..e6ed55c09 100644 --- a/src/containers/select_team_container.js +++ b/src/routes/select_team/select_team_container.js @@ -4,7 +4,7 @@ import {bindActionCreators} from 'redux'; import {connect} from 'react-redux'; import * as teamActions from 'actions/teams'; -import SelectTeamView from 'components/select_team_view'; +import SelectTeamView from './select_team.js'; function mapStateToProps(state) { return {