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 1 commit
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

Next
Loading status checks…

Remove feature listing for ghostery rewards on Cliqz browser

  • Loading branch information
@benstrumeyer
benstrumeyer committed Sep 18, 2019
commit 65df03f76f6886c5500e23742c281cabd6463577
7 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
@@ -46,7 +47,7 @@ class SideNavigationViewContainer extends Component {
const { user, location } = this.props;
const disableRegEx = /^(\/setup(?!\/4$))|(\/tutorial(?!\/6$))/;

const menuItems = [
let menuItems = [
{ href: '/', icon: 'home', text: t('hub_side_navigation_home') },
{ href: '/setup', icon: 'setup', text: t('hub_side_navigation_setup') },
{ href: '/tutorial', icon: 'tutorial', text: t('hub_side_navigation_tutorial') },
@@ -55,6 +56,10 @@ class SideNavigationViewContainer extends Component {
{ href: '/products', icon: 'products', text: t('hub_side_navigation_products') }
];

if (IS_CLIQZ) {
menuItems = menuItems.filter(item => item.href !== '/rewards');
This conversation was marked as resolved by fcjr

This comment has been minimized.

Sign in to view
@fcjr

fcjr Sep 18, 2019
Member

@benstrumeyer can we keep the menuItems a constant? You can do this by declaring it something like this:

	const menuItems = [
		{ href: '/', icon: 'home', text: t('hub_side_navigation_home') },
		{ 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') },
		...(IS_CLIQZ ? [{ href: '/rewards', icon: 'rewards', text: t('hub_side_navigation_rewards') }] : []),
		...[{ href: '/products', icon: 'products', text: t('hub_side_navigation_products') }]
	];

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Sep 18, 2019
Author Contributor

Great idea, fixed.
}

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.