From 1641370fbedc42e07f7a9b7758286d341f13b624 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 19 Jul 2016 10:16:44 -0400 Subject: Moving javascript driver back to platform (#3613) --- webapp/components/activity_log_modal.jsx | 2 +- webapp/components/admin_console/admin_settings.jsx | 2 +- webapp/components/admin_console/admin_sidebar_header.jsx | 2 +- webapp/components/admin_console/brand_image_setting.jsx | 2 +- webapp/components/admin_console/compliance_reports.jsx | 2 +- webapp/components/admin_console/email_connection_test.jsx | 2 +- webapp/components/admin_console/license_settings.jsx | 2 +- webapp/components/admin_console/recycle_db.jsx | 2 +- webapp/components/admin_console/reload_config.jsx | 2 +- webapp/components/admin_console/reset_password_modal.jsx | 2 +- webapp/components/admin_console/saml_settings.jsx | 2 +- webapp/components/admin_console/sync_now_button.jsx | 2 +- webapp/components/admin_console/team_users.jsx | 2 +- webapp/components/admin_console/user_item.jsx | 2 +- webapp/components/authorize.jsx | 2 +- webapp/components/channel_header.jsx | 2 +- webapp/components/channel_invite_button.jsx | 2 +- webapp/components/channel_members_modal.jsx | 2 +- webapp/components/channel_notifications_modal.jsx | 2 +- webapp/components/claim/components/email_to_ldap.jsx | 2 +- webapp/components/claim/components/email_to_oauth.jsx | 2 +- webapp/components/claim/components/oauth_to_email.jsx | 2 +- webapp/components/create_comment.jsx | 2 +- webapp/components/create_post.jsx | 2 +- webapp/components/delete_channel_modal.jsx | 2 +- webapp/components/delete_post_modal.jsx | 2 +- webapp/components/do_verify_email.jsx | 2 +- webapp/components/edit_channel_header_modal.jsx | 2 +- webapp/components/edit_channel_purpose_modal.jsx | 2 +- webapp/components/edit_post_modal.jsx | 2 +- webapp/components/file_attachment.jsx | 2 +- webapp/components/file_upload.jsx | 2 +- webapp/components/invite_member_modal.jsx | 2 +- webapp/components/login/login_controller.jsx | 2 +- webapp/components/navbar.jsx | 2 +- webapp/components/new_channel_flow.jsx | 2 +- webapp/components/password_reset_form.jsx | 2 +- webapp/components/password_reset_send_link.jsx | 2 +- webapp/components/popover_list_members.jsx | 2 +- webapp/components/post_view/components/pending_post_options.jsx | 2 +- webapp/components/register_app_modal.jsx | 2 +- webapp/components/rename_channel_modal.jsx | 2 +- webapp/components/rhs_comment.jsx | 2 +- webapp/components/root.jsx | 2 +- webapp/components/search_bar.jsx | 4 ++-- webapp/components/should_verify_email.jsx | 2 +- webapp/components/sidebar_header.jsx | 2 +- webapp/components/signup_user_complete.jsx | 2 +- webapp/components/suggestion/at_mention_provider.jsx | 2 +- webapp/components/suggestion/search_user_provider.jsx | 2 +- webapp/components/team_general_tab.jsx | 2 +- webapp/components/team_members_dropdown.jsx | 2 +- webapp/components/user_list_row.jsx | 2 +- webapp/components/user_profile.jsx | 2 +- webapp/components/user_settings/manage_languages.jsx | 2 +- webapp/components/user_settings/user_settings_general.jsx | 2 +- webapp/components/user_settings/user_settings_notifications.jsx | 2 +- webapp/components/user_settings/user_settings_security.jsx | 2 +- webapp/components/youtube_video.jsx | 2 +- 59 files changed, 60 insertions(+), 60 deletions(-) (limited to 'webapp/components') diff --git a/webapp/components/activity_log_modal.jsx b/webapp/components/activity_log_modal.jsx index ab6224906..7560cf5d9 100644 --- a/webapp/components/activity_log_modal.jsx +++ b/webapp/components/activity_log_modal.jsx @@ -3,7 +3,7 @@ import $ from 'jquery'; import UserStore from 'stores/user_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import {Modal} from 'react-bootstrap'; import LoadingScreen from './loading_screen.jsx'; diff --git a/webapp/components/admin_console/admin_settings.jsx b/webapp/components/admin_console/admin_settings.jsx index eda2d1d8a..d670d599d 100644 --- a/webapp/components/admin_console/admin_settings.jsx +++ b/webapp/components/admin_console/admin_settings.jsx @@ -4,7 +4,7 @@ import React from 'react'; import * as AsyncClient from 'utils/async_client.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import FormError from 'components/form_error.jsx'; import SaveButton from 'components/admin_console/save_button.jsx'; diff --git a/webapp/components/admin_console/admin_sidebar_header.jsx b/webapp/components/admin_console/admin_sidebar_header.jsx index 400730030..86c2c6b0f 100644 --- a/webapp/components/admin_console/admin_sidebar_header.jsx +++ b/webapp/components/admin_console/admin_sidebar_header.jsx @@ -4,7 +4,7 @@ import $ from 'jquery'; import AdminNavbarDropdown from './admin_navbar_dropdown.jsx'; import UserStore from 'stores/user_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import {FormattedMessage} from 'react-intl'; diff --git a/webapp/components/admin_console/brand_image_setting.jsx b/webapp/components/admin_console/brand_image_setting.jsx index 252328f25..653073200 100644 --- a/webapp/components/admin_console/brand_image_setting.jsx +++ b/webapp/components/admin_console/brand_image_setting.jsx @@ -5,7 +5,7 @@ import $ from 'jquery'; import React from 'react'; import ReactDOM from 'react-dom'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import FormError from 'components/form_error.jsx'; diff --git a/webapp/components/admin_console/compliance_reports.jsx b/webapp/components/admin_console/compliance_reports.jsx index 9bde450ff..eb7faa0f6 100644 --- a/webapp/components/admin_console/compliance_reports.jsx +++ b/webapp/components/admin_console/compliance_reports.jsx @@ -7,7 +7,7 @@ import * as Utils from '../../utils/utils.jsx'; import AdminStore from '../../stores/admin_store.jsx'; import UserStore from '../../stores/user_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from '../../utils/async_client.jsx'; import {FormattedMessage, FormattedDate, FormattedTime} from 'react-intl'; diff --git a/webapp/components/admin_console/email_connection_test.jsx b/webapp/components/admin_console/email_connection_test.jsx index c90c80b99..c66543bbf 100644 --- a/webapp/components/admin_console/email_connection_test.jsx +++ b/webapp/components/admin_console/email_connection_test.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; diff --git a/webapp/components/admin_console/license_settings.jsx b/webapp/components/admin_console/license_settings.jsx index 94cd83c07..a1e1f277c 100644 --- a/webapp/components/admin_console/license_settings.jsx +++ b/webapp/components/admin_console/license_settings.jsx @@ -4,7 +4,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedHTMLMessage} from 'react-intl'; diff --git a/webapp/components/admin_console/recycle_db.jsx b/webapp/components/admin_console/recycle_db.jsx index 0a88e6a89..db13b5295 100644 --- a/webapp/components/admin_console/recycle_db.jsx +++ b/webapp/components/admin_console/recycle_db.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; diff --git a/webapp/components/admin_console/reload_config.jsx b/webapp/components/admin_console/reload_config.jsx index a04a98690..cf65fee8b 100644 --- a/webapp/components/admin_console/reload_config.jsx +++ b/webapp/components/admin_console/reload_config.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import {getConfig} from 'utils/async_client.jsx'; diff --git a/webapp/components/admin_console/reset_password_modal.jsx b/webapp/components/admin_console/reset_password_modal.jsx index c383a4fb8..6d5a03f2a 100644 --- a/webapp/components/admin_console/reset_password_modal.jsx +++ b/webapp/components/admin_console/reset_password_modal.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import ReactDOM from 'react-dom'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import {Modal} from 'react-bootstrap'; diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx index 5fba78b75..ae6f3e169 100644 --- a/webapp/components/admin_console/saml_settings.jsx +++ b/webapp/components/admin_console/saml_settings.jsx @@ -12,7 +12,7 @@ import RemoveFileSetting from './remove_file_setting.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import SettingsGroup from './settings_group.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; export default class SamlSettings extends AdminSettings { diff --git a/webapp/components/admin_console/sync_now_button.jsx b/webapp/components/admin_console/sync_now_button.jsx index 7197b7b35..7b08b241d 100644 --- a/webapp/components/admin_console/sync_now_button.jsx +++ b/webapp/components/admin_console/sync_now_button.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx index f82c20a86..56b76c195 100644 --- a/webapp/components/admin_console/team_users.jsx +++ b/webapp/components/admin_console/team_users.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import AdminStore from 'stores/admin_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import FormError from 'components/form_error.jsx'; import LoadingScreen from '../loading_screen.jsx'; import UserItem from './user_item.jsx'; diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx index 79dbd5639..3743c075d 100644 --- a/webapp/components/admin_console/user_item.jsx +++ b/webapp/components/admin_console/user_item.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import * as Utils from 'utils/utils.jsx'; import UserStore from 'stores/user_store.jsx'; diff --git a/webapp/components/authorize.jsx b/webapp/components/authorize.jsx index b18469568..49ca0f36b 100644 --- a/webapp/components/authorize.jsx +++ b/webapp/components/authorize.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index e69f470a3..5757fd3b2 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -27,7 +27,7 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import * as Utils from 'utils/utils.jsx'; import * as TextFormatting from 'utils/text_formatting.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; const UserStatuses = Constants.UserStatuses; diff --git a/webapp/components/channel_invite_button.jsx b/webapp/components/channel_invite_button.jsx index 979e029ae..59eda8e41 100644 --- a/webapp/components/channel_invite_button.jsx +++ b/webapp/components/channel_invite_button.jsx @@ -4,7 +4,7 @@ import React from 'react'; import * as AsyncClient from 'utils/async_client.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import {FormattedMessage} from 'react-intl'; import SpinnerButton from 'components/spinner_button.jsx'; diff --git a/webapp/components/channel_members_modal.jsx b/webapp/components/channel_members_modal.jsx index ecea891bb..55250d5c5 100644 --- a/webapp/components/channel_members_modal.jsx +++ b/webapp/components/channel_members_modal.jsx @@ -9,7 +9,7 @@ import UserStore from 'stores/user_store.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; diff --git a/webapp/components/channel_notifications_modal.jsx b/webapp/components/channel_notifications_modal.jsx index e6430402a..f18cefa23 100644 --- a/webapp/components/channel_notifications_modal.jsx +++ b/webapp/components/channel_notifications_modal.jsx @@ -6,7 +6,7 @@ import {Modal} from 'react-bootstrap'; import SettingItemMin from './setting_item_min.jsx'; import SettingItemMax from './setting_item_max.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import {FormattedMessage} from 'react-intl'; diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx index 92d822a34..4a59b818e 100644 --- a/webapp/components/claim/components/email_to_ldap.jsx +++ b/webapp/components/claim/components/email_to_ldap.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/webapp/components/claim/components/email_to_oauth.jsx b/webapp/components/claim/components/email_to_oauth.jsx index 422b31a3a..d7c4956a6 100644 --- a/webapp/components/claim/components/email_to_oauth.jsx +++ b/webapp/components/claim/components/email_to_oauth.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import React from 'react'; diff --git a/webapp/components/claim/components/oauth_to_email.jsx b/webapp/components/claim/components/oauth_to_email.jsx index 79392849f..ed604583d 100644 --- a/webapp/components/claim/components/oauth_to_email.jsx +++ b/webapp/components/claim/components/oauth_to_email.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import React from 'react'; diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx index bf23f7b44..d6744e9fb 100644 --- a/webapp/components/create_comment.jsx +++ b/webapp/components/create_comment.jsx @@ -4,7 +4,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import UserStore from 'stores/user_store.jsx'; import PostDeletedModal from './post_deleted_modal.jsx'; import PostStore from 'stores/post_store.jsx'; diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index 9b61cca24..c0da9ae1d 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -11,7 +11,7 @@ import TutorialTip from './tutorial/tutorial_tip.jsx'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import * as ChannelActions from 'actions/channel_actions.jsx'; diff --git a/webapp/components/delete_channel_modal.jsx b/webapp/components/delete_channel_modal.jsx index 925fa163c..7ec6fde44 100644 --- a/webapp/components/delete_channel_modal.jsx +++ b/webapp/components/delete_channel_modal.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import * as AsyncClient from 'utils/async_client.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import {Modal} from 'react-bootstrap'; import TeamStore from 'stores/team_store.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/delete_post_modal.jsx b/webapp/components/delete_post_modal.jsx index b2aea6590..6563e3ee8 100644 --- a/webapp/components/delete_post_modal.jsx +++ b/webapp/components/delete_post_modal.jsx @@ -3,7 +3,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import PostStore from 'stores/post_store.jsx'; import ModalStore from 'stores/modal_store.jsx'; import {Modal} from 'react-bootstrap'; diff --git a/webapp/components/do_verify_email.jsx b/webapp/components/do_verify_email.jsx index c54d32b56..e0ac3218e 100644 --- a/webapp/components/do_verify_email.jsx +++ b/webapp/components/do_verify_email.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import {FormattedMessage} from 'react-intl'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import LoadingScreen from './loading_screen.jsx'; import {browserHistory, Link} from 'react-router/es6'; diff --git a/webapp/components/edit_channel_header_modal.jsx b/webapp/components/edit_channel_header_modal.jsx index cfc89500d..6112668ba 100644 --- a/webapp/components/edit_channel_header_modal.jsx +++ b/webapp/components/edit_channel_header_modal.jsx @@ -3,7 +3,7 @@ import ReactDOM from 'react-dom'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import * as Utils from 'utils/utils.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; diff --git a/webapp/components/edit_channel_purpose_modal.jsx b/webapp/components/edit_channel_purpose_modal.jsx index 747ac6fed..664a94cf2 100644 --- a/webapp/components/edit_channel_purpose_modal.jsx +++ b/webapp/components/edit_channel_purpose_modal.jsx @@ -4,7 +4,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; import * as AsyncClient from 'utils/async_client.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'react-intl'; import PreferenceStore from 'stores/preference_store.jsx'; diff --git a/webapp/components/edit_post_modal.jsx b/webapp/components/edit_post_modal.jsx index 8be0ba243..b346503a9 100644 --- a/webapp/components/edit_post_modal.jsx +++ b/webapp/components/edit_post_modal.jsx @@ -3,7 +3,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import Textbox from './textbox.jsx'; diff --git a/webapp/components/file_attachment.jsx b/webapp/components/file_attachment.jsx index b6d535b84..f9c361afc 100644 --- a/webapp/components/file_attachment.jsx +++ b/webapp/components/file_attachment.jsx @@ -4,7 +4,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; import * as utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import {intlShape, injectIntl, defineMessages} from 'react-intl'; diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx index 1a3c6eadc..ee3871b29 100644 --- a/webapp/components/file_upload.jsx +++ b/webapp/components/file_upload.jsx @@ -4,7 +4,7 @@ import $ from 'jquery'; import 'jquery-dragster/jquery.dragster.js'; import ReactDOM from 'react-dom'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import * as Utils from 'utils/utils.jsx'; diff --git a/webapp/components/invite_member_modal.jsx b/webapp/components/invite_member_modal.jsx index 68a7b7b15..1ba3b0c4e 100644 --- a/webapp/components/invite_member_modal.jsx +++ b/webapp/components/invite_member_modal.jsx @@ -5,7 +5,7 @@ import ReactDOM from 'react-dom'; import * as utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import ModalStore from 'stores/modal_store.jsx'; import UserStore from 'stores/user_store.jsx'; diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index d2dbf1800..0e5440b4b 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -8,7 +8,7 @@ import FormError from 'components/form_error.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import UserStore from 'stores/user_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as TextFormatting from 'utils/text_formatting.jsx'; diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index c2d262819..b9dea4370 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -21,7 +21,7 @@ import TeamStore from 'stores/team_store.jsx'; import ChannelSwitchModal from './channel_switch_modal.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; diff --git a/webapp/components/new_channel_flow.jsx b/webapp/components/new_channel_flow.jsx index f6e91afc4..e0ab2d5a1 100644 --- a/webapp/components/new_channel_flow.jsx +++ b/webapp/components/new_channel_flow.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import UserStore from 'stores/user_store.jsx'; import NewChannelModal from './new_channel_modal.jsx'; diff --git a/webapp/components/password_reset_form.jsx b/webapp/components/password_reset_form.jsx index 05bf29eae..b37e07f2d 100644 --- a/webapp/components/password_reset_form.jsx +++ b/webapp/components/password_reset_form.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import ReactDOM from 'react-dom'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/password_reset_send_link.jsx b/webapp/components/password_reset_send_link.jsx index 48179e162..18741b816 100644 --- a/webapp/components/password_reset_send_link.jsx +++ b/webapp/components/password_reset_send_link.jsx @@ -4,7 +4,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; import * as Utils from 'utils/utils.jsx'; -import client from 'utils/web_client.jsx'; +import client from 'client/web_client.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx index 28e45d5d6..306fa7a2e 100644 --- a/webapp/components/popover_list_members.jsx +++ b/webapp/components/popover_list_members.jsx @@ -7,7 +7,7 @@ import UserStore from 'stores/user_store.jsx'; import {Popover, Overlay} from 'react-bootstrap'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import {FormattedMessage} from 'react-intl'; import {browserHistory} from 'react-router/es6'; diff --git a/webapp/components/post_view/components/pending_post_options.jsx b/webapp/components/post_view/components/pending_post_options.jsx index 536ec541c..711ea832c 100644 --- a/webapp/components/post_view/components/pending_post_options.jsx +++ b/webapp/components/post_view/components/pending_post_options.jsx @@ -6,7 +6,7 @@ import ChannelStore from 'stores/channel_store.jsx'; import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/register_app_modal.jsx b/webapp/components/register_app_modal.jsx index 82a095c75..b9523c3ed 100644 --- a/webapp/components/register_app_modal.jsx +++ b/webapp/components/register_app_modal.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import ModalStore from 'stores/modal_store.jsx'; import {Modal} from 'react-bootstrap'; diff --git a/webapp/components/rename_channel_modal.jsx b/webapp/components/rename_channel_modal.jsx index 4dc84d971..f83cf110f 100644 --- a/webapp/components/rename_channel_modal.jsx +++ b/webapp/components/rename_channel_modal.jsx @@ -4,7 +4,7 @@ import ReactDOM from 'react-dom'; import TeamStore from 'stores/team_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index ac029f6fa..758642cae 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -12,7 +12,7 @@ import * as GlobalActions from 'actions/global_actions.jsx'; import * as TextFormatting from 'utils/text_formatting.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx index f98ed4c3d..9bb7d2970 100644 --- a/webapp/components/root.jsx +++ b/webapp/components/root.jsx @@ -3,7 +3,7 @@ import * as GlobalActions from 'actions/global_actions.jsx'; import LocalizationStore from 'stores/localization_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import {IntlProvider} from 'react-intl'; diff --git a/webapp/components/search_bar.jsx b/webapp/components/search_bar.jsx index 290572612..c92adcd9b 100644 --- a/webapp/components/search_bar.jsx +++ b/webapp/components/search_bar.jsx @@ -3,7 +3,7 @@ import $ from 'jquery'; import ReactDOM from 'react-dom'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import SearchStore from 'stores/search_store.jsx'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; @@ -206,4 +206,4 @@ export default class SearchBar extends React.Component { ); } -} \ No newline at end of file +} diff --git a/webapp/components/should_verify_email.jsx b/webapp/components/should_verify_email.jsx index 18a936b13..5ac67e383 100644 --- a/webapp/components/should_verify_email.jsx +++ b/webapp/components/should_verify_email.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import {FormattedMessage} from 'react-intl'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import React from 'react'; import {Link} from 'react-router/es6'; diff --git a/webapp/components/sidebar_header.jsx b/webapp/components/sidebar_header.jsx index 76d9cf214..29503c410 100644 --- a/webapp/components/sidebar_header.jsx +++ b/webapp/components/sidebar_header.jsx @@ -7,7 +7,7 @@ import NavbarDropdown from './navbar_dropdown.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; const Preferences = Constants.Preferences; diff --git a/webapp/components/signup_user_complete.jsx b/webapp/components/signup_user_complete.jsx index 629fb2f78..9d65aee19 100644 --- a/webapp/components/signup_user_complete.jsx +++ b/webapp/components/signup_user_complete.jsx @@ -11,7 +11,7 @@ import BrowserStore from 'stores/browser_store.jsx'; import UserStore from 'stores/user_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import React from 'react'; diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx index a3e5cd59b..b33662420 100644 --- a/webapp/components/suggestion/at_mention_provider.jsx +++ b/webapp/components/suggestion/at_mention_provider.jsx @@ -7,7 +7,7 @@ import SuggestionStore from 'stores/suggestion_store.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import UserStore from 'stores/user_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import {FormattedMessage} from 'react-intl'; import Suggestion from './suggestion.jsx'; diff --git a/webapp/components/suggestion/search_user_provider.jsx b/webapp/components/suggestion/search_user_provider.jsx index 1a3075a30..7a5bdabf1 100644 --- a/webapp/components/suggestion/search_user_provider.jsx +++ b/webapp/components/suggestion/search_user_provider.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import SuggestionStore from 'stores/suggestion_store.jsx'; import UserStore from 'stores/user_store.jsx'; diff --git a/webapp/components/team_general_tab.jsx b/webapp/components/team_general_tab.jsx index ac50c69a0..7ca8f8fce 100644 --- a/webapp/components/team_general_tab.jsx +++ b/webapp/components/team_general_tab.jsx @@ -5,7 +5,7 @@ import $ from 'jquery'; import SettingItemMin from './setting_item_min.jsx'; import SettingItemMax from './setting_item_max.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import TeamStore from 'stores/team_store.jsx'; diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx index f8c217aed..b583d2caa 100644 --- a/webapp/components/team_members_dropdown.jsx +++ b/webapp/components/team_members_dropdown.jsx @@ -3,7 +3,7 @@ import UserStore from 'stores/user_store.jsx'; import ChannelStore from 'stores/channel_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; import ConfirmModal from './confirm_modal.jsx'; diff --git a/webapp/components/user_list_row.jsx b/webapp/components/user_list_row.jsx index a7838ec32..aae3d4dd8 100644 --- a/webapp/components/user_list_row.jsx +++ b/webapp/components/user_list_row.jsx @@ -4,7 +4,7 @@ import Constants from 'utils/constants.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import React from 'react'; export default function UserListRow({user, teamMember, actions, actionProps}) { diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx index 9a6045be7..c7020fed9 100644 --- a/webapp/components/user_profile.jsx +++ b/webapp/components/user_profile.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import * as Utils from 'utils/utils.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import UserStore from 'stores/user_store.jsx'; import {Popover, OverlayTrigger} from 'react-bootstrap'; diff --git a/webapp/components/user_settings/manage_languages.jsx b/webapp/components/user_settings/manage_languages.jsx index f6e2aaa6d..a62482462 100644 --- a/webapp/components/user_settings/manage_languages.jsx +++ b/webapp/components/user_settings/manage_languages.jsx @@ -3,7 +3,7 @@ import SettingItemMax from '../setting_item_max.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as I18n from 'i18n/i18n.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index 9b0e6a204..2a411a607 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -9,7 +9,7 @@ import SettingPicture from '../setting_picture.jsx'; import UserStore from 'stores/user_store.jsx'; import ErrorStore from 'stores/error_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx index b9e9b6de1..e116ea7c4 100644 --- a/webapp/components/user_settings/user_settings_notifications.jsx +++ b/webapp/components/user_settings/user_settings_notifications.jsx @@ -7,7 +7,7 @@ import SettingItemMax from '../setting_item_max.jsx'; import UserStore from 'stores/user_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 976e65981..a4f02a614 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -11,7 +11,7 @@ import ToggleModalButton from '../toggle_modal_button.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import TeamStore from 'stores/team_store.jsx'; -import Client from 'utils/web_client.jsx'; +import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/youtube_video.jsx b/webapp/components/youtube_video.jsx index 4295b27e9..0012b1e98 100644 --- a/webapp/components/youtube_video.jsx +++ b/webapp/components/youtube_video.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import ChannelStore from 'stores/channel_store.jsx'; -import WebClient from 'utils/web_client.jsx'; +import WebClient from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; const ytRegex = /(?:http|https):\/\/(?:www\.)?(?:(?:youtube\.com\/(?:(?:v\/)|(\/u\/\w\/)|(?:(?:watch|embed\/watch)(?:\/|.*v=))|(?:embed\/)|(?:user\/[^\/]+\/u\/[0-9]\/)))|(?:youtu\.be\/))([^#&\?]*)/; -- cgit v1.2.3-1-g7c22