Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

People: Invites: Add accepted invite welcome message #636

Merged
merged 5 commits into from
Dec 1, 2015

Conversation

lezama
Copy link
Contributor

@lezama lezama commented Nov 24, 2015

How to partially test

  • pull add/invites-accept-decline-notices
  • go to calypso.localhost:3000/?invite_accepted=<blog_id>

You should see a message like this:

image

Partially-closes #133

cc @ebinnion @roccotripaldi for an early review

@ebinnion
Copy link
Contributor

This approach seems fine to me 👍 Although, note that there are some formatting issues currently where the notice is going behind the sidebar. This may get fixed in #302 though, so let's keep an eye on that PR.

I think we're going to run into issues with logged out users since these users won't be able to see the Calypso dashboard. So, how do we handle users that turn decline invites or users that opt to only follow by email? cc @rickybanister

@rickybanister
Copy link

If they opt to follow by email we send them to subscribe.wordpress.com.

If they decline they see something like this:

follower-flow-11

The button would take them to the normal NUX

@lezama lezama force-pushed the add/invites-accept-decline-notices branch 4 times, most recently from c612464 to d9d87e9 Compare November 27, 2015 13:14
@lezama lezama added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] In Progress labels Nov 27, 2015
@lezama lezama changed the title People: Invites: Add accept/decline notices People: Invites: Add accept invite notice Nov 27, 2015
@lezama lezama changed the title People: Invites: Add accept invite notice People: Invites: Add accepted invite welcome message Nov 27, 2015
@@ -1,7 +1,14 @@
/**
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should place all of these non-view pieces be in lib.

@mtias
Copy link
Member

mtias commented Nov 27, 2015

image

Given the current message I think it should be just a success <Notice>.

@lezama lezama force-pushed the add/invites-accept-decline-notices branch from 4702a31 to 15258df Compare November 27, 2015 16:20
@lezama
Copy link
Contributor Author

lezama commented Nov 27, 2015

@mtias could you give it another look, I changed everything :p

image

I would love some help on how to tackle the design

I'd consider putting the invite-message component in the client/signup folder.

I think we should move the entire accept-invite folder on another PR

@ebinnion
Copy link
Contributor

I'm not sure I agree to moving the entire directory to within signup. While we are using the shared signup form component, we are not at all using the same logic that the signup steps allow.

@mtias
Copy link
Member

mtias commented Nov 28, 2015

@ebinnion consider the large folder groups in client (my-sites, reader, me, signup, post-editor) as a way to organize the main areas of the apps and their views. There are some miscellaneous pieces (translator, layout components, etc) that don't quite fit in any of these buckets. Perhaps this is one of them? I'd like for us to find a place for the react components used here that is not the root of client. We've had on our minds the idea of reworking the layout folder into a more general app one once we move into a single render tree.

Now thinking a bit more about this, invites seems like a "my-sites" domain in general. Why not move it there?

}
return (
<SimpleNotice status="is-success" onClick={ dismissInviteAccepted }>
<h3 className="invite-message__title">{ this.translate( 'You\'re now a user of: %(site)s', { args: { site: site.slug } } ) }</h3>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the site should be a link to the front-end. Also the sentence would read better without the :You're now a user of <a>Blabla</a>., with a period at the end.

@mtias
Copy link
Member

mtias commented Nov 30, 2015

I think we should move the entire accept-invite folder on another PR

Sure, but please, open an issue for it so we don't lose track — I hope we avoid adding stuff into client's root in general.

@ebinnion ebinnion added the [Status] Needs Design Review Add this when you'd like to get a review / feedback from the Design team on your PR label Nov 30, 2015
@ebinnion
Copy link
Contributor

cc @rickybanister for a design review.

@@ -2,6 +2,8 @@
* Internal dependencies
*/
import wpcom from 'lib/wp' ;
import Dispatcher from 'dispatcher';
import { DISPLAY_INVITE_ACCEPTED_NOTICE, DISMISS_INVITE_ACCEPTED_NOTICE, DISPLAY_INVITE_DECLINED_NOTICE, DISMISS_INVITE_DECLINED_NOTICE } from './invite-message/constants'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oooh, I love this. Great idea!! I'm going to copy it :D

/**
* Internal dependencies
*/
import SimpleNotice from 'notices/simple-notice'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think SimpleNotice have just been (like... 2 hours ago) deprecated! :/

@johnHackworth
Copy link
Contributor

We need to update this for using instead of , but once that is done, I think code-wise this is ready to go :shipit:

@lezama lezama force-pushed the add/invites-accept-decline-notices branch from 15258df to 4189d7b Compare December 1, 2015 13:37
lezama added a commit that referenced this pull request Dec 1, 2015
…tices

People: Invites: Add accepted invite welcome message
@lezama lezama merged commit a588651 into master Dec 1, 2015
@lezama lezama deleted the add/invites-accept-decline-notices branch December 1, 2015 13:38
@scruffian scruffian removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Dec 1, 2015
@lancewillett lancewillett removed the [Status] Needs Design Review Add this when you'd like to get a review / feedback from the Design team on your PR label Oct 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

People: Create invite accept/decline notices
7 participants