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

Add support for products on My Plan page and update layout to match mocks #14121

Merged
merged 1 commit into from
Nov 25, 2019

Conversation

delawski
Copy link
Contributor

This PR adds a support for products to the My Plan page and adjusts the page header area layout to match the new designs.

Please note that this PR doesn't add the action buttons like "Manage Plan" or "Manage Purchase". They need to be added in a follow-up PR.

Before
Screenshot 2019-11-25 at 18 25 20

After
Screenshot 2019-11-25 at 18 24 12

Fixes n/a

Changes proposed in this Pull Request:

  • Migrate MyPlanCard from Calypso
  • Refactor MyPlanHeader so that it supports both plans and products
  • Update MyPlanHeader layout to match the latest mock-ups

Testing instructions:

  • Go to /wp-admin/admin.php?page=jetpack#/my-plan
  • Check if each plan information is displayed there (free and paid plans)
  • Check if both Jetpack Backup information is displayed there along with the plan information.

Proposed changelog entry for your changes:

  • Add MyPlanCard card
  • Refactor MyPlanHeader so that it supports both plans and products

@delawski delawski added [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Status] Needs Design Review Design has been added. Needs a review! Plans labels Nov 25, 2019
@delawski delawski added this to the 8.0 milestone Nov 25, 2019
@delawski delawski requested review from enejb, tyxla, robertf4 and a team November 25, 2019 17:27
@delawski delawski self-assigned this Nov 25, 2019
@jetpackbot
Copy link

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Scheduled Jetpack release: December 3, 2019.
Scheduled code freeze: November 26, 2019

Generated by 🚫 dangerJS against 6ffd538

Copy link
Contributor

@robertf4 robertf4 left a comment

Choose a reason for hiding this comment

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

Excellent work @delawski! I like the code and everything tested well for me so I think this is good to 🚢

Copy link
Member

@tyxla tyxla left a comment

Choose a reason for hiding this comment

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

LGTM, let's ship this 🚢

@tyxla tyxla added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Design Review Design has been added. Needs a review! [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Nov 25, 2019
@enejb
Copy link
Member

enejb commented Nov 25, 2019

I tested this as well and it worked as expected :shipit:

@enejb
Copy link
Member

enejb commented Nov 25, 2019

Just wanted to note that calypso uses a different Free plan icon.

I don't think this should hold this PR but we should address this in the future.

@delawski
Copy link
Contributor Author

I was confused about the icons in Jetpack. There is a PlanIcon component that renders yet different icons than what we have here, on My Plan page, and in Calypso. I think this needs some attention and improvements in the future.

@delawski delawski merged commit 22a5558 into master Nov 25, 2019
@delawski delawski deleted the update/my-plan-page-header branch November 25, 2019 19:58
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Ready to Merge Go ahead, you can push that green button! labels Nov 25, 2019
jeherve added a commit that referenced this pull request Nov 25, 2019
jeherve added a commit that referenced this pull request Nov 25, 2019
* 8.0 Release: running changelog

* Changelog: add #13921

* Changelog: add #13980

* Changelog: add #13905

* Changelog: add #13971

* Changelog: add #13984

* Changelog: add #14009

* Changelog: add #13620

* Remove things that will ship in 7.9.1

* Changelog: add 7.9.1 release (#14044)

* Changelog: add base for 7.9.1 release

* Update release date and post link

* Changelog: add #14066

* Update changelog for 7.9.1

* Changelog: add #13405

* Changelog: add #13841

* Changelog: add #13924

* Changelog: add #13986

* Changelog: add #14010, #14028, #14053, #14055.

* Changelog: add #14054

* Changelog: add #14031

* Changelog: add #14039

* Changelog: add #14050

* Changelog: add #14070

* Changelog: add #14082

* Changelog: add #14084

* Changelog: add #14111

* Changelog: add #13961

* Changelog: add #14047

* Changelog: add #14091

* Changelog: add #14108

* Changelog: add #14121
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Plans [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants