Merge branch 'feature/manage-org-tabs'
* feature/manage-org-tabs: refactoring - created DumbTab for non routable tab adding managable tabs for organistaion nav
This commit is contained in:
commit
702747d520
@ -53,6 +53,7 @@ const OrgName = styled.span`
|
|||||||
const NavLi = styled(NavLink)`
|
const NavLi = styled(NavLink)`
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
font-size: 16px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledTabs = styled(Tabs)`
|
const StyledTabs = styled(Tabs)`
|
||||||
@ -73,6 +74,27 @@ const StyledContainer = styled(Container)`
|
|||||||
`}
|
`}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const ManageTab = styled(Tab)`
|
||||||
|
|
||||||
|
${breakpoints.medium`
|
||||||
|
float: right;
|
||||||
|
`}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const DumbTab = ({
|
||||||
|
children
|
||||||
|
}) => (
|
||||||
|
<NavLi activeClassName='active' to='#'>{({
|
||||||
|
isActive
|
||||||
|
}) =>
|
||||||
|
<NavigationLinkContainer className={isActive ? 'active' : ''}>
|
||||||
|
<OrgName>
|
||||||
|
{children}
|
||||||
|
</OrgName>
|
||||||
|
</NavigationLinkContainer>
|
||||||
|
}</NavLi>
|
||||||
|
);
|
||||||
|
|
||||||
const OrgNavigation = ({
|
const OrgNavigation = ({
|
||||||
orgs = []
|
orgs = []
|
||||||
}) => {
|
}) => {
|
||||||
@ -107,11 +129,22 @@ const OrgNavigation = ({
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const manageTabs = () => (
|
||||||
|
<DumbTab>Manage Tabs ({orgs.length})</DumbTab>
|
||||||
|
);
|
||||||
|
|
||||||
|
const addOrgTab = () => (
|
||||||
|
<DumbTab>+ Add organisation</DumbTab>
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledNav>
|
<StyledNav>
|
||||||
<StyledContainer>
|
<StyledContainer>
|
||||||
<StyledTabs name='organisation-navigation-group'>
|
<StyledTabs name='organisation-navigation-group'>
|
||||||
{navLinks}
|
{navLinks}
|
||||||
|
|
||||||
|
<Tab title={addOrgTab()} key='1' />
|
||||||
|
<ManageTab title={manageTabs()} key='2' />
|
||||||
</StyledTabs>
|
</StyledTabs>
|
||||||
</StyledContainer>
|
</StyledContainer>
|
||||||
</StyledNav>
|
</StyledNav>
|
||||||
@ -122,6 +155,10 @@ OrgNavigation.propTypes = {
|
|||||||
orgs: React.PropTypes.arrayOf(PropTypes.org)
|
orgs: React.PropTypes.arrayOf(PropTypes.org)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
DumbTab.propTypes = {
|
||||||
|
children: React.PropTypes.node
|
||||||
|
};
|
||||||
|
|
||||||
const mapStateToProps = (state) => ({
|
const mapStateToProps = (state) => ({
|
||||||
orgs: orgsSelector(state)
|
orgs: orgsSelector(state)
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user