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 <aijana.schumann@highstreet-technologies.com>
Change-Id: I21137756b204287e25766a9646bf2faf7bad9d35

1 files changed, 9 insertions, 1 deletions

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<typeof styles>;

 

 class FrameComponent extends React.Component<FrameProps>{

@@ -89,6 +92,11 @@ class FrameComponent extends React.Component<FrameProps>{
                           <About />

                       </AppFrame>

                     )} />

+                    <Route path="/settings" component={() => (

+                      <AppFrame title={"Settings"} icon={faCog} >

+                          <UserSettings />

+                      </AppFrame>

+                    )} />

                     {process.env.NODE_ENV === "development" ? <Route path="/test" component={() => (

                       <AppFrame title={"Test"} icon={faAddressBook} >

                           <Test />