From b2a679c25da42c4665059965830858da4f0ec238 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 15 Sep 2015 18:59:14 -0700 Subject: PLT-93 cleaing up client side configs --- web/react/pages/channel.jsx | 24 ++++++++++++------------ web/react/pages/home.jsx | 6 +++--- web/react/pages/login.jsx | 8 ++++---- web/react/pages/password_reset.jsx | 12 ++++++------ web/react/pages/signup_team.jsx | 4 ++-- web/react/pages/signup_team_complete.jsx | 8 ++++---- web/react/pages/signup_user_complete.jsx | 16 ++++++++-------- web/react/pages/verify.jsx | 8 ++++---- 8 files changed, 43 insertions(+), 43 deletions(-) (limited to 'web/react/pages') diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index e70b51865..1f034165f 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -39,18 +39,18 @@ var AsyncClient = require('../utils/async_client.jsx'); var Constants = require('../utils/constants.jsx'); var ActionTypes = Constants.ActionTypes; -function setupChannelPage(teamName, teamType, teamId, channelName, channelId) { +function setupChannelPage(props) { AsyncClient.getConfig(); AppDispatcher.handleViewAction({ type: ActionTypes.CLICK_CHANNEL, - name: channelName, - id: channelId + name: props.ChannelName, + id: props.ChannelId }); AppDispatcher.handleViewAction({ type: ActionTypes.CLICK_TEAM, - id: teamId + id: props.TeamId }); // ChannelLoader must be rendered first @@ -65,14 +65,14 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) { ); React.render( - , + , document.getElementById('navbar') ); React.render( , document.getElementById('sidebar-left') ); @@ -88,17 +88,17 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) { ); React.render( - , + , document.getElementById('team_settings_modal') ); React.render( - , + , document.getElementById('team_members_modal') ); React.render( - , + , document.getElementById('invite_member_modal') ); @@ -184,8 +184,8 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) { React.render( , document.getElementById('sidebar-menu') ); diff --git a/web/react/pages/home.jsx b/web/react/pages/home.jsx index 18553542c..2299c306e 100644 --- a/web/react/pages/home.jsx +++ b/web/react/pages/home.jsx @@ -4,12 +4,12 @@ var ChannelStore = require('../stores/channel_store.jsx'); var Constants = require('../utils/constants.jsx'); -function setupHomePage(teamURL) { +function setupHomePage(props) { var last = ChannelStore.getLastVisitedName(); if (last == null || last.length === 0) { - window.location = teamURL + '/channels/' + Constants.DEFAULT_CHANNEL; + window.location = props.TeamURL + '/channels/' + Constants.DEFAULT_CHANNEL; } else { - window.location = teamURL + '/channels/' + last; + window.location = props.TeamURL + '/channels/' + last; } } diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx index 424ae0e84..830f622fa 100644 --- a/web/react/pages/login.jsx +++ b/web/react/pages/login.jsx @@ -3,12 +3,12 @@ var Login = require('../components/login.jsx'); -function setupLoginPage(teamDisplayName, teamName, authServices) { +function setupLoginPage(props) { React.render( , document.getElementById('login') ); diff --git a/web/react/pages/password_reset.jsx b/web/react/pages/password_reset.jsx index 2ca468bea..b7bfdcd5e 100644 --- a/web/react/pages/password_reset.jsx +++ b/web/react/pages/password_reset.jsx @@ -3,14 +3,14 @@ var PasswordReset = require('../components/password_reset.jsx'); -function setupPasswordResetPage(isReset, teamDisplayName, teamName, hash, data) { +function setupPasswordResetPage(props) { React.render( , document.getElementById('reset') ); diff --git a/web/react/pages/signup_team.jsx b/web/react/pages/signup_team.jsx index e9e803aa4..5346347ec 100644 --- a/web/react/pages/signup_team.jsx +++ b/web/react/pages/signup_team.jsx @@ -5,10 +5,10 @@ var SignupTeam = require('../components/signup_team.jsx'); var AsyncClient = require('../utils/async_client.jsx'); -function setupSignupTeamPage(authServices) { +function setupSignupTeamPage(props) { AsyncClient.getConfig(); - var services = JSON.parse(authServices); + var services = JSON.parse(props.AuthServices); React.render( , diff --git a/web/react/pages/signup_team_complete.jsx b/web/react/pages/signup_team_complete.jsx index 72f9992a8..ec77e6602 100644 --- a/web/react/pages/signup_team_complete.jsx +++ b/web/react/pages/signup_team_complete.jsx @@ -3,12 +3,12 @@ var SignupTeamComplete = require('../components/signup_team_complete.jsx'); -function setupSignupTeamCompletePage(email, data, hash) { +function setupSignupTeamCompletePage(props) { React.render( , document.getElementById('signup-team-complete') ); diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx index eaf93a61c..112aaa3f2 100644 --- a/web/react/pages/signup_user_complete.jsx +++ b/web/react/pages/signup_user_complete.jsx @@ -3,16 +3,16 @@ var SignupUserComplete = require('../components/signup_user_complete.jsx'); -function setupSignupUserCompletePage(email, name, uiName, id, data, hash, authServices) { +function setupSignupUserCompletePage(props) { React.render( , document.getElementById('signup-user-complete') ); diff --git a/web/react/pages/verify.jsx b/web/react/pages/verify.jsx index 7077b40b8..e48471bbd 100644 --- a/web/react/pages/verify.jsx +++ b/web/react/pages/verify.jsx @@ -3,12 +3,12 @@ var EmailVerify = require('../components/email_verify.jsx'); -global.window.setupVerifyPage = function setupVerifyPage(isVerified, teamURL, userEmail) { +global.window.setupVerifyPage = function setupVerifyPage(props) { React.render( , document.getElementById('verify') ); -- cgit v1.2.3-1-g7c22