diff --git a/packages/builder/package.json b/packages/builder/package.json
index cb91f2ce42..3e76ac87d8 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -38,6 +38,7 @@
]
},
"dependencies": {
+ "@budibase/bbui": "^0.3.1",
"@budibase/client": "^0.0.32",
"@nx-js/compiler-util": "^2.0.0",
"codemirror": "^5.51.0",
@@ -82,4 +83,4 @@
"svelte": "^3.0.0"
},
"gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
-}
\ No newline at end of file
+}
diff --git a/packages/builder/src/components/common/Icons/Close.svelte b/packages/builder/src/components/common/Icons/Close.svelte
new file mode 100644
index 0000000000..e39564d9ad
--- /dev/null
+++ b/packages/builder/src/components/common/Icons/Close.svelte
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/builder/src/components/common/Icons/Info.svelte b/packages/builder/src/components/common/Icons/Info.svelte
new file mode 100644
index 0000000000..162a9b3887
--- /dev/null
+++ b/packages/builder/src/components/common/Icons/Info.svelte
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/builder/src/components/common/Icons/index.js b/packages/builder/src/components/common/Icons/index.js
index c7e4da29da..69b78421da 100644
--- a/packages/builder/src/components/common/Icons/index.js
+++ b/packages/builder/src/components/common/Icons/index.js
@@ -29,3 +29,5 @@ export { default as ContributionIcon } from "./Contribution.svelte"
export { default as BugIcon } from "./Bug.svelte"
export { default as EmailIcon } from "./Email.svelte"
export { default as TwitterIcon } from "./Twitter.svelte"
+export { default as InfoIcon } from "./Info.svelte"
+export { default as CloseIcon } from "./Close.svelte"
diff --git a/packages/builder/src/components/common/ModalDialog.svelte b/packages/builder/src/components/common/ModalDialog.svelte
deleted file mode 100644
index 121714cd85..0000000000
--- a/packages/builder/src/components/common/ModalDialog.svelte
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
{message}
-
-{#if hasForm}
- e.which === 13 && _onOkay()} />
-{/if}
-
-
-
-
-
-
-
diff --git a/packages/builder/src/components/start/AppList.svelte b/packages/builder/src/components/start/AppList.svelte
index 22ba16c45d..e53b1f93bf 100644
--- a/packages/builder/src/components/start/AppList.svelte
+++ b/packages/builder/src/components/start/AppList.svelte
@@ -56,7 +56,7 @@
max-width: 400px;
max-height: 150px;
border-radius: 5px;
- border: 1px solid var(--grey-dark);
+ border: 1px solid var(--grey-medium);
}
.app-button:hover {
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
new file mode 100644
index 0000000000..07f53cc1b3
--- /dev/null
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -0,0 +1,118 @@
+
+
+
+
+
diff --git a/packages/builder/src/global.css b/packages/builder/src/global.css
index 3ad5851157..dea20e4d26 100644
--- a/packages/builder/src/global.css
+++ b/packages/builder/src/global.css
@@ -13,6 +13,7 @@
--grey: #F2F2F2;
--grey-light: #FBFBFB;
+ --grey-medium: #e8e8ef;
--grey-dark: #E6E6E6;
--primary100: #0055ff;
@@ -125,6 +126,10 @@ h5 {
color: var(--darkslate);
}
+textarea {
+ font-family: var(--fontnormal);
+}
+
.hoverable:hover {
cursor: pointer;
}
\ No newline at end of file
diff --git a/packages/builder/src/pages/_layout.svelte b/packages/builder/src/pages/_layout.svelte
index b807c1737b..98bae8aa7d 100644
--- a/packages/builder/src/pages/_layout.svelte
+++ b/packages/builder/src/pages/_layout.svelte
@@ -142,7 +142,7 @@
padding: 20px;
display: flex;
flex-direction: column;
- border-right: 1px solid var(--grey-dark);
+ border-right: 1px solid var(--grey-medium);
}
.home-logo {
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index 6c77059739..8ef61f68cd 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -7,6 +7,7 @@
import IconButton from "components/common/IconButton.svelte"
import Spinner from "components/common/Spinner.svelte"
+ import CreateAppModal from "components/start/CreateAppModal.svelte"
let promise = getApps()
@@ -23,9 +24,19 @@
// Handle create app modal
const { open } = getContext("simple-modal")
+ const onCancel = text => {
+ name = ""
+ status = -1
+ }
+
+ const onOkay = text => {
+ name = text
+ status = 1
+ }
+
const showCreateAppModal = () => {
open(
- Dialog,
+ CreateAppModal,
{
message: "What is your name?",
hasForm: true,
@@ -36,6 +47,7 @@
closeButton: false,
closeOnEsc: false,
closeOnOuterClick: false,
+ styleContent: { padding: 0 },
}
)
}
@@ -47,7 +59,7 @@
-