diff options
author | 2019-07-10 14:43:24 +0200 | |
---|---|---|
committer | 2019-07-10 14:43:24 +0200 | |
commit | 53b8eb3a104c991a246db32c66a19e702594c901 (patch) | |
tree | 7af12f77c0f0dc75d546d90c036ad60490bd57f9 /src/components | |
parent | Merge branch 'release/5.2.0-beta.2' (diff) | |
download | ferdium-app-53b8eb3a104c991a246db32c66a19e702594c901.tar.gz ferdium-app-53b8eb3a104c991a246db32c66a19e702594c901.tar.zst ferdium-app-53b8eb3a104c991a246db32c66a19e702594c901.zip |
basic integration of todos as static sidebar
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 499bc097a..797db6eb5 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -17,6 +17,7 @@ import { isWindows } from '../../environment'; | |||
17 | import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; | 17 | import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; |
18 | import { workspaceStore } from '../../features/workspaces'; | 18 | import { workspaceStore } from '../../features/workspaces'; |
19 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; | 19 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; |
20 | import TodosWebview from '../../features/todos/components/TodosWebview'; | ||
20 | 21 | ||
21 | function createMarkup(HTMLString) { | 22 | function createMarkup(HTMLString) { |
22 | return { __html: HTMLString }; | 23 | return { __html: HTMLString }; |
@@ -39,7 +40,8 @@ const messages = defineMessages({ | |||
39 | 40 | ||
40 | const styles = theme => ({ | 41 | const styles = theme => ({ |
41 | appContent: { | 42 | appContent: { |
42 | width: `calc(100% + ${theme.workspaces.drawer.width}px)`, | 43 | // width: `calc(100% + ${theme.workspaces.drawer.width}px)`, |
44 | width: '100%', | ||
43 | transition: 'transform 0.5s ease', | 45 | transition: 'transform 0.5s ease', |
44 | transform() { | 46 | transform() { |
45 | return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`; | 47 | return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`; |
@@ -50,6 +52,7 @@ const styles = theme => ({ | |||
50 | @injectSheet(styles) @observer | 52 | @injectSheet(styles) @observer |
51 | class AppLayout extends Component { | 53 | class AppLayout extends Component { |
52 | static propTypes = { | 54 | static propTypes = { |
55 | authToken: PropTypes.string.isRequired, | ||
53 | classes: PropTypes.object.isRequired, | 56 | classes: PropTypes.object.isRequired, |
54 | isFullScreen: PropTypes.bool.isRequired, | 57 | isFullScreen: PropTypes.bool.isRequired, |
55 | sidebar: PropTypes.element.isRequired, | 58 | sidebar: PropTypes.element.isRequired, |
@@ -83,6 +86,7 @@ class AppLayout extends Component { | |||
83 | 86 | ||
84 | render() { | 87 | render() { |
85 | const { | 88 | const { |
89 | authToken, | ||
86 | classes, | 90 | classes, |
87 | isFullScreen, | 91 | isFullScreen, |
88 | workspacesDrawer, | 92 | workspacesDrawer, |
@@ -173,6 +177,7 @@ class AppLayout extends Component { | |||
173 | {children} | 177 | {children} |
174 | </div> | 178 | </div> |
175 | </div> | 179 | </div> |
180 | <TodosWebview authToken={authToken} /> | ||
176 | </div> | 181 | </div> |
177 | </div> | 182 | </div> |
178 | </ErrorBoundary> | 183 | </ErrorBoundary> |