diff options
author | 2019-07-30 11:41:54 +0200 | |
---|---|---|
committer | 2019-07-30 11:41:54 +0200 | |
commit | d7ed456a7b6f73e046ba3a2ef38eb21f82f06ca4 (patch) | |
tree | f24f4f39ae38bdfdd581f451fc3e2e79f5670df5 /src/components | |
parent | Fix position of todos app (diff) | |
download | ferdium-app-d7ed456a7b6f73e046ba3a2ef38eb21f82f06ca4.tar.gz ferdium-app-d7ed456a7b6f73e046ba3a2ef38eb21f82f06ca4.tar.zst ferdium-app-d7ed456a7b6f73e046ba3a2ef38eb21f82f06ca4.zip |
Make todo layer resizable
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 7f2f707fb..dbf7d3c21 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -17,7 +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 | import Todos from '../../features/todos/containers/TodosScreen'; |
21 | 21 | ||
22 | function createMarkup(HTMLString) { | 22 | function createMarkup(HTMLString) { |
23 | return { __html: HTMLString }; | 23 | return { __html: HTMLString }; |
@@ -52,7 +52,6 @@ const styles = theme => ({ | |||
52 | @injectSheet(styles) @observer | 52 | @injectSheet(styles) @observer |
53 | class AppLayout extends Component { | 53 | class AppLayout extends Component { |
54 | static propTypes = { | 54 | static propTypes = { |
55 | authToken: PropTypes.string.isRequired, | ||
56 | classes: PropTypes.object.isRequired, | 55 | classes: PropTypes.object.isRequired, |
57 | isFullScreen: PropTypes.bool.isRequired, | 56 | isFullScreen: PropTypes.bool.isRequired, |
58 | sidebar: PropTypes.element.isRequired, | 57 | sidebar: PropTypes.element.isRequired, |
@@ -60,7 +59,6 @@ class AppLayout extends Component { | |||
60 | services: PropTypes.element.isRequired, | 59 | services: PropTypes.element.isRequired, |
61 | children: PropTypes.element, | 60 | children: PropTypes.element, |
62 | news: MobxPropTypes.arrayOrObservableArray.isRequired, | 61 | news: MobxPropTypes.arrayOrObservableArray.isRequired, |
63 | // isOnline: PropTypes.bool.isRequired, | ||
64 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, | 62 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, |
65 | appUpdateIsDownloaded: PropTypes.bool.isRequired, | 63 | appUpdateIsDownloaded: PropTypes.bool.isRequired, |
66 | nextAppReleaseVersion: PropTypes.string, | 64 | nextAppReleaseVersion: PropTypes.string, |
@@ -85,7 +83,6 @@ class AppLayout extends Component { | |||
85 | 83 | ||
86 | render() { | 84 | render() { |
87 | const { | 85 | const { |
88 | authToken, | ||
89 | classes, | 86 | classes, |
90 | isFullScreen, | 87 | isFullScreen, |
91 | workspacesDrawer, | 88 | workspacesDrawer, |
@@ -129,15 +126,6 @@ class AppLayout extends Component { | |||
129 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> | 126 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> |
130 | </InfoBar> | 127 | </InfoBar> |
131 | ))} | 128 | ))} |
132 | {/* {!isOnline && ( | ||
133 | <InfoBar | ||
134 | type="danger" | ||
135 | sticky | ||
136 | > | ||
137 | <span className="mdi mdi-flash" /> | ||
138 | {intl.formatMessage(globalMessages.notConnectedToTheInternet)} | ||
139 | </InfoBar> | ||
140 | )} */} | ||
141 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( | 129 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( |
142 | <InfoBar | 130 | <InfoBar |
143 | type="danger" | 131 | type="danger" |
@@ -173,7 +161,7 @@ class AppLayout extends Component { | |||
173 | {services} | 161 | {services} |
174 | {children} | 162 | {children} |
175 | </div> | 163 | </div> |
176 | <TodosWebview authToken={authToken} /> | 164 | <Todos /> |
177 | </div> | 165 | </div> |
178 | </div> | 166 | </div> |
179 | </ErrorBoundary> | 167 | </ErrorBoundary> |