From 74918b1d71d74e3abf72883b8052f568fa99dc18 Mon Sep 17 00:00:00 2001
From: Victoria Sloan <victoriasloan@gmail.com>
Date: Thu, 3 Sep 2020 08:59:05 +0100
Subject: [PATCH] NewScreen using bbui modal

---
 .../components/userInterface/NewScreen.svelte | 76 +++++++++++--------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/packages/builder/src/components/userInterface/NewScreen.svelte b/packages/builder/src/components/userInterface/NewScreen.svelte
index ea6ebe194..ae5a50ab6 100644
--- a/packages/builder/src/components/userInterface/NewScreen.svelte
+++ b/packages/builder/src/components/userInterface/NewScreen.svelte
@@ -1,14 +1,9 @@
 <script>
   import { store } from "builderStore"
-  import Button from "components/common/Button.svelte"
-  import ActionButton from "components/common/ActionButton.svelte"
-  import ButtonGroup from "components/common/ButtonGroup.svelte"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { pipe } from "components/common/core"
-  import UIkit from "uikit"
   import { isRootComponent } from "./pagesParsing/searchComponents"
   import { splitName } from "./pagesParsing/splitRootComponentName.js"
-  import { Input, Select } from "@budibase/bbui"
+  import { Input, Select, Modal, Button } from "@budibase/bbui"
 
   import { find, filter, some, map, includes } from "lodash/fp"
   import { assign } from "lodash"
@@ -72,34 +67,49 @@
   }
 </script>
 
-<ConfirmDialog
-  bind:this={dialog}
-  title="New Screen"
-  onCancel={cancel}
-  onOk={save}
-  okText="Create Screen">
-
-  <div data-cy="new-screen-dialog">
-    <div class="bb-margin-xl">
-      <Input label="Name" bind:value={name} />
+<Modal bind:this={dialog}>
+  <h2>New Screen</h2>
+
+  <div class="modal-body">
+    <div data-cy="new-screen-dialog">
+      <div class="bb-margin-xl">
+        <Input label="Name" bind:value={name} />
+      </div>
+
+      <div class="bb-margin-xl">
+        <Input
+          label="Url"
+          error={routeError}
+          bind:value={route}
+          on:change={routeChanged} />
+      </div>
+
+      <div class="bb-margin-xl">
+        <label>Layout Component</label>
+        <Select bind:value={layoutComponent} secondary>
+          {#each layoutComponents as { _component, name }}
+            <option value={_component}>{name}</option>
+          {/each}
+        </Select>
+      </div>
     </div>
+  </div>
 
-    <div class="bb-margin-xl">
-      <Input
-        label="Url"
-        error={routeError}
-        bind:value={route}
-        on:change={routeChanged} />
-    </div>
+  <Button secondary medium on:click={cancel}>Cancel</Button>
+  <Button blue medium on:click={save}>Create Screen</Button>
 
-    <div class="bb-margin-xl">
-      <label>Layout Component</label>
-      <Select bind:value={layoutComponent} secondary>
-        {#each layoutComponents as { _component, name }}
-          <option value={_component}>{name}</option>
-        {/each}
-      </Select>
-    </div>
-  </div>
+</Modal>
+
+<style>
+  h2 {
+    font-size: var(--font-size-xl);
+    margin: 0;
+    font-family: var(--font-sans);
+    font-weight: 600;
+  }
 
-</ConfirmDialog>
+  .modal-body {
+    margin-top: var(--spacing-m);
+    margin-bottom: var(--spacing-m);
+  }
+</style>