diff --git a/server/app/auth.go b/server/app/auth.go index 49a069482..2783bc314 100644 --- a/server/app/auth.go +++ b/server/app/auth.go @@ -64,6 +64,7 @@ func handleLogin(ds model.DataStore, username string, password string, w http.Re "name": user.Name, "username": username, "isAdmin": user.IsAdmin, + "version": consts.Version(), }) } diff --git a/ui/src/authProvider.js b/ui/src/authProvider.js index 3ee09b35e..47b2e579c 100644 --- a/ui/src/authProvider.js +++ b/ui/src/authProvider.js @@ -23,6 +23,7 @@ const authProvider = { jwtDecode(response.token) localStorage.removeItem('initialAccountCreation') localStorage.setItem('token', response.token) + localStorage.setItem('version', response.version) localStorage.setItem('name', response.name) localStorage.setItem('username', response.username) localStorage.setItem('role', response.isAdmin ? 'admin' : 'regular') @@ -71,6 +72,7 @@ const removeItems = () => { localStorage.removeItem('name') localStorage.removeItem('username') localStorage.removeItem('role') + localStorage.removeItem('version') } export default authProvider diff --git a/ui/src/layout/AppBar.js b/ui/src/layout/AppBar.js new file mode 100644 index 000000000..729a13326 --- /dev/null +++ b/ui/src/layout/AppBar.js @@ -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) => ( + } + onClick={onClick} + /> +)) + +const CustomUserMenu = (props) => ( + + + +) + +const AppBar = (props) => } /> + +export default AppBar diff --git a/ui/src/layout/Layout.js b/ui/src/layout/Layout.js index 1a11c11f2..f82225b12 100644 --- a/ui/src/layout/Layout.js +++ b/ui/src/layout/Layout.js @@ -1,5 +1,6 @@ import React from 'react' import { Layout } from 'react-admin' import Menu from './Menu' +import AppBar from './AppBar' -export default (props) => +export default (props) =>