From dd8b89d4e047fa1dc99a2ef00b3ac1fb7c55031b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 6 Sep 2023 13:14:35 +0100
Subject: [PATCH] Update side bar to use square styles in line with the builder

---
 .../src/pages/builder/portal/_layout.svelte   |   2 +-
 .../pages/builder/portal/apps/[appId].svelte  |  75 ++++++------
 .../apps/_components/PortalSideBar.svelte     | 110 +++++++++---------
 .../apps/_components/PortalSideNavItem.svelte |   4 +-
 packages/builder/src/stores/portal/index.js   |   4 +
 5 files changed, 100 insertions(+), 95 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 006e69daca..09df6c2de6 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -99,7 +99,7 @@
     justify-content: flex-start;
     align-items: center;
     border-bottom: var(--border-light);
-    padding: 0 24px;
+    padding: 0 var(--spacing-l);
     gap: 24px;
     position: relative;
   }
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId].svelte b/packages/builder/src/pages/builder/portal/apps/[appId].svelte
index 3059f51077..f19e95d3d0 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId].svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId].svelte
@@ -1,11 +1,10 @@
 <script>
   import { params, goto } from "@roxi/routify"
-  import { apps } from "stores/portal"
-  import { Icon } from "@budibase/bbui"
+  import { apps, sideBarCollapsed } from "stores/portal"
+  import { ActionButton } from "@budibase/bbui"
 
   $: app = $apps.find(app => app.appId === $params.appId)
   $: iframeUrl = getIframeURL(app)
-  $: preview = app?.status !== "published"
 
   const getIframeURL = app => {
     if (app.status === "published") {
@@ -17,28 +16,37 @@
 
 <div class="container">
   <div class="header">
-    <div class="icons">
-      <Icon name="RailRightOpen" size="S" />
-    </div>
-    <div class="text">
-      {#if preview}
-        This is a preview of your unpublished app
-      {/if}
-    </div>
-    <div class="icons">
-      <Icon
-        name="Edit"
-        hoverable
-        on:click={() => $goto(`../../app/${app.devId}`)}
-        size="S"
-      />
-      <Icon
-        name="LinkOut"
-        hoverable
-        on:click={() => window.open(iframeUrl, "_blank")}
-        size="S"
-      />
-    </div>
+    {#if $sideBarCollapsed}
+      <ActionButton
+        quiet
+        icon="Rail"
+        on:click={() => sideBarCollapsed.set(false)}
+      >
+        Menu
+      </ActionButton>
+    {:else}
+      <ActionButton
+        quiet
+        icon="RailRightOpen"
+        on:click={() => sideBarCollapsed.set(true)}
+      >
+        Collapse
+      </ActionButton>
+    {/if}
+    <ActionButton
+      quiet
+      icon="Edit"
+      on:click={() => $goto(`../../app/${app.devId}`)}
+    >
+      Edit
+    </ActionButton>
+    <ActionButton
+      quiet
+      icon="LinkOut"
+      on:click={() => window.open(iframeUrl, "_blank")}
+    >
+      Fullscreen
+    </ActionButton>
   </div>
   <iframe src={iframeUrl} />
 </div>
@@ -50,23 +58,18 @@
     flex-direction: column;
     justify-content: flex-start;
     align-items: stretch;
-    gap: 10px;
-    padding: 10px 10px 10px 0;
+    gap: var(--spacing-s);
+    padding: var(--spacing-s) var(--spacing-l) var(--spacing-l) var(--spacing-l);
   }
   .header {
-    flex: 0 0 32px;
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-start;
     align-items: center;
-    padding: 0 8px;
-  }
-  .icons {
-    display: flex;
-    gap: 24px;
+    gap: var(--spacing-xs);
   }
   iframe {
     flex: 1 1 auto;
-    border-radius: 8px;
-    border: none;
+    border-radius: var(--spacing-s);
+    border: 1px solid var(--spectrum-global-color-gray-300);
   }
 </style>
diff --git a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
index 8f1592bb1a..29c5373b70 100644
--- a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
@@ -1,10 +1,13 @@
 <script>
-  import { Icon } from "@budibase/bbui"
+  import { Icon, Body } from "@budibase/bbui"
   import PortalSideNavItem from "./PortalSideNavItem.svelte"
-  import { apps } from "stores/portal"
+  import { apps, sideBarCollapsed } from "stores/portal"
   import { params, goto } from "@roxi/routify"
+  import { tick } from "svelte"
 
+  let searchInput
   let searchString
+  let searching = false
 
   $: filteredApps = $apps.filter(app => {
     return (
@@ -12,17 +15,34 @@
       app.name.toLowerCase().includes(searchString.toLowerCase())
     )
   })
+
+  const startSearching = async () => {
+    searching = true
+    searchString = ""
+    await tick()
+    searchInput.focus()
+  }
+
+  const stopSearching = () => {
+    searching = false
+    searchString = ""
+  }
 </script>
 
-<div class="side-bar">
+<div class="side-bar" class:collapsed={$sideBarCollapsed}>
   <div class="side-bar-controls">
-    <div class="search">
-      <input bind:value={searchString} placeholder="Search" />
-      <Icon name="Search" size="S" />
-    </div>
-    <div class="add-app" on:click={() => $goto("./create")}>
-      <Icon name="Add" />
-    </div>
+    {#if searching}
+      <input
+        bind:this={searchInput}
+        bind:value={searchString}
+        placeholder="Search"
+      />
+      <Icon hoverable on:click={stopSearching} name="Close" size="S" />
+    {:else}
+      <Body size="S">Apps</Body>
+      <Icon name="Search" size="S" hoverable on:click={startSearching} />
+    {/if}
+    <Icon name="Add" hoverable on:click={() => $goto("./create")} />
   </div>
   <div class="side-bar-nav">
     <PortalSideNavItem
@@ -45,82 +65,60 @@
 
 <style>
   .side-bar {
-    --spacing: 10px;
-    --radius: 8px;
-
     flex: 0 0 300px;
-    padding: var(--spacing);
     display: flex;
     flex-direction: column;
     align-items: stretch;
-    gap: var(--spacing);
+    border-right: var(--border-light);
+    background: var(--spectrum-global-color-gray-100);
+    overflow: hidden;
+    transition: margin-left 300ms ease-out;
   }
+  .side-bar.collapsed {
+    margin-left: -302px;
+  }
+
   .side-bar-controls {
+    flex: 0 0 32px;
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
-    align-items: stretch;
-    gap: var(--spacing);
-  }
-  .search {
-    flex: 1 1 auto;
-    display: flex;
     align-items: center;
-    justify-content: flex-start;
-    position: relative;
+    gap: var(--spacing-l);
+    padding: 0 var(--spacing-l);
+    margin: var(--spacing-s);
   }
+  .side-bar-controls :global(.spectrum-Body),
+  .side-bar-controls input {
+    flex: 1 1 auto;
+  }
+  .side-bar-controls :global(.spectrum-Icon) {
+    color: var(--spectrum-global-color-gray-600);
+  }
+
   input {
     outline: none;
+    border: none;
     max-width: none;
     flex: 1 1 auto;
-    padding: 0 38px 0 var(--spacing);
+    padding: 0 38px 0 0;
     color: var(--spectrum-global-color-gray-800);
     font-size: 14px;
-    border: 1px solid transparent;
     transition: border 130ms ease-out;
     font-family: var(--font-sans);
+    background: inherit;
   }
   input::placeholder {
     color: var(--spectrum-global-color-gray-700);
     transition: color 130ms ease-out;
   }
-  input:hover {
-    border: 1px solid var(--spectrum-global-color-gray-300);
-  }
   input:hover::placeholder {
     color: var(--spectrum-global-color-gray-800);
   }
-  input:focus {
-    border: 1px solid var(--spectrum-global-color-blue-400);
-  }
 
-  .search :global(.spectrum-Icon) {
-    position: absolute;
-    right: 10px;
-  }
-  .add-app {
-    flex: 0 0 32px;
-    display: grid;
-    place-items: center;
-    transition: background 130ms ease-out;
-  }
-  .add-app:hover {
-    cursor: pointer;
-    background: var(--spectrum-global-color-gray-200);
-  }
-  .search input,
-  .add-app {
-    height: 32px;
-  }
-  .search input,
-  .add-app,
-  .side-bar-nav {
-    background: var(--spectrum-global-color-gray-100);
-    border-radius: var(--radius);
-  }
   .side-bar-nav {
     flex: 1 1 auto;
-    padding: var(--spacing);
+    padding: 0 16px;
     display: flex;
     flex-direction: column;
     justify-items: flex-start;
diff --git a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideNavItem.svelte b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideNavItem.svelte
index 41158c10ef..0df3cdf6f9 100644
--- a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideNavItem.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideNavItem.svelte
@@ -17,11 +17,11 @@
 <style>
   .container {
     padding: 8px 12px;
-    border-radius: var(--radius);
+    border-radius: var(--spacing-s);
     display: flex;
     align-items: center;
     justify-content: flex-start;
-    gap: var(--spacing);
+    gap: var(--spacing-l);
     transition: background 130ms ease-out;
   }
   .container:hover {
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js
index a7c430e621..e70df5c3ee 100644
--- a/packages/builder/src/stores/portal/index.js
+++ b/packages/builder/src/stores/portal/index.js
@@ -1,3 +1,5 @@
+import { writable } from "svelte/store"
+
 export { organisation } from "./organisation"
 export { users } from "./users"
 export { admin } from "./admin"
@@ -14,3 +16,5 @@ export { environment } from "./environment"
 export { menu } from "./menu"
 export { auditLogs } from "./auditLogs"
 export { features } from "./features"
+
+export const sideBarCollapsed = writable(false)