Skip to content

🎧 Your Personal Streaming Service

Don't show "logout" when authenticated by Header

Deluancf553ce81281
diff --git a/ui/src/layout/Menu.js b/ui/src/layout/Menu.js
index 820d6a5ae..b59e487d3 100644
--- a/ui/src/layout/Menu.js
+++ b/ui/src/layout/Menu.js
@@ -1,6 +1,6 @@
import React, { useState } from 'react'
import { useSelector } from 'react-redux'
-import { makeStyles, useMediaQuery } from '@material-ui/core'
+import { makeStyles } from '@material-ui/core'
import { useTranslate, MenuItemLink, getResources } from 'react-admin'
import { withRouter } from 'react-router-dom'
import LibraryMusicIcon from '@material-ui/icons/LibraryMusic'
@@ -30,8 +30,7 @@ const translatedResourceName = (resource, translate) =>
: inflection.humanize(inflection.pluralize(resource.name)),
})
-const Menu = ({ onMenuClick, dense, logout }) => {
- const isXsmall = useMediaQuery((theme) => theme.breakpoints.down('xs'))
+const Menu = ({ onMenuClick, dense }) => {
const open = useSelector((state) => state.admin.ui.sidebarOpen)
const translate = useTranslate()
const classes = useStyles()
@@ -116,7 +115,6 @@ const Menu = ({ onMenuClick, dense, logout }) => {
{resources.filter(subItems('library')).map(renderResourceMenuItemLink)}
</SubMenu>
{resources.filter(subItems(undefined)).map(renderResourceMenuItemLink)}
- {isXsmall && logout}
<HelpDialog />
</div>
)
diff --git a/ui/src/layout/UserMenu.js b/ui/src/layout/UserMenu.js
index f83404987..1c005c2d3 100644
--- a/ui/src/layout/UserMenu.js
+++ b/ui/src/layout/UserMenu.js
@@ -15,6 +15,7 @@ import {
} from '@material-ui/core'
import { makeStyles } from '@material-ui/core/styles'
import AccountCircle from '@material-ui/icons/AccountCircle'
+import config from '../config'
const useStyles = makeStyles((theme) => ({
user: {},
@@ -99,7 +100,7 @@ const UserMenu = (props) => {
})
: null
)}
- {logout}
+ {!config.auth && logout}
</MenuList>
</Popover>
</div>