summaryrefslogtreecommitdiffstats
path: root/web/react/pages
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-19 21:12:56 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-19 21:12:56 -0500
commit55b831e4e1d3db3ffcf1d40247018783ca76af8d (patch)
treee817ed0fc96ae6ee8c1a39619adff070dd86f95d /web/react/pages
parent5c35c2631e59f895a7b0fb6761c1cae7aee60466 (diff)
downloadchat-55b831e4e1d3db3ffcf1d40247018783ca76af8d.tar.gz
chat-55b831e4e1d3db3ffcf1d40247018783ca76af8d.tar.bz2
chat-55b831e4e1d3db3ffcf1d40247018783ca76af8d.zip
Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package system.
Diffstat (limited to 'web/react/pages')
-rw-r--r--web/react/pages/admin_console.jsx6
-rw-r--r--web/react/pages/authorize.jsx2
-rw-r--r--web/react/pages/channel.jsx46
-rw-r--r--web/react/pages/docs.jsx2
-rw-r--r--web/react/pages/find_team.jsx2
-rw-r--r--web/react/pages/home.jsx6
-rw-r--r--web/react/pages/login.jsx2
-rw-r--r--web/react/pages/password_reset.jsx2
-rw-r--r--web/react/pages/signup_team.jsx2
-rw-r--r--web/react/pages/signup_team_complete.jsx2
-rw-r--r--web/react/pages/signup_user_complete.jsx2
-rw-r--r--web/react/pages/verify.jsx2
12 files changed, 38 insertions, 38 deletions
diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index ea9ae06f4..cbd2bd80d 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -1,9 +1,9 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var ErrorBar = require('../components/error_bar.jsx');
-var SelectTeamModal = require('../components/admin_console/select_team_modal.jsx');
-var AdminController = require('../components/admin_console/admin_controller.jsx');
+import ErrorBar from '../components/error_bar.jsx';
+import SelectTeamModal from '../components/admin_console/select_team_modal.jsx';
+import AdminController from '../components/admin_console/admin_controller.jsx';
export function setupAdminConsolePage(props) {
ReactDOM.render(
diff --git a/web/react/pages/authorize.jsx b/web/react/pages/authorize.jsx
index 2bc8b539d..71f17d007 100644
--- a/web/react/pages/authorize.jsx
+++ b/web/react/pages/authorize.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var Authorize = require('../components/authorize.jsx');
+import Authorize from '../components/authorize.jsx';
function setupAuthorizePage(props) {
ReactDOM.render(
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 9aba1a564..126942e65 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -1,29 +1,29 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var ChannelView = require('../components/channel_view.jsx');
-var ChannelLoader = require('../components/channel_loader.jsx');
-var ErrorBar = require('../components/error_bar.jsx');
-var ErrorStore = require('../stores/error_store.jsx');
-
-var MentionList = require('../components/mention_list.jsx');
-var GetLinkModal = require('../components/get_link_modal.jsx');
-var EditChannelModal = require('../components/edit_channel_modal.jsx');
-var RenameChannelModal = require('../components/rename_channel_modal.jsx');
-var EditPostModal = require('../components/edit_post_modal.jsx');
-var DeletePostModal = require('../components/delete_post_modal.jsx');
-var MoreChannelsModal = require('../components/more_channels.jsx');
-var PostDeletedModal = require('../components/post_deleted_modal.jsx');
-var TeamSettingsModal = require('../components/team_settings_modal.jsx');
-var TeamMembersModal = require('../components/team_members.jsx');
-var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx');
-var RegisterAppModal = require('../components/register_app_modal.jsx');
-var ImportThemeModal = require('../components/user_settings/import_theme_modal.jsx');
-var InviteMemberModal = require('../components/invite_member_modal.jsx');
-
-var AsyncClient = require('../utils/async_client.jsx');
-var Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import ChannelView from '../components/channel_view.jsx';
+import ChannelLoader from '../components/channel_loader.jsx';
+import ErrorBar from '../components/error_bar.jsx';
+import ErrorStore from '../stores/error_store.jsx';
+
+import MentionList from '../components/mention_list.jsx';
+import GetLinkModal from '../components/get_link_modal.jsx';
+import EditChannelModal from '../components/edit_channel_modal.jsx';
+import RenameChannelModal from '../components/rename_channel_modal.jsx';
+import EditPostModal from '../components/edit_post_modal.jsx';
+import DeletePostModal from '../components/delete_post_modal.jsx';
+import MoreChannelsModal from '../components/more_channels.jsx';
+import PostDeletedModal from '../components/post_deleted_modal.jsx';
+import TeamSettingsModal from '../components/team_settings_modal.jsx';
+import TeamMembersModal from '../components/team_members.jsx';
+import RemovedFromChannelModal from '../components/removed_from_channel_modal.jsx';
+import RegisterAppModal from '../components/register_app_modal.jsx';
+import ImportThemeModal from '../components/user_settings/import_theme_modal.jsx';
+import InviteMemberModal from '../components/invite_member_modal.jsx';
+
+import * as AsyncClient from '../utils/async_client.jsx';
+import Constants from '../utils/constants.jsx';
var ActionTypes = Constants.ActionTypes;
function setupChannelPage(props) {
diff --git a/web/react/pages/docs.jsx b/web/react/pages/docs.jsx
index ed2b6d0c9..74d9c2d19 100644
--- a/web/react/pages/docs.jsx
+++ b/web/react/pages/docs.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var Docs = require('../components/docs.jsx');
+import Docs from '../components/docs.jsx';
function setupDocumentationPage(props) {
ReactDOM.render(
diff --git a/web/react/pages/find_team.jsx b/web/react/pages/find_team.jsx
index f95fce5c6..c4653fd77 100644
--- a/web/react/pages/find_team.jsx
+++ b/web/react/pages/find_team.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var FindTeam = require('../components/find_team.jsx');
+import FindTeam from '../components/find_team.jsx';
function setupFindTeamPage() {
ReactDOM.render(
diff --git a/web/react/pages/home.jsx b/web/react/pages/home.jsx
index a59f2afd0..2c1edaa3a 100644
--- a/web/react/pages/home.jsx
+++ b/web/react/pages/home.jsx
@@ -1,9 +1,9 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var ChannelStore = require('../stores/channel_store.jsx');
-var TeamStore = require('../stores/team_store.jsx');
-var Constants = require('../utils/constants.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
+import Constants from '../utils/constants.jsx';
function setupHomePage() {
var last = ChannelStore.getLastVisitedName();
diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx
index 9865e6fd2..4a565623e 100644
--- a/web/react/pages/login.jsx
+++ b/web/react/pages/login.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var Login = require('../components/login.jsx');
+import Login from '../components/login.jsx';
function setupLoginPage(props) {
ReactDOM.render(
diff --git a/web/react/pages/password_reset.jsx b/web/react/pages/password_reset.jsx
index aef9ab3f9..4a6f1dcb0 100644
--- a/web/react/pages/password_reset.jsx
+++ b/web/react/pages/password_reset.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var PasswordReset = require('../components/password_reset.jsx');
+import PasswordReset from '../components/password_reset.jsx';
function setupPasswordResetPage(props) {
ReactDOM.render(
diff --git a/web/react/pages/signup_team.jsx b/web/react/pages/signup_team.jsx
index caa93b5bf..08ea45000 100644
--- a/web/react/pages/signup_team.jsx
+++ b/web/react/pages/signup_team.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var SignupTeam = require('../components/signup_team.jsx');
+import SignupTeam from '../components/signup_team.jsx';
function setupSignupTeamPage(props) {
var teams = [];
diff --git a/web/react/pages/signup_team_complete.jsx b/web/react/pages/signup_team_complete.jsx
index 44ec05b98..d5ed144a1 100644
--- a/web/react/pages/signup_team_complete.jsx
+++ b/web/react/pages/signup_team_complete.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var SignupTeamComplete = require('../components/signup_team_complete.jsx');
+import SignupTeamComplete from '../components/signup_team_complete.jsx';
function setupSignupTeamCompletePage(props) {
ReactDOM.render(
diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx
index a0e0962ff..de2c48443 100644
--- a/web/react/pages/signup_user_complete.jsx
+++ b/web/react/pages/signup_user_complete.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var SignupUserComplete = require('../components/signup_user_complete.jsx');
+import SignupUserComplete from '../components/signup_user_complete.jsx';
function setupSignupUserCompletePage(props) {
ReactDOM.render(
diff --git a/web/react/pages/verify.jsx b/web/react/pages/verify.jsx
index 7535009b3..d4ce4844d 100644
--- a/web/react/pages/verify.jsx
+++ b/web/react/pages/verify.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var EmailVerify = require('../components/email_verify.jsx');
+import EmailVerify from '../components/email_verify.jsx';
global.window.setupVerifyPage = function setupVerifyPage(props) {
ReactDOM.render(