+2 −1

.eslintrc.json

.eslintrc.json

+4 −1

.travis.yml

.travis.yml

+10 −0

config

.tx/config

+15 −0

CHANGELOG.md

CHANGELOG.md

+25 −0

CODEOWNERS

CODEOWNERS

+6 −2

CONTRIBUTING.md

CONTRIBUTING.md

+14 −0

Dockerfile

Dockerfile

+141 −0

Jenkinsfile

Jenkinsfile

+19 −0

README.md

README.md

+13 −30

messages.json

_locales/de/messages.json

+239 −29

messages.json

_locales/en/messages.json

+7 −27

messages.json

_locales/es/messages.json

+7 −27

messages.json

_locales/fr/messages.json

+6 −26

messages.json

_locales/hu/messages.json

+6 −26

messages.json

_locales/it/messages.json

+6 −26

messages.json

_locales/ja/messages.json

+6 −26

messages.json

_locales/ko/messages.json

+6 −26

messages.json

_locales/nl/messages.json

+6 −26

messages.json

_locales/pl/messages.json

+6 −26

messages.json

_locales/pt_BR/messages.json

+6 −26

messages.json

_locales/ru/messages.json

+6 −26

messages.json

_locales/zh_CN/messages.json

+6 −26

messages.json

_locales/zh_TW/messages.json

+7 −7

click_to_play.js

app/content-scripts/click_to_play.js

+10 −11

notifications.js

app/content-scripts/notifications.js

+109 −0

HotDog.jsx

app/content-scripts/rewards/HotDog.jsx

+89 −0

Notification.jsx

app/content-scripts/rewards/Notification.jsx

+318 −0

OfferCard.jsx

app/content-scripts/rewards/OfferCard.jsx

+61 −0

Settings.jsx

app/content-scripts/rewards/Settings.jsx

+157 −0

index.jsx

app/content-scripts/rewards/index.jsx

BIN

icon19.png

app/images/icon19.png

BIN

icon19_off.png

app/images/icon19_off.png

BIN

icon19_star.png

app/images/icon19_star.png

BIN

icon38.png

app/images/icon38.png

BIN

icon38_off.png

app/images/icon38_off.png

BIN

icon38_star.png

app/images/icon38_star.png

+3 −12

caret-up.svg

app/images/panel/caret-up.svg

+5 −21

icon-list-view.svg

app/images/panel/icon-list-view.svg

+6 −15

left-left-moon.svg

app/images/panel/left-left-moon.svg

+6 −15

left-right-moon.svg

app/images/panel/left-right-moon.svg

+3 −0

line-empty-moon.svg

app/images/panel/line-empty-moon.svg

+6 −19

plus.svg

app/images/panel/plus.svg

+1 −0

right-left-moon.svg

app/images/panel/right-left-moon.svg

+1 −17

right-right-moon.svg

app/images/panel/right-right-moon.svg

BIN

ghostery-rewards-beta.png

app/images/rewards/ghostery-rewards-beta.png

+3 −0

ghosty-grey.svg

app/images/rewards/ghosty-grey.svg

+6 −0

ghosty-star.svg

app/images/rewards/ghosty-star.svg

+3 −0

light-x.svg

app/images/rewards/light-x.svg

+5 −0

settings-kebab.svg

app/images/rewards/settings-kebab.svg

+3 −0

white-x.svg

app/images/rewards/white-x.svg

+4 −2

BlockingActions.js

app/panel/actions/BlockingActions.js

+0 −70

DrawerActions.js

app/panel/actions/DrawerActions.js

+31 −2

PanelActions.js

app/panel/actions/PanelActions.js

+92 −0

RewardsActions.js

app/panel/actions/RewardsActions.js

+4 −3

SettingsActions.js

app/panel/actions/SettingsActions.js

+5 −14

SummaryActions.js

app/panel/actions/SummaryActions.js

+102 −0

RewardsActions.js

app/panel/actions/__tests__/RewardsActions.js

+102 −0

SummaryActions.js

app/panel/actions/__tests__/SummaryActions.js

+2 −2

Blocking.jsx

app/panel/components/Blocking.jsx

+2 −1

BlockingHeader.jsx

app/panel/components/Blocking/BlockingHeader.jsx

+6 −5

ClickOutside.jsx/{ → }

...mponents/{helpers → BuildingBlocks}/ClickOutside.jsx

+204 −0

CliqzFeatures.jsx

app/panel/components/BuildingBlocks/CliqzFeatures.jsx

+98 −53

DonutGraph.jsx/{ → }

app/panel/components/{ → BuildingBlocks}/DonutGraph.jsx

+170 −0

GhosteryFeatures.jsx

...panel/components/BuildingBlocks/GhosteryFeatures.jsx

+42 −0

NotScanned.jsx

app/panel/components/BuildingBlocks/NotScanned.jsx

+191 −0

PauseButton.jsx

app/panel/components/BuildingBlocks/PauseButton.jsx

+154 −0

RewardDetail.jsx

app/panel/components/BuildingBlocks/RewardDetail.jsx

+122 −0

RewardListItem.jsx

app/panel/components/BuildingBlocks/RewardListItem.jsx

+83 −0

ToggleSlider.jsx

app/panel/components/BuildingBlocks/ToggleSlider.jsx

+37 −0

index.js

app/panel/components/BuildingBlocks/index.js

+9 −6

Detail.jsx

app/panel/components/Detail.jsx

+12 −48

DetailMenu.jsx

app/panel/components/DetailMenu.jsx

+0 −166

Drawer.jsx

app/panel/components/Drawer.jsx

+71 −15

Header.jsx

app/panel/components/Header.jsx

+1 −1

HeaderMenu.jsx

app/panel/components/HeaderMenu.jsx

+0 −35

NotScanned.jsx

app/panel/components/NotScanned.jsx

+50 −32

Panel.jsx

app/panel/components/Panel.jsx

+236 −29

Rewards.jsx

app/panel/components/Rewards.jsx

+0 −119

SelectButton.jsx

app/panel/components/SelectButton.jsx

+3 −0

Settings.jsx

app/panel/components/Settings.jsx

+5 −4

GlobalBlocking.jsx

app/panel/components/Settings/GlobalBlocking.jsx

+19 −19

OptIn.jsx

app/panel/components/Settings/OptIn.jsx

+251 −307

Summary.jsx

app/panel/components/Summary.jsx

+33 −11

Tooltip.jsx

app/panel/components/Tooltip.jsx

+163 −0

PauseButton.jsx

app/panel/components/__tests__/PauseButton.jsx

+179 −0

RewardDetail.jsx

app/panel/components/__tests__/RewardDetail.jsx

+156 −0

RewardListItem.jsx

app/panel/components/__tests__/RewardListItem.jsx

+66 −0

Rewards.jsx

app/panel/components/__tests__/Rewards.jsx

+116 −0

PauseButton.jsx.snap

...ponents/__tests__/__snapshots__/PauseButton.jsx.snap

+339 −0

RewardDetail.jsx.snap

...onents/__tests__/__snapshots__/RewardDetail.jsx.snap

+331 −0

RewardListItem.jsx.snap

...ents/__tests__/__snapshots__/RewardListItem.jsx.snap

+133 −0

Rewards.jsx.snap

.../components/__tests__/__snapshots__/Rewards.jsx.snap

+10 −8

constants.js

app/panel/constants/constants.js

+1 −0

BlockingContainer.js

app/panel/containers/BlockingContainer.js

+2 −0

DetailContainer.js

app/panel/containers/DetailContainer.js

+1 −1

PanelContainer.js

app/panel/containers/PanelContainer.js

+23 −17

DrawerContainer.js → RewardsContainer.js

...ontainers/{DrawerContainer.js → RewardsContainer.js}

+2 −0

SettingsContainer.js

app/panel/containers/SettingsContainer.js

+2 −3

SummaryContainer.js

app/panel/containers/SummaryContainer.js

+132 −0

rewards.js

app/panel/reducers/__tests__/rewards.js

+102 −0

summary.js

app/panel/reducers/__tests__/summary.js

+4 −2

blocking.js

app/panel/reducers/blocking.js

+0 −47

drawer.js

app/panel/reducers/drawer.js

+2 −2

index.js

app/panel/reducers/index.js

+45 −16

panel.js

app/panel/reducers/panel.js

+82 −0

rewards.js

app/panel/reducers/rewards.js

+4 −2

settings.js

app/panel/reducers/settings.js

+4 −2

summary.js

app/panel/reducers/summary.js

+24 −0

msg.js

app/panel/utils/msg.js

+47 −0

utils.js

app/panel/utils/utils.js

+14 −2

panel.scss

app/scss/panel.scss

+2 −54

_blocking.scss

app/scss/partials/_blocking.scss

+5 −5

_blocking_tracker.scss

app/scss/partials/_blocking_tracker.scss

+6 −1

_callout.scss

app/scss/partials/_callout.scss

+122 −0

_cliqz_features.scss

app/scss/partials/_cliqz_features.scss

+3 −8

_colors.scss

app/scss/partials/_colors.scss

+26 −2

_detail.scss

app/scss/partials/_detail.scss

+66 −0

_donut_graph.scss

app/scss/partials/_donut_graph.scss

+160 −0

_ghostery_features.scss

app/scss/partials/_ghostery_features.scss

+25 −1

_header.scss

app/scss/partials/_header.scss

+27 −58

_not_scanned.scss

app/scss/partials/_not_scanned.scss

+201 −0

_pause_button.scss

app/scss/partials/_pause_button.scss

+1 −1

_placeholders.scss

app/scss/partials/_placeholders.scss

+267 −0

_rewards.scss

app/scss/partials/_rewards.scss

+59 −47

_select_button.scss

app/scss/partials/_select_button.scss

+158 −343

_summary.scss

app/scss/partials/_summary.scss

+7 −2

_summary_expert.scss

app/scss/partials/_summary_expert.scss

+68 −0

_svgs.scss

app/scss/partials/_svgs.scss

+55 −0

_toggle_slider.scss

app/scss/partials/_toggle_slider.scss

+31 −10

_tooltip.scss

app/scss/partials/_tooltip.scss

+1 −1

purplebox.scss

app/scss/purplebox.scss

+503 −0

rewards.scss

app/scss/rewards.scss

+13 −47

setup.scss

app/scss/setup.scss

+3 −0

NavigationActions.js

app/setup/actions/NavigationActions.js

+3 −3

SetupChoiceViewActions.js

app/setup/actions/SetupChoiceViewActions.js

+43 −30

Navigation.jsx

app/setup/components/Navigation.jsx

+27 −19

AdditionalFeaturesView.jsx

app/setup/components/Views/AdditionalFeaturesView.jsx

+1 −1

BlockingView.jsx

app/setup/components/Views/BlockingView.jsx

+1 −1

DataCollectionView.jsx

app/setup/components/Views/DataCollectionView.jsx

+1 −1

DisplayView.jsx

app/setup/components/Views/DisplayView.jsx

+1 −1

DoneView.jsx

app/setup/components/Views/DoneView.jsx

+2 −43

LogInView.jsx

app/setup/components/Views/LogInView.jsx

+1 −1

SetupChoiceView.jsx

app/setup/components/Views/SetupChoiceView.jsx

+1 −1

UpgradeView.jsx

app/setup/components/Views/UpgradeView.jsx

+6 −0

additionalFeatures.js

app/setup/reducers/additionalFeatures.js

+1 −3

display.js

app/setup/reducers/display.js

+0 −1

panel.html

app/templates/panel.html

+1 −1

jest.config.js

jest.config.js

+18 −7

manifest.json

manifest.json

+9,729 −6,466

package-lock.json

package-lock.json

+15 −7

package.json

package.json

+251 −152

background.js

src/background.js

+1 −1

ABTest.js

src/classes/ABTest.js

+11 −9

BrowserButton.js

src/classes/BrowserButton.js

+17 −0

Cliqz.js

src/classes/Cliqz.js

+1 −0

ConfData.js

src/classes/ConfData.js

+27 −26

EventHandlers.js

src/classes/EventHandlers.js

+1 −1

FoundBugs.js

src/classes/FoundBugs.js

+1 −1

Globals.js

src/classes/Globals.js

+24 −73

Metrics.js

src/classes/Metrics.js

+21 −4

PanelData.js

src/classes/PanelData.js

+36 −14

Policy.js

src/classes/Policy.js

+81 −92

PolicySmartBlock.js

src/classes/PolicySmartBlock.js

+2 −2

PurpleBox.js

src/classes/PurpleBox.js

+132 −0

Rewards.js

src/classes/Rewards.js

+1 −0

TabInfo.js

src/classes/TabInfo.js

+2 −0

accounts.js

src/utils/accounts.js

+2 −2

click2play.js

src/utils/click2play.js

+8 −4

matcher.js

src/utils/matcher.js

+12 −2

utils.js

src/utils/utils.js

+6 −1

setup.js

test/setup.js

+15 −2

matcher.test.js

test/src/matcher.test.js

+69 −0

appxmanifest.xml

tools/edge/appxmanifest.xml

BIN

icon150.png

tools/edge/assets/icon150.png

BIN

icon44.png

tools/edge/assets/icon44.png

BIN

icon50.png

tools/edge/assets/icon50.png

+22 −0

priconfig.xml

tools/edge/priconfig.xml

+1 −0

resources.resjson

tools/edge/resources/de/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/en/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/es/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/fr/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/hu/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/it/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/ja/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/ko/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/nl/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/pl/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/pt-br/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/ru/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/zh-cn/resources.resjson

+1 −0

resources.resjson

tools/edge/resources/zh-tw/resources.resjson

+36 −71

webpack.config.js

webpack.config.js