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-2066, GH-2068, GH-2069, GH-2082, GH-2067 Upgrade Plan panel subscription content #567

Merged
merged 142 commits into from Jun 25, 2020
Merged

GH-2066, GH-2068, GH-2069, GH-2082, GH-2067 Upgrade Plan panel subscription content #567

merged 142 commits into from Jun 25, 2020
+1,699 −66

Commits on May 7, 2020

  1. Show premium subscribers a premium badge in simple/detailed views, he… 

    …ader, and settings panel
    @benstrumeyer
    benstrumeyer committed May 7, 2020
    901c4fa

  2. Use api version 2.1.0 to get multiple subscriptions

    @benstrumeyer
    benstrumeyer committed May 7, 2020
    f944c6c

  3. Add hover effect for premium icon in menu

    @benstrumeyer
    benstrumeyer committed May 7, 2020
    e035e69

  4. Use css as single source of truth for icon colors

    @benstrumeyer
    benstrumeyer committed May 7, 2020
    659749b

  5. Handle case where a user has multiple subscriptions and display Premi… 

    …um > Plus
    @benstrumeyer
    benstrumeyer committed May 7, 2020
    2a83d42

Commits on May 8, 2020

  1. Display subscription name

    @benstrumeyer
    benstrumeyer committed May 8, 2020
    de02e6c

  2. Remove duplicate locale string

    @benstrumeyer
    benstrumeyer committed May 8, 2020
    53378f0

  3. Handle case where user only has a premium subscription and clicks the… 

    … subscriber badge icon
    @benstrumeyer
    benstrumeyer committed May 8, 2020
    a10bd6c

  4. Refactor code

    @benstrumeyer
    benstrumeyer committed May 8, 2020
    7e552d2

  5. Merge branch 'develop' into GH-2048

    @benstrumeyer
    benstrumeyer committed May 8, 2020
    eb43832

Commits on May 11, 2020

  1. Refactor subscriber badge css classes, image paths and comments

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    9eb39bd

  2. Fix account#getUserSubscriptionData behavior

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    2d2aa90

  3. Add subscriptionsPremium property to user object to check if a user h… 

    …as a premium subscription
    @benstrumeyer
    benstrumeyer committed May 11, 2020
    9383ab6

  4. Refactor Header component to use subscriptionsPremium property

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    f7b36a9

  5. Add newline

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    f545e7b

  6. Refactor svg template literal

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    2fcc862

Commits on May 12, 2020

  1. Refactor account#getUserSubscriptionData to return an array of subscr… 

    …iptions, and the background handler to return the highest tier subscription
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    ef91547

  2. Pass object that allows destructuring of subscriptionData

    @benstrumeyer
    benstrumeyer committed May 12, 2020
    4fc3f53

  3. Add return statement after callbacks

    @benstrumeyer
    benstrumeyer committed May 12, 2020
    2a9ffcb

  4. Add guard to account#_setSubscriptionData to prevent overriding premi… 

    …um subscription
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    f120d4d

  5. Give user subscriptionsPlus bool if they have either plus or premium … 

    …scope
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    7fe5a24

  6. Rename subscriptionsPlus and subscriptionsPremium to plusAccess and p… 

    …remiumAccess
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    33c506a

  7. Set subscription property on user object with highest tier subscripti… 

    …on in account#getUserSubscriptionData
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    0586ff5

  8. Refactor menu upsell icon to use user.subscriber instead of plusAcces… 

    …s/premiumAccess
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    a77797c

  9. test

    @benstrumeyer
    benstrumeyer committed May 12, 2020
    1816764

Commits on May 13, 2020

  1. Refactor Header logo and menu icon to use subscription instead of pre… 

    …miumAccess and plusAccess
    @benstrumeyer
    benstrumeyer committed May 13, 2020
    0847e49

  2. Rename subscriber variable to subscription

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    d25d313

  3. Refactor subscriber badge to use plusAccess and premiumAccess on clic… 

    …k, and user.subscription for UI
    @benstrumeyer
    benstrumeyer committed May 13, 2020
    c9ad1de

  4. Check if user object exists before accessing subscription property

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    6398be1

  5. Display UI elements basedd off user scope

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    eb337bc

  6. Remove unused subscription property on user

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    3d51fd0

  7. Base menu icon off of plusAccess and premiumAccess

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    23e5eb7

  8. Refactor isPlus to hasPlusAccess, destructure some things, and save s… 

    …ubscriptionData in account#setSubscriptionData
    @benstrumeyer
    benstrumeyer committed May 13, 2020
    49eb749

  9. Use panel#hasPlusAccess() directly

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    47f1cd5

Commits on May 14, 2020

  1. Fix menu icon link

    @benstrumeyer
    benstrumeyer committed May 14, 2020
    ead0930

Commits on May 15, 2020

  1. Add description and button for upgrade prompt

    @benstrumeyer
    benstrumeyer committed May 15, 2020
    cf73693

Commits on May 18, 2020

  1. Add shield icon without color params

    @benstrumeyer
    benstrumeyer committed May 18, 2020
    01e96c8

  2. Add url-friendly-params to shield icon

    @benstrumeyer
    benstrumeyer committed May 18, 2020
    dd113ce

  3. Add responsive styles for upgrade promo

    @benstrumeyer
    benstrumeyer committed May 18, 2020
    4bd057b

  4. Merge branch 'GH-2048' into GH-2070

    @benstrumeyer
    benstrumeyer committed May 18, 2020
    9e2774c

  5. Add purple border for non-premium users

    @benstrumeyer
    benstrumeyer committed May 18, 2020
    c8c4606

  6. Update snapshot

    @benstrumeyer
    benstrumeyer committed May 18, 2020
    b4f891e

  7. Fix button from leaking outside the container right before hitting br… 

    …eakpoint
    @benstrumeyer
    benstrumeyer committed May 18, 2020
    e992df0

  8. Refactor colors

    @benstrumeyer
    benstrumeyer committed May 18, 2020
    d44147f

  9. Small style changes

    @benstrumeyer
    benstrumeyer committed May 18, 2020
    5b22311

Commits on May 19, 2020

  1. Fix responsive styling for button when logged into a premium account

    @benstrumeyer
    benstrumeyer committed May 19, 2020
    5406aaf

  2. Change copy

    @benstrumeyer
    benstrumeyer committed May 19, 2020
    03bdff3

Commits on May 20, 2020

  1. Remove errors from UpgradePlanView

    @benstrumeyer
    benstrumeyer committed May 20, 2020
    bdf4f30

  2. Remove sass errors from UpgradePlanView.scss

    @benstrumeyer
    benstrumeyer committed May 20, 2020
    0ddb508

  3. Start replacing strings with messages

    @benstrumeyer
    benstrumeyer committed May 20, 2020
    b74ada6

  4. Finish replacing strings with messages

    @benstrumeyer
    benstrumeyer committed May 20, 2020
    783c7aa

Commits on Jun 3, 2020

  1. Switch to new designs & fix breakage. Add card images and check marks

    @benstrumeyer
    benstrumeyer committed Jun 3, 2020
    4e8ae40

  2. Delete old designs

    @benstrumeyer
    benstrumeyer committed Jun 3, 2020
    e71ce59

Commits on Jun 8, 2020

  1. Add x icon, and table style changes

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    01946f8

  2. Create redux flow for UpgradePlanView

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    6ace9f2

  3. Make slider work

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    0ddf4ce

  4. Change prices depending on toggle state. Remove active css classes

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    8a8859b

  5. Change per month/year based on toggle state

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    81e4961

  6. Make protection level toggle

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    924b67b

  7. Add premium sparkle icon to table

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    52860da

  8. Add premium sparkle to table in mobile view

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    3eed5d7

  9. Add background to card header images

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    a559998

  10. Fix bug where image scrolled

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    c77a0ce

  11. Add arrow that scrolls to comparison table

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    34b03c3

  12. Add scroll for mobile

    @benstrumeyer
    benstrumeyer committed Jun 8, 2020
    d0463b5

Commits on Jun 9, 2020

  1. Add Must have Ghostery Midnight Installed note for larger screens

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    299c6b0

  2. Change monthly/yearly toggle label to grey if it is inactive

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    ffdb8e2

  3. Minor style changes and make price per year absolute

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    7751a34

  4. Change height/width of CTA buttons

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    2f94cce

  5. Add card border, toggle, midnight note, & protection description for … 

    …medium breakpoint
    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    c7def0e

  6. Change card sizes, table style, and margins for mobile view

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    9bf2e4d

  7. Add shield menu icon

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    c5df6dc

  8. Change default route to UpgradePlanView

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    c24f016

  9. Added /home to all hrefDones in hub

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    be27fa3

  10. Merge branch 'develop' into GH-2066

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    14ed61b

  11. Remove premium promo modal

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    117eb72

  12. Add premiumAccess in hub. Already Protected buttons redirect to home … 

    …or respective checkout link. Add PropTypes
    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    5611ba2

  13. Change background color to gold instead of gradient

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    04cc686

  14. More gradient -> gold changes

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    9844933

  15. Add translations for basic/additional/maximum

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    880339d

  16. Missed one

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    acf2546

  17. Remove debug flag from manifest.json

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    4389210

  18. Change comments

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    f72ebc3

  19. Route to home after steppedNavigation ends

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    0e4bb5d

  20. Merge branch 'GH-2066-routes' into GH-2066

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    bf79481

  21. Change color check marks

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    d8a4862

  22. Make table show until small breakpoint

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    5630a84

  23. Remove unused css

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    3e41607

  24. Left align table titles

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    004c4f1

  25. Remove comments/console log

    @benstrumeyer
    benstrumeyer committed Jun 9, 2020
    a4ad2af

Commits on Jun 10, 2020

  1. Navigate to home page when clicking No on Override settings

    @benstrumeyer
    benstrumeyer committed Jun 10, 2020
    2dc1374

Commits on Jun 11, 2020

  1. Replace localized ghostery plus/premium strings with hardcoded strings

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    bb72863

  2. Fix slider position

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    6602cd7

  3. Switch monthly and yearly on toggle

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    7ce79bc

  4. Hardcode strings that should not be translated

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    1861235

  5. Make medium-large-breakpoint to switch to single card view

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    f9d07e5

  6. Fix key container on medium-large-breakpoint

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    004490a

  7. Fix more strings that shouldnt be translated. Use staging/prod links.

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    53fe165

  8. Add blue and gold hover effects

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    a1fd992

  9. Break to mobile design at 1020px

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    9f5145a

  10. Add hover effects for premium buttons

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    027289a

  11. Switch to background position implementation for premium hover effect

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    b6aad02

  12. Only keep 2 breakpoints

    @benstrumeyer
    benstrumeyer committed Jun 11, 2020
    86954d9

Commits on Jun 12, 2020

  1. Match hover transition timing for premium button

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    664e603

  2. Some style changes

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    b40a4d8

  3. Add intro_hub_click ping

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    ab52cee

  4. Merge branch 'GH-2070' into GH-2066

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    23898d0

  5. Fix Upgrade Plan promo on home view

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    e7cefa4

  6. Add intro_hub_home_upgrade ping

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    2766aea

  7. Add utm params

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    d069bc5

  8. Update tests

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    d6997e6

  9. Update snapshot

    @benstrumeyer
    benstrumeyer committed Jun 12, 2020
    aca8def

Commits on Jun 15, 2020

  1. Show yearly prices by default. Re-add interval query param. Destructu… 

    …re action creators
    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    89b7507

  2. Capitalize button casing as intended

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    cc141bb

  3. Darken hover color for primary color buttons on Home view and plus up… 

    …grade view
    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    276b95d

  4. Add cursor: pointer to arrow/learn-more

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    2bd46b3

  5. Make mobile table header sticky

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    364044f

  6. Change font, capitalization, and width of buttons on large view

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    89d2a3b

  7. Add cursor pointer to tabs on mobile view

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    74af740

  8. Fix primary button color

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    97cf434

  9. Fix query param

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    038b4fb

  10. Merge branch 'develop' into GH-2066

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    1ad18d0

  11. Merge branch 'develop' into GH-2066

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    29fec26

  12. Merge branch 'develop' into GH-2066

    @benstrumeyer
    benstrumeyer committed Jun 15, 2020
    b8cd6b5

Commits on Jun 16, 2020

  1. Fix merge remnant

    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    47ed388

  2. Add newlines. Change button hover color on HomeView

    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    f1fbf67

  3. Use - as the standard for svg filenames

    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    61c561a

  4. Re-add premium promo modal code behind a flag. Move constants to file… 

    … scope. Change font weight of buttons.
    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    2885b55

  5. Remove ternary

    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    6dcbe6e

  6. Fade shield icon when taking a tutorial

    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    1422fbd

  7. Refactor checkout links

    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    651e46b

  8. Remove unused shield svg

    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    debfc28

  9. Change sbt to subscription_interval

    @benstrumeyer
    benstrumeyer committed Jun 16, 2020
    88eaef4

Commits on Jun 17, 2020

  1. Bump year and remove unused css

    @benstrumeyer
    benstrumeyer committed Jun 17, 2020
    625fb6a

Commits on Jun 23, 2020

  1. Create featureMatrixRow and mobileFeatureMatrixRow render helper func… 

    …tions and bump versions
    @benstrumeyer
    benstrumeyer committed Jun 23, 2020
    529da16

  2. Create basicCard, plusCard, and premiumCard render helper functions

    @benstrumeyer
    benstrumeyer committed Jun 23, 2020
    ed961e6

  3. Create plusCTAButton and premiumCTAButton render helper functions

    @benstrumeyer
    benstrumeyer committed Jun 23, 2020
    553a4f7

  4. Create toggleSwitch render helper function

    @benstrumeyer
    benstrumeyer committed Jun 23, 2020
    d464077

  5. Replace basic, additional, and maximum with Basic, Plus, and Premium

    @benstrumeyer
    benstrumeyer committed Jun 23, 2020
    d2a7da2

Commits on Jun 24, 2020

  1. Re-add basic translation string

    @benstrumeyer
    benstrumeyer committed Jun 24, 2020
    4b06ee1

  2. Untranslate plus/premium in CTA buttons (upgrade to)

    @benstrumeyer
    benstrumeyer committed Jun 24, 2020
    80fb9f3

Commits on Jun 25, 2020

  1. Merge branch 'develop' into GH-2066

    @christophertino
    christophertino committed Jun 25, 2020
    0eb7793