From 7ffcf8cf417e76fe1206b945d417095534b3cad8 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 11 Sep 2019 13:46:00 +0200 Subject: feat(Todos): Move todos toggle to sidebar --- src/components/layout/Sidebar.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/components/layout') diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 36c1f2e39..128f94959 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -8,6 +8,8 @@ import Tabbar from '../services/tabs/Tabbar'; import { ctrlKey } from '../../environment'; import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../../features/workspaces'; import { gaEvent } from '../../lib/analytics'; +import { todosStore, GA_CATEGORY_TODOS } from '../../features/todos'; +import todoActions from '../../features/todos/actions'; const messages = defineMessages({ settings: { @@ -34,6 +36,14 @@ const messages = defineMessages({ id: 'sidebar.closeWorkspaceDrawer', defaultMessage: '!!!Close workspace drawer', }, + openTodosDrawer: { + id: 'sidebar.openTodosDrawer', + defaultMessage: '!!!Open Franz Todos', + }, + closeTodosDrawer: { + id: 'sidebar.closeTodosDrawer', + defaultMessage: '!!!Close Franz Todos', + }, }); export default @observer class Sidebar extends Component { @@ -79,6 +89,10 @@ export default @observer class Sidebar extends Component { toggleWorkspaceDrawer, } = this.props; const { intl } = this.context; + const todosToggleMessage = ( + todosStore.isTodosPanelVisible ? messages.closeTodosDrawer : messages.openTodosDrawer + ); + const workspaceToggleMessage = ( isWorkspaceDrawerOpen ? messages.closeWorkspaceDrawer : messages.openWorkspaceDrawer ); @@ -90,6 +104,20 @@ export default @observer class Sidebar extends Component { enableToolTip={() => this.enableToolTip()} disableToolTip={() => this.disableToolTip()} /> + {todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? ( + + ) : null} {workspaceStore.isFeatureEnabled ? (