From 556786f204fc980d1af7adf53aa7e974237abcde Mon Sep 17 00:00:00 2001
From: kytwb <kytwb@pm.me>
Date: Sat, 18 Dec 2021 15:33:53 +0100
Subject: Iterate on Sidebar icons order

---
 src/components/layout/Sidebar.js | 89 ++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

(limited to 'src/components')

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 4f67a8719..57ba170e8 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -149,25 +149,31 @@ class Sidebar extends Component {
         />
         {isLoggedIn ? (
           <>
-            {stores.settings.all.app.lockingFeatureEnabled ? (
-              <button
-                type="button"
-                className="sidebar__button"
-                onClick={() => {
-                  actions.settings.update({
-                    type: 'app',
-                    data: {
-                      locked: true,
-                    },
-                  });
-                }}
-                data-tip={`${intl.formatMessage(
-                  messages.lockFerdi,
-                )} (${lockFerdiShortcutKey(false)})`}
-              >
-                <Icon icon={mdiLock} size={1.5} />
-              </button>
-            ) : null}
+            <button
+              type="button"
+              onClick={() => openSettings({ path: 'recipes' })}
+              className="sidebar__button sidebar__button--new-service"
+              data-tip={`${intl.formatMessage(
+                messages.addNewService,
+              )} (${addNewServiceShortcutKey(false)})`}
+            >
+              <Icon icon={mdiPlusBox} size={1.5} />
+            </button>
+            <button
+              type="button"
+              onClick={() => {
+                toggleWorkspaceDrawer();
+                this.updateToolTip();
+              }}
+              className={`sidebar__button sidebar__button--workspaces ${
+                isWorkspaceDrawerOpen ? 'is-active' : ''
+              }`}
+              data-tip={`${intl.formatMessage(
+                workspaceToggleMessage,
+              )} (${workspaceToggleShortcutKey(false)})`}
+            >
+              <Icon icon={mdiViewGrid} size={1.5} />
+            </button>
             {todosStore.isFeatureEnabledByUser ? (
               <button
                 type="button"
@@ -186,21 +192,6 @@ class Sidebar extends Component {
                 <Icon icon={mdiCheckAll} size={1.5} />
               </button>
             ) : null}
-            <button
-              type="button"
-              onClick={() => {
-                toggleWorkspaceDrawer();
-                this.updateToolTip();
-              }}
-              className={`sidebar__button sidebar__button--workspaces ${
-                isWorkspaceDrawerOpen ? 'is-active' : ''
-              }`}
-              data-tip={`${intl.formatMessage(
-                workspaceToggleMessage,
-              )} (${workspaceToggleShortcutKey(false)})`}
-            >
-              <Icon icon={mdiViewGrid} size={1.5} />
-            </button>
             <button
               type="button"
               onClick={() => {
@@ -216,16 +207,26 @@ class Sidebar extends Component {
             >
               <Icon icon={isAppMuted ? mdiBellOff : mdiBell} size={1.5} />
             </button>
-            <button
-              type="button"
-              onClick={() => openSettings({ path: 'recipes' })}
-              className="sidebar__button sidebar__button--new-service"
-              data-tip={`${intl.formatMessage(
-                messages.addNewService,
-              )} (${addNewServiceShortcutKey(false)})`}
-            >
-              <Icon icon={mdiPlusBox} size={1.5} />
-            </button>
+
+            {stores.settings.all.app.lockingFeatureEnabled ? (
+              <button
+                type="button"
+                className="sidebar__button"
+                onClick={() => {
+                  actions.settings.update({
+                    type: 'app',
+                    data: {
+                      locked: true,
+                    },
+                  });
+                }}
+                data-tip={`${intl.formatMessage(
+                  messages.lockFerdi,
+                )} (${lockFerdiShortcutKey(false)})`}
+              >
+                <Icon icon={mdiLock} size={1.5} />
+              </button>
+            ) : null}
           </>
         ) : (
           <Link
-- 
cgit v1.2.3-54-g00ecf