From b62e29ba9cd6183551266da05b9b602a4415d738 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 24 Mar 2016 11:05:13 -0400 Subject: Moving all links and redirects to react-router --- webapp/components/claim/claim.jsx | 5 +++-- webapp/components/claim/components/email_to_ldap.jsx | 3 ++- webapp/components/claim/components/email_to_oauth.jsx | 3 ++- webapp/components/claim/components/ldap_to_email.jsx | 3 ++- webapp/components/claim/components/oauth_to_email.jsx | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) (limited to 'webapp/components/claim') diff --git a/webapp/components/claim/claim.jsx b/webapp/components/claim/claim.jsx index 464187c37..5cfb04af3 100644 --- a/webapp/components/claim/claim.jsx +++ b/webapp/components/claim/claim.jsx @@ -5,6 +5,7 @@ import TeamStore from 'stores/team_store.jsx'; import React from 'react'; import {FormattedMessage} from 'react-intl'; +import {Link} from 'react-router'; import logoImage from 'images/logo.png'; @@ -50,12 +51,12 @@ export default class Claim extends React.Component { return (
- + - +
diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx index f3046fa74..1f51f9cd5 100644 --- a/webapp/components/claim/components/email_to_ldap.jsx +++ b/webapp/components/claim/components/email_to_ldap.jsx @@ -7,6 +7,7 @@ import * as Client from 'utils/client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; import {FormattedMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; export default class EmailToLDAP extends React.Component { constructor(props) { @@ -54,7 +55,7 @@ export default class EmailToLDAP extends React.Component { Client.emailToLDAP(postData, (data) => { if (data.follow_link) { - window.location.href = data.follow_link; + browserHistory.push(data.follow_link); } }, (error) => { diff --git a/webapp/components/claim/components/email_to_oauth.jsx b/webapp/components/claim/components/email_to_oauth.jsx index f3e370a4a..f4376067a 100644 --- a/webapp/components/claim/components/email_to_oauth.jsx +++ b/webapp/components/claim/components/email_to_oauth.jsx @@ -7,6 +7,7 @@ import * as Client from 'utils/client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; import {FormattedMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; export default class EmailToOAuth extends React.Component { constructor(props) { @@ -39,7 +40,7 @@ export default class EmailToOAuth extends React.Component { Client.emailToOAuth(postData, (data) => { if (data.follow_link) { - window.location.href = data.follow_link; + browserHistory.push(data.follow_link); } }, (error) => { diff --git a/webapp/components/claim/components/ldap_to_email.jsx b/webapp/components/claim/components/ldap_to_email.jsx index b4ffd4944..ed8a314bd 100644 --- a/webapp/components/claim/components/ldap_to_email.jsx +++ b/webapp/components/claim/components/ldap_to_email.jsx @@ -7,6 +7,7 @@ import * as Client from 'utils/client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; import {FormattedMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; export default class LDAPToEmail extends React.Component { constructor(props) { @@ -53,7 +54,7 @@ export default class LDAPToEmail extends React.Component { Client.ldapToEmail(postData, (data) => { if (data.follow_link) { - window.location.href = data.follow_link; + browserHistory.push(data.follow_link); } }, (error) => { diff --git a/webapp/components/claim/components/oauth_to_email.jsx b/webapp/components/claim/components/oauth_to_email.jsx index 476677aeb..72e0500a9 100644 --- a/webapp/components/claim/components/oauth_to_email.jsx +++ b/webapp/components/claim/components/oauth_to_email.jsx @@ -7,6 +7,7 @@ import * as Client from 'utils/client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; import {FormattedMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; export default class OAuthToEmail extends React.Component { constructor(props) { @@ -45,7 +46,7 @@ export default class OAuthToEmail extends React.Component { Client.oauthToEmail(postData, (data) => { if (data.follow_link) { - window.location.href = data.follow_link; + browserHistory.push(data.follow_link); } }, (error) => { -- cgit v1.2.3-1-g7c22