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-1607/Remove feature listing #452

Merged
merged 6 commits into from Sep 25, 2019
+15 −5
Merged

GH-1607/Remove feature listing #452

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65df03f
Remove feature listing for ghostery rewards on Cliqz browser
benstrumeyer Sep 18, 2019
62b92e3
Refactored menu items to a constant
benstrumeyer Sep 18, 2019
b37308e
Refactored menuItems. Removed Ghostery Rewards reference in Cliqz bro…
benstrumeyer Sep 20, 2019
bb92e84
Refactored to remove a variable
benstrumeyer Sep 20, 2019
2e0e65f
Merge branch 'develop' into feature/remove-feature-listing
benstrumeyer Sep 20, 2019
5113452
Refactor switch to if/else. Modify language.
benstrumeyer Sep 20, 2019
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

3 _locales/en/messages.json
View file
Open in desktop
@@ -1395,6 +1395,9 @@
"hub_home_header_info": {
"message": "New users are opted in to participating in Human Web and Ghostery Rewards. You may change these settings in custom setup or in the extension. "
},
"hub_home_header_info_cliqz": {
"message": "New users are opted in to participating in Human Web. You may change this setting in custom setup or in the extension. "
},
This conversation was marked as resolved by benstrumeyer

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Sep 20, 2019
Member

Since we only mention one setting for Cliqz, it should be 'this setting' in the second sentence here.

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Sep 20, 2019
Author Contributor

Gotcha, fixed.
"hub_home_header_info_link": {
"message": "Learn More."
},
13 app/hub/Views/HomeView/HomeView.jsx
View file
Open in desktop
@@ -34,9 +34,16 @@ const HomeView = (props) => {
isPlus,
} = props;
const accountHref = `https://account.${globals.GHOSTERY_DOMAIN}.com`;
const headerInfoText = (globals.BROWSER_INFO && globals.BROWSER_INFO.name === 'firefox')
? t('hub_home_header_info_opted_out')
: t('hub_home_header_info');

let headerInfoText = t('hub_home_header_info');
if (globals.BROWSER_INFO) {
if (globals.BROWSER_INFO.name === 'firefox') {
headerInfoText = t('hub_home_header_info_opted_out');
} else if (globals.BROWSER_INFO.name === 'cliqz') {
headerInfoText = t('hub_home_header_info_cliqz');
}
}

This conversation was marked as resolved by benstrumeyer

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Sep 20, 2019
Member

This introduces a dependency on globals.BROWSER_INFO being set compared to the old code; let's refactor to avoid doing that. We can do

let headerInfoText = t('hub_home_header_info');
if (globals.BROWSER_INFO) {
    // switching to if/else to avoid duplication in the default case of switch
    if (globals.BROWSER_INFO.name === 'firefox') { headerInfoText = ....}
    else if (.... === 'cliqz') { .....}
}

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Sep 20, 2019
Author Contributor

Great catch. Fixed.
const tutorialFeatureClassNames = ClassNames('HomeView__onboardingFeature columns flex-container align-middle flex-dir-column', {
'feature-tutorial-complete': tutorial_complete,
'feature-tutorial': !tutorial_complete,
4 app/hub/Views/SideNavigationView/SideNavigationViewContainer.jsx
View file
Open in desktop
@@ -16,6 +16,7 @@ import PropTypes from 'prop-types';
import SideNavigationView from './SideNavigationView';
import globals from '../../../../src/classes/Globals';

const { IS_CLIQZ } = globals;
/**
* @class Implement the Side Navigation View for the Ghostery Hub
* @extends Component
@@ -51,10 +52,9 @@ class SideNavigationViewContainer extends Component {
{ href: '/setup', icon: 'setup', text: t('hub_side_navigation_setup') },
{ href: '/tutorial', icon: 'tutorial', text: t('hub_side_navigation_tutorial') },
{ href: '/plus', icon: 'plus', text: t('hub_side_navigation_supporter') },
{ href: '/rewards', icon: 'rewards', text: t('hub_side_navigation_rewards') },
...(IS_CLIQZ ? [] : [{ href: '/rewards', icon: 'rewards', text: t('hub_side_navigation_rewards') }]),
{ href: '/products', icon: 'products', text: t('hub_side_navigation_products') }
];

const bottomItems = user ? [
{ id: 'email', href: `https://account.${globals.GHOSTERY_DOMAIN}.com/`, text: user.email },
{ id: 'logout', text: t('hub_side_navigation_log_out'), clickHandler: this._handleLogoutClick },
ProTip! Use n and p to navigate between commits in a pull request.