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
GH-2066, GH-2068, GH-2069, GH-2082, GH-2067 Upgrade Plan panel subscription content #567
Merged
+1,699
−66
Give user subscriptionsPlus bool if they have either plus or premium …
7fe5a24
Select commit
901c4fa
Show premium subscribers a premium badge in simple/detailed views, he…
benstrumeyer f944c6c
Use api version 2.1.0 to get multiple subscriptions
benstrumeyer e035e69
Add hover effect for premium icon in menu
benstrumeyer 659749b
Use css as single source of truth for icon colors
benstrumeyer 2a83d42
Handle case where a user has multiple subscriptions and display Premi…
benstrumeyer de02e6c
Display subscription name
benstrumeyer 53378f0
Remove duplicate locale string
benstrumeyer a10bd6c
Handle case where user only has a premium subscription and clicks the…
benstrumeyer 7e552d2
Refactor code
benstrumeyer eb43832
Merge branch 'develop' into GH-2048
benstrumeyer 9eb39bd
Refactor subscriber badge css classes, image paths and comments
benstrumeyer 2d2aa90
Fix account#getUserSubscriptionData behavior
benstrumeyer 9383ab6
Add subscriptionsPremium property to user object to check if a user h…
benstrumeyer f7b36a9
Refactor Header component to use subscriptionsPremium property
benstrumeyer f545e7b
Add newline
benstrumeyer 2fcc862
Refactor svg template literal
benstrumeyer ef91547
Refactor account#getUserSubscriptionData to return an array of subscr…
benstrumeyer 4fc3f53
Pass object that allows destructuring of subscriptionData
benstrumeyer 2a9ffcb
Add return statement after callbacks
benstrumeyer f120d4d
Add guard to account#_setSubscriptionData to prevent overriding premi…
benstrumeyer 7fe5a24
Give user subscriptionsPlus bool if they have either plus or premium …
benstrumeyer 33c506a
Rename subscriptionsPlus and subscriptionsPremium to plusAccess and p…
benstrumeyer 0586ff5
Set subscription property on user object with highest tier subscripti…
benstrumeyer a77797c
Refactor menu upsell icon to use user.subscriber instead of plusAcces…
benstrumeyer 1816764
test
benstrumeyer 0847e49
Refactor Header logo and menu icon to use subscription instead of pre…
benstrumeyer d25d313
Rename subscriber variable to subscription
benstrumeyer c9ad1de
Refactor subscriber badge to use plusAccess and premiumAccess on clic…
benstrumeyer 6398be1
Check if user object exists before accessing subscription property
benstrumeyer eb337bc
Display UI elements basedd off user scope
benstrumeyer 3d51fd0
Remove unused subscription property on user
benstrumeyer 23e5eb7
Base menu icon off of plusAccess and premiumAccess
benstrumeyer 49eb749
Refactor isPlus to hasPlusAccess, destructure some things, and save s…
benstrumeyer 47f1cd5
Use panel#hasPlusAccess() directly
benstrumeyer ead0930
Fix menu icon link
benstrumeyer cf73693
Add description and button for upgrade prompt
benstrumeyer 01e96c8
Add shield icon without color params
benstrumeyer dd113ce
Add url-friendly-params to shield icon
benstrumeyer 4bd057b
Add responsive styles for upgrade promo
benstrumeyer 9e2774c
Merge branch 'GH-2048' into GH-2070
benstrumeyer c8c4606
Add purple border for non-premium users
benstrumeyer b4f891e
Update snapshot
benstrumeyer e992df0
Fix button from leaking outside the container right before hitting br…
benstrumeyer d44147f
Refactor colors
benstrumeyer 5b22311
Small style changes
benstrumeyer 5406aaf
Fix responsive styling for button when logged into a premium account
benstrumeyer 03bdff3
Change copy
benstrumeyer bdf4f30
Remove errors from UpgradePlanView
benstrumeyer 0ddb508
Remove sass errors from UpgradePlanView.scss
benstrumeyer b74ada6
Start replacing strings with messages
benstrumeyer 783c7aa
Finish replacing strings with messages
benstrumeyer 4e8ae40
Switch to new designs & fix breakage. Add card images and check marks
benstrumeyer e71ce59
Delete old designs
benstrumeyer 01946f8
Add x icon, and table style changes
benstrumeyer 6ace9f2
Create redux flow for UpgradePlanView
benstrumeyer 0ddf4ce
Make slider work
benstrumeyer 8a8859b
Change prices depending on toggle state. Remove active css classes
benstrumeyer 81e4961
Change per month/year based on toggle state
benstrumeyer 924b67b
Make protection level toggle
benstrumeyer 52860da
Add premium sparkle icon to table
benstrumeyer 3eed5d7
Add premium sparkle to table in mobile view
benstrumeyer a559998
Add background to card header images
benstrumeyer c77a0ce
Fix bug where image scrolled
benstrumeyer 34b03c3
Add arrow that scrolls to comparison table
benstrumeyer d0463b5
Add scroll for mobile
benstrumeyer 299c6b0
Add Must have Ghostery Midnight Installed note for larger screens
benstrumeyer ffdb8e2
Change monthly/yearly toggle label to grey if it is inactive
benstrumeyer 7751a34
Minor style changes and make price per year absolute
benstrumeyer 2f94cce
Change height/width of CTA buttons
benstrumeyer c7def0e
Add card border, toggle, midnight note, & protection description for …
benstrumeyer 9bf2e4d
Change card sizes, table style, and margins for mobile view
benstrumeyer c5df6dc
Add shield menu icon
benstrumeyer c24f016
Change default route to UpgradePlanView
benstrumeyer be27fa3
Added /home to all hrefDones in hub
benstrumeyer 14ed61b
Merge branch 'develop' into GH-2066
benstrumeyer 117eb72
Remove premium promo modal
benstrumeyer 5611ba2
Add premiumAccess in hub. Already Protected buttons redirect to home …
benstrumeyer 04cc686
Change background color to gold instead of gradient
benstrumeyer 9844933
More gradient -> gold changes
benstrumeyer 880339d
Add translations for basic/additional/maximum
benstrumeyer acf2546
Missed one
benstrumeyer 4389210
Remove debug flag from manifest.json
benstrumeyer f72ebc3
Change comments
benstrumeyer 0e4bb5d
Route to home after steppedNavigation ends
benstrumeyer bf79481
Merge branch 'GH-2066-routes' into GH-2066
benstrumeyer d8a4862
Change color check marks
benstrumeyer 5630a84
Make table show until small breakpoint
benstrumeyer 3e41607
Remove unused css
benstrumeyer 004c4f1
Left align table titles
benstrumeyer a4ad2af
Remove comments/console log
benstrumeyer 2dc1374
Navigate to home page when clicking No on Override settings
benstrumeyer bb72863
Replace localized ghostery plus/premium strings with hardcoded strings
benstrumeyer 6602cd7
Fix slider position
benstrumeyer 7ce79bc
Switch monthly and yearly on toggle
benstrumeyer 1861235
Hardcode strings that should not be translated
benstrumeyer f9d07e5
Make medium-large-breakpoint to switch to single card view
benstrumeyer 004490a
Fix key container on medium-large-breakpoint
benstrumeyer 53fe165
Fix more strings that shouldnt be translated. Use staging/prod links.
benstrumeyer a1fd992
Add blue and gold hover effects
benstrumeyer 9f5145a
Break to mobile design at 1020px
benstrumeyer 027289a
Add hover effects for premium buttons
benstrumeyer b6aad02
Switch to background position implementation for premium hover effect
benstrumeyer 86954d9
Only keep 2 breakpoints
benstrumeyer 664e603
Match hover transition timing for premium button
benstrumeyer b40a4d8
Some style changes
benstrumeyer ab52cee
Add intro_hub_click ping
benstrumeyer 23898d0
Merge branch 'GH-2070' into GH-2066
benstrumeyer e7cefa4
Fix Upgrade Plan promo on home view
benstrumeyer 2766aea
Add intro_hub_home_upgrade ping
benstrumeyer d069bc5
Add utm params
benstrumeyer d6997e6
Update tests
benstrumeyer aca8def
Update snapshot
benstrumeyer 89b7507
Show yearly prices by default. Re-add interval query param. Destructu…
benstrumeyer cc141bb
Capitalize button casing as intended
benstrumeyer 276b95d
Darken hover color for primary color buttons on Home view and plus up…
benstrumeyer 2bd46b3
Add cursor: pointer to arrow/learn-more
benstrumeyer 364044f
Make mobile table header sticky
benstrumeyer 89d2a3b
Change font, capitalization, and width of buttons on large view
benstrumeyer 74af740
Add cursor pointer to tabs on mobile view
benstrumeyer 97cf434
Fix primary button color
benstrumeyer 038b4fb
Fix query param
benstrumeyer 1ad18d0
Merge branch 'develop' into GH-2066
benstrumeyer 29fec26
Merge branch 'develop' into GH-2066
benstrumeyer b8cd6b5
Merge branch 'develop' into GH-2066
benstrumeyer 47ed388
Fix merge remnant
benstrumeyer f1fbf67
Add newlines. Change button hover color on HomeView
benstrumeyer 61c561a
Use - as the standard for svg filenames
benstrumeyer 2885b55
Re-add premium promo modal code behind a flag. Move constants to file…
benstrumeyer 6dcbe6e
Remove ternary
benstrumeyer 1422fbd
Fade shield icon when taking a tutorial
benstrumeyer 651e46b
Refactor checkout links
benstrumeyer debfc28
Remove unused shield svg
benstrumeyer 88eaef4
Change sbt to subscription_interval
benstrumeyer 625fb6a
Bump year and remove unused css
benstrumeyer 529da16
Create featureMatrixRow and mobileFeatureMatrixRow render helper func…
benstrumeyer ed961e6
Create basicCard, plusCard, and premiumCard render helper functions
benstrumeyer 553a4f7
Create plusCTAButton and premiumCTAButton render helper functions
benstrumeyer d464077
Create toggleSwitch render helper function
benstrumeyer d2a7da2
Replace basic, additional, and maximum with Basic, Plus, and Premium
benstrumeyer 4b06ee1
Re-add basic translation string
benstrumeyer 80fb9f3
Untranslate plus/premium in CTA buttons (upgrade to)
benstrumeyer 0eb7793
Merge branch 'develop' into GH-2066
christophertino
Merged
GH-2066, GH-2068, GH-2069, GH-2082, GH-2067 Upgrade Plan panel subscription content #567
Give user subscriptionsPlus bool if they have either plus or premium …
May 7, 2020
May 7, 2020
May 7, 2020
May 7, 2020
May 7, 2020
May 8, 2020
May 8, 2020
May 8, 2020
May 8, 2020
May 8, 2020
May 11, 2020
May 11, 2020
May 11, 2020
May 11, 2020
May 11, 2020
May 11, 2020
May 12, 2020
May 12, 2020
May 12, 2020
May 12, 2020
May 12, 2020
May 12, 2020
May 12, 2020
May 12, 2020
May 12, 2020
May 13, 2020
May 13, 2020
May 13, 2020
May 13, 2020
May 13, 2020
May 13, 2020
May 13, 2020
May 13, 2020
May 13, 2020
May 14, 2020
May 15, 2020
May 18, 2020
May 18, 2020
May 18, 2020
May 18, 2020
May 18, 2020
May 18, 2020
May 18, 2020
May 18, 2020
May 18, 2020
May 19, 2020
May 19, 2020
May 20, 2020
May 20, 2020
May 20, 2020
May 20, 2020
Jun 3, 2020
Jun 3, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 8, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 9, 2020
Jun 10, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 11, 2020
Jun 12, 2020
Jun 12, 2020
Jun 12, 2020
Jun 12, 2020
Jun 12, 2020
Jun 12, 2020
Jun 12, 2020
Jun 12, 2020
Jun 12, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 16, 2020
Jun 16, 2020
Jun 16, 2020
Jun 16, 2020
Jun 16, 2020
Jun 16, 2020
Jun 16, 2020
Jun 16, 2020
Jun 16, 2020
Jun 17, 2020
Jun 23, 2020
Jun 23, 2020
Jun 23, 2020
Jun 23, 2020
Jun 23, 2020
Jun 24, 2020
Jun 24, 2020
Jun 25, 2020
7fe5a24
Select commit
901c4fa
Show premium subscribers a premium badge in simple/detailed views, he…
benstrumeyer f944c6c
Use api version 2.1.0 to get multiple subscriptions
benstrumeyer e035e69
Add hover effect for premium icon in menu
benstrumeyer 659749b
Use css as single source of truth for icon colors
benstrumeyer 2a83d42
Handle case where a user has multiple subscriptions and display Premi…
benstrumeyer de02e6c
Display subscription name
benstrumeyer 53378f0
Remove duplicate locale string
benstrumeyer a10bd6c
Handle case where user only has a premium subscription and clicks the…
benstrumeyer 7e552d2
Refactor code
benstrumeyer eb43832
Merge branch 'develop' into GH-2048
benstrumeyer 9eb39bd
Refactor subscriber badge css classes, image paths and comments
benstrumeyer 2d2aa90
Fix account#getUserSubscriptionData behavior
benstrumeyer 9383ab6
Add subscriptionsPremium property to user object to check if a user h…
benstrumeyer f7b36a9
Refactor Header component to use subscriptionsPremium property
benstrumeyer f545e7b
Add newline
benstrumeyer 2fcc862
Refactor svg template literal
benstrumeyer ef91547
Refactor account#getUserSubscriptionData to return an array of subscr…
benstrumeyer 4fc3f53
Pass object that allows destructuring of subscriptionData
benstrumeyer 2a9ffcb
Add return statement after callbacks
benstrumeyer f120d4d
Add guard to account#_setSubscriptionData to prevent overriding premi…
benstrumeyer 7fe5a24
Give user subscriptionsPlus bool if they have either plus or premium …
benstrumeyer 33c506a
Rename subscriptionsPlus and subscriptionsPremium to plusAccess and p…
benstrumeyer 0586ff5
Set subscription property on user object with highest tier subscripti…
benstrumeyer a77797c
Refactor menu upsell icon to use user.subscriber instead of plusAcces…
benstrumeyer 1816764
test
benstrumeyer 0847e49
Refactor Header logo and menu icon to use subscription instead of pre…
benstrumeyer d25d313
Rename subscriber variable to subscription
benstrumeyer c9ad1de
Refactor subscriber badge to use plusAccess and premiumAccess on clic…
benstrumeyer 6398be1
Check if user object exists before accessing subscription property
benstrumeyer eb337bc
Display UI elements basedd off user scope
benstrumeyer 3d51fd0
Remove unused subscription property on user
benstrumeyer 23e5eb7
Base menu icon off of plusAccess and premiumAccess
benstrumeyer 49eb749
Refactor isPlus to hasPlusAccess, destructure some things, and save s…
benstrumeyer 47f1cd5
Use panel#hasPlusAccess() directly
benstrumeyer ead0930
Fix menu icon link
benstrumeyer cf73693
Add description and button for upgrade prompt
benstrumeyer 01e96c8
Add shield icon without color params
benstrumeyer dd113ce
Add url-friendly-params to shield icon
benstrumeyer 4bd057b
Add responsive styles for upgrade promo
benstrumeyer 9e2774c
Merge branch 'GH-2048' into GH-2070
benstrumeyer c8c4606
Add purple border for non-premium users
benstrumeyer b4f891e
Update snapshot
benstrumeyer e992df0
Fix button from leaking outside the container right before hitting br…
benstrumeyer d44147f
Refactor colors
benstrumeyer 5b22311
Small style changes
benstrumeyer 5406aaf
Fix responsive styling for button when logged into a premium account
benstrumeyer 03bdff3
Change copy
benstrumeyer bdf4f30
Remove errors from UpgradePlanView
benstrumeyer 0ddb508
Remove sass errors from UpgradePlanView.scss
benstrumeyer b74ada6
Start replacing strings with messages
benstrumeyer 783c7aa
Finish replacing strings with messages
benstrumeyer 4e8ae40
Switch to new designs & fix breakage. Add card images and check marks
benstrumeyer e71ce59
Delete old designs
benstrumeyer 01946f8
Add x icon, and table style changes
benstrumeyer 6ace9f2
Create redux flow for UpgradePlanView
benstrumeyer 0ddf4ce
Make slider work
benstrumeyer 8a8859b
Change prices depending on toggle state. Remove active css classes
benstrumeyer 81e4961
Change per month/year based on toggle state
benstrumeyer 924b67b
Make protection level toggle
benstrumeyer 52860da
Add premium sparkle icon to table
benstrumeyer 3eed5d7
Add premium sparkle to table in mobile view
benstrumeyer a559998
Add background to card header images
benstrumeyer c77a0ce
Fix bug where image scrolled
benstrumeyer 34b03c3
Add arrow that scrolls to comparison table
benstrumeyer d0463b5
Add scroll for mobile
benstrumeyer 299c6b0
Add Must have Ghostery Midnight Installed note for larger screens
benstrumeyer ffdb8e2
Change monthly/yearly toggle label to grey if it is inactive
benstrumeyer 7751a34
Minor style changes and make price per year absolute
benstrumeyer 2f94cce
Change height/width of CTA buttons
benstrumeyer c7def0e
Add card border, toggle, midnight note, & protection description for …
benstrumeyer 9bf2e4d
Change card sizes, table style, and margins for mobile view
benstrumeyer c5df6dc
Add shield menu icon
benstrumeyer c24f016
Change default route to UpgradePlanView
benstrumeyer be27fa3
Added /home to all hrefDones in hub
benstrumeyer 14ed61b
Merge branch 'develop' into GH-2066
benstrumeyer 117eb72
Remove premium promo modal
benstrumeyer 5611ba2
Add premiumAccess in hub. Already Protected buttons redirect to home …
benstrumeyer 04cc686
Change background color to gold instead of gradient
benstrumeyer 9844933
More gradient -> gold changes
benstrumeyer 880339d
Add translations for basic/additional/maximum
benstrumeyer acf2546
Missed one
benstrumeyer 4389210
Remove debug flag from manifest.json
benstrumeyer f72ebc3
Change comments
benstrumeyer 0e4bb5d
Route to home after steppedNavigation ends
benstrumeyer bf79481
Merge branch 'GH-2066-routes' into GH-2066
benstrumeyer d8a4862
Change color check marks
benstrumeyer 5630a84
Make table show until small breakpoint
benstrumeyer 3e41607
Remove unused css
benstrumeyer 004c4f1
Left align table titles
benstrumeyer a4ad2af
Remove comments/console log
benstrumeyer 2dc1374
Navigate to home page when clicking No on Override settings
benstrumeyer bb72863
Replace localized ghostery plus/premium strings with hardcoded strings
benstrumeyer 6602cd7
Fix slider position
benstrumeyer 7ce79bc
Switch monthly and yearly on toggle
benstrumeyer 1861235
Hardcode strings that should not be translated
benstrumeyer f9d07e5
Make medium-large-breakpoint to switch to single card view
benstrumeyer 004490a
Fix key container on medium-large-breakpoint
benstrumeyer 53fe165
Fix more strings that shouldnt be translated. Use staging/prod links.
benstrumeyer a1fd992
Add blue and gold hover effects
benstrumeyer 9f5145a
Break to mobile design at 1020px
benstrumeyer 027289a
Add hover effects for premium buttons
benstrumeyer b6aad02
Switch to background position implementation for premium hover effect
benstrumeyer 86954d9
Only keep 2 breakpoints
benstrumeyer 664e603
Match hover transition timing for premium button
benstrumeyer b40a4d8
Some style changes
benstrumeyer ab52cee
Add intro_hub_click ping
benstrumeyer 23898d0
Merge branch 'GH-2070' into GH-2066
benstrumeyer e7cefa4
Fix Upgrade Plan promo on home view
benstrumeyer 2766aea
Add intro_hub_home_upgrade ping
benstrumeyer d069bc5
Add utm params
benstrumeyer d6997e6
Update tests
benstrumeyer aca8def
Update snapshot
benstrumeyer 89b7507
Show yearly prices by default. Re-add interval query param. Destructu…
benstrumeyer cc141bb
Capitalize button casing as intended
benstrumeyer 276b95d
Darken hover color for primary color buttons on Home view and plus up…
benstrumeyer 2bd46b3
Add cursor: pointer to arrow/learn-more
benstrumeyer 364044f
Make mobile table header sticky
benstrumeyer 89d2a3b
Change font, capitalization, and width of buttons on large view
benstrumeyer 74af740
Add cursor pointer to tabs on mobile view
benstrumeyer 97cf434
Fix primary button color
benstrumeyer 038b4fb
Fix query param
benstrumeyer 1ad18d0
Merge branch 'develop' into GH-2066
benstrumeyer 29fec26
Merge branch 'develop' into GH-2066
benstrumeyer b8cd6b5
Merge branch 'develop' into GH-2066
benstrumeyer 47ed388
Fix merge remnant
benstrumeyer f1fbf67
Add newlines. Change button hover color on HomeView
benstrumeyer 61c561a
Use - as the standard for svg filenames
benstrumeyer 2885b55
Re-add premium promo modal code behind a flag. Move constants to file…
benstrumeyer 6dcbe6e
Remove ternary
benstrumeyer 1422fbd
Fade shield icon when taking a tutorial
benstrumeyer 651e46b
Refactor checkout links
benstrumeyer debfc28
Remove unused shield svg
benstrumeyer 88eaef4
Change sbt to subscription_interval
benstrumeyer 625fb6a
Bump year and remove unused css
benstrumeyer 529da16
Create featureMatrixRow and mobileFeatureMatrixRow render helper func…
benstrumeyer ed961e6
Create basicCard, plusCard, and premiumCard render helper functions
benstrumeyer 553a4f7
Create plusCTAButton and premiumCTAButton render helper functions
benstrumeyer d464077
Create toggleSwitch render helper function
benstrumeyer d2a7da2
Replace basic, additional, and maximum with Basic, Plus, and Premium
benstrumeyer 4b06ee1
Re-add basic translation string
benstrumeyer 80fb9f3
Untranslate plus/premium in CTA buttons (upgrade to)
benstrumeyer 0eb7793
Merge branch 'develop' into GH-2066
christophertino