Fix sidemenu and drawer menu icon for the home routes.

master
Tom Hacohen 4 years ago
parent 09dc82df67
commit a4ee9b57c9

@ -104,7 +104,9 @@ function AppBarWitHistory(props: AppBarPropsType) {
function canGoBack() {
return (
(history!.length > 1) &&
(history!.location.pathname !== routeResolver.getRoute("pim")) &&
(history!.location.pathname !== routeResolver.getRoute("pim.contacts")) &&
(history!.location.pathname !== routeResolver.getRoute("pim.events")) &&
(history!.location.pathname !== routeResolver.getRoute("pim.tasks")) &&
(history!.location.pathname !== routeResolver.getRoute("home"))
);
}

@ -21,7 +21,7 @@ import { logout } from "../store/actions";
import * as C from "../constants";
import { useTheme } from "@material-ui/core";
import { useCredentials } from "../login";
import { useCredentials } from "../credentials";
import { useHistory } from "react-router";
interface PropsType {
@ -30,17 +30,17 @@ interface PropsType {
export default function SideMenu(props: PropsType) {
const theme = useTheme();
const etesync = useCredentials();
const username = etesync?.credentials.email ?? C.appName;
const etebase = useCredentials();
const username = etebase?.user.username ?? C.appName;
const history = useHistory();
function logoutDo() {
store.dispatch(logout(etesync! as any));
store.dispatch(logout(etebase!));
props.onCloseDrawerRequest();
}
let loggedInItems;
if (etesync) {
if (etebase) {
loggedInItems = (
<React.Fragment>
<ListItem

Loading…
Cancel
Save