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.

Sign up for GitHub

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

fix: AB#334 Something is wrong with header integration #17

Merged
merged 3 commits into from
Sep 26, 2022
Merged

fix: AB#334 Something is wrong with header integration #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d1b676
fix: AB#334 Something is wrong with header integration
DerCed Jun 29, 2022
95db240
fix: AB#334 Something is wrong with header integration
DerCed Jun 29, 2022
bc405f9
fix: AB#334 Something is wrong with header integration
DerCed Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/appHeader/AppHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ import {Logout} from "@mui/icons-material";
import StarwitLogo from "../assets/img/logo-white.png";

function AppHeader(props) {
const {menuItems, title, logo, styles} = props;
const {menuItems, title, logo} = props;
const defaultStyles = HeaderStyles();

let styles = props.styles;
if (!styles){
styles = defaultStyles;
}

const history = useHistory();
const {t} = useTranslation();

Expand All @@ -22,10 +29,10 @@ function AppHeader(props) {
</Typography>
<div className={styles.spacer}/>
{menuItems.map(item => (
<Button key={item.title} color="secondary" disableRipple className={styles.linkButton}
<Button key={item.title} color="inherit" disableRipple className={styles.linkButton}
onClick={() => history.push(item.link)}>{t(item.title)}</Button>
))}
<IconButton color="secondary" disableRipple className={styles.linkButton}
<IconButton color="inherit" disableRipple className={styles.linkButton}
onClick={() => history.push("/logout")}><Logout/></IconButton>
</Toolbar>
</AppBar>
Expand All @@ -35,7 +42,6 @@ function AppHeader(props) {
}

AppHeader.defaultProps = {
//styles: HeaderStyles(),
title: "A LireJarp App",
logo: StarwitLogo,
menuItems: []
Expand Down