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-1675: total requests modified readout (& summary refactors) #392

Merged
merged 141 commits into from Jun 11, 2019
Merged

GH-1675: total requests modified readout (& summary refactors) #392

merged 141 commits into from Jun 11, 2019
+1,560 −1,440

Commits on Mar 20, 2019

  1. Remove old Plus banner/logo

    @wlycdgr
    wlycdgr committed Mar 20, 2019
    b64fdae

Commits on Apr 8, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @wlycdgr
    wlycdgr committed Apr 8, 2019
    68378c6

  2. Add green upgrade banner to Summary component

    @wlycdgr
    wlycdgr committed Apr 8, 2019
    a131dfb

Commits on Apr 12, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @wlycdgr
    wlycdgr committed Apr 12, 2019
    26953b0

  2. Add upgrade banner class

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    8e409d6

  3. Fix classNames -> className typo

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    a8f4602

  4. Implement CSS for green upgrade banner

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    cd6148a

  5. Display smaller upgrade banner in summary view when on detailed tab

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    208fcd4

  6. Adjust position of smaller upgrade banner upwards a little to avoid o… 

    …verlapping the donut
    @wlycdgr
    wlycdgr committed Apr 12, 2019
    dd1de6f

  7. Add gold subscriber icon to display when a subscribed user is signed in

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    ec59226

Commits on Apr 14, 2019

  1. Finish implementation of plus upgrade banner and gold icon display lo… 

    …gic for the case when the panel is not both in detailed view and expanded
    @wlycdgr
    wlycdgr committed Apr 14, 2019
    b3a380b

  2. Remove debug code and redundant variable from Summary#render

    @wlycdgr
    wlycdgr committed Apr 14, 2019
    4e0af1e

Commits on Apr 15, 2019

  1. Refactor Summary#render for clarity

    @wlycdgr
    wlycdgr committed Apr 15, 2019
    901e06e

  2. Add green upgrade banner and gold plus icon SVGs for expanded view

    @wlycdgr
    wlycdgr committed Apr 15, 2019
    5c861d9

  3. Add expanded view upgrade banner div stub to Header#render. Refactor … 

    …and clean up Header#render a bit.
    @wlycdgr
    wlycdgr committed Apr 15, 2019
    d4dedb3

Commits on Apr 16, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    c9eb688

  2. Display gold icon in expanded view if user is a logged-in subscriber

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    499051f

  3. Stub click on badge in expanded view

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    6273e6e

  4. Replicate dev behavior of badge clicking in Header in expanded view

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    8c8b7fd

  5. Rename upgrade banner / gold plus badge click handler for clarity

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    8e7abf1

  6. Add badge CSS classes to extended view badges. These need updating

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    dbdea1e

  7. Correct subscriber redirect path for gold plus icon click handler in … 

    …Header
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    9aedc21

  8. Update badge CSS

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    43b5e81

  9. Tweak CSS for expanded view upgrade banner and gold plus icon to spec

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    4cc227b

  10. Remove reference to non-extant state.header from header container map… 

    …StateToProps. pass state.panel.is_expanded to Header
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    8c4a316

  11. Implement show/hide logic for header upgrade banner and gold plus icon

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    740f61b

  12. Factor kebab div out to const for clarity in Header#render

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    5ebbd1e

  13. Tweak gold plus icon expanded view SVG to make sure Plus is more cent… 

    …ered, with Vinnie's approval. Refactor Header#render for clarity
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    d0c3b4f

  14. Finish clarity refactor of Summary#render

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    6035749

  15. Nudge summary content down in expert view so green upgrade banner can… 

    … fit. Delete two unused scss partials
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    a0170de

Commits on Apr 17, 2019

  1. Adjust positioning of simple/detailed view upgrade banners and gold i… 

    …cons to spec
    @wlycdgr
    wlycdgr committed Apr 17, 2019
    8534297

  2. Add click handling for simple and detailed view upgrade banner and go… 

    …ld badge. Adjust CSS for them.
    @wlycdgr
    wlycdgr committed Apr 17, 2019
    2a43fa9

  3. Switch between upgrade banner and gold icon in Summary view on sign i… 

    …n / out instead of on panel reopen
    @wlycdgr
    wlycdgr committed Apr 17, 2019
    dfb9596

Commits on Apr 18, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @IAmThePan
    IAmThePan committed Apr 18, 2019
    1f31716

  2. Decompose totalTrackersBlockedAndPageLoadTime in Summary#render

    @wlycdgr
    wlycdgr committed Apr 18, 2019
    10631ab

  3. Remove duplication from return of Summary#render

    @wlycdgr
    wlycdgr committed Apr 18, 2019
    be447e7

  4. Merge branch 'GH-1593_and_GH-1594/UpgradePlus-banner-and-logo' of git… 

    …hub.com:ghostery/ghostery-extension into GH-1593_and_GH-1594/UpgradePlus-banner-and-logo
    @wlycdgr
    wlycdgr committed Apr 18, 2019
    069fca6

  5. Fix Summary view display in Midnight theme on Detailed tab. Realign g… 

    …reen upgrade banner and gold icon accordingly. Add debug and log truebools back into manifest
    @wlycdgr
    wlycdgr committed Apr 18, 2019
    c38b4b5

Commits on Apr 19, 2019

  1. Display subscriber badge in header in gold in Midnight theme

    @wlycdgr
    wlycdgr committed Apr 19, 2019
    ce7158b

  2. Add upgrade banner text to locale strings file. Remove SVG upgarde te… 

    …xt. Replace it with a text span.
    @wlycdgr
    wlycdgr committed Apr 19, 2019
    80a1736

  3. Finalize CSS for upgrade banner text. Delete duplicate upgrade banner… 

    … SVG
    @wlycdgr
    wlycdgr committed Apr 19, 2019
    26c6ab0

  4. Convert 'upgrade to' text in the green banner from SVG to text for sm… 

    …aller detail view banner
    @wlycdgr
    wlycdgr committed Apr 19, 2019
    de6aa6b

  5. Make sure upgrade banner or subscriber badge display in the hamburger… 

    … dropdown views
    @wlycdgr
    wlycdgr committed Apr 19, 2019
    c7a43ee

Commits on Apr 22, 2019

  1. Stub out Requests Modified readout. Begin to specify CSS, click handler.

    @wlycdgr
    wlycdgr committed Apr 22, 2019
    1873388

  2. Swap locale string in for stub for Requests Modified

    @wlycdgr
    wlycdgr committed Apr 22, 2019
    977b610

  3. Display the Requests Modified total in the spec shade of blue

    @wlycdgr
    wlycdgr committed Apr 22, 2019
    4517abc

  4. Add tooltip for Requests Modified readout

    @wlycdgr
    wlycdgr committed Apr 22, 2019
    ad9da95

  5. Adjust expert mode Summary view CSS so everything fits nicely with th… 

    …e new upgrade banner and Requests Modified readout
    @wlycdgr
    wlycdgr committed Apr 22, 2019
    86abd20

  6. Tweak Summary condensed view CSS so everything fits nicely with the n… 

    …ew Requests Modified readout
    @wlycdgr
    wlycdgr committed Apr 22, 2019
    7d5c5cd

  7. Position Requests Modified tooltip correctly in Condensed version of … 

    …Summary view
    @wlycdgr
    wlycdgr committed Apr 22, 2019
    3ce8e6b

  8. Remove unusued click handler from Summary. Make Requests Modified rea… 

    …dout value dynamic
    @wlycdgr
    wlycdgr committed Apr 22, 2019
    44c8b5c

Commits on Apr 28, 2019

  1. Merge in develop after resolving conflicts

    @wlycdgr
    wlycdgr committed Apr 28, 2019
    b69cb7b

Commits on Apr 29, 2019

  1. Remove smart blocking from Requests Modified total. Update tooltip co… 

    …py to reflect this.
    @wlycdgr
    wlycdgr committed Apr 29, 2019
    ae24d6d

Commits on May 1, 2019

  1. Merge branch 'develop' into GH-1675_TrackerListBreakdown-TotalCount

    @wlycdgr
    wlycdgr committed May 1, 2019
    979165f

Commits on May 2, 2019

  1. Remove obsolete abPause code in Summary and related files

    @wlycdgr
    wlycdgr committed May 2, 2019
    8ae8d7c

  2. Update PauseButton snapshots to reflect removal of abPause code

    @wlycdgr
    wlycdgr committed May 2, 2019
    d36ae0d

  3. Remove abPause css from _summary.scss

    @wlycdgr
    wlycdgr committed May 2, 2019
    7ef5f82

  4. Remove this.pauseLeft property from PauseButton

    @wlycdgr
    wlycdgr committed May 2, 2019
    ea44cee

  5. Clean up PauseButton dropdown container JSX and CSS

    @wlycdgr
    wlycdgr committed May 2, 2019
    e02077b

  6. Update failing PauseButton test snapshot to reflect removal of abPaus… 

    …e bits
    @wlycdgr
    wlycdgr committed May 2, 2019
    7f79415

  7. Remove abPause CSS from _ghostery_features partial

    @wlycdgr
    wlycdgr committed May 2, 2019
    7f3e45a

Commits on May 3, 2019

  1. Refactor PauseButton#render

    @wlycdgr
    wlycdgr committed May 3, 2019
    0983485

Commits on May 5, 2019

  1. Begin removal of abPause CSS

    @wlycdgr
    wlycdgr committed May 5, 2019
    87a1cd5

  2. Continue removing abPause CSS

    @wlycdgr
    wlycdgr committed May 5, 2019
    6c83c7e

Commits on May 6, 2019

  1. Remove dropdown abPause CSS from pause button css

    @wlycdgr
    wlycdgr committed May 6, 2019
    212434c

  2. Further clean up pause button css

    @wlycdgr
    wlycdgr committed May 6, 2019
    f743ef5

  3. Refactor Summary scss towards modified BEM structure

    @wlycdgr
    wlycdgr committed May 6, 2019
    12e691e

  4. Continue CSS refactor for Summary and sub-components

    @wlycdgr
    wlycdgr committed May 6, 2019
    0a23283

Commits on May 7, 2019

  1. Refactor CliqzFeatures out to a generic CliqzFeature building block c… 

    …omponent
    @wlycdgr
    wlycdgr committed May 7, 2019
    63c03e0

  2. Remove CliqzFeatures

    @wlycdgr
    wlycdgr committed May 7, 2019
    da976b3

Commits on May 9, 2019

  1. Work to generalize GhosteryFeatures out to GhosteryFeature. CSS and J… 

    …SX cleanup in CliqzFeature and Summary and summary partial
    @wlycdgr
    wlycdgr committed May 9, 2019
    0204bed

  2. Finish implementation of GhosteryFeature. Remove GhosteryFeatures.

    @wlycdgr
    wlycdgr committed May 9, 2019
    d6db970

Commits on May 11, 2019

  1. Merge in develop

    @wlycdgr
    wlycdgr committed May 11, 2019
    7119fc5

Commits on May 13, 2019

  1. Fix typo & comment placement error

    @wlycdgr
    wlycdgr committed May 13, 2019
    5ecba97

  2. Update prop name in CliqzFeature

    @wlycdgr
    wlycdgr committed May 13, 2019
    efd5d67

  3. Rewrite feature-name string interpolation in CliqzFeature

    @wlycdgr
    wlycdgr committed May 13, 2019
    a29bbfd

  4. Send the right data to ad block and smart block Cliqz features

    @wlycdgr
    wlycdgr committed May 13, 2019
    db38c79

  5. Clean up CliqzFeature

    @wlycdgr
    wlycdgr committed May 13, 2019
    292fd5b

  6. Cleanup Summary#render

    @wlycdgr
    wlycdgr committed May 13, 2019
    5c55d73

  7. Break up Summary#render with render helper functions

    @wlycdgr
    wlycdgr committed May 13, 2019
    b74837f

  8. Factor donut and page host readout rendering to render helpers in Sum… 

    …mary
    @wlycdgr
    wlycdgr committed May 13, 2019
    a1df93d

  9. Factor sbBlocked, sbAllowed, sbAdjust, and totalTrackersBlockedCount … 

    …out to helper methods in Summary
    @wlycdgr
    wlycdgr committed May 13, 2019
    1b6c65b

  10. Factor antiTrackUnsafe, adBlockBlocked, and totalTrackersFound out to… 

    … helper methods in Summary
    @wlycdgr
    wlycdgr committed May 13, 2019
    9487eb2

  11. Continue refactor of Summary

    @wlycdgr
    wlycdgr committed May 13, 2019
    3fc59a9

  12. Factor out rendering of GhosteryFeature components to generic render … 

    …helper function in Summary
    @wlycdgr
    wlycdgr committed May 13, 2019
    ecd3139

Commits on May 15, 2019

  1. Clean up Summary.jsx

    @wlycdgr
    wlycdgr committed May 15, 2019
    6a9fff3

  2. Remove unused Custom button handling code from Summary#clickSitePolicy

    @wlycdgr
    wlycdgr committed May 15, 2019
    7ec35c1

  3. Clean up CliqzFeature

    @wlycdgr
    wlycdgr committed May 15, 2019
    5634995

  4. Comment public CliqzFeature methods. Refactor _getCount helpers.

    @wlycdgr
    wlycdgr committed May 15, 2019
    fa1d0df

  5. Doc GhosteryFeature#handleClick. Remove redundant check for paused or… 

    … disabled blocking in the delegate handler in Summary
    @wlycdgr
    wlycdgr committed May 15, 2019
    64a3a2b

  6. Make semantic constants for whitelist and blacklist site policy states

    @wlycdgr
    wlycdgr committed May 15, 2019
    f6250e9

  7. Etend the user of BLACKLIST and WHITELIST globals to Summary. Update … 

    …syntax for using it.
    @wlycdgr
    wlycdgr committed May 15, 2019
    606fc0f

  8. Fix page host text alignment

    @wlycdgr
    wlycdgr committed May 15, 2019
    3692dad

  9. Fix page host readout display logic bug

    @wlycdgr
    wlycdgr committed May 15, 2019
    65e48a7

Commits on May 16, 2019

  1. Fix bug that kept GhosteryFeature button text from rendering

    @wlycdgr
    wlycdgr committed May 16, 2019
    e5b6df2

  2. Make progress towards fixing Trust button CSS

    @wlycdgr
    wlycdgr committed May 16, 2019
    c5f368c

  3. Refactor CSS for GhosteryFeatureButtons

    @wlycdgr
    wlycdgr committed May 16, 2019
    3b9a24c

  4. Modify GhosteryFeature#render to account for CSS updates to GhosteryF… 

    …eatureButton. Fix CSS typo.
    @wlycdgr
    wlycdgr committed May 16, 2019
    04d1242

Commits on May 19, 2019

  1. Create shared helper classes SASS file. Use these glasses in Ghostery… 

    …Feature and Summary
    @wlycdgr
    wlycdgr committed May 19, 2019
    ed4dd1b

Commits on May 22, 2019

  1. Add Foundation button class back to Ghostery Feature button element. 

    Add Foundation dependency notes to GhosteryFeature
    @wlycdgr
    wlycdgr committed May 22, 2019
    a428570

Commits on May 29, 2019

  1. Fix text color in Ghostery Feature Buttons. Make sure ghostery featur… 

    …e buttons and pause button display in a line
    @wlycdgr
    wlycdgr committed May 29, 2019
    e6f1159

  2. Implement BEM CSS for Cliqz Feature icon and count elements

    @wlycdgr
    wlycdgr committed May 29, 2019
    069ae5d

  3. Implement BEM CSS for CliqzFeature feature-name element

    @wlycdgr
    wlycdgr committed May 29, 2019
    a465084

Commits on Jun 1, 2019

  1. Implement BEM CSS for stats nav button

    @wlycdgr
    wlycdgr committed Jun 1, 2019
    68f4b54

Commits on Jun 2, 2019

  1. Implement BEM CSS for green upgrade banner

    @wlycdgr
    wlycdgr committed Jun 2, 2019
    da4ea2e

Commits on Jun 3, 2019

  1. Finish and debug BEM CSS for green upgrade banner

    @wlycdgr
    wlycdgr committed Jun 3, 2019
    0f569c3

  2. Move upgrade banner css to its own partial

    @wlycdgr
    wlycdgr committed Jun 3, 2019
    44110b0

  3. Implement BEM CSS for subscriber badge

    @wlycdgr
    wlycdgr committed Jun 3, 2019
    6516f1c

  4. Update classes in the JSX for the trackers blocked and requests modif… 

    …ied readouts
    @wlycdgr
    wlycdgr committed Jun 3, 2019
    40001d3

Commits on Jun 4, 2019

  1. Implement BEM CSS for Donut Graph component

    @wlycdgr
    wlycdgr committed Jun 4, 2019
    46d7a94

  2. Convert total tracker count display in Condensed view to BEM

    @wlycdgr
    wlycdgr committed Jun 4, 2019
    d5ef546

  3. Fix hover state and feature_name element CSS for CliqzFeature. Clean … 

    …up and organize its partial.
    @wlycdgr
    wlycdgr committed Jun 4, 2019
    39c07b6

Commits on Jun 5, 2019

  1. Debug and cleanup CliqzFeature component and its SCSS partial

    @wlycdgr
    wlycdgr committed Jun 5, 2019
    7187b39

  2. Uncomment mouseleave handler in Tooltip

    @wlycdgr
    wlycdgr committed Jun 5, 2019
    896ea62

Commits on Jun 6, 2019

  1. Move GhosteryKVReadout CSS to SummaryPageStat

    @wlycdgr
    wlycdgr committed Jun 6, 2019
    a6f8079

  2. Clean up page stat render helpers in Summary. Remove GhosteryKVReadou… 

    …t CSS from summary partial.
    @wlycdgr
    wlycdgr committed Jun 6, 2019
    c561a55

  3. Finalize summary page host container element and summary page host bl… 

    …ock CSS
    @wlycdgr
    wlycdgr committed Jun 6, 2019
    a1aff4d

  4. Finalize summary page stats container, page stat container, and page … 

    …stat CSS
    @wlycdgr
    wlycdgr committed Jun 6, 2019
    d0cb6fb

Commits on Jun 9, 2019

  1. Simplify CliqzFeature CSS. Reorganize partial based on block-level mo… 

    …difiers for clarity. Purify CliqzFeature helper functions.
    @wlycdgr
    wlycdgr committed Jun 9, 2019
    ddc3cbd

  2. Fix typo

    @wlycdgr
    wlycdgr committed Jun 9, 2019
    346102d

  3. Rename _ghostery_features partial to _ghostery_feature

    @wlycdgr
    wlycdgr committed Jun 9, 2019
    09100a0

  4. Ghostery Feature button alignment and styling fixes. Centered page st… 

    …ats.
    @wlycdgr
    wlycdgr committed Jun 9, 2019
    f87c273

  5. Fix Trust button tooltip

    @wlycdgr
    wlycdgr committed Jun 9, 2019
    3ac3533

Commits on Jun 10, 2019

  1. Fix alignment for ghostery features tooltips in expert mode

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    9428034

  2. Remove silly placeholder name in pause button CSS. Fix summary vertic… 

    …al layout in condensed view.
    @wlycdgr
    wlycdgr committed Jun 10, 2019
    4f4359e

  3. Fix ghostery feature tooltip alignment in condensed view

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    0564e52

  4. Fix cliqz feature state change notifications bug

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    8e2a117

  5. Finish fixing and organizing tooltip CSS for trust, restrict, pause, … 

    …and Cliqz features
    @wlycdgr
    wlycdgr committed Jun 10, 2019
    5fe0d0f

  6. Nudge cliqz icons up in expert view

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    caace4a

  7. Finalize requests modified page stat tooltip CSS

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    fe16a44

  8. Finalize total tracker count tooltip CSS

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    7aad2c3

  9. Finalize css for donut number tooltip

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    e52c373

  10. Make donut category tooltips show again

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    f024579

  11. Restore Foundation formatting to donut category tooltips

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    0e84e9e

  12. Update pause button snapshots and tests to reflect code updates

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    1052d93

  13. Merge branch 'develop' into GH-1675_TrackerListBreakdown-TotalCount

    @wlycdgr
    wlycdgr committed Jun 10, 2019
    25d13d1

  14. Fix typo in panel.scss. Remove double header in ghostery_feature.scss… 

    …. Remove commented code in ghostery_feature.scss
    @wlycdgr
    wlycdgr committed Jun 10, 2019
    522397e

  15. Remove count from Cliqz Features, replace with ON/OFF indicator (#393) 

    * Remove count from Cliqz Features, replace with ON/OFF indicator

* Stop passing now unneeded data prop to CliqzFeature
    @IAmThePan @wlycdgr
    IAmThePan authored and wlycdgr committed Jun 10, 2019
    870b9c8

Commits on Jun 11, 2019

  1. Remove commented out code from GhosteryFeature

    @wlycdgr
    wlycdgr committed Jun 11, 2019
    e7a8adc

  2. Make CliqzFeature-specific locale string keys for CliqzFeature status… 

    … labels
    @wlycdgr
    wlycdgr committed Jun 11, 2019
    d7c9559

  3. Merge branch 'develop' into GH-1675_TrackerListBreakdown-TotalCount

    @jsignanini
    jsignanini committed Jun 11, 2019
    8d54958