-
Notifications
You must be signed in to change notification settings - Fork 799
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
My Plan: Add Checklist CTA #12429
Merged
Merged
My Plan: Add Checklist CTA #12429
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
3b53259
Add static Checklist CTA to my plan
sirreal ff3adf1
Remove instead of placeholder
sirreal 39c5485
Finish removing placeholder references
sirreal 38ebdae
Fix bad class name
sirreal e888501
Remove unused style
sirreal 1e05673
Remove unused jp-landing-plans__header-description
sirreal 6510c6c
Remove unused jp-landing-plans__header-btn-container class
sirreal 8cb14fb
Remove unused jp-landing-plans__header-title class
sirreal c0e9fd6
Remove unused jp-landing-plans__header-subtitle class
sirreal 6d3c202
Remove unused classes
sirreal 7d3c896
Remove unused classes
sirreal 4c9859b
Ensure correct line break and placeholder display
sirreal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
/** | ||
* External dependencies | ||
*/ | ||
import React from 'react'; | ||
import { translate as __ } from 'i18n-calypso'; | ||
|
||
/** | ||
* Internal dependencies | ||
*/ | ||
import Button from 'components/button'; | ||
|
||
export default function ChecklistCta( { siteSlug } ) { | ||
return ( | ||
<div className="jp-landing__plan-features-header-checklist-cta-container"> | ||
<Button primary href={ `https://wordpress.com/plans/my-plan/${ siteSlug }` }> | ||
{ __( 'View your setup checklist' ) } | ||
jeherve marked this conversation as resolved.
Show resolved
Hide resolved
|
||
</Button> | ||
</div> | ||
); | ||
} |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,9 +10,10 @@ import { connect } from 'react-redux'; | |
/** | ||
* Internal dependencies | ||
*/ | ||
import { imagePath } from 'constants/urls'; | ||
import { getUpgradeUrl, showBackups } from 'state/initial-state'; | ||
import ChecklistCta from './checklist-cta'; | ||
import ChecklistProgress from './checklist-progress-card'; | ||
import { getUpgradeUrl, getSiteRawUrl, showBackups } from 'state/initial-state'; | ||
import { imagePath } from 'constants/urls'; | ||
|
||
class MyPlanHeader extends React.Component { | ||
trackLearnMore = () => { | ||
|
@@ -24,6 +25,7 @@ class MyPlanHeader extends React.Component { | |
}; | ||
|
||
render() { | ||
const { siteSlug } = this.props; | ||
let planCard = ''; | ||
switch ( getPlanClass( this.props.plan ) ) { | ||
case 'is-free-plan': | ||
|
@@ -43,6 +45,7 @@ class MyPlanHeader extends React.Component { | |
<p className="jp-landing__plan-features-text"> | ||
{ __( 'Get started with hassle-free design, stats, and performance tools.' ) } | ||
</p> | ||
<ChecklistCta siteSlug={ siteSlug } /> | ||
</div> | ||
</div> | ||
); | ||
|
@@ -71,6 +74,7 @@ class MyPlanHeader extends React.Component { | |
{ __( 'Spam filtering and priority support.' ) } | ||
</p> | ||
) } | ||
<ChecklistCta siteSlug={ siteSlug } /> | ||
</div> | ||
</div> | ||
); | ||
|
@@ -86,7 +90,7 @@ class MyPlanHeader extends React.Component { | |
alt={ __( 'Jetpack Premium Plan' ) } | ||
/> | ||
</div> | ||
<div className="jp-landing__plan-iconcard-current"> | ||
<div className="jp-landing__plan-card-current"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This one class was inconsistent with the rest. |
||
<h3 className="jp-landing__plan-features-title"> | ||
{ __( 'Welcome to Jetpack Premium' ) } | ||
</h3> | ||
|
@@ -95,6 +99,7 @@ class MyPlanHeader extends React.Component { | |
'Full security suite, marketing and revenue automation tools, unlimited video hosting, and priority support.' | ||
) } | ||
</p> | ||
<ChecklistCta siteSlug={ siteSlug } /> | ||
</div> | ||
</div> | ||
); | ||
|
@@ -119,6 +124,7 @@ class MyPlanHeader extends React.Component { | |
'Full security suite, marketing and revenue automation tools, unlimited video hosting, unlimited themes, enhanced search, and priority support.' | ||
) } | ||
</p> | ||
<ChecklistCta siteSlug={ siteSlug } /> | ||
</div> | ||
</div> | ||
); | ||
|
@@ -146,6 +152,7 @@ class MyPlanHeader extends React.Component { | |
} | ||
export default connect( state => { | ||
return { | ||
siteSlug: getSiteRawUrl( state ), | ||
showBackups: showBackups( state ), | ||
plansMainTopUpgradeUrl: getUpgradeUrl( state, 'plans-main-top' ), | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to add tracking to clicks on that button?