Fix merge errors

1 files changed, 57 insertions, 44 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 4bc6feb15..729bd35af 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -9,6 +9,7 @@ import Tabbar from '../services/tabs/Tabbar';
 import { ctrlKey } from '../../environment';
 import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
+import { todoActions } from '../../features/todos/actions';
 
 const messages = defineMessages({
   settings: {
@@ -104,51 +105,63 @@ export default @observer class Sidebar extends Component {
           enableToolTip={() => this.enableToolTip()}
           disableToolTip={() => this.disableToolTip()}
         />
-        {todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? (
-          <button
-            type="button"
-            onClick={() => {
-              todoActions.toggleTodosPanel();
-              this.updateToolTip();
-            }}
-            className="sidebar__button sidebar__button--workspaces"
-            data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
+        { isLoggedIn ? (
+          <>
+            {todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? (
+              <button
+                type="button"
+                onClick={() => {
+                  todoActions.toggleTodosPanel();
+                  this.updateToolTip();
+                }}
+                className="sidebar__button sidebar__button--workspaces"
+                data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
+              >
+                <i className="mdi mdi-check-all" />
+              </button>
+            ) : null}
+            {workspaceStore.isFeatureEnabled ? (
+              <button
+                type="button"
+                onClick={() => {
+                  toggleWorkspaceDrawer();
+                  this.updateToolTip();
+                }}
+                className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
+                data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
+              >
+                <i className="mdi mdi-view-grid" />
+              </button>
+            ) : null}
+            <button
+              type="button"
+              onClick={() => {
+                toggleMuteApp();
+                this.updateToolTip();
+              }}
+              className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
+              data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
+            >
+              <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
+            </button>
+            <button
+              type="button"
+              onClick={() => openSettings({ path: 'recipes' })}
+              className="sidebar__button sidebar__button--new-service"
+              data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
+            >
+              <i className="mdi mdi-plus-box" />
+            </button>
+          </>
+        ) : (
+          <Link
+            to="/auth/welcome"
+            className="sidebar__button sidebar__button--new-service"
+            data-tip="Login"
           >
-            <i className="mdi mdi-check-all" />
-          </button>
-        ) : null}
-        {workspaceStore.isFeatureEnabled ? (
-          <button
-            type="button"
-            onClick={() => {
-              toggleWorkspaceDrawer();
-              this.updateToolTip();
-            }}
-            className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
-            data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
-          >
-            <i className="mdi mdi-view-grid" />
-          </button>
-        ) : null}
-        <button
-          type="button"
-          onClick={() => {
-            toggleMuteApp();
-            this.updateToolTip();
-          }}
-          className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
-          data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
-        >
-          <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
-        </button>
-        <button
-          type="button"
-          onClick={() => openSettings({ path: 'recipes' })}
-          className="sidebar__button sidebar__button--new-service"
-          data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
-        >
-          <i className="mdi mdi-plus-box" />
-        </button>
+            <i className="mdi mdi-login-variant" />
+          </Link>
+        )}
         <button
           type="button"
           onClick={() => openSettings({ path: 'app' })}