From 5c35c2631e59f895a7b0fb6761c1cae7aee60466 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 19 Nov 2015 18:10:08 -0500 Subject: Upgrading ESLint and adding some more rules. Refactoring to meet these new rules --- web/react/components/admin_console/admin_controller.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx index 8e0ab0555..3c3f03f5a 100644 --- a/web/react/components/admin_console/admin_controller.jsx +++ b/web/react/components/admin_console/admin_controller.jsx @@ -189,4 +189,12 @@ export default class AdminController extends React.Component { ); } -} \ No newline at end of file +} + +AdminController.defaultProps = { +}; + +AdminController.propTypes = { + tab: React.PropTypes.string, + teamId: React.PropTypes.string +}; -- cgit v1.2.3-1-g7c22 From 55b831e4e1d3db3ffcf1d40247018783ca76af8d Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 19 Nov 2015 21:12:56 -0500 Subject: Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package system. --- .../components/admin_console/admin_controller.jsx | 38 +++++++++++----------- .../admin_console/admin_navbar_dropdown.jsx | 8 ++--- .../components/admin_console/admin_sidebar.jsx | 6 ++-- .../admin_console/admin_sidebar_header.jsx | 6 ++-- .../components/admin_console/email_settings.jsx | 6 ++-- .../components/admin_console/gitlab_settings.jsx | 4 +-- .../components/admin_console/image_settings.jsx | 6 ++-- .../components/admin_console/log_settings.jsx | 4 +-- web/react/components/admin_console/logs.jsx | 6 ++-- .../components/admin_console/privacy_settings.jsx | 4 +-- .../components/admin_console/rate_settings.jsx | 4 +-- .../admin_console/reset_password_modal.jsx | 2 +- .../components/admin_console/service_settings.jsx | 4 +-- .../components/admin_console/sql_settings.jsx | 6 ++-- .../components/admin_console/team_analytics.jsx | 6 ++-- .../components/admin_console/team_settings.jsx | 4 +-- web/react/components/admin_console/team_users.jsx | 8 ++--- web/react/components/admin_console/user_item.jsx | 4 +-- 18 files changed, 63 insertions(+), 63 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx index 3c3f03f5a..4f144b0dd 100644 --- a/web/react/components/admin_console/admin_controller.jsx +++ b/web/react/components/admin_console/admin_controller.jsx @@ -1,25 +1,25 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AdminSidebar = require('./admin_sidebar.jsx'); -var AdminStore = require('../../stores/admin_store.jsx'); -var TeamStore = require('../../stores/team_store.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var LoadingScreen = require('../loading_screen.jsx'); -var Utils = require('../../utils/utils.jsx'); - -var EmailSettingsTab = require('./email_settings.jsx'); -var LogSettingsTab = require('./log_settings.jsx'); -var LogsTab = require('./logs.jsx'); -var FileSettingsTab = require('./image_settings.jsx'); -var PrivacySettingsTab = require('./privacy_settings.jsx'); -var RateSettingsTab = require('./rate_settings.jsx'); -var GitLabSettingsTab = require('./gitlab_settings.jsx'); -var SqlSettingsTab = require('./sql_settings.jsx'); -var TeamSettingsTab = require('./team_settings.jsx'); -var ServiceSettingsTab = require('./service_settings.jsx'); -var TeamUsersTab = require('./team_users.jsx'); -var TeamAnalyticsTab = require('./team_analytics.jsx'); +import AdminSidebar from './admin_sidebar.jsx'; +import AdminStore from '../../stores/admin_store.jsx'; +import TeamStore from '../../stores/team_store.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import LoadingScreen from '../loading_screen.jsx'; +import * as Utils from '../../utils/utils.jsx'; + +import EmailSettingsTab from './email_settings.jsx'; +import LogSettingsTab from './log_settings.jsx'; +import LogsTab from './logs.jsx'; +import FileSettingsTab from './image_settings.jsx'; +import PrivacySettingsTab from './privacy_settings.jsx'; +import RateSettingsTab from './rate_settings.jsx'; +import GitLabSettingsTab from './gitlab_settings.jsx'; +import SqlSettingsTab from './sql_settings.jsx'; +import TeamSettingsTab from './team_settings.jsx'; +import ServiceSettingsTab from './service_settings.jsx'; +import TeamUsersTab from './team_users.jsx'; +import TeamAnalyticsTab from './team_analytics.jsx'; export default class AdminController extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/admin_navbar_dropdown.jsx b/web/react/components/admin_console/admin_navbar_dropdown.jsx index df8da94e1..783d45de6 100644 --- a/web/react/components/admin_console/admin_navbar_dropdown.jsx +++ b/web/react/components/admin_console/admin_navbar_dropdown.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../../utils/utils.jsx'); -var Client = require('../../utils/client.jsx'); -var TeamStore = require('../../stores/team_store.jsx'); +import * as Utils from '../../utils/utils.jsx'; +import * as Client from '../../utils/client.jsx'; +import TeamStore from '../../stores/team_store.jsx'; -var Constants = require('../../utils/constants.jsx'); +import Constants from '../../utils/constants.jsx'; function getStateFromStores() { return {currentTeam: TeamStore.getCurrent()}; diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx index 0d52ae347..076a07618 100644 --- a/web/react/components/admin_console/admin_sidebar.jsx +++ b/web/react/components/admin_console/admin_sidebar.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AdminSidebarHeader = require('./admin_sidebar_header.jsx'); -var SelectTeamModal = require('./select_team_modal.jsx'); -var Utils = require('../../utils/utils.jsx'); +import AdminSidebarHeader from './admin_sidebar_header.jsx'; +import SelectTeamModal from './select_team_modal.jsx'; +import * as Utils from '../../utils/utils.jsx'; export default class AdminSidebar extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/admin_sidebar_header.jsx b/web/react/components/admin_console/admin_sidebar_header.jsx index fd6d92c4a..bfd479939 100644 --- a/web/react/components/admin_console/admin_sidebar_header.jsx +++ b/web/react/components/admin_console/admin_sidebar_header.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AdminNavbarDropdown = require('./admin_navbar_dropdown.jsx'); -var UserStore = require('../../stores/user_store.jsx'); -var Utils = require('../../utils/utils.jsx'); +import AdminNavbarDropdown from './admin_navbar_dropdown.jsx'; +import UserStore from '../../stores/user_store.jsx'; +import * as Utils from '../../utils/utils.jsx'; export default class SidebarHeader extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 0cabf7f70..d0565a0e0 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var crypto = require('crypto'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import crypto from 'crypto'; export default class EmailSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx index f8fb6d115..8c689a2d8 100644 --- a/web/react/components/admin_console/gitlab_settings.jsx +++ b/web/react/components/admin_console/gitlab_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class GitLabSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/image_settings.jsx b/web/react/components/admin_console/image_settings.jsx index 8b577e012..e1ffad7d3 100644 --- a/web/react/components/admin_console/image_settings.jsx +++ b/web/react/components/admin_console/image_settings.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var crypto = require('crypto'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import crypto from 'crypto'; export default class FileSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/log_settings.jsx b/web/react/components/admin_console/log_settings.jsx index 7e9eda89b..a91cc57ab 100644 --- a/web/react/components/admin_console/log_settings.jsx +++ b/web/react/components/admin_console/log_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class LogSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/logs.jsx b/web/react/components/admin_console/logs.jsx index 3449c78d9..01135f1b8 100644 --- a/web/react/components/admin_console/logs.jsx +++ b/web/react/components/admin_console/logs.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AdminStore = require('../../stores/admin_store.jsx'); -var LoadingScreen = require('../loading_screen.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import AdminStore from '../../stores/admin_store.jsx'; +import LoadingScreen from '../loading_screen.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class Logs extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/privacy_settings.jsx b/web/react/components/admin_console/privacy_settings.jsx index f2d22f36e..61393f1c6 100644 --- a/web/react/components/admin_console/privacy_settings.jsx +++ b/web/react/components/admin_console/privacy_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class PrivacySettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/rate_settings.jsx b/web/react/components/admin_console/rate_settings.jsx index 4d71777c4..ca9fcb074 100644 --- a/web/react/components/admin_console/rate_settings.jsx +++ b/web/react/components/admin_console/rate_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class RateSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/reset_password_modal.jsx b/web/react/components/admin_console/reset_password_modal.jsx index 35d3cdd17..5ff7c3413 100644 --- a/web/react/components/admin_console/reset_password_modal.jsx +++ b/web/react/components/admin_console/reset_password_modal.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); +import * as Client from '../../utils/client.jsx'; var Modal = ReactBootstrap.Modal; export default class ResetPasswordModal extends React.Component { diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index 53c89a942..908eb709a 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class ServiceSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/sql_settings.jsx b/web/react/components/admin_console/sql_settings.jsx index b43108bf7..2a55f7324 100644 --- a/web/react/components/admin_console/sql_settings.jsx +++ b/web/react/components/admin_console/sql_settings.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var crypto = require('crypto'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import crypto from 'crypto'; export default class SqlSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx index 0c9d1f61b..6c8e63c83 100644 --- a/web/react/components/admin_console/team_analytics.jsx +++ b/web/react/components/admin_console/team_analytics.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var Utils = require('../../utils/utils.jsx'); -var LineChart = require('./line_chart.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as Utils from '../../utils/utils.jsx'; +import LineChart from './line_chart.jsx'; export default class TeamAnalytics extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/team_settings.jsx b/web/react/components/admin_console/team_settings.jsx index 6587184ea..7991b9a01 100644 --- a/web/react/components/admin_console/team_settings.jsx +++ b/web/react/components/admin_console/team_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class TeamSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/team_users.jsx b/web/react/components/admin_console/team_users.jsx index 7161139e6..2d9657956 100644 --- a/web/react/components/admin_console/team_users.jsx +++ b/web/react/components/admin_console/team_users.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var LoadingScreen = require('../loading_screen.jsx'); -var UserItem = require('./user_item.jsx'); -var ResetPasswordModal = require('./reset_password_modal.jsx'); +import * as Client from '../../utils/client.jsx'; +import LoadingScreen from '../loading_screen.jsx'; +import UserItem from './user_item.jsx'; +import ResetPasswordModal from './reset_password_modal.jsx'; export default class UserList extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx index 2badaf0e5..bd64564c9 100644 --- a/web/react/components/admin_console/user_item.jsx +++ b/web/react/components/admin_console/user_item.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var Utils = require('../../utils/utils.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as Utils from '../../utils/utils.jsx'; export default class UserItem extends React.Component { constructor(props) { -- cgit v1.2.3-1-g7c22