Skip to content
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

GH-1621: Site-Specific Whitelisting for Unknown Trackers via Anti-Tracking #416

Closed
wants to merge 23 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d17e342
Add anonymized data points to donut graph
Eden12345 Jun 4, 2019
3ec01dc
Half of original implementation complete
Eden12345 Jun 5, 2019
1f80f91
Copy icons to original branch
Eden12345 Jun 10, 2019
c2002a5
Finish rebuilding feature in original branch with cleaner code
Eden12345 Jun 10, 2019
3dcfa15
Rendering is working properly for the detailed view list, holding off…
Eden12345 Jun 12, 2019
f07a901
update npm dependencies. refactor webpack, babel, eslint
christophertino Jun 27, 2019
43e7683
apply new eslint rules and fix errors
christophertino Jun 27, 2019
ce2518c
fix formatting of if statements after lint auto-fix
christophertino Jul 1, 2019
95267e9
fix proptype errors in hub
christophertino Jul 1, 2019
e70fcd7
update codeowners and readme
christophertino Jul 1, 2019
4bad7bb
Shorten and correct the russian translations for cookies, fingerprint…
wlycdgr Jul 2, 2019
22236a6
Fix layout in Summary condensed view on Page Not Scanned pages (#404)
wlycdgr Jul 2, 2019
14973e6
bump browser core version
christophertino Jul 2, 2019
9a88931
updated donut number tooltip
tdtnguyen Jul 3, 2019
3cea1c7
fix tracker counting to include ad-block data
christophertino Jul 8, 2019
c610b08
Merge master into branch to access CliqzFeature component
Eden12345 Jul 9, 2019
82cb4bb
Get Anti-Tracking button working in category header
Eden12345 Jul 9, 2019
d57dc3d
Finish styling header
Eden12345 Jul 10, 2019
df763d6
Header styling and functionality complete, SVG buttons styled
Eden12345 Jul 11, 2019
0fdb21f
Resolve merge conflicts with Tino's changes to CliqzModuleData
Eden12345 Jul 11, 2019
6896ad7
Saving (relatively) working code)
Eden12345 Jul 17, 2019
8a88239
Complete core functionality, UI needs to be completed and refactored
Eden12345 Jul 18, 2019
45a97be
Finish styling
Eden12345 Jul 18, 2019
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Half of original implementation complete
  • Loading branch information
Eden12345 committed Jun 5, 2019
commit 3ec01dc5da0264260d5130cb1b3c4937755eb81c
@@ -281,6 +281,7 @@ class Blocking extends React.Component {
const {
actions,
categories,
antiTracking,
expand_all_trackers,
is_expanded,
language,
@@ -324,6 +325,7 @@ class Blocking extends React.Component {
language={language}
smartBlockActive={smartBlockActive}
smartBlock={smartBlock}
antiTracking={antiTracking}
/>
}
</div>
@@ -29,7 +29,8 @@ class Categories extends React.Component {
* @return {ReactComponent} ReactComponent instance
*/
render() {
const { categories, expandAll } = this.props;
const { categories, expandAll, antiTracking } = this.props;
console.log(categories, antiTracking)
const globalBlocking = !!this.props.globalBlocking;
const filtered = !!this.props.filtered;
const categoryList = categories.map((cat, index) => (
@@ -50,7 +51,12 @@ class Categories extends React.Component {
smartBlock={this.props.smartBlock}
/>
));
return <div className="scroll-content">{ categoryList }</div>;
return (
<div className="scroll-content">
{categoryList}
{antiTracking && <div />}
</div>
);
}
}

@@ -333,7 +333,12 @@ class DonutGraph extends React.Component {
* @return {JSX} JSX for rendering the donut-graph portion of the Summary View
*/
render() {
const { isSmall, totalCount, antiTracking } = this.props;
const {
isSmall,
categories,
antiTracking,
totalCount,
} = this.props;
const componentClasses = ClassNames('sub-component', 'donut-graph', {
small: isSmall,
big: !isSmall,
@@ -342,7 +347,7 @@ class DonutGraph extends React.Component {
return (
<div className={componentClasses}>
<div className="tooltip-container">
{this.props.categories.map(cat => (
{categories.map(cat => (
<span key={cat.id} id={`${cat.id}_tooltip`} className="tooltip top">
{cat.name}
</span>
@@ -34,6 +34,7 @@ const mapStateToProps = state => Object.assign({}, state.blocking, {
sitePolicy: state.summary.sitePolicy,
smartBlockActive: state.panel.enable_smart_block,
smartBlock: state.panel.smartBlock,
antiTracking: state.summary.antiTracking,
});
/**
* Bind Blocking view component action creators using Redux's bindActionCreators
ProTip! Use n and p to navigate between commits in a pull request.