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-2070: Main screen promotion box #551

Merged
merged 53 commits into from Jun 15, 2020
Merged

GH-2070: Main screen promotion box #551

merged 53 commits into from Jun 15, 2020

Conversation

@benstrumeyer
Copy link
Contributor

@benstrumeyer benstrumeyer commented May 18, 2020 •
edited

  • 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 main screen promo box as per design specs in GH-2070
  • Break responsively where the tutorial/customize setup div breaks for fluidity instead of 768 x 1040 as mentioned in design specs
  • Merge in GH-2048 (which has already been reviewed) to take advantage of user.premiumAccess property
  • CTA button navigates to non-existant /update route, will update when it is created

Ticket: https://cliqztix.atlassian.net/browse/GH-2070
benstrumeyer added 30 commits May 7, 2020
@benstrumeyer
Show premium subscribers a premium badge in simple/detailed views, he…
901c4fa 
…ader, and settings panel
@benstrumeyer
Use api version 2.1.0 to get multiple subscriptions
f944c6c
@benstrumeyer
Add hover effect for premium icon in menu
e035e69
@benstrumeyer
Use css as single source of truth for icon colors
659749b
@benstrumeyer
Handle case where a user has multiple subscriptions and display Premi…
2a83d42 
…um > Plus
@benstrumeyer
Display subscription name
Loading status checks…
de02e6c
@benstrumeyer
Remove duplicate locale string
Loading status checks…
53378f0
@benstrumeyer
Handle case where user only has a premium subscription and clicks the…
Loading status checks…
a10bd6c 
… subscriber badge icon
@benstrumeyer
Refactor code
7e552d2
@benstrumeyer
Merge branch 'develop' into GH-2048
Loading status checks…
eb43832
@benstrumeyer
Refactor subscriber badge css classes, image paths and comments
9eb39bd
@benstrumeyer
Fix account#getUserSubscriptionData behavior
2d2aa90
@benstrumeyer
Add subscriptionsPremium property to user object to check if a user h…
9383ab6 
…as a premium subscription
@benstrumeyer
Refactor Header component to use subscriptionsPremium property
f7b36a9
@benstrumeyer
Add newline
Loading status checks…
f545e7b
@benstrumeyer
Refactor svg template literal
Loading status checks…
2fcc862
@benstrumeyer
Refactor account#getUserSubscriptionData to return an array of subscr…
Loading status checks…
ef91547 
…iptions, and the background handler to return the highest tier subscription
@benstrumeyer
Pass object that allows destructuring of subscriptionData
Loading status checks…
4fc3f53
@benstrumeyer
Add return statement after callbacks
Loading status checks…
2a9ffcb
@benstrumeyer
Add guard to account#_setSubscriptionData to prevent overriding premi…
Loading status checks…
f120d4d 
…um subscription
@benstrumeyer
Give user subscriptionsPlus bool if they have either plus or premium …
7fe5a24 
…scope
@benstrumeyer
Rename subscriptionsPlus and subscriptionsPremium to plusAccess and p…
33c506a 
…remiumAccess
@benstrumeyer
Set subscription property on user object with highest tier subscripti…
0586ff5 
…on in account#getUserSubscriptionData
@benstrumeyer
Refactor menu upsell icon to use user.subscriber instead of plusAcces…
Loading status checks…
a77797c 
…s/premiumAccess
@benstrumeyer
test
Loading status checks…
1816764
@benstrumeyer
Refactor Header logo and menu icon to use subscription instead of pre…
0847e49 
…miumAccess and plusAccess
@benstrumeyer
Rename subscriber variable to subscription
Loading status checks…
d25d313
@benstrumeyer
Refactor subscriber badge to use plusAccess and premiumAccess on clic…
Loading status checks…
c9ad1de 
…k, and user.subscription for UI
@benstrumeyer
Check if user object exists before accessing subscription property
6398be1
@benstrumeyer
Display UI elements basedd off user scope
eb337bc
@benstrumeyer benstrumeyer added this to the 8.5.2 milestone May 18, 2020
@benstrumeyer benstrumeyer requested a review from wlycdgr May 18, 2020
@benstrumeyer benstrumeyer requested review from Eden12345, zarembsky and ghostery/ghostery as code owners May 18, 2020
@benstrumeyer benstrumeyer self-assigned this May 18, 2020
@benstrumeyer benstrumeyer changed the base branch from master to develop May 18, 2020
@benstrumeyer
Update snapshot
Loading status checks…
b4f891e
@benstrumeyer
Fix button from leaking outside the container right before hitting br…
Loading status checks…
e992df0 
…eakpoint
@wlycdgr
wlycdgr reviewed May 18, 2020
View changes
app/hub/Views/HomeView/HomeView.scss Outdated Show resolved Hide resolved
app/hub/Views/HomeView/HomeView.scss Outdated Show resolved Hide resolved
app/hub/Views/HomeView/HomeView.scss Outdated Show resolved Hide resolved
src/utils/api.js Outdated Show resolved Hide resolved
@benstrumeyer
Refactor colors
d44147f
@benstrumeyer
Small style changes
Loading status checks…
5b22311
@benstrumeyer
Fix responsive styling for button when logged into a premium account
Loading status checks…
5406aaf
@wlycdgr
wlycdgr reviewed May 19, 2020
View changes
Copy link
Member

@wlycdgr wlycdgr left a comment

Looks good - thanks for going through and updating all the colors to use the color variables
@wlycdgr
wlycdgr approved these changes May 19, 2020
View changes
@benstrumeyer
Change copy
Loading status checks…
03bdff3
@wlycdgr
wlycdgr approved these changes May 19, 2020
View changes
Copy link
Member

@wlycdgr wlycdgr left a comment

LGTM
@benstrumeyer
Merge branch 'GH-2070' of github.com:ghostery/ghostery-extension into…
16da3e8 
… GH-2070
@benstrumeyer
Fix passing wrong prop
f380b59
@christophertino
Merge branch 'develop' into GH-2070
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
0fcce0f
@christophertino
christophertino approved these changes Jun 15, 2020
View changes
benstrumeyer and others added 3 commits Jun 15, 2020
@benstrumeyer
Update tests and snapshot
f060857
@benstrumeyer
Merge branch 'GH-2070' of github.com:ghostery/ghostery-extension into…
9902d6e 
… GH-2070
@christophertino
Merge branch 'develop' into GH-2070
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…
01478a5
@christophertino christophertino merged commit 6441ca9 into develop Jun 15, 2020
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@christophertino christophertino deleted the GH-2070 branch Jun 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christophertino christophertino

@wlycdgr wlycdgr

@Eden12345 Eden12345

@zarembsky zarembsky

@jsignanini jsignanini

Assignees

@benstrumeyer benstrumeyer

Labels
Type: Feature Enhancement
Projects
None yet
Milestone
8.5.2
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@benstrumeyer @christophertino @wlycdgr