project folder structure (#107)

* project folder structure

* Moving store to be called from app folder

.babelrc

@@ -1,6 +1,6 @@
 {
   "presets": [ "react-native" ],
   "plugins": [
-    ["resolver", {"resolveDirs": ["src", "test"]}]
+    ["resolver", {"resolveDirs": [".", "config", "test"]}]
   ]
-}
+}

app/actions/navigation/index.js

@@ -1,8 +1,8 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {NavigationTypes} from 'constants';
-import Routes from 'navigation/routes';
+import {NavigationTypes} from 'app/constants';
+import Routes from 'app/navigation/routes';
 
 export function goBack() {
     return async (dispatch, getState) => {

app/actions/views/login.js

@@ -1,12 +1,12 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {UsersTypes} from 'constants';
+import {UsersViewTypes} from 'app/constants';
 
 export function handleLoginIdChanged(loginId) {
     return async (dispatch, getState) => {
         dispatch({
-            type: UsersTypes.LOGIN_ID_CHANGED,
+            type: UsersViewTypes.LOGIN_ID_CHANGED,
             loginId
         }, getState);
     };
@@ -15,7 +15,7 @@ export function handleLoginIdChanged(loginId) {
 export function handlePasswordChanged(password) {
     return async (dispatch, getState) => {
         dispatch({
-            type: UsersTypes.PASSWORD_CHANGED,
+            type: UsersViewTypes.PASSWORD_CHANGED,
             password
         }, getState);
     };

app/actions/views/root.js

@@ -1,8 +1,8 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {NavigationTypes} from 'constants';
-import Routes from 'navigation/routes';
+import {NavigationTypes} from 'app/constants';
+import Routes from 'app/navigation/routes';
 
 export function goToSelectServer() {
     return async (dispatch, getState) => {

app/actions/views/select_server.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {GeneralTypes} from 'constants';
+import {GeneralTypes} from 'service/constants';
 
 export function handleServerUrlChanged(serverUrl) {
     return async (dispatch, getState) => {

app/components/button.js

@@ -5,7 +5,7 @@ import React from 'react';
 
 import {ActivityIndicator, StyleSheet, TouchableHighlight, View} from 'react-native';
 
-import {GlobalStyles} from 'styles';
+import {GlobalStyles} from 'app/styles';
 
 const styles = StyleSheet.create({
     container: {

app/components/error_text.js

@@ -4,7 +4,7 @@
 import React, {Component, PropTypes} from 'react';
 import {Text} from 'react-native';
 
-import {GlobalStyles} from 'styles';
+import {GlobalStyles} from 'app/styles';
 
 const propTypes = {
     error: PropTypes.oneOfType([PropTypes.string, PropTypes.object])

app/components/logout/logout.js

@@ -4,7 +4,7 @@
 import React from 'react';
 
 import {TouchableHighlight} from 'react-native';
-import FormattedText from 'components/formatted_text';
+import FormattedText from 'app/components/formatted_text';
 
 export default class Logout extends React.Component {
     static propTypes = {

app/components/logout/logout_container.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {logout} from 'actions/users';
+import {logout} from 'service/actions/users';
 
 import Logout from './logout.js';
 

app/components/right_sidebar_menu/right_sidebar_menu.js

@@ -3,7 +3,7 @@
 
 import React from 'react';
 
-import FormattedText from 'components/formatted_text';
+import FormattedText from 'app/components/formatted_text';
 import Icon from 'react-native-vector-icons/FontAwesome';
 import Item from './components/item';
 import {

app/components/right_sidebar_menu/right_sidebar_menu_container.js

@@ -4,8 +4,8 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {goToFlaggedPosts, goToRecentMentions} from 'actions/navigation';
-import {logout} from 'actions/users';
+import {goToFlaggedPosts, goToRecentMentions} from 'app/actions/navigation';
+import {logout} from 'service/actions/users';
 
 import RightSidebarMenu from './right_sidebar_menu';
 

app/components/root_navigator.js

@@ -4,7 +4,7 @@
 import React from 'react';
 
 import {Image, Navigator, StyleSheet, Text, TouchableOpacity} from 'react-native';
-import SelectServerView from './select_server_view.js';
+import SelectServerView from './select_server_view';
 
 import menuImage from 'images/menu.png';
 

app/constants/index.js

@@ -0,0 +1,10 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import NavigationTypes from './navigation';
+import UsersViewTypes from './users';
+
+export {
+    NavigationTypes,
+    UsersViewTypes
+};

app/constants/users.js

@@ -3,10 +3,9 @@
 
 import keymirror from 'keymirror';
 
-const DeviceTypes = keymirror({
-    DEVICE_REQUEST: null,
-    DEVICE_SUCCESS: null,
-    DEVICE_FAILURE: null
+const UsersViewTypes = keymirror({
+    LOGIN_ID_CHANGED: null,
+    PASSWORD_CHANGED: null
 });
 
-export default DeviceTypes;
+export default UsersViewTypes;

app/layouts/root_layout/root_layout.js

@@ -3,14 +3,14 @@
 
 import React from 'react';
 
-import {getTranslations} from 'i18n';
+import {getTranslations} from 'service/i18n';
 import {IntlProvider} from 'react-intl';
 
 export default class RootLayout extends React.Component {
     static propTypes = {
         children: React.PropTypes.node,
         locale: React.PropTypes.string.isRequired
-    }
+    };
 
     render() {
         const locale = this.props.locale;

app/mattermost.js

@@ -4,10 +4,11 @@
 import React from 'react';
 import {Provider} from 'react-redux';
 
-import store from 'store';
+import configureStore from 'app/store';
+import Router from 'app/navigation/router';
+import RootLayout from 'app/layouts/root_layout/root_layout_container';
 
-import Router from 'navigation/router';
-import RootLayout from 'layouts/root_layout/root_layout_container';
+const store = configureStore();
 
 export default class Mattermost extends React.Component {
     render() {

app/navigation/router.js

@@ -6,12 +6,12 @@ import React from 'react';
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {goBack} from 'actions/navigation';
+import {goBack} from 'app/actions/navigation';
 
-import {getComponentForScene} from 'scenes';
+import {getComponentForScene} from 'app/scenes';
 
 import {Easing, NavigationExperimental, View} from 'react-native';
-import FormattedText from 'components/formatted_text.js';
+import FormattedText from 'app/components/formatted_text';
 
 class Router extends React.Component {
     static propTypes = {

app/reducers/index.js

@@ -1,16 +1,10 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {combineReducers} from 'redux';
-
-import entities from './entities';
-import requests from './requests';
 import views from './views';
 import navigation from './navigation';
 
-export default combineReducers({
-    entities,
-    requests,
+export default {
     views,
     navigation
-});
+};

app/reducers/navigation/index.js

@@ -3,9 +3,10 @@
 
 import {NavigationExperimental} from 'react-native';
 
-import {UsersTypes, NavigationTypes} from 'constants';
+import {UsersTypes} from 'service/constants';
+import {NavigationTypes} from 'app/constants';
 
-import Routes from 'navigation/routes.js';
+import Routes from 'app/navigation/routes';
 
 const initialState = {
     index: 0,

app/reducers/views/i18n.js

@@ -3,8 +3,8 @@
 
 import {combineReducers} from 'redux';
 
-import Config from 'config/index';
-import {UsersTypes} from 'constants';
+import Config from 'config';
+import {UsersTypes} from 'service/constants';
 
 function locale(state = Config.DefaultLocale, action) {
     switch (action.type) {

app/reducers/views/index.js

@@ -5,11 +5,9 @@ import {combineReducers} from 'redux';
 
 import login from './login';
 import selectServer from './select_server';
-import device from './device';
 import i18n from './i18n';
 
 export default combineReducers({
-    device,
     i18n,
     login,
     selectServer

app/reducers/views/login.js

@@ -2,12 +2,12 @@
 // See License.txt for license information.
 
 import {combineReducers} from 'redux';
-
-import {UsersTypes} from 'constants';
+import {UsersTypes} from 'service/constants';
+import {UsersViewTypes} from 'app/constants';
 
 function loginId(state = '', action) {
     switch (action.type) {
-    case UsersTypes.LOGIN_ID_CHANGED:
+    case UsersViewTypes.LOGIN_ID_CHANGED:
         return action.loginId;
     case UsersTypes.LOGOUT_SUCCESS:
         return '';
@@ -18,7 +18,7 @@ function loginId(state = '', action) {
 
 function password(state = '', action) {
     switch (action.type) {
-    case UsersTypes.PASSWORD_CHANGED:
+    case UsersViewTypes.PASSWORD_CHANGED:
         return action.password;
     case UsersTypes.LOGOUT_SUCCESS:
         return '';

app/reducers/views/select_server.js

@@ -3,9 +3,9 @@
 
 import {combineReducers} from 'redux';
 
-import Config from 'config/index';
+import Config from 'config';
 
-import {GeneralTypes} from 'constants';
+import {GeneralTypes} from 'service/constants';
 
 function serverUrl(state = Config.DefaultServerUrl, action) {
     switch (action.type) {

app/scenes/channel/channel.js

@@ -6,9 +6,9 @@ import React from 'react';
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 import Drawer from 'react-native-drawer';
-import ChannelSidebar from 'components/channel_sidebar';
-import Loading from 'components/loading';
-import RightSidebarMenu from 'components/right_sidebar_menu';
+import ChannelSidebar from 'app/components/channel_sidebar';
+import Loading from 'app/components/loading';
+import RightSidebarMenu from 'app/components/right_sidebar_menu';
 import {StatusBar, Text, TouchableHighlight, View} from 'react-native';
 
 export default class Channel extends React.Component {

app/scenes/channel/channel_container.js

@@ -3,7 +3,7 @@
 
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
-import {fetchMyChannelsAndMembers} from 'actions/channels.js';
+import {fetchMyChannelsAndMembers} from 'service/actions/channels';
 import Channel from './channel.js';
 
 function mapStateToProps(state, ownProps) {

app/scenes/login/login.js

@@ -4,16 +4,16 @@
 import React, {Component, PropTypes} from 'react';
 import {View, Text, TextInput, Image} from 'react-native';
 
-import Button from 'components/button';
-import FormattedText from 'components/formatted_text';
-import ErrorText from 'components/error_text';
-import Loading from 'components/loading';
-import {GlobalStyles} from 'styles';
-import logo from 'images/logo.png';
+import Button from 'app/components/button';
+import FormattedText from 'app/components/formatted_text';
+import ErrorText from 'app/components/error_text';
+import Loading from 'app/components/loading';
+import {GlobalStyles} from 'app/styles';
+import logo from 'app/images/logo.png';
 
 import {injectIntl, intlShape} from 'react-intl';
 
-import {RequestStatus} from 'constants';
+import {RequestStatus} from 'service/constants';
 
 class Login extends Component {
     static propTypes = {

app/scenes/login/login_container.js

@@ -4,10 +4,10 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getClientConfig, getLicenseConfig} from 'actions/general';
-import * as LoginActions from 'actions/views/login';
-import {goToSelectTeam} from 'actions/navigation';
-import {login} from 'actions/users';
+import {getClientConfig, getLicenseConfig} from 'service/actions/general';
+import * as LoginActions from 'app/actions/views/login';
+import {goToSelectTeam} from 'app/actions/navigation';
+import {login} from 'service/actions/users';
 
 import Login from './login.js';
 

app/scenes/root/root_container.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {goToSelectServer} from 'actions/views/root';
+import {goToSelectServer} from 'app/actions/views/root';
 
 import Root from './root';
 

app/scenes/search/search.js

@@ -3,8 +3,8 @@
 
 import React from 'react';
 
-import Button from 'components/button';
-import {GlobalStyles} from 'styles';
+import Button from 'app/components/button';
+import {GlobalStyles} from 'app/styles';
 import {Text, View} from 'react-native';
 
 export default class Search extends React.Component {

app/scenes/search/search_container.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {goBack} from 'actions/navigation';
+import {goBack} from 'app/actions/navigation';
 
 import Search from './search';
 

app/scenes/select_server/select_server.js

@@ -5,16 +5,16 @@ import React, {Component} from 'react';
 import {View, TextInput, Image} from 'react-native';
 import KeyboardSpacer from 'react-native-keyboard-spacer';
 
-import Client from 'client';
-import Button from 'components/button';
-import ErrorText from 'components/error_text';
-import FormattedText from 'components/formatted_text';
-import {GlobalStyles} from 'styles';
-import logo from 'images/logo.png';
+import Client from 'service/client';
+import Button from 'app/components/button';
+import ErrorText from 'app/components/error_text';
+import FormattedText from 'app/components/formatted_text';
+import {GlobalStyles} from 'app/styles';
+import logo from 'app/images/logo.png';
 
 import {injectIntl, intlShape} from 'react-intl';
 
-import RequestStatus from 'constants/request_status';
+import RequestStatus from 'service/constants/request_status';
 
 class SelectServer extends Component {
     static propTypes = {

app/scenes/select_server/select_server_container.js

@@ -4,9 +4,9 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getPing} from 'actions/general';
-import {goToLogin} from 'actions/navigation';
-import * as SelectServerActions from 'actions/views/select_server';
+import {getPing} from 'service/actions/general';
+import {goToLogin} from 'app/actions/navigation';
+import * as SelectServerActions from 'app/actions/views/select_server';
 
 import SelectServer from './select_server';
 

app/scenes/select_team/select_team.js

@@ -5,14 +5,14 @@ import React, {Component, PropTypes} from 'react';
 
 import {View, Image, Text} from 'react-native';
 import Button from 'react-native-button';
-import Loading from 'components/loading';
+import Loading from 'app/components/loading';
 import Icon from 'react-native-vector-icons/MaterialIcons';
 
-import ErrorText from 'components/error_text';
-import {GlobalStyles} from 'styles';
-import logo from 'images/logo.png';
-import FormattedText from 'components/formatted_text';
-import {RequestStatus} from 'constants';
+import ErrorText from 'app/components/error_text';
+import {GlobalStyles} from 'app/styles';
+import logo from 'app/images/logo.png';
+import FormattedText from 'app/components/formatted_text';
+import {RequestStatus} from 'service/constants';
 
 export default class SelectTeam extends Component {
     static propTypes = {

app/scenes/select_team/select_team_container.js

@@ -4,8 +4,8 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import * as teamActions from 'actions/teams';
-import {goToChannelView} from 'actions/navigation';
+import * as teamActions from 'service/actions/teams';
+import {goToChannelView} from 'app/actions/navigation';
 
 import SelectTeamView from './select_team.js';
 

app/store/index.js

@@ -0,0 +1,13 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import appReducer from 'app/reducers';
+import configureServiceStore from 'service/store';
+
+function getAppReducer() {
+    return require('../../app/reducers'); // eslint-disable-line global-require
+}
+
+export default function configureStore(preloadedState) {
+    return configureServiceStore(preloadedState, appReducer, getAppReducer);
+}

config/index.js

@@ -1,12 +1,12 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import BaseConfig from '../../config/config.json';
-import SecretConfig from '../../config/config.secret.json';
+import BaseConfig from './config.json';
+import SecretConfig from './config.secret.json';
 
 const Config = {
     ...BaseConfig,
     ...SecretConfig
 };
 
-export default Config;
+export default Config;

index.android.js

@@ -2,6 +2,6 @@
 // See License.txt for license information.
 
 import {AppRegistry} from 'react-native';
-import Mattermost from 'mattermost';
+import Mattermost from 'app/mattermost';
 
 AppRegistry.registerComponent('Mattermost', () => Mattermost);

index.ios.js

@@ -2,6 +2,6 @@
 // See License.txt for license information.
 
 import {AppRegistry} from 'react-native';
-import Mattermost from 'mattermost';
+import Mattermost from 'app/mattermost';
 
 AppRegistry.registerComponent('Mattermost', () => Mattermost);

rn-cli.config.js

@@ -6,10 +6,9 @@ var path = require('path');
 var config = {
     getProjectRoots() {
         return [
-            path.resolve(__dirname, '.'),
-            path.resolve(__dirname, './src')
+            path.resolve(__dirname, '.')
         ];
     }
 };
 
-module.exports = config;
+module.exports = config;

service/actions/channels.js

@@ -1,10 +1,10 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {Constants, ChannelTypes, UsersTypes} from 'constants';
+import {Constants, ChannelTypes, UsersTypes} from 'service/constants';
 import {forceLogoutIfNecessary} from './helpers';
 import {batchActions} from 'redux-batched-actions';
-import Client from 'client';
+import Client from 'service/client';
 
 export function createChannel(channel, userId) {
     return async (dispatch, getState) => {

service/actions/general.js

@@ -1,9 +1,9 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import Client from 'client';
+import Client from 'service/client';
 import {bindClientFunc} from './helpers.js';
-import {GeneralTypes} from 'constants';
+import {GeneralTypes} from 'service/constants';
 
 export function getPing() {
     return bindClientFunc(

service/actions/helpers.js

@@ -1,8 +1,8 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import Client from 'client';
-import {UsersTypes} from 'constants';
+import Client from 'service/client';
+import {UsersTypes} from 'service/constants';
 const HTTP_UNAUTHORIZED = 401;
 
 export async function forceLogoutIfNecessary(err, dispatch) {

service/actions/posts.js

@@ -2,8 +2,8 @@
 // See License.txt for license information.
 
 import {bindClientFunc} from './helpers.js';
-import Client from 'client';
-import {PostsTypes} from 'constants';
+import Client from 'service/client';
+import {PostsTypes} from 'service/constants';
 
 export function fetchPosts(teamId, channelId) {
     return bindClientFunc(

service/actions/teams.js

@@ -1,9 +1,9 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import Client from 'client';
+import Client from 'service/client';
 import {batchActions} from 'redux-batched-actions';
-import {Constants, TeamsTypes} from 'constants';
+import {Constants, TeamsTypes} from 'service/constants';
 import {bindClientFunc, forceLogoutIfNecessary} from './helpers';
 
 export function selectTeam(team) {

service/actions/users.js

@@ -2,11 +2,11 @@
 // See License.txt for license information.
 
 import {batchActions} from 'redux-batched-actions';
-import Client from 'client';
+import Client from 'service/client';
 
 // TODO: uncomment when PLT-4167 is merged
 // import {Constants, UsersTypes, TeamsTypes} from 'constants';
-import {Constants, UsersTypes} from 'constants';
+import {Constants, UsersTypes} from 'service/constants';
 import {bindClientFunc, forceLogoutIfNecessary} from './helpers';
 
 export function login(loginId, password, mfaToken = '') {

service/constants/index.js

@@ -3,24 +3,18 @@
 
 import Constants from './constants';
 import ChannelTypes from './channels';
-import DeviceTypes from './device';
 import GeneralTypes from './general';
 import UsersTypes from './users';
 import TeamsTypes from './teams';
 import PostsTypes from './posts';
-import NavigationTypes from './navigation';
-
 import RequestStatus from './request_status';
 
 export {
     Constants,
-    DeviceTypes,
     GeneralTypes,
     UsersTypes,
     TeamsTypes,
     ChannelTypes,
     PostsTypes,
-    NavigationTypes,
-
     RequestStatus
 };

service/constants/users.js

@@ -4,9 +4,6 @@
 import keymirror from 'keymirror';
 
 const UserTypes = keymirror({
-    LOGIN_ID_CHANGED: null,
-    PASSWORD_CHANGED: null,
-
     LOGIN_REQUEST: null,
     LOGIN_SUCCESS: null,
     LOGIN_FAILURE: null,

service/reducers/entities/channels.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {ChannelTypes, UsersTypes} from 'constants';
+import {ChannelTypes, UsersTypes} from 'service/constants';
 import {combineReducers} from 'redux';
 
 function currentId(state = '', action) {

service/reducers/entities/general.js

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import {combineReducers} from 'redux';
-import {GeneralTypes, UsersTypes} from 'constants';
+import {GeneralTypes, UsersTypes} from 'service/constants';
 
 function config(state = {}, action) {
     switch (action.type) {

service/reducers/entities/posts.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {PostsTypes, UsersTypes} from 'constants';
+import {PostsTypes, UsersTypes} from 'service/constants';
 import {combineReducers} from 'redux';
 import {addPosts} from './helpers';
 

service/reducers/entities/teams.js

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import {combineReducers} from 'redux';
-import {TeamsTypes, UsersTypes} from 'constants';
+import {TeamsTypes, UsersTypes} from 'service/constants';
 
 function currentId(state = '', action) {
     switch (action.type) {

service/reducers/entities/users.js

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import {combineReducers} from 'redux';
-import {UsersTypes} from 'constants';
+import {UsersTypes} from 'service/constants';
 import {profilesToSet, addProfileToSet, removeProfileFromSet} from './helpers';
 
 function currentId(state = '', action) {

service/reducers/index.js

@@ -0,0 +1,10 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import entities from './entities';
+import requests from './requests';
+
+export default {
+    entities,
+    requests
+};

service/reducers/requests/channels.js

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import {handleRequest, initialRequestState} from './helpers';
-import {ChannelTypes} from 'constants';
+import {ChannelTypes} from 'service/constants';
 
 import {combineReducers} from 'redux';
 

service/reducers/requests/general.js

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import {combineReducers} from 'redux';
-import {GeneralTypes} from 'constants';
+import {GeneralTypes} from 'service/constants';
 import {handleRequest, initialRequestState} from './helpers';
 
 function server(state = initialRequestState(), action) {

service/reducers/requests/helpers.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {RequestStatus} from 'constants';
+import {RequestStatus} from 'service/constants';
 
 export function initialRequestState() {
     return {

service/reducers/requests/teams.js

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import {handleRequest, initialRequestState} from './helpers';
-import {TeamsTypes} from 'constants';
+import {TeamsTypes} from 'service/constants';
 
 import {combineReducers} from 'redux';
 

service/reducers/requests/users.js

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import {handleRequest, initialRequestState} from './helpers';
-import {UsersTypes, RequestStatus} from 'constants';
+import {UsersTypes, RequestStatus} from 'service/constants';
 
 import {combineReducers} from 'redux';
 

service/store/configureStore.dev.js

@@ -0,0 +1,37 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import {applyMiddleware, compose, createStore, combineReducers} from 'redux';
+import devTools from 'remote-redux-devtools';
+import {enableBatching} from 'redux-batched-actions';
+import serviceReducer from 'service/reducers';
+import thunk from 'redux-thunk';
+
+export default function configureServiceStore(preloadedState, appReducer, getAppReducer) {
+    const store = createStore(
+        enableBatching(combineReducers(Object.assign({}, serviceReducer, appReducer))),
+        preloadedState,
+        compose(
+            applyMiddleware(thunk),
+            devTools({
+                name: 'Mattermost',
+                hostname: 'localhost',
+                port: 5678
+            })
+        )
+    );
+
+    if (module.hot) {
+        // Enable Webpack hot module replacement for reducers
+        module.hot.accept(() => {
+            const nextServiceReducer = require('../reducers').default; // eslint-disable-line global-require
+            let nextAppReducer;
+            if (getAppReducer) {
+                nextAppReducer = getAppReducer(); // eslint-disable-line global-require
+            }
+            store.replaceReducer(combineReducers(Object.assign({}, nextServiceReducer, nextAppReducer)));
+        });
+    }
+
+    return store;
+}

service/store/configureStore.prod.js

@@ -1,14 +1,14 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {applyMiddleware, createStore} from 'redux';
+import {applyMiddleware, createStore, combineReducers} from 'redux';
 import {enableBatching} from 'redux-batched-actions';
-import rootReducer from 'reducers/index.js';
+import serviceReducer from 'service/reducers';
 import thunk from 'redux-thunk';
 
-export default function configureStore(preloadedState) {
+export default function configureServiceStore(preloadedState, appReducer) {
     return createStore(
-        enableBatching(rootReducer),
+        enableBatching(combineReducers({serviceReducer, appReducer})),
         preloadedState,
         applyMiddleware(thunk)
     );

src/actions/device.js

@@ -1,24 +0,0 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import {requestData, requestSuccess, requestFailure} from './helpers.js';
-import {AsyncStorage} from 'react-native';
-import {DeviceTypes} from 'constants';
-
-function fetchDevice() {
-    return async (dispatch) => {
-        try {
-            dispatch(requestData(DeviceTypes.DEVICE_REQUEST));
-            const json = await AsyncStorage.getItem('basic_info');
-            dispatch(requestSuccess(DeviceTypes.DEVICE_SUCCESS, JSON.parse(json)));
-        } catch (err) {
-            dispatch(requestFailure(DeviceTypes.DEVICE_FAILURE, {msg: 'failed to load local storage'}));
-        }
-    };
-}
-
-export function loadDevice() {
-    return (dispatch, getState) => { // eslint-disable-line no-unused-vars
-        return dispatch(fetchDevice());
-    };
-}

src/i18n/i18n.js

@@ -1,18 +0,0 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import 'intl';
-
-import en from 'i18n/en.json';
-import es from 'i18n/es.json';
-
-const DEFAULT_LOCALE = 'en';
-
-const TRANSLATIONS = {
-    en,
-    es
-};
-
-export function getTranslations(locale) {
-    return TRANSLATIONS[locale] || TRANSLATIONS[DEFAULT_LOCALE];
-}

src/reducers/views/device.js

@@ -1,36 +0,0 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import {DeviceTypes} from 'constants';
-import RequestStatus from 'constants/request_status';
-
-export const initState = {
-    status: RequestStatus.NOT_STARTED,
-    error: null
-};
-
-export default function device(state = initState, action) {
-    switch (action.type) {
-    case DeviceTypes.DEVICE_REQUEST:
-        return {
-            ...state,
-            status: RequestStatus.STARTED
-        };
-    case DeviceTypes.DEVICE_SUCCESS:
-        return {
-            ...state,
-            status: RequestStatus.SUCCESS,
-            data: action.data,
-            error: null
-        };
-    case DeviceTypes.DEVICE_FAILURE:
-        return {
-            ...state,
-            status: RequestStatus.FAILURE,
-            error: action.error
-        };
-
-    default:
-        return state;
-    }
-}

src/store/configureStore.dev.js

@@ -1,33 +0,0 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import {applyMiddleware, compose, createStore} from 'redux';
-import devTools from 'remote-redux-devtools';
-import {enableBatching} from 'redux-batched-actions';
-import rootReducer from 'reducers/index.js';
-import thunk from 'redux-thunk';
-
-export default function configureStore(preloadedState) {
-    const store = createStore(
-        enableBatching(rootReducer),
-        preloadedState,
-        compose(
-            applyMiddleware(thunk),
-            devTools({
-                name: 'Mattermost',
-                hostname: 'localhost',
-                port: 5678
-            })
-        )
-    );
-
-    if (module.hot) {
-        // Enable Webpack hot module replacement for reducers
-        module.hot.accept(() => {
-            const nextRootReducer = require('../reducers/index.js').default; // eslint-disable-line global-require
-            store.replaceReducer(nextRootReducer);
-        });
-    }
-
-    return store;
-}

src/store/index.js

@@ -1,8 +0,0 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import configureStore from 'store/configureStore.js';
-
-const store = configureStore();
-
-export default store;

test/app/actions/login.test.js

@@ -3,8 +3,8 @@
 
 import assert from 'assert';
 
-import * as Actions from 'actions/views/login';
-import configureStore from 'store/configureStore';
+import * as Actions from 'app/actions/views/login';
+import configureStore from 'app/store';
 
 describe('Actions.Views.Login', () => {
     it('handleLoginIdChanged', (done) => {

test/app/actions/select_server.test.js

@@ -3,8 +3,8 @@
 
 import assert from 'assert';
 
-import * as Actions from 'actions/views/select_server';
-import configureStore from 'store/configureStore';
+import * as Actions from 'app/actions/views/select_server';
+import configureStore from 'app/store';
 
 describe('Actions.Views.SelectServer', () => {
     it('handleServerUrlChanged', (done) => {

test/app/reducers/navigation.test.js

@@ -4,9 +4,9 @@
 import assert from 'assert';
 import deepFreeze from 'deep-freeze';
 
-import {NavigationTypes} from 'constants';
-import Routes from 'navigation/routes';
-import reduceNavigation from 'reducers/navigation';
+import {NavigationTypes} from 'app/constants';
+import Routes from 'app/navigation/routes';
+import reduceNavigation from 'app/reducers/navigation';
 
 function reduceAndFreeze(state, actions) {
     return deepFreeze(reduceNavigation(state, actions));

test/service/actions/channels.test.js

@@ -3,12 +3,12 @@
 
 import assert from 'assert';
 
-import * as Actions from 'actions/channels';
-import {getProfiles} from 'actions/users';
-import Client from 'client';
-import configureStore from 'store/configureStore';
-import {RequestStatus} from 'constants';
-import TestHelper from 'test_helper';
+import * as Actions from 'service/actions/channels';
+import {getProfiles} from 'service/actions/users';
+import Client from 'service/client';
+import configureStore from 'app/store';
+import {RequestStatus} from 'service/constants';
+import TestHelper from 'test/test_helper';
 
 describe('Actions.Channels', () => {
     it('createChannel', (done) => {
@@ -77,12 +77,12 @@ describe('Actions.Channels', () => {
 
                     const channelsCount = Object.keys(channels).length;
                     const membersCount = Object.keys(members).length;
-                    assert.ok(channels);
-                    assert.ok(members);
-                    assert.ok(profiles[user.id]);
-                    assert.ok(Object.keys(preferences).length);
-                    assert.ok(channels[Object.keys(members)[0]]);
-                    assert.ok(members[Object.keys(channels)[0]]);
+                    assert.ok(channels, 'channels is empty');
+                    assert.ok(members, 'members is empty');
+                    assert.ok(profiles[user.id], 'profiles does not have userId');
+                    assert.ok(Object.keys(preferences).length, 'preferences is empty');
+                    assert.ok(channels[Object.keys(members)[0]], 'channels should have the member');
+                    assert.ok(members[Object.keys(channels)[0]], 'members should belong to channel');
                     assert.equal(members[Object.keys(channels)[0]].user_id, TestHelper.basicUser.id);
                     assert.equal(channelsCount, membersCount);
                     assert.equal(channels[Object.keys(channels)[0]].type, 'D');