@@ -122,7 +122,6 @@ import * as React from 'react'
122122import {ChangeTheme }from ' ../actions/layout.actions'
123123import {Logout }from ' ../actions/auth.actions'
124124
125- import {TopBar }from ' ../components/topBar'
126125import {connect }from ' react-redux'
127126import {mapDispatchToProps ,StateToProps }from ' redux-ts'
128127
@@ -137,15 +136,28 @@ const dispatchProps = mapDispatchToProps({
137136ChangeTheme ,
138137})
139138
140- type MainProps = ReturnType <typeof dispatchProps >&
141- ReturnType <typeof storeProps >
142-
143- const MainContainer: React .SFC <MainProps >= ({children ,... rest })=> (
144- <div >
145- <TopBar { ... rest } />
146- { children }
147- </div >
148- )
139+ type MainProps = ReturnType <typeof dispatchProps >& ReturnType <typeof storeProps >
140+
141+ const MainContainer: React .SFC <MainProps >= ({children ,useDarkTheme ,Logout ,ChangeTheme })=> {
142+
143+ const appBarRightElement= (
144+ <div style = { { display:' inline-block' }} >
145+ <Toggle
146+ onToggle = { ChangeTheme }
147+ label = { useDarkTheme :' dark' :' light' }
148+ toggled = { useDarkTheme }
149+ />
150+ <FlatButton onClick = { Logout } label = " logout" />
151+ </div >
152+ )
153+
154+ return (
155+ <div >
156+ <AppBar iconElementRight = { appBarRightElement } />
157+ { children }
158+ </div >
159+ )
160+ }
149161
150162export const Main= connect (storeProps ,dispatchProps )(MainContainer )
151163```