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-339 HomeView and SideNavigation for Ghostery Hub #179

Merged
merged 8 commits into from Aug 31, 2018

Fix tests and linting errors.

  • Loading branch information
IAmThePan committed Aug 31, 2018
commit 76cc962710816a411a722359f02721d3cf3ed25a
@@ -46,7 +46,7 @@ class RewardsView extends Component {
{t('hub_rewards_header_description')}
</div>
<div className="RewardsView__buttonContainer">
<a className="RewardsView__button button success" href="https://www.ghostery.com/faqs/what-is-ghostery-rewards/">
<a className="RewardsView__button button success" href="https://www.ghostery.com/faqs/what-is-ghostery-rewards/" target="_blank" rel="noopener noreferrer">
{t('hub_rewards_header_learn_more')}
</a>
</div>
@@ -25,6 +25,7 @@ import {
setGhosteryRewards
} from '../SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewActions';
import { setHumanWeb } from '../SetupViews/SetupHumanWebView/SetupHumanWebViewActions';
import { setSetupComplete } from '../SetupViews/SetupDoneView/SetupDoneViewActions';

/**
* Map redux store state properties to the component's own properties.
@@ -48,6 +49,7 @@ const mapDispatchToProps = dispatch => ({
setSmartBlocking,
setGhosteryRewards,
setHumanWeb,
setSetupComplete,
}), dispatch),
});

@@ -20,7 +20,7 @@ const SideNavigationView = (props) => {

return (
<div className="SideNavigation flex-container flex-dir-column">
<div className="SideNavigation__top" />
<NavLink to="/" className="SideNavigation__top" />
<div className="SideNavigation__menu flex-child-grow flex-container flex-dir-column">
{menuItems.map(item => (
<div key={`menu-item-${item.href.substring(1)}`} className="SideNavigation__item SideNavigation__menuItem flex-container align-middle">
@@ -33,9 +33,11 @@ const SideNavigationView = (props) => {
</div>
<div className="SideNavigation__bottom flex-container flex-dir-column">
{bottomItems.map(item => (
<NavLink key={`bottom-item-${item.href.substring(1)}`} to={item.href} className="SideNavigation__item SideNavigation__bottomItem flex-container align-middle">
{item.text}
</NavLink>
<div key={`bottom-item-${item.href.substring(1)}`} className="SideNavigation__item SideNavigation__bottomItem flex-container align-middle">
<NavLink to={item.href}>
{item.text}
</NavLink>
</div>
))}
</div>
</div>
ProTip! Use n and p to navigate between commits in a pull request.