diff --git a/packages/builder/assets/budibase-emblem-white.svg b/packages/builder/assets/budibase-emblem-white.svg deleted file mode 100644 index 728e859260..0000000000 --- a/packages/builder/assets/budibase-emblem-white.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/packages/builder/assets/budibase-logo-only.png b/packages/builder/assets/budibase-logo-only.png deleted file mode 100644 index 652444e5bd..0000000000 Binary files a/packages/builder/assets/budibase-logo-only.png and /dev/null differ diff --git a/packages/builder/assets/budibase-logo-white.png b/packages/builder/assets/budibase-logo-white.png deleted file mode 100644 index da8440c09e..0000000000 Binary files a/packages/builder/assets/budibase-logo-white.png and /dev/null differ diff --git a/packages/builder/assets/budibase-logo.png b/packages/builder/assets/budibase-logo.png deleted file mode 100644 index 1d6fc3d1cc..0000000000 Binary files a/packages/builder/assets/budibase-logo.png and /dev/null differ diff --git a/packages/builder/src/budibase.css b/packages/builder/src/budibase.css index 283a761c3b..910a795cd2 100644 --- a/packages/builder/src/budibase.css +++ b/packages/builder/src/budibase.css @@ -1,8 +1,7 @@ /* Budibase Component Styles */ .header { font-size: 0.75rem; - color: #000333; - opacity: 0.4; + color: var(--ink); text-transform: uppercase; margin-top: 1rem; font-weight: 500; @@ -81,10 +80,9 @@ max-width: 250px; height: 35px; border-radius: 3px; - border: 1px solid #DBDBDB; + border: 1px solid var(--grey-dark); text-align: left; - letter-spacing: 0.7px; - color: #000333; + color: var(--ink); font-size: 16px; padding-left: 5px; } @@ -103,27 +101,32 @@ } .budibase__table { - border: 1px solid #ccc; + border: 1px solid var(--grey-dark); background: #fff; border-radius: 2px; } .budibase__table thead { - background: #fafafa; + background: var(--blue-light); } .budibase__table thead > tr > th { - color: var(--button-text); + color: var(--ink); text-transform: capitalize; font-weight: 500; } .budibase__table tr { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid var(--grey-light); } .button--toggled { - background: #fafafa; - color: var(--button-text); - padding: 10px; + background: var(--blue-light); + color: var(--ink-light); + width: 40px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + font-size: 20px; } \ No newline at end of file diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js index 04dcce6cb9..c132b01fc0 100644 --- a/packages/builder/src/builderStore/api.js +++ b/packages/builder/src/builderStore/api.js @@ -3,6 +3,7 @@ const apiCall = method => async (url, body) => { method: method, headers: { "Content-Type": "application/json", + "User-Agent": "Budibase Builder", }, body: body && JSON.stringify(body), }) @@ -14,11 +15,11 @@ const apiCall = method => async (url, body) => { return response } -const post = apiCall("POST") -const get = apiCall("GET") -const patch = apiCall("PATCH") -const del = apiCall("DELETE") -const put = apiCall("PUT") +export const post = apiCall("POST") +export const get = apiCall("GET") +export const patch = apiCall("PATCH") +export const del = apiCall("DELETE") +export const put = apiCall("PUT") export default { post, diff --git a/packages/builder/src/components/common/ActionButton.svelte b/packages/builder/src/components/common/ActionButton.svelte index f8eb00f6e3..147737b5c6 100644 --- a/packages/builder/src/components/common/ActionButton.svelte +++ b/packages/builder/src/components/common/ActionButton.svelte @@ -1,6 +1,7 @@ - handleChange(e.target.value)} /> + handleChange(e.target.value)} /> diff --git a/packages/builder/src/components/common/Modal.svelte b/packages/builder/src/components/common/Modal.svelte index 807dcee922..c91c30827e 100644 --- a/packages/builder/src/components/common/Modal.svelte +++ b/packages/builder/src/components/common/Modal.svelte @@ -50,10 +50,10 @@ diff --git a/packages/builder/src/components/common/Select.svelte b/packages/builder/src/components/common/Select.svelte index 39dbe6d059..e89b8006a5 100644 --- a/packages/builder/src/components/common/Select.svelte +++ b/packages/builder/src/components/common/Select.svelte @@ -20,11 +20,9 @@ diff --git a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte index 8a16d5d0b1..f1d49894a0 100644 --- a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte +++ b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte @@ -145,19 +145,19 @@ } table { - border: 1px solid #ccc; + border: 1px solid var(--grey-dark); background: #fff; border-radius: 3px; border-collapse: collapse; } thead { - background: #f9f9f9; - border: 1px solid #ccc; + background: var(--blue-light); + border: 1px solid var(--grey-dark); } thead th { - color: var(--button-text); + color: var(--ink); text-transform: capitalize; font-weight: 500; font-size: 14px; @@ -166,14 +166,14 @@ } tbody tr { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid var(--grey-dark); transition: 0.3s background-color; - color: var(--secondary100); + color: var(--ink); font-size: 14px; } tbody tr:hover { - background: #fafafa; + background: var(--grey-light); } .table-controls { diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/CreateEditModel.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/CreateEditModel.svelte index bd302df5b7..6264b74e09 100644 --- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/CreateEditModel.svelte +++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/CreateEditModel.svelte @@ -35,7 +35,7 @@ } -
+
{#if !showFieldView}

Create / Edit Model

@@ -43,22 +43,20 @@

Create / Edit Field

{/if} -
+ {#if !showFieldView}
-

Settings

- {#if $store.errors && $store.errors.length > 0} {/if} - - - +
+ +
- Fields -

(showFieldView = true)}> + Fields +
(showFieldView = true)}> Add new field -

+
@@ -67,7 +65,6 @@ - @@ -90,9 +87,9 @@ {/each}
Edit Name TypeValues
-
+
Save -
+ {:else} .padding { - padding: 20px; + padding-top: 40px; + } + + .label { + font-size: 14px; + font-weight: 500; + } + + .textbox { + margin: 0px 40px 0px 40px; + font-size: 14px; + font-weight: 500; } .new-field { font-size: 16px; font-weight: bold; - color: var(--button-text); + color: var(--blue); } .fields-table { - margin: 1rem 1rem 0rem 0rem; + margin: 8px 40px 0px 40px; border-collapse: collapse; + width: 88%; } tbody > tr:hover { - background-color: var(--primary10); + background-color: var(--grey-light); } .table-controls { display: flex; justify-content: space-between; align-items: center; + margin: 0px 40px; } .ri-more-line:hover { cursor: pointer; } - heading { - padding: 20px 20px 0 20px; + .heading { + padding: 40px 40px 0 40px; display: flex; align-items: center; } h3 { margin: 0 0 0 10px; + color: var(--ink); + } + + footer { + background-color: var(--grey-light); + margin-top: 40px; + padding: 20px 40px 20px 40px; + display: flex; + justify-content: flex-end; } diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/FieldView.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/FieldView.svelte index 2c3443ae56..c17a0ac9c8 100644 --- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/FieldView.svelte +++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/FieldView.svelte @@ -79,19 +79,28 @@
+
+ Cancel +
Save - Cancel
diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditView.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditView.svelte index 606310d44f..4db445e54f 100644 --- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditView.svelte +++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditView.svelte @@ -39,51 +39,49 @@ } - +

Create / Edit View

- +
-

Settings

{#if $store.errors && $store.errors.length > 0} {/if} -
-
- +
+
+
+ +
+
+
+ {#each Object.values(SNIPPET_EDITORS) as snippetType} + (currentSnippetEditor = snippetType)}> + {snippetType} + + {/each} + {#if currentSnippetEditor === SNIPPET_EDITORS.MAP} + + {:else if currentSnippetEditor === SNIPPET_EDITORS.FILTER} + + {:else if currentSnippetEditor === SNIPPET_EDITORS.REDUCE} + + {/if}
- -

Snippets

- {#each Object.values(SNIPPET_EDITORS) as snippetType} - (currentSnippetEditor = snippetType)}> - {snippetType} - - {/each} - {#if currentSnippetEditor === SNIPPET_EDITORS.MAP} - - {:else if currentSnippetEditor === SNIPPET_EDITORS.FILTER} - - {:else if currentSnippetEditor === SNIPPET_EDITORS.REDUCE} - - {/if} - - Save - Delete +
+
+ Delete +
+ Save +
diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateUser.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateUser.svelte index e81659f716..d5c924405f 100644 --- a/packages/builder/src/components/database/ModelDataTable/modals/CreateUser.svelte +++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateUser.svelte @@ -22,7 +22,11 @@
-
+
+
+ +
Create User
+
@@ -41,18 +45,40 @@
- Cancel +
+ Cancel +
Save
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index d2232f7604..f012860194 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -5,6 +5,7 @@ import { AppsIcon, InfoIcon, CloseIcon } from "components/common/Icons/" import { getContext } from "svelte" import { fade } from "svelte/transition" + import { post } from "builderStore/api" const { open, close } = getContext("simple-modal") @@ -33,15 +34,7 @@ const data = { name, description } loading = true try { - const response = await fetch("/api/applications", { - method: "POST", // *GET, POST, PUT, DELETE, etc. - credentials: "same-origin", // include, *same-origin, omit - headers: { - "Content-Type": "application/json", - // 'Content-Type': 'application/x-www-form-urlencoded', - }, - body: JSON.stringify(data), // body data type must match "Content-Type" header - }) + const response = await post("/api/applications", data) const res = await response.json() diff --git a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js b/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js index d3a94b6cf5..462becb32f 100644 --- a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js +++ b/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js @@ -17,6 +17,7 @@ export default ({ body, html { height: 100%!important; + font-family: Roboto !important; } .lay-__screenslot__text { width: 100%; diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte index 151f013ffe..0b51b962ba 100644 --- a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte +++ b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte @@ -151,7 +151,7 @@ } -
{}}> +
{}}> diff --git a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte index 1edf5d45a0..28c4edece5 100644 --- a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte +++ b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte @@ -28,7 +28,7 @@ {/each} {:else} - +