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-2070: Main screen promotion box #551
Merged
+89
−109
Merge branch 'develop' into GH-2070
0fcce0f
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 16da3e8
Merge branch 'GH-2070' of github.com:ghostery/ghostery-extension into…
benstrumeyer f380b59
Fix passing wrong prop
benstrumeyer 0fcce0f
Merge branch 'develop' into GH-2070
christophertino f060857
Update tests and snapshot
benstrumeyer 9902d6e
Merge branch 'GH-2070' of github.com:ghostery/ghostery-extension into…
benstrumeyer 01478a5
Merge branch 'develop' into GH-2070
christophertino
Merged
GH-2070: Main screen promotion box #551
Merge branch 'develop' into GH-2070
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
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
Jun 15, 2020
0fcce0f
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 16da3e8
Merge branch 'GH-2070' of github.com:ghostery/ghostery-extension into…
benstrumeyer f380b59
Fix passing wrong prop
benstrumeyer 0fcce0f
Merge branch 'develop' into GH-2070
christophertino f060857
Update tests and snapshot
benstrumeyer 9902d6e
Merge branch 'GH-2070' of github.com:ghostery/ghostery-extension into…
benstrumeyer 01478a5
Merge branch 'develop' into GH-2070
christophertino