summaryrefslogtreecommitdiffstats
path: root/web/react/pages
diff options
context:
space:
mode:
Diffstat (limited to 'web/react/pages')
-rw-r--r--web/react/pages/admin_console.jsx13
-rw-r--r--web/react/pages/authorize.jsx2
-rw-r--r--web/react/pages/channel.jsx77
-rw-r--r--web/react/pages/find_team.jsx2
-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
10 files changed, 53 insertions, 53 deletions
diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index 7e7dcfae8..ea9ae06f4 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -5,18 +5,21 @@ 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');
-export function setupAdminConsolePage() {
- React.render(
- <AdminController />,
+export function setupAdminConsolePage(props) {
+ ReactDOM.render(
+ <AdminController
+ tab={props.ActiveTab}
+ teamId={props.TeamId}
+ />,
document.getElementById('admin_controller')
);
- React.render(
+ ReactDOM.render(
<SelectTeamModal />,
document.getElementById('select_team_modal')
);
- React.render(
+ ReactDOM.render(
<ErrorBar/>,
document.getElementById('error_bar')
);
diff --git a/web/react/pages/authorize.jsx b/web/react/pages/authorize.jsx
index 1338e6cc2..2bc8b539d 100644
--- a/web/react/pages/authorize.jsx
+++ b/web/react/pages/authorize.jsx
@@ -4,7 +4,7 @@
var Authorize = require('../components/authorize.jsx');
function setupAuthorizePage(props) {
- React.render(
+ ReactDOM.render(
<Authorize
teamName={props.TeamName}
appName={props.AppName}
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 4d6d3fd15..20ed1bf0a 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -24,7 +24,6 @@ var TeamSettingsModal = require('../components/team_settings_modal.jsx');
var ChannelMembersModal = require('../components/channel_members.jsx');
var ChannelInviteModal = require('../components/channel_invite_modal.jsx');
var TeamMembersModal = require('../components/team_members.jsx');
-var DirectChannelModal = require('../components/more_direct_channels.jsx');
var ErrorBar = require('../components/error_bar.jsx');
var ErrorStore = require('../stores/error_store.jsx');
var ChannelLoader = require('../components/channel_loader.jsx');
@@ -38,6 +37,7 @@ var RegisterAppModal = require('../components/register_app_modal.jsx');
var ImportThemeModal = require('../components/user_settings/import_theme_modal.jsx');
var TeamStore = require('../stores/team_store.jsx');
+var AsyncClient = require('../utils/async_client.jsx');
var Constants = require('../utils/constants.jsx');
var ActionTypes = Constants.ActionTypes;
@@ -55,23 +55,25 @@ function setupChannelPage(props) {
id: props.TeamId
});
+ AsyncClient.getAllPreferences();
+
// ChannelLoader must be rendered first
- React.render(
+ ReactDOM.render(
<ChannelLoader/>,
document.getElementById('channel_loader')
);
- React.render(
+ ReactDOM.render(
<ErrorBar/>,
document.getElementById('error_bar')
);
- React.render(
+ ReactDOM.render(
<Navbar teamDisplayName={props.TeamDisplayName} />,
document.getElementById('navbar')
);
- React.render(
+ ReactDOM.render(
<Sidebar
teamDisplayName={props.TeamDisplayName}
teamName={props.TeamName}
@@ -80,117 +82,112 @@ function setupChannelPage(props) {
document.getElementById('sidebar-left')
);
- React.render(
+ ReactDOM.render(
<GetLinkModal />,
document.getElementById('get_link_modal')
);
- React.render(
+ ReactDOM.render(
<UserSettingsModal />,
document.getElementById('user_settings_modal')
);
- React.render(
+ ReactDOM.render(
<ImportThemeModal />,
document.getElementById('import_theme_modal')
);
- React.render(
+ ReactDOM.render(
<TeamSettingsModal teamDisplayName={props.TeamDisplayName} />,
document.getElementById('team_settings_modal')
);
- React.render(
+ ReactDOM.render(
<TeamMembersModal teamDisplayName={props.TeamDisplayName} />,
document.getElementById('team_members_modal')
);
- React.render(
+ ReactDOM.render(
<MemberInviteModal teamType={props.TeamType} />,
document.getElementById('invite_member_modal')
);
- React.render(
+ ReactDOM.render(
<ChannelHeader />,
document.getElementById('channel-header')
);
- React.render(
+ ReactDOM.render(
<EditChannelModal />,
document.getElementById('edit_channel_modal')
);
- React.render(
+ ReactDOM.render(
<DeleteChannelModal />,
document.getElementById('delete_channel_modal')
);
- React.render(
+ ReactDOM.render(
<RenameChannelModal />,
document.getElementById('rename_channel_modal')
);
- React.render(
+ ReactDOM.render(
<ChannelNotificationsModal />,
document.getElementById('channel_notifications_modal')
);
- React.render(
+ ReactDOM.render(
<ChannelMembersModal />,
document.getElementById('channel_members_modal')
);
- React.render(
+ ReactDOM.render(
<ChannelInviteModal />,
document.getElementById('channel_invite_modal')
);
- React.render(
+ ReactDOM.render(
<ChannelInfoModal />,
document.getElementById('channel_info_modal')
);
- React.render(
+ ReactDOM.render(
<MoreChannelsModal />,
document.getElementById('more_channels_modal')
);
- React.render(
- <DirectChannelModal />,
- document.getElementById('direct_channel_modal')
- );
-
- React.render(
+ ReactDOM.render(
<PostListContainer />,
document.getElementById('post-list')
);
- React.render(
+ ReactDOM.render(
<EditPostModal />,
document.getElementById('edit_post_modal')
);
- React.render(
+ ReactDOM.render(
<DeletePostModal />,
document.getElementById('delete_post_modal')
);
- React.render(
+ ReactDOM.render(
<PostDeletedModal />,
document.getElementById('post_deleted_modal')
);
- React.render(
+ ReactDOM.render(
<CreatePost />,
document.getElementById('post-create')
);
- React.render(
+ ReactDOM.render(
<SidebarRight />,
document.getElementById('sidebar-right')
);
- React.render(
+ ReactDOM.render(
<SidebarRightMenu
teamDisplayName={props.TeamDisplayName}
teamType={props.TeamType}
@@ -198,44 +195,44 @@ function setupChannelPage(props) {
document.getElementById('sidebar-menu')
);
- React.render(
+ ReactDOM.render(
<MentionList id='post_textbox' />,
document.getElementById('post_mention_tab')
);
- React.render(
+ ReactDOM.render(
<MentionList id='reply_textbox' />,
document.getElementById('reply_mention_tab')
);
- React.render(
+ ReactDOM.render(
<MentionList id='edit_textbox' />,
document.getElementById('edit_mention_tab')
);
- React.render(
+ ReactDOM.render(
<AccessHistoryModal />,
document.getElementById('access_history_modal')
);
- React.render(
+ ReactDOM.render(
<ActivityLogModal />,
document.getElementById('activity_log_modal')
);
- React.render(
+ ReactDOM.render(
<RemovedFromChannelModal />,
document.getElementById('removed_from_channel_modal')
);
- React.render(
+ ReactDOM.render(
<FileUploadOverlay
overlayType='center'
/>,
document.getElementById('file_upload_overlay')
);
- React.render(
+ ReactDOM.render(
<RegisterAppModal />,
document.getElementById('register_app_modal')
);
diff --git a/web/react/pages/find_team.jsx b/web/react/pages/find_team.jsx
index d901e380b..f95fce5c6 100644
--- a/web/react/pages/find_team.jsx
+++ b/web/react/pages/find_team.jsx
@@ -4,7 +4,7 @@
var FindTeam = require('../components/find_team.jsx');
function setupFindTeamPage() {
- React.render(
+ ReactDOM.render(
<FindTeam />,
document.getElementById('find-team')
);
diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx
index 17835c47f..430de980c 100644
--- a/web/react/pages/login.jsx
+++ b/web/react/pages/login.jsx
@@ -4,7 +4,7 @@
var Login = require('../components/login.jsx');
function setupLoginPage(props) {
- React.render(
+ ReactDOM.render(
<Login
teamDisplayName={props.TeamDisplayName}
teamName={props.TeamName}
diff --git a/web/react/pages/password_reset.jsx b/web/react/pages/password_reset.jsx
index 6f9c5eab1..aef9ab3f9 100644
--- a/web/react/pages/password_reset.jsx
+++ b/web/react/pages/password_reset.jsx
@@ -4,7 +4,7 @@
var PasswordReset = require('../components/password_reset.jsx');
function setupPasswordResetPage(props) {
- React.render(
+ ReactDOM.render(
<PasswordReset
isReset={props.IsReset}
teamDisplayName={props.TeamDisplayName}
diff --git a/web/react/pages/signup_team.jsx b/web/react/pages/signup_team.jsx
index 06b5cfad9..dc8394a77 100644
--- a/web/react/pages/signup_team.jsx
+++ b/web/react/pages/signup_team.jsx
@@ -4,7 +4,7 @@
var SignupTeam = require('../components/signup_team.jsx');
function setupSignupTeamPage() {
- React.render(
+ ReactDOM.render(
<SignupTeam />,
document.getElementById('signup-team')
);
diff --git a/web/react/pages/signup_team_complete.jsx b/web/react/pages/signup_team_complete.jsx
index 572117867..44ec05b98 100644
--- a/web/react/pages/signup_team_complete.jsx
+++ b/web/react/pages/signup_team_complete.jsx
@@ -4,7 +4,7 @@
var SignupTeamComplete = require('../components/signup_team_complete.jsx');
function setupSignupTeamCompletePage(props) {
- React.render(
+ ReactDOM.render(
<SignupTeamComplete
email={props.Email}
hash={props.Hash}
diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx
index 63a55b4a1..a0e0962ff 100644
--- a/web/react/pages/signup_user_complete.jsx
+++ b/web/react/pages/signup_user_complete.jsx
@@ -4,7 +4,7 @@
var SignupUserComplete = require('../components/signup_user_complete.jsx');
function setupSignupUserCompletePage(props) {
- React.render(
+ ReactDOM.render(
<SignupUserComplete
teamId={props.TeamId}
teamName={props.TeamName}
diff --git a/web/react/pages/verify.jsx b/web/react/pages/verify.jsx
index 7f06ff6fb..7535009b3 100644
--- a/web/react/pages/verify.jsx
+++ b/web/react/pages/verify.jsx
@@ -4,7 +4,7 @@
var EmailVerify = require('../components/email_verify.jsx');
global.window.setupVerifyPage = function setupVerifyPage(props) {
- React.render(
+ ReactDOM.render(
<EmailVerify
isVerified={props.IsVerified}
teamURL={props.TeamURL}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 05:14:57 +0000