diff --git a/ui/src/App.js b/ui/src/App.js
index 8a56fef55..0f93eb460 100644
--- a/ui/src/App.js
+++ b/ui/src/App.js
@@ -16,7 +16,7 @@ import artist from './artist'
import { Player, playQueueReducer } from './audioplayer'
import { albumViewReducer } from './album/albumState'
import customRoutes from './routes'
-import themeReducer from './configuration/themeReducer'
+import themeReducer from './personal/themeReducer'
import createAdminStore from './store/createAdminStore'
const i18nProvider = polyglotI18nProvider(
diff --git a/ui/src/i18n/en.js b/ui/src/i18n/en.js
index 78d19a74f..69e8f346e 100644
--- a/ui/src/i18n/en.js
+++ b/ui/src/i18n/en.js
@@ -45,7 +45,7 @@ export default deepmerge(englishMessages, {
menu: {
library: 'Library',
settings: 'Settings',
- configuration: 'Configuration',
+ personal: 'Personal',
version: 'Version %{version}',
theme: 'Theme'
},
diff --git a/ui/src/layout/AppBar.js b/ui/src/layout/AppBar.js
index 04202f0ab..468fccc99 100644
--- a/ui/src/layout/AppBar.js
+++ b/ui/src/layout/AppBar.js
@@ -1,13 +1,12 @@
import React, { forwardRef } from 'react'
import {
AppBar as RAAppBar,
- UserMenu,
MenuItemLink,
+ UserMenu,
useTranslate
} from 'react-admin'
import { makeStyles } from '@material-ui/core'
import InfoIcon from '@material-ui/icons/Info'
-import TuneIcon from '@material-ui/icons/Tune'
const useStyles = makeStyles((theme) => ({
menuItem: {
@@ -15,22 +14,6 @@ const useStyles = makeStyles((theme) => ({
}
}))
-const ConfigurationMenu = forwardRef(({ onClick }, ref) => {
- const translate = useTranslate()
- const classes = useStyles()
- return (
- }
- onClick={onClick}
- className={classes.menuItem}
- sidebarIsOpen={true}
- />
- )
-})
-
const VersionMenu = forwardRef((props, ref) => {
const translate = useTranslate()
const classes = useStyles()
@@ -50,7 +33,6 @@ const VersionMenu = forwardRef((props, ref) => {
const CustomUserMenu = (props) => (
-
)
diff --git a/ui/src/layout/Menu.js b/ui/src/layout/Menu.js
index dcaf94b95..af0370fc5 100644
--- a/ui/src/layout/Menu.js
+++ b/ui/src/layout/Menu.js
@@ -8,6 +8,7 @@ import SettingsIcon from '@material-ui/icons/Settings'
import ViewListIcon from '@material-ui/icons/ViewList'
import SubMenu from './SubMenu'
import inflection from 'inflection'
+import PersonalMenu from './PersonalMenu'
const translatedResourceName = (resource, translate) =>
translate(`resources.${resource.name}.name`, {
@@ -74,6 +75,7 @@ const Menu = ({ onMenuClick, dense, logout }) => {
dense={dense}
>
{resources.filter(subItems('settings')).map(renderMenuItemLink)}
+
{resources.filter(subItems(undefined)).map(renderMenuItemLink)}
{isXsmall && logout}
diff --git a/ui/src/layout/PersonalMenu.js b/ui/src/layout/PersonalMenu.js
new file mode 100644
index 000000000..4a39b2a9c
--- /dev/null
+++ b/ui/src/layout/PersonalMenu.js
@@ -0,0 +1,29 @@
+import React, { forwardRef } from 'react'
+import { MenuItemLink, useTranslate } from 'react-admin'
+import { makeStyles } from '@material-ui/core'
+import TuneIcon from '@material-ui/icons/Tune'
+
+const useStyles = makeStyles((theme) => ({
+ menuItem: {
+ color: theme.palette.text.secondary
+ }
+}))
+
+const PersonalMenu = forwardRef(({ onClick, open, dense }, ref) => {
+ const translate = useTranslate()
+ const classes = useStyles()
+ return (
+ }
+ onClick={onClick}
+ className={classes.menuItem}
+ sidebarIsOpen={open}
+ dense={dense}
+ />
+ )
+})
+
+export default PersonalMenu
diff --git a/ui/src/configuration/Configuration.js b/ui/src/personal/Personal.js
similarity index 95%
rename from ui/src/configuration/Configuration.js
rename to ui/src/personal/Personal.js
index ce092568a..e527f30ad 100644
--- a/ui/src/configuration/Configuration.js
+++ b/ui/src/personal/Personal.js
@@ -11,7 +11,7 @@ const useStyles = makeStyles({
select: { minWidth: 200 }
})
-const Configuration = () => {
+const Personal = () => {
const translate = useTranslate()
const classes = useStyles()
const theme = useSelector((state) => state.theme)
@@ -40,4 +40,4 @@ const Configuration = () => {
)
}
-export default Configuration
+export default Personal
diff --git a/ui/src/configuration/actions.js b/ui/src/personal/actions.js
similarity index 100%
rename from ui/src/configuration/actions.js
rename to ui/src/personal/actions.js
diff --git a/ui/src/configuration/themeReducer.js b/ui/src/personal/themeReducer.js
similarity index 100%
rename from ui/src/configuration/themeReducer.js
rename to ui/src/personal/themeReducer.js
diff --git a/ui/src/routes.js b/ui/src/routes.js
index 77322dc00..05139d5bd 100644
--- a/ui/src/routes.js
+++ b/ui/src/routes.js
@@ -1,7 +1,5 @@
import React from 'react'
import { Route } from 'react-router-dom'
-import Configuration from './configuration/Configuration'
+import Personal from './personal/Personal'
-export default [
- } />
-]
+export default [ } />]