Skip to content

Commit

Permalink
Invites: Display message on invite accepted …
Browse files Browse the repository at this point in the history
  • Loading branch information
lezama committed Nov 27, 2015
1 parent a2a5f1b commit 15258df
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
8 changes: 4 additions & 4 deletions client/accept-invite/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ export default React.createClass( {
},

getRedirectTo() {
const redirectTo = window.location.origin,
{ invite } = this.state.invite;
const { invite } = this.state.invite;
let redirectTo = window.location.origin;
switch ( invite.meta.role ) {
case 'viewer':
case 'follower':
return redirectTo;
break;
default:
return redirectTo + '/posts/' + invite.blog_id;
redirectTo += '/posts/' + invite.blog_id;
}
return redirectTo += '?invite_accepted=' + invite.blog_id;
},

renderForm() {
Expand Down
6 changes: 6 additions & 0 deletions client/boot/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ var config = require( 'config' ),
translatorInvitation = require( 'layout/community-translator/invitation-utils' ),
layoutFocus = require( 'lib/layout-focus' ),
nuxWelcome = require( 'nux-welcome' ),
inviteActions = require( 'accept-invite/actions' ),
emailVerification = require( 'components/email-verification' ),
viewport = require( 'lib/viewport' ),
detectHistoryNavigation = require( 'lib/detect-history-navigation' ),
Expand Down Expand Up @@ -229,6 +230,11 @@ function boot() {
nuxWelcome.clearTempWelcome();
}

if ( context.query.invite_accepted ) {
inviteActions.displayInviteAccepted( parseInt( context.query.invite_accepted ) );
page( context.pathname );
}

// Bump general stat tracking overall Newdash usage
analytics.mc.bumpStat( { newdash_pageviews: 'route' } );

Expand Down
2 changes: 2 additions & 0 deletions client/layout/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ var Masterbar = require( './masterbar' ),
EmailVerificationNotice = require( 'components/email-verification/email-verification-notice' ),
Welcome = require( 'my-sites/welcome/welcome' ),
WelcomeMessage = require( 'nux-welcome/welcome-message' ),
InviteMessage = require( 'accept-invite/invite-message' ),
analytics = require( 'analytics' ),
config = require( 'config' ),
PulsingDot = require( 'components/pulsing-dot' ),
Expand Down Expand Up @@ -107,6 +108,7 @@ module.exports = React.createClass( {
<Welcome isVisible={ showWelcome } closeAction={ this.closeWelcome } additionalClassName="NuxWelcome">
<WelcomeMessage welcomeSite={ newestSite } />
</Welcome>
<InviteMessage sites={ this.props.sites }/>
<EmailVerificationNotice user={ this.props.user } />
<NoticesList id="notices" notices={ notices.list } forcePinned={ 'post' === this.state.section } />
<TranslatorInvitation isVisible={ showInvitation } />
Expand Down

0 comments on commit 15258df

Please sign in to comment.