From 152cb381ea2c915c762416092337ce1d8589d1c6 Mon Sep 17 00:00:00 2001 From: Aijana Schumann Date: Mon, 6 Dec 2021 15:09:15 +0100 Subject: Update ODLUX Update login view, add logout after user session ends, add user settings, several bugfixes Issue-ID: CCSDK-3540 Signed-off-by: Aijana Schumann Change-Id: I21137756b204287e25766a9646bf2faf7bad9d35 --- sdnr/wt/odlux/framework/src/views/frame.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'sdnr/wt/odlux/framework/src/views/frame.tsx') diff --git a/sdnr/wt/odlux/framework/src/views/frame.tsx b/sdnr/wt/odlux/framework/src/views/frame.tsx index b4cc43e0b..1c78dd297 100644 --- a/sdnr/wt/odlux/framework/src/views/frame.tsx +++ b/sdnr/wt/odlux/framework/src/views/frame.tsx @@ -19,7 +19,7 @@ import * as React from 'react'; import { HashRouter as Router, Route, Redirect, Switch } from 'react-router-dom'; import { withStyles, WithStyles, createStyles, Theme } from '@material-ui/core/styles'; -import { faHome, faAddressBook, faSignInAlt } from '@fortawesome/free-solid-svg-icons'; +import { faHome, faAddressBook, faSignInAlt, faCog } from '@fortawesome/free-solid-svg-icons'; import { SnackbarProvider } from 'notistack'; import { ConfirmProvider } from 'material-ui-confirm'; @@ -34,6 +34,7 @@ import Home from '../views/home'; import Login from '../views/login'; import About from '../views/about'; import Test from '../views/test'; +import UserSettings from '../views/settings'; import applicationService from '../services/applicationManager'; @@ -58,6 +59,8 @@ const styles = (theme: Theme) => createStyles({ toolbar: theme.mixins.toolbar as any }); + + type FrameProps = WithStyles; class FrameComponent extends React.Component{ @@ -89,6 +92,11 @@ class FrameComponent extends React.Component{ )} /> + ( + + + + )} /> {process.env.NODE_ENV === "development" ? ( -- cgit 1.2.3-korg