Skip to content

/ ghostery-extension

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

Jump to bottom

GH-2210: Onboarding - Step 4 - Choose Plan #640

Merged
merged 32 commits into from Dec 10, 2020
Merged

GH-2210: Onboarding - Step 4 - Choose Plan #640

merged 32 commits into from Dec 10, 2020

Conversation

@benstrumeyer
Copy link
Contributor

@benstrumeyer benstrumeyer commented Dec 6, 2020

  • Have you followed the guidelines in CONTRIBUTING.md?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do?
  • Does your submission pass tests?
  • Did you lint your code prior to submission?
  • Create ChoosePlanView design for ghostery browser intro hub
  • Does not handle Start trial behavior
  • Uses didNotSelectGhosterySearch prop that indicates if the ghostery search promo should be shown (currently unused)
  • Add alternate design for radio button component
  • Responsive
  • Move radioButton and RadioButtonGroup components to the shared-components folder
benstrumeyer added 30 commits Nov 24, 2020
@benstrumeyer
Create ghostery-search promo in plan view
81e9177
@benstrumeyer
Add scroll arrow and cards
0a36f46
@benstrumeyer
Add value prop list to cards
6e38e7c
@benstrumeyer
Add radio button and hover effects to cards
890315d
@benstrumeyer
Add click handler to full card, not only radio button
c475484
@benstrumeyer
Select default plan depending on current plan
81bf436
@benstrumeyer
Add logic to display title and subtitle texts
3609b8e
@benstrumeyer
Style radio button alt design
8a32f7b
@benstrumeyer
Touch up radio button alt design
cdcef84
@benstrumeyer
Make responsive
Loading status checks…
40685f9
@benstrumeyer
Change CTA button to a button
2e299cc
@benstrumeyer
Add back backgrounds on small screens and add checkmarks for free card
b452c0c
@benstrumeyer
Add working links
Loading status checks…
2ab5254
@benstrumeyer
Refactor basic/plus/premium states
8dc513b
@benstrumeyer
Make cards responsive with OR
ae09663
@benstrumeyer
Add padding and change CTA button strings
6154223
@benstrumeyer
Add hover effects to search and premium CTA buttons
f61e456
@benstrumeyer
Conditionally show cards based on users subscriptions and refactor ar…
0865b2e 
…row to show/hide plan cards instead of scrolling
@benstrumeyer
Fix logic for showing caret
dbe0507
@benstrumeyer
Fix and refactor cta button links
957a436
@benstrumeyer
Fix color of premium CTA button when displaying to a basic user
b56ca6e
@benstrumeyer
Refactor and add comments
cd0f937
@benstrumeyer
Remove unused css
11cbdbe
@benstrumeyer
Update plus and premium checkout links to specify english
b1c585c
@benstrumeyer
Merge branch 'ghostery-browser-intro-hub' into GH-2210-2
3e37ddd
@benstrumeyer
Move RadioButton and RadioButtonGroup to shared components
9fccb04
@benstrumeyer
Rename Step4_ChoosePlanView to ChoosePlanView
Loading status checks…
a6d647e
@benstrumeyer
Use BASIC, PLUS, and PREMIUM constants from UpgradePlanViewConstants …
Loading status checks…
2bebdab 
…and fix search.svg path
@benstrumeyer
Update copywrite year
Loading status checks…
e04c652
@benstrumeyer
Replace hex color codes with variables
Loading status checks…
cd70f46
@benstrumeyer
Add border to unchecked radio button
Loading status checks…
c9c5eed
@benstrumeyer benstrumeyer requested a review from wlycdgr Dec 6, 2020
@benstrumeyer benstrumeyer self-assigned this Dec 6, 2020
@benstrumeyer benstrumeyer requested a review from ghostery/extension as a code owner Dec 6, 2020
@wlycdgr
Merge branch 'ghostery-browser-intro-hub' into GH-2210-2
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
Loading status checks…
5775130
@wlycdgr
wlycdgr approved these changes Dec 10, 2020
View changes
Copy link
Member

@wlycdgr wlycdgr left a comment

Looks good for merging into intermediate branch
@wlycdgr wlycdgr merged commit d87f5c2 into ghostery-browser-intro-hub Dec 10, 2020
0 of 2 checks passed
0 of 2 checks passed
@travis-ci
Travis CI - Branch Build Failed
Details
@travis-ci
Travis CI - Pull Request Build Failed
Details
@benstrumeyer benstrumeyer deleted the GH-2210-2 branch Jan 29, 2021
@christophertino christophertino added this to the 8.5.5 milestone Jan 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wlycdgr wlycdgr

Assignees

@benstrumeyer benstrumeyer

Labels
Type: Feature Request
Projects
None yet
Milestone
8.5.5
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@benstrumeyer @wlycdgr @christophertino