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

Ghostery browser intro hub #665

Merged
merged 120 commits into from Jan 29, 2021
+8,592 −160
Merged

Ghostery browser intro hub #665

Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
0d1136a
Work towards implementing stub of new intro hub
Nov 11, 2020
d295be0
Implement AppView for Ghostery Browser Hub
Nov 11, 2020
2afb600
Progress towards intro hub skeleton
Nov 13, 2020
9163edb
Merge in develop
Nov 29, 2020
3bb394a
Add stubs for the various onboarding views. Add top level onboarding …
Nov 29, 2020
5a9de84
Merge in develop
Dec 1, 2020
f59a5dd
Continued work on fleshing out the ghostery browser hub react app
Dec 2, 2020
078a137
Factor store creation and Redux HOC construction to utility functions
Dec 2, 2020
388f8f8
Factor out and clean up toast and anti suite reducers for the Hubs
Dec 2, 2020
5b957e3
Factor setup lifecycle actions and constants out to shared-hub dir. N…
Dec 3, 2020
382b81e
Move blocking policy reducer to shared-hub
Dec 3, 2020
a51e0ae
GH-2205: Onboarding - Welcome & Get Started (#637)
benstrumeyer Dec 3, 2020
fb7de96
GH-2207: Onboarding - Success Screen (#638)
benstrumeyer Dec 3, 2020
9799389
GH-2206: Onboarding - Step 1 - Create Account (#639)
benstrumeyer Dec 7, 2020
edc434e
GH-2211: Onboarding - Status Bar (#641)
benstrumeyer Dec 7, 2020
fe5ef4a
Work towards connecting and reconciling new intro hub views
Dec 8, 2020
80f0fcf
Connecting intro hub pieces
Dec 9, 2020
b901263
Merge in latest develop
Dec 9, 2020
5ebb12c
Cleaning up new intro hub SCSS
Dec 9, 2020
50bd0c6
Get inline script that branches to the correct hub to run
Dec 9, 2020
cf1ceaa
Update BlockSettingsView and localization messages (#643)
leuryr Dec 10, 2020
d87f5c2
GH-2210: Onboarding - Step 4 - Choose Plan (#640)
benstrumeyer Dec 10, 2020
e901117
Post-PR-merge SCSS imports cleanup
Dec 10, 2020
3e92e7d
Cleanup of index files and debugging in new intro hub
Dec 11, 2020
bfaf1f3
Continue cleanup of Step1 JSX
Dec 11, 2020
11f3a7e
Render hub step progress bar across all views
Dec 11, 2020
077f680
Add StepNavigator component to manage navigation within a step
Dec 11, 2020
4b55efd
Update data structure passed to OnboardingView by the container to ma…
Dec 11, 2020
89edc23
Finish converting index files to use buildReduxHOC
Dec 11, 2020
e2999d2
Merge in latest develop
Dec 16, 2020
7ad2916
Assorted intro hub fixes
Dec 16, 2020
4717269
Use constants for paths
Dec 22, 2020
0500444
Merge in develop
Dec 22, 2020
9552fc4
Cleanup StepProgressBar
Dec 22, 2020
d237448
Add new intro hub css to template
Dec 22, 2020
4d7a47e
Remove unused navigation mechanism
Dec 22, 2020
e0e806c
Removed unused setup lifecycle actions
Dec 23, 2020
3fc6876
Conditionally include the appropriate hub css
Dec 23, 2020
c444764
Clean up welcome view css, fix up button link
Dec 23, 2020
a24d53c
More welcome view cleanup. Make sure progress bar does not show on We…
Dec 23, 2020
38601b9
GH-2220: Onboarding - Telemetry (#650)
benstrumeyer Jan 4, 2021
6dd38b6
Replace search view element
Jan 4, 2021
66e7b5c
Iterate on search view layout
Jan 4, 2021
b35a01c
Option container design on default search select view
Jan 5, 2021
41677bd
Further work on default search view option containers
Jan 5, 2021
6806dad
Add confirmation modal for default search view
Jan 5, 2021
13b9fbe
Message search extension with user choice
Jan 5, 2021
0781671
Fix typo in template. Tidy up status bar
Jan 5, 2021
fa3b348
Implement updating search preference
Jan 5, 2021
a9e9cf2
GH-2218: Browser Onboarding Copy Edits & Tooltips (#652)
benstrumeyer Jan 5, 2021
bcf1a34
There was a coup attempt at The Capitol yesterday
Jan 7, 2021
c05c7cc
GH-2218: 8.5.5 Translations (#654)
benstrumeyer Jan 7, 2021
9100e95
Ghostery Dawn Intro Hub Miscellaneous Fixes (#653)
benstrumeyer Jan 7, 2021
2c72617
Reduce tooltip delay in Block Settings view
Jan 11, 2021
0bf679b
Make entire option box clickable on default search view
Jan 11, 2021
bf548b9
Rough out custom URL selector
Jan 11, 2021
d2e1f9b
Choose Default Search view option container adjustments
Jan 11, 2021
7c15c2f
Make toasts work
Jan 11, 2021
9472e03
Improvements to UX of custom URL input in choose default search view
Jan 11, 2021
c2a7204
Tidy up custom URL input a little more
Jan 11, 2021
0db8f7c
Remove console statement
Jan 12, 2021
e6e4392
GH-2236: Update onboarding branding (#658)
leuryr Jan 12, 2021
8addd79
Remove custom URL input from choose default search view. Style and co…
Jan 13, 2021
a6b43c1
Choose Default Search view modal styling
Jan 14, 2021
153077f
More choose default search view modal styling
Jan 14, 2021
359b7c2
GH-2244: Unit tests for Ghostery Dawn Intro Hub (#657)
benstrumeyer Jan 19, 2021
3630e93
Remove updates and promotions checkbox and dropdown (#659)
benstrumeyer Jan 19, 2021
3e7e2b9
Fix routing bug
wlycdgr Jan 20, 2021
c423fd7
Step Progress Bar Bug (#661)
benstrumeyer Jan 20, 2021
f877791
Update locale string keys to match new Dawn branding
wlycdgr Jan 20, 2021
0a8b70b
Redirect user to new onboarding from background script instead of thr…
wlycdgr Jan 21, 2021
8abda5e
Fixes for Dawn Onboarding toast messages (#660)
leuryr Jan 21, 2021
8044a41
Reenable search selection which had been disabled for testing purposes
wlycdgr Jan 22, 2021
a1118ca
Leet tool character limits and misc fixes (#662)
benstrumeyer Jan 22, 2021
e60eade
Ghostery Dawn Intro Hub Design Fixes (#663)
benstrumeyer Jan 22, 2021
f1ba4f0
Ghostery Dawn Miscellaneous Bug fixes (#664)
benstrumeyer Jan 22, 2021
4627a05
Update and clean up strings
wlycdgr Jan 25, 2021
d4a0c56
Merge branch 'ghostery-browser-intro-hub' of github.com:ghostery/ghos…
wlycdgr Jan 25, 2021
1b02dfe
Add search dropdown strings
wlycdgr Jan 25, 2021
f5e9536
Clean uphub templates and on install hub branching code
wlycdgr Jan 25, 2021
7f9cbf1
Linter updates and fixes
wlycdgr Jan 25, 2021
4206481
Use correct hub branching logic in background
wlycdgr Jan 25, 2021
9da9a53
Merge branch 'develop' into ghostery-browser-intro-hub
wlycdgr Jan 25, 2021
de2e78a
Open correct hub from Help view of panel
wlycdgr Jan 25, 2021
0e25788
Show the appropriate upgrade plan view to user based on their default…
wlycdgr Jan 25, 2021
8053eea
Copy and formatting fixes in the Choose Plan view
wlycdgr Jan 26, 2021
67a9bb3
Fix Startpage search selection confirmation modal copy
wlycdgr Jan 26, 2021
478ea52
Do not show progress bar on Sucess view
wlycdgr Jan 26, 2021
f5d4668
Prevent title text on Success view from wrapping to a new line
wlycdgr Jan 26, 2021
201f955
Implements Start Trial button logic that branches on user login state…
wlycdgr Jan 26, 2021
ba27815
Change StartPage identifier to Startpage
wlycdgr Jan 26, 2021
09ee4de
Modifications to faciliate testing
wlycdgr Jan 26, 2021
6d4d5ca
Update ghostery-common dependency to ^1.2.1
wlycdgr Jan 26, 2021
f7848dc
Update Startpage logo
wlycdgr Jan 26, 2021
f7ce546
Fix prop type mismatch console warnings on Welcome and Choose Plan sc…
wlycdgr Jan 26, 2021
f92160c
GH-2218: Browser Onboarding Copy Edits (#666)
benstrumeyer Jan 26, 2021
172af55
Fix <li> inside <li> console warning on Block Settings screen
wlycdgr Jan 26, 2021
e104fbc
Remove testing modifications for Dawn nightly build
wlycdgr Jan 26, 2021
ddeb7c5
Modifiations for ease of testing
wlycdgr Jan 26, 2021
776751c
Wrap call to search extension in a try catch to facilitate testing in…
wlycdgr Jan 26, 2021
a45ae4f
Make radio button labels clickable in Block Settings view. Factor ans…
wlycdgr Jan 26, 2021
d7fdfce
Minor copy fixes (#668)
leuryr Jan 27, 2021
7d32d5f
Add dropdown for search options (#667)
leuryr Jan 27, 2021
b321605
Guard against race condition in background when picking which hub to …
wlycdgr Jan 27, 2021
7c573de
Establish Dawn Hub naming consistency
wlycdgr Jan 27, 2021
895ac09
Implement other search engine option retrieval via browser.search.get
wlycdgr Jan 27, 2021
a761103
Only show other search options dropdown if there are actually other o…
wlycdgr Jan 27, 2021
5697c1d
Update search dropdown CSS to handle variable height
wlycdgr Jan 27, 2021
391bc6d
Remove search permission from manifest as it is added to Dawn GBE at …
wlycdgr Jan 28, 2021
13b92f5
setup_number ping parameter (#669)
benstrumeyer Jan 29, 2021
de28d6b
Remove comment that is no longer relevant
wlycdgr Jan 29, 2021
25c8483
Fix block settings styling, update Next or Start Trial button label o…
wlycdgr Jan 29, 2021
c5032c8
Filter our StartPage and Ghostery Glow fromother search engines dropdown
wlycdgr Jan 29, 2021
cffcc7a
GH-2248: Update CTA & links to Plus, Premium, and free trial subscrip…
benstrumeyer Jan 29, 2021
b23a933
Fix certain block settings not setting (#672)
leuryr Jan 29, 2021
b4df03c
Restore some clobbered paths in tests in the old Hub
wlycdgr Jan 29, 2021
649200b
Remove unused old-name directory
wlycdgr Jan 29, 2021
58b7b72
Update Block Settings view tests to match new value in the code
wlycdgr Jan 29, 2021
6455d56
Use our logger instead of console.log in ChooseDefaultSearchView
wlycdgr Jan 29, 2021
2199622
Remove hack that forced Dawn hub from background. Add support for ope…
wlycdgr Jan 29, 2021
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

Use correct hub branching logic in background

  • Loading branch information
@wlycdgr
wlycdgr committed Jan 25, 2021
commit 4206481d9e9fee1797894089b82ea541c802567a
2 src/background.js
View file
Open in desktop
@@ -1639,7 +1639,7 @@ function initializeGhosteryModules() {
// run scheduledTasks on init
scheduledTasks().then(() => {
if (globals.JUST_INSTALLED) {
if (BROWSER_INFO.name !== 'ghostery_desktop') {
if (BROWSER_INFO.name === 'ghostery_desktop') {
This conversation was marked as resolved by christophertino

This comment has been minimized.

Sign in to view
@christophertino

christophertino Jan 25, 2021
Member

Potential race condition here. See async check above

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Jan 26, 2021 •
edited
Author Member

list item forbidden nesting warning fixed. StepNavigator warning also addressed. didNotSelectGhosterySearch warning now moot (and gone).

I can no longer rep any of these three console errors

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Jan 27, 2021
Author Member

Only linter warnings are now the console statements for the try/catch in ChooseDefaultSearch, which I will remove once testing is complete.

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Jan 27, 2021
Author Member

Wrapped hub opening logic in async check to guard against race condition

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Jan 27, 2021
Author Member

(Working on fixing the Help > Set Up Ghostery fix)
chrome.tabs.create({
url: chrome.runtime.getURL('./app/templates/dawn_onboarding.html?justInstalled=true'),
active: true
ProTip! Use n and p to navigate between commits in a pull request.