diff options
| author | crupest <crupest@outlook.com> | 2020-11-04 12:29:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 12:29:55 +0800 |
| commit | 013baff7500c773082d79b03a44a5e2aa2072ae2 (patch) | |
| tree | c03aaf0842a526e47c29e4b24a414cc7016b4d07 /FrontEnd/src/app/views/common/AppBar.tsx | |
| parent | fc3c2de7b4f431f0edcabb5ead2a2e1aa79d665a (diff) | |
| parent | a20b15c1c79cd49ee4be7ac3fba80955704122d3 (diff) | |
| download | timeline-013baff7500c773082d79b03a44a5e2aa2072ae2.tar.gz timeline-013baff7500c773082d79b03a44a5e2aa2072ae2.tar.bz2 timeline-013baff7500c773082d79b03a44a5e2aa2072ae2.zip | |
Merge pull request #165 from crupest/timeline
Redesign timeline ui.
Diffstat (limited to 'FrontEnd/src/app/views/common/AppBar.tsx')
| -rw-r--r-- | FrontEnd/src/app/views/common/AppBar.tsx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/FrontEnd/src/app/views/common/AppBar.tsx b/FrontEnd/src/app/views/common/AppBar.tsx index ee4ead8f..699c596e 100644 --- a/FrontEnd/src/app/views/common/AppBar.tsx +++ b/FrontEnd/src/app/views/common/AppBar.tsx @@ -2,6 +2,7 @@ import React from "react"; import { useTranslation } from "react-i18next"; import { LinkContainer } from "react-router-bootstrap"; import { Navbar, Nav } from "react-bootstrap"; +import { NavLink } from "react-router-dom"; import { useUser, useAvatar } from "@/services/user"; @@ -28,18 +29,17 @@ const AppBar: React.FC = (_) => { <Navbar.Toggle /> <Navbar.Collapse> <Nav className="mr-auto"> - <LinkContainer to="/settings"> - <Nav.Link>{t("nav.settings")}</Nav.Link> - </LinkContainer> - - <LinkContainer to="/about"> - <Nav.Link>{t("nav.about")}</Nav.Link> - </LinkContainer> + <NavLink to="/settings" className="nav-link" activeClassName="active"> + {t("nav.settings")} + </NavLink> + <NavLink to="/about" className="nav-link" activeClassName="active"> + {t("nav.about")} + </NavLink> {isAdministrator && ( - <LinkContainer to="/admin"> - <Nav.Link>Administration</Nav.Link> - </LinkContainer> + <NavLink to="/admin" className="nav-link" activeClassName="active"> + Administration + </NavLink> )} </Nav> <Nav className="ml-auto mr-2"> @@ -51,9 +51,9 @@ const AppBar: React.FC = (_) => { /> </LinkContainer> ) : ( - <LinkContainer to="/login"> - <Nav.Link>{t("nav.login")}</Nav.Link> - </LinkContainer> + <NavLink to="/login" className="nav-link" activeClassName="active"> + {t("nav.login")} + </NavLink> )} </Nav> </Navbar.Collapse> |