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.

Sign up for GitHub

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

Jump to bottom

Plans: Add beginning of PlanOverview, PlanFeatures, and PlanStatus #1395

Merged
merged 14 commits into from
Dec 10, 2015
Merged

Plans: Add beginning of PlanOverview, PlanFeatures, and PlanStatus #1395

merged 14 commits into from
Dec 10, 2015

Conversation

stephanethomas
Copy link
Contributor

This pull request addressed part of #1151 by introducing a new variant of the Plans page. This new Plan Overview page is displayed when the user has subscribed to a free trial.

screen shot 2015-12-09 at 4 10 45 pm

Three new components are added in this PR: PlanOverview, PlanFeatures, and PlanStatus.

  • PlanOverview is used to render /plans/:site when :site has a free trial.
  • PlanStatus implements a <ProgressBar /> to show the amount of time remaining in a trial. To be implemented in a separate PR:
    • The 'Purchase Now' button.
    • The states where a plan is near to expiring or expired (with a red progress bar).
  • PlanFeatures is a stub component and will be implemented in a separate PR.

Testing

  • Visit /plans/:site and start a premium or business free trial.
  • Visit /plans/:site and assert that you see PlanOverview as above.
  • QA review
  • Code review

@stephanethomas stephanethomas added [Feature] Plans & Upgrades All of the plans on WordPress.com and flow for upgrading plans. [Status] In Progress labels Dec 8, 2015
@stephanethomas stephanethomas added this to the No-cc Free Trials: v1 milestone Dec 8, 2015
@drewblaisdell drewblaisdell force-pushed the add/plans-overview branch 4 times, most recently from 84a39a4 to 8f17719 Compare December 9, 2015 15:40
@drewblaisdell drewblaisdell changed the title Plans: Add plans overview page Plans: Add beginning of PlanOverview, PlanFeatures, and PlanStatus Dec 9, 2015
@drewblaisdell drewblaisdell 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 Dec 9, 2015
@drewblaisdell drewblaisdell self-assigned this Dec 9, 2015
matthusby
matthusby reviewed Dec 9, 2015
View reviewed changes
client/my-sites/plans/plan-overview/plan-status/style.scss

.plan-status__info {
display: flex;
align-items: center;
Copy link
Contributor

Choose a reason for hiding this comment

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

We should order these css props alphabetically (We should do this on the whole file)

@matthusby
Copy link
Contributor

Should we feature flag this?

code 👍

@fabianapsimoes
Copy link
Contributor

I signed up for a new trial from /plans/:site and it gave me a 11-day trial instead of 14. The page then says 10 days remaining (not 11, as it should). The issue with the length of the trial should be solved in #1423, but we need to make sure the status is correct with regards to the amount of the days left on the date of signup.

@fabianapsimoes fabianapsimoes added [Status] Needs Author Reply and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Dec 9, 2015
@fabianapsimoes
Copy link
Contributor

We need to fix the capitalization in this case (for "a day remaining"):

screenshot-calypso localhost 3000 2015-12-09 16-50-22

Edit: Maybe it should say "one day" instead of "a day"? (cc @mikeshelton1503)

@mikeshelton1503
Copy link
Contributor

Let's do:

1 day remaining

@fabianapsimoes
Copy link
Contributor

  • Right after signup, this first loads the regular version of plans, and then replaces it with the trial version. Can we load the trial version right away?

domain

  • If I remove the trial sub from the admin tools, /plans still displays the plan as being active (but in full subscription mode). This changes after a minute or two to the correct state. Here's an example from a Premium trial subscription removed:

screenshot-calypso localhost 3000 2015-12-09 17-06-22

@fabianapsimoes
Copy link
Contributor

The issue with the length of the trial should be solved in #1423

Actually this seems to have been a weird one-off. I can't reproduce it anymore, I'm getting 14 days when I sign up for a trial.

@drewblaisdell drewblaisdell mentioned this pull request Dec 10, 2015
Closed
@drewblaisdell
Copy link
Contributor

Can we load the trial version right away?

@fabianapsimoes This is a bit complex and may increase the size of this already large PR, so I opened an issue to fix displaying stale data on PlanOverview: #1465

@matthusby Would you mind taking another look at this PR?

@drewblaisdell drewblaisdell added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] Needs Author Reply labels Dec 10, 2015
@drewblaisdell drewblaisdell force-pushed the add/plans-overview branch 2 times, most recently from 96d69cc to 76122fc Compare December 10, 2015 15:41
stephanethomas
stephanethomas reviewed Dec 10, 2015
View reviewed changes
client/my-sites/plans/plan-overview/plan-status/index.jsx
} );
}

return this.translate( '1 day remaining' );
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should probably use the count attribute here in order to better handle pluralization.

@stephanethomas stephanethomas mentioned this pull request Dec 10, 2015
Closed
@stephanethomas
Copy link
Contributor Author

We should be good to go. I've created #1469 to better handle SVG files.

@stephanethomas stephanethomas added [Status] Ready to Merge and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Dec 10, 2015
@fabianapsimoes
Copy link
Contributor

QA 👍

stephanethomas and others added 14 commits December 10, 2015 11:50
@stephanethomas @drewblaisdell
Plans: Remove unnecessary functions in Plan page
8ab7e14 
These functions were only called once - it doesn't bring really any benefit to have this code extracted.
@stephanethomas @drewblaisdell
Plans: Add method to retrieve the current plan from the Site Specific…
102f2da 
… Plans Details List component
@stephanethomas @drewblaisdell
Plans: Add skeletons for the Plan Overview pages
dbfcf90
@drewblaisdell
Plans: Add plan name to PlanStatus
e7294d9
@drewblaisdell
Plans: Add assembler for site specific plan details
3aa1d2d
@drewblaisdell
Plans: Display PlanOverview properly when local storage is empty
c6e8c6a
@mikeshelton1503 @drewblaisdell
Adding icons, again.
8609a53
@drewblaisdell
Plans: Use subscribed date/expiry to render a progress bar
d3c9ab1
@drewblaisdell
Plans: Move PlanStatus and PlanFeatures into separate directories
37d34ce
@Tug @drewblaisdell
Free Trials: Add styling for plan-status
a21b398
@Tug @drewblaisdell
Free Trials: Set a minimum for the ProgressBar in PlanStatus
4ee1ec0 
The reason is to show the user that the trial has started already when they just subscribed
@drewblaisdell
Plans: Update userFacingExpiryMoment to expire at the end of the ex…
08b24e3 
…piry day
@drewblaisdell
Plans: Display '1 day remaining' instead of 'a day remaining'
0c8473e
@drewblaisdell
Plans: Add feature flag to PlanOverview
3a4f5e3
drewblaisdell added a commit that referenced this pull request Dec 10, 2015
@drewblaisdell
Merge pull request #1395 from Automattic/add/plans-overview
2d966dc 
Plans: Add beginning of `PlanOverview`, `PlanFeatures`, and `PlanStatus`
@drewblaisdell drewblaisdell merged commit 2d966dc into master Dec 10, 2015
@drewblaisdell drewblaisdell deleted the add/plans-overview branch December 10, 2015 17:00
@Tug Tug mentioned this pull request Dec 29, 2015
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@drewblaisdell drewblaisdell

Labels
[Feature] Plans & Upgrades All of the plans on WordPress.com and flow for upgrading plans.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@stephanethomas @matthusby @fabianapsimoes @mikeshelton1503 @drewblaisdell @Tug