Skip to content

Loading…

Raul/whitelisting #1579

Closed
wants to merge 306 commits into from

6 participants

@rchall-gladly

Add the withelisting feature to goodblock popup

kmjennison and others added some commits
@kmjennison kmjennison Fix JQuery inclusion bug in icon placement tests. Add an icon placeme…
…nt test.
bf7b958
@kmjennison kmjennison Improve ad icon placement. d023ec1
@kmjennison kmjennison Move Goodblock icon to bottom-right of ad; shrink icon. 9000b0e
@oahzit oahzit added water and heart svg icons f6c79f1
@oahzit oahzit added water and heart svg icons 3dceb1d
@oahzit oahzit added question mark icon 34999d0
@oahzit oahzit added question mark icon a26c783
@oahzit oahzit formatted background, waves, and added tad to header 42bff6b
@oahzit oahzit formatted background, waves, and added tad to header 563016b
@oahzit oahzit implement impact conversion function badafb1
@oahzit oahzit change the number formatting function s/t numbers in the thousands an…
…d millions are abbreviated
b5a8189
@oahzit oahzit change the number formatting function s/t numbers in the thousands an…
…d millions are abbreviated
debe2e6
@oahzit oahzit added in links to settings and faq 90cdf18
@oahzit oahzit give settings and faq icons a bit more room 47cce9e
@oahzit oahzit added resources for the waves c11add6
@oahzit oahzit added style tweaks to the impact and vc stats 086ccbf
Ti Zhao updated messaging when the impact is at zero c0aa561
Ti Zhao code cleanup 0bab2f1
@kmjennison kmjennison Organize TODOs for finding visible ad unit. c5f3972
Ti Zhao Merge branch 'kevin/ad_elephant' of https://github.com/gladly-team/go…
…odblock into kevin/ad_elephant
78f3f02
Ti Zhao fixed remaining merge issues 721f1c1
Ti Zhao use real data in overlay modal 145351b
Ti Zhao remove debugging console.logs 8e212a8
Ti Zhao code cleanup 0a7f279
@useername useername code cleanup 90273f1
Ti Zhao Merge branch 'tiz/tad-counting' of https://github.com/gladly-team/goo…
…dblock into tiz/tad-counting
849ad85
Ti Zhao add iframe finder function back in 3c29504
@oahzit oahzit email change commit 12f24ab
@oahzit oahzit added explicit rule for the google duplicate iframe d361327
@oahzit oahzit added helper functions to find "invisible" ad units 4ff32a5
@oahzit oahzit created template, styles, and skeleton js template for the welcome page 86b0ddc
@oahzit oahzit fixed syntax error in content-script-end.js 2ea7a69
@oahzit oahzit updated welcome page style; added image 5bbe5d7
@oahzit oahzit changed the page to just have tad 5a8d597
@oahzit oahzit fix spelling errors on welcome page 41c8f7f
@oahzit oahzit added helper functions to find "invisible" ad units f74831e
@oahzit oahzit created template, styles, and skeleton js template for the welcome page f4463e5
@oahzit oahzit fixed syntax error in content-script-end.js dbd1211
@oahzit oahzit updated welcome page style; added image 8294dff
@oahzit oahzit changed the page to just have tad 1d7c2a3
@oahzit oahzit fix spelling errors on welcome page 3680c0c
@oahzit oahzit changed welcome text 89b5c94
@oahzit oahzit Merge branch 'tiz/welcome-page' of https://github.com/gladly-team/goo…
…dblock into tiz/welcome-page
5fc9ff2
@kmjennison kmjennison To avoid duplicates, don't add Goodblock icons to content within ifra…
…mes.
03c97ea
@kmjennison kmjennison Clarify function name and code comments. fe82be2
@kmjennison kmjennison Remove a handful of console logs. 369e293
@kmjennison kmjennison Make consistent 2-space indentation in content scripts. c590578
@kmjennison kmjennison Prevent from ever copying background image to Goodblock icon element. c2d1d6d
@oahzit oahzit add script to detect extension install and open a new tab with the we…
…lcome page
9f7c657
@oahzit oahzit implemented some crude searching and determining ad size and placement 26f84a9
@oahzit oahzit tweak to styling inline ads 474e2d1
@kmjennison kmjennison Remove Goodblock ad icon code from content scripts. c4481e6
@kmjennison kmjennison Reverse code related to Gladly partner pages ad adding Goodblock icon…
… to ads.
0716d58
@kmjennison kmjennison Add separate Goodblock content script to web pages. f7b7605
@kmjennison kmjennison Disable updating the extension badge with blocked request count. 04a8803
@kmjennison kmjennison Install npm react-tools. a138345
@kmjennison kmjennison Make Goodblock content script into JSX to be able to use React.js. 4605ef9
@kmjennison kmjennison Include some interaction in the placeholder Goodblock element. 24c36f1
@kmjennison kmjennison Use better way of injecting content scripts on the fly. 6f63707
@kmjennison kmjennison Add TODO notes. 32ed636
@kmjennison kmjennison Move Goodblock data messaging into contentscript-goodblock.js. 8560f2c
@kmjennison kmjennison Fetch Goodblock image URLs. 72510ba
@kmjennison kmjennison Make extension's background inject Goodblock scripts.
Make the extension's background code trigger injection of Goodblock content scripts, not the existing content scripts. This allows us to more easily control the Goodblock icon's presence across all browser tabs and conditionally decide not to inject the Goodblock content scripts (for performance optimization).
82272de
@kmjennison kmjennison Add ability for extension to message a specific tab. 3b4ed51
@kmjennison kmjennison Add missing break statement in switch. 7756edd
@kmjennison kmjennison Inject Goodblock content scripts to a specific tab. 461066c
@kmjennison kmjennison Make the Goodblock elements updatable with new data. 1340743
@kmjennison kmjennison Fix HTML ID and DOM selector bugs. dca4749
@kmjennison kmjennison Set up an event emitter for sending updated Goodblock app data to Rea…
…ctJS.
59851bf
@kmjennison kmjennison Remove unneeded line of code. 76f6f7c
@kmjennison kmjennison Change visibility of the Goodblock app when switching tabs. d827088
@kmjennison kmjennison Catch error when trying to send a message to a tab that hasn't regist…
…ered a port.
a90f1fa
@kmjennison kmjennison Make Goodblock functional immediately on extension load.
Have the extension inject Goodblock scripts to all tabs when it first ones, and have the Goodblock content scripts fetch data on load. For simplicity, pass Goodblock data to a tab as one big object rather than as individual messages.
0e443c4
@kmjennison kmjennison TODO notes. 72f7d8e
@kmjennison kmjennison Use Chrome manifest for Goodblock script injection. c890a73
@kmjennison kmjennison Make data in the Goodblock content script the source of truth for state. d6fa92d
@kmjennison kmjennison Turn off updating Goodblock visibility based on active browser tab. 1a92e9d
@kmjennison kmjennison Style Goodblock icon. 2df1ef3
@kmjennison kmjennison Tidy up Chrome manifest. 8335d7a
@kmjennison kmjennison Add entrance and exit animation to icon. cfb9ece
@kmjennison kmjennison Add snooze button element to Goodblock icon. c954836
@kmjennison kmjennison Add speech bubble when snoozing the Goodblock icon. 92d8658
@kmjennison kmjennison Prevent snooze button click from triggering icon click handler. 9e23544
@kmjennison kmjennison Ignore *.DS_Store files. fbbf7af
@kmjennison kmjennison Fix for commit 9e23544. Prevent bubbling of snooze click event. ebd41b4
@kmjennison kmjennison Tweak thought bubble and speech bubble UX. 602a31d
@kmjennison kmjennison Add functionality to snooze Goodblock. 76f6659
@kmjennison kmjennison Use Browserify to require modules and Reactify to transform JSX. 3860fa7
@kmjennison kmjennison Add transition module to fix React's CSSTransitionGroup limitations. f42c484
@kmjennison kmjennison Update TimeoutTransitionGroup to handle component appear. 3ad8748
@kmjennison kmjennison Use TimeoutTransitionGroup for animations. c2f23b0
@kmjennison kmjennison Break out Goodblock data store and actions into separate files. 46a883b
@kmjennison kmjennison Break Goodblock React app into component files.. 41a120e
@kmjennison kmjennison Create barebones ad container. 59f3ea8
@kmjennison kmjennison Hide Goodblock icon after viewing an ad. 4b7b1c4
@kmjennison kmjennison Create a placeholder ad iframe. 7b43609
@asp2insp asp2insp Added logging for snooze and sleep events 05a36cd
@oahzit oahzit aggregated where to keep the styles for the snoozebutton 50a8c03
@oahzit oahzit changed the default color of Tad 9c1a3de
@oahzit oahzit changed style of the snooze bubble 3c0209e
@kurtextrem

You have to register alarms in the onInstall event. That one will only be called update installation or upgrade. Afterwards the alarm is registered even after restarts.

kmjennison and others added some commits
@kmjennison kmjennison Add new tests for the Goodblock icon. ad4a831
@kmjennison kmjennison Remove old tests. d4f98ac
@kmjennison kmjennison Install Jest. fa83d49
@kmjennison kmjennison Ignore Jest cache file. 0eef666
@kmjennison kmjennison Add ability to build Chrome extension with test pages. daf1a84
@kmjennison kmjennison Revert "Add ability to build Chrome extension with test pages."
This reverts commit daf1a84.
7868af2
@asp2insp asp2insp Added more logging calls 90444b3
@asp2insp asp2insp Added time to snooze and time to ad metrics eac2c83
@kmjennison kmjennison WIP -- clean up Goodblock logging to InfluxDB. b556710
@asp2insp asp2insp Fixed data format 25712e8
@asp2insp asp2insp Fixed data format cca72df
@asp2insp asp2insp fixed column quoting ead2d0d
@kmjennison kmjennison Add a half-finished Selenium test helper for getting the Chrome exten…
…sion ID.

This may be useful in opening local Chrome extension pages for testing.
bd86b9c
@asp2insp asp2insp Addressing PR Feedback 79601a3
@asp2insp asp2insp Merge pull request #3 from gladly-team/kevin/opt-in-ads-alpha
Merge logging code
97b89e4
@kmjennison kmjennison Add a separate config for the testing environment. 540afd8
@kmjennison kmjennison Add test for Goodblock icon hover. c6c2397
@kmjennison kmjennison Make icon test less flaky by allowing for longer browser load. c6ce208
@kmjennison kmjennison Fix bug of dual React apps running when reloading the extension. bce529e
@kmjennison kmjennison Use a MutationObserver rather than polling to watch for changes to th…
…e Goodblock DOM element.
7f1f34b
@kmjennison kmjennison Add test of stopping Goodblock icon hover. d126600
@kmjennison kmjennison Test Goodblock snooze. 7354bd8
@kmjennison kmjennison Set a more flexible wait time for extension load in testing. e98339f
@kmjennison kmjennison Add test for Goodblock ad open and sleeping. 09db975
@kmjennison kmjennison Close the post-extension-install tab before icon tests. 25e3ce5
@kmjennison kmjennison Comment out unnecessary "is installed" test. b37070a
@kmjennison kmjennison Clean up a test to use helper functions. 5f227ca
@kmjennison kmjennison Move shared test code to helpers module. ad93c4e
@kmjennison kmjennison Test for presence of post-install page. a8ac86f
@kmjennison kmjennison Update comment. c645506
@kmjennison kmjennison Merge branch 'master' into kevin/fix-alpha-bugs 11b6f29
@kmjennison kmjennison Break out Goodblock code from ublock.js. 9347efb
@kmjennison kmjennison Reset Goodblock UI state on snooze or sleep. ea9a8a2
@kmjennison kmjennison Fix Goodblock icon entrance animation. 2e9e40a
@kmjennison kmjennison Longer snooze and sleep for testing to allow time for animation. 7c9a20a
@kmjennison kmjennison Add unit test. 16527f8
@kmjennison kmjennison Fix data logging bug and remove unused code. 307d5a0
@kmjennison kmjennison Add goodblock.org to whitelisted domains. ab3b7b0
@asp2insp asp2insp Token will be sent from app/* and saved in background JS localstorage b00e8c4
@asp2insp asp2insp Removing duplicate handler 5907b53
@kmjennison kmjennison Merge pull request #4 from gladly-team/josiah/local_storage_content_s…
…cript

Token will be sent from app/* and saved in background JS localstorage
d861287
@kmjennison kmjennison Remove event logging. 84453d7
@kmjennison kmjennison Change ad view URL. 7d32d8e
@asp2insp asp2insp Adds XHR function fetchEndpoint to goodblock.API which returns a promise b9f1d5f
@kmjennison kmjennison Change extension popup to use our web app. 42159a0
@kmjennison kmjennison Change welcome page. da0a43b
@kmjennison kmjennison Increment version. aec4b75
@kmjennison kmjennison Merge remote-tracking branch 'origin/josiah/add_endpoint_fetcher' 1a66f23
@kmjennison kmjennison Create functions to call user API endpoint. 21fcc49
@kmjennison kmjennison Use database endpoint to fetch and save the time to wake up. 7e73af9
@kmjennison kmjennison Add settings icon to dashboard popup. 9db6750
@kmjennison kmjennison Add '!important' to all inline CSS rules. 3465e79
@kmjennison kmjennison Default to showing the Goodblock icon if the user is not logged in. dbbddfa
@kmjennison kmjennison Poll for token in web app when no token exists. 106bc32
@kmjennison kmjennison After logging in, check if we should show the Goodblock icon. 919bf54
@kmjennison kmjennison Use dates instead of UTC milliseconds. 7c2541b
@kmjennison kmjennison Poll server to check for changed time to notify. e670193
@kmjennison kmjennison Move polling interval setting to config. 3f00960
@kmjennison kmjennison Add ability to hide Goodblock icon if server-side "time to notify" ch…
…anges.
3d6ee6a
@kmjennison kmjennison Reduce polling time. efbb5cc
@kmjennison kmjennison Make sure the extension considers only the exact ad page. cdc1a61
@kmjennison kmjennison Increment version. 76db96b
@kmjennison kmjennison Delay Goodblock icon mounting to delay animation into page. edec043
@kmjennison kmjennison Fix bug with hiding Goodblock icon. b1c54eb
@kmjennison kmjennison On uninstall, open feedback page. fcd3174
Raul Chall Log Tad snooze and Tad resume. 4e50a70
Raul Chall Change endpoint url. 9152e7a
@kmjennison kmjennison Merge pull request #6 from gladly-team/raul/extension-events-logs
Log Tad snooze and Tad resume.
231755e
@kmjennison kmjennison Don't ever grey out the Goodblock icon. c095023
@kmjennison kmjennison Hide Tad on ad click. 324ae03
@kmjennison kmjennison Speed up Chrome extension's popup appearance. b84d0da
@kmjennison kmjennison Don't highlight settings icon in popup. 22bddd9
@kmjennison kmjennison Make CSS rules !important. b79bc4f
@kmjennison kmjennison Add snooze button tooltip. 61305e9
@kmjennison kmjennison Add tooltip enter/exit animation. 7288dd6
@kmjennison kmjennison Increment version. 565905e
Raul Chall WIP 0da8d5f
@kmjennison kmjennison Add ability to configure whitelisted Gladly domains in dev environment. d578ac0
Raul Chall Whitelisting websites from extension popup. 9eed551
Raul Chall Merged master. ea4e544
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.