added default icon for subnavigation and removed icons from subnavigation navlinks

This commit is contained in:
Florian Scholdei
2019-01-23 17:12:10 +01:00
parent afdd9fc66a
commit 27f02c7e87
5 changed files with 12 additions and 5 deletions

View File

@@ -4,6 +4,7 @@ import {Link, Route} from "react-router-dom";
type Props = {
to: string,
icon?: string,
label: string,
activeOnlyWhenExact?: boolean,
activeWhenMatch?: (route: any) => boolean,
@@ -21,7 +22,12 @@ class SubNavigation extends React.Component<Props> {
}
renderLink = (route: any) => {
const { to, label } = this.props;
const { to, icon, label } = this.props;
let defaultIcon = "fas fa-cog";
if (icon) {
defaultIcon = icon;
}
let children = null;
if(this.isActive(route)) {
@@ -33,6 +39,7 @@ class SubNavigation extends React.Component<Props> {
return (
<li>
<Link className={this.isActive(route) ? "is-active" : ""} to={to}>
<><i className={defaultIcon}></i>{" "}</>
{label}
</Link>
{children}

View File

@@ -21,7 +21,7 @@ class GeneralGroupNavLink extends React.Component<Props> {
if (!this.isEditable()) {
return null;
}
return <NavLink to={editUrl} icon="fas fa-cog" label={t("singleGroup.menu.generalNavLink")} />;
return <NavLink to={editUrl} label={t("singleGroup.menu.generalNavLink")} />;
}
}

View File

@@ -21,7 +21,7 @@ class GeneralRepoNavLink extends React.Component<Props> {
if (!this.isEditable()) {
return null;
}
return <NavLink to={editUrl} icon="fas fa-cog" label={t("repositoryRoot.menu.generalNavLink")} />;
return <NavLink to={editUrl} label={t("repositoryRoot.menu.generalNavLink")} />;
}
}

View File

@@ -20,7 +20,7 @@ class PermissionsNavLink extends React.Component<Props> {
}
const { permissionUrl, t } = this.props;
return (
<NavLink to={permissionUrl} icon="fas fa-lock" label={t("repositoryRoot.menu.permissionsNavLink")} />
<NavLink to={permissionUrl} label={t("repositoryRoot.menu.permissionsNavLink")} />
);
}
}

View File

@@ -21,7 +21,7 @@ class GeneralUserNavLink extends React.Component<Props> {
if (!this.isEditable()) {
return null;
}
return <NavLink to={editUrl} icon="fas fa-cog" label={t("singleUser.menu.generalNavLink")} />;
return <NavLink to={editUrl} label={t("singleUser.menu.generalNavLink")} />;
}
}