feat: show server version in User Menu
This commit is contained in:
@@ -64,6 +64,7 @@ func handleLogin(ds model.DataStore, username string, password string, w http.Re
|
|||||||
"name": user.Name,
|
"name": user.Name,
|
||||||
"username": username,
|
"username": username,
|
||||||
"isAdmin": user.IsAdmin,
|
"isAdmin": user.IsAdmin,
|
||||||
|
"version": consts.Version(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ const authProvider = {
|
|||||||
jwtDecode(response.token)
|
jwtDecode(response.token)
|
||||||
localStorage.removeItem('initialAccountCreation')
|
localStorage.removeItem('initialAccountCreation')
|
||||||
localStorage.setItem('token', response.token)
|
localStorage.setItem('token', response.token)
|
||||||
|
localStorage.setItem('version', response.version)
|
||||||
localStorage.setItem('name', response.name)
|
localStorage.setItem('name', response.name)
|
||||||
localStorage.setItem('username', response.username)
|
localStorage.setItem('username', response.username)
|
||||||
localStorage.setItem('role', response.isAdmin ? 'admin' : 'regular')
|
localStorage.setItem('role', response.isAdmin ? 'admin' : 'regular')
|
||||||
@@ -71,6 +72,7 @@ const removeItems = () => {
|
|||||||
localStorage.removeItem('name')
|
localStorage.removeItem('name')
|
||||||
localStorage.removeItem('username')
|
localStorage.removeItem('username')
|
||||||
localStorage.removeItem('role')
|
localStorage.removeItem('role')
|
||||||
|
localStorage.removeItem('version')
|
||||||
}
|
}
|
||||||
|
|
||||||
export default authProvider
|
export default authProvider
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import React, { forwardRef } from 'react';
|
||||||
|
import { AppBar as RAAppBar, UserMenu, MenuItemLink } from 'react-admin'
|
||||||
|
import InfoIcon from '@material-ui/icons/Info';
|
||||||
|
|
||||||
|
const ConfigurationMenu = forwardRef(({ onClick }, ref) => (
|
||||||
|
<MenuItemLink
|
||||||
|
ref={ref}
|
||||||
|
to=""
|
||||||
|
primaryText={"Version " + localStorage.getItem("version") }
|
||||||
|
leftIcon={<InfoIcon />}
|
||||||
|
onClick={onClick}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
|
||||||
|
const CustomUserMenu = (props) => (
|
||||||
|
<UserMenu {...props}>
|
||||||
|
<ConfigurationMenu />
|
||||||
|
</UserMenu>
|
||||||
|
)
|
||||||
|
|
||||||
|
const AppBar = (props) => <RAAppBar {...props} userMenu={<CustomUserMenu />} />
|
||||||
|
|
||||||
|
export default AppBar
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import { Layout } from 'react-admin'
|
import { Layout } from 'react-admin'
|
||||||
import Menu from './Menu'
|
import Menu from './Menu'
|
||||||
|
import AppBar from './AppBar'
|
||||||
|
|
||||||
export default (props) => <Layout {...props} menu={Menu} />
|
export default (props) => <Layout {...props} menu={Menu} appBar={AppBar} />
|
||||||
|
|||||||
Reference in New Issue
Block a user