summaryrefslogtreecommitdiffstats
path: root/webapp/root.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-04-01 09:26:28 -0400
committerChristopher Speller <crspeller@gmail.com>2016-04-01 11:53:53 -0400
commit35b63caafc912dae2200b5b6497ad059189c5048 (patch)
tree8757f7ab512dab029759e99f7d565618a5a22f8d /webapp/root.jsx
parent36f611fac48536f26770357de8d5b6767bd46d2f (diff)
downloadchat-35b63caafc912dae2200b5b6497ad059189c5048.tar.gz
chat-35b63caafc912dae2200b5b6497ad059189c5048.tar.bz2
chat-35b63caafc912dae2200b5b6497ad059189c5048.zip
Fixing signup flow. Better root redirect. Fixes back buttons.
Diffstat (limited to 'webapp/root.jsx')
-rw-r--r--webapp/root.jsx20
1 files changed, 1 insertions, 19 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx
index 9c2708506..112f0880e 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -149,23 +149,6 @@ function preLoggedIn(nextState, replace, callback) {
});
}
-function onRootEnter(nextState, replace, callback) {
- if (nextState.location.pathname === '/') {
- Client.getMeLoggedIn((data) => {
- if (!data || data.logged_in === 'false') {
- replace({pathname: '/signup_team'});
- callback();
- } else {
- replace({pathname: '/' + data.team_name + '/channels/town-square'});
- callback();
- }
- });
- return;
- }
-
- callback();
-}
-
function onPermalinkEnter(nextState) {
const postId = nextState.params.postid;
@@ -216,7 +199,6 @@ function renderRootComponent() {
<Route
path='/'
component={Root}
- onEnter={onRootEnter}
>
<Route
component={LoggedIn}
@@ -314,7 +296,7 @@ function renderRootComponent() {
component={TeamURLPage}
/>
<Route
- path='invites'
+ path='send_invites'
component={SendInivtesPage}
/>
<Route