From 106262657b1c3561eb0d8e7aa151ff3a3d4d4ffe Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Wed, 8 Jul 2020 14:33:48 +0100 Subject: [PATCH 01/14] bugfix - heading not updating with state change --- packages/standard-components/src/Heading.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/standard-components/src/Heading.svelte b/packages/standard-components/src/Heading.svelte index 4760ae05db..963377070b 100644 --- a/packages/standard-components/src/Heading.svelte +++ b/packages/standard-components/src/Heading.svelte @@ -8,7 +8,7 @@ let containerElement - $: containerElement && !text && _bb.attachChildren(containerElement) + $: containerElement && !text && _bb.props.children && _bb.props.children.length && _bb.attachChildren(containerElement) {#if type === 'h1'} From 7bd31f3dcfe9c864bb2787ace9464460e8405e22 Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Wed, 8 Jul 2020 15:12:55 +0100 Subject: [PATCH 02/14] worflow save record action broken (no ctx.user) --- .../server/src/api/controllers/workflow/actions/SAVE_RECORD.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/src/api/controllers/workflow/actions/SAVE_RECORD.js b/packages/server/src/api/controllers/workflow/actions/SAVE_RECORD.js index 45e0c1ee65..51f215b6bf 100644 --- a/packages/server/src/api/controllers/workflow/actions/SAVE_RECORD.js +++ b/packages/server/src/api/controllers/workflow/actions/SAVE_RECORD.js @@ -11,6 +11,7 @@ module.exports = async function saveRecord({ args, instanceId }) { request: { body: record, }, + user: { instanceId }, } await recordController.save(ctx) From f048105a03cdd45b395ddad3dfb2df2d26175e1b Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 9 Jul 2020 14:26:47 +0100 Subject: [PATCH 03/14] New budibase logo --- packages/server/build/icon.icns | Bin 25550 -> 0 bytes packages/server/build/icon.png | Bin 25714 -> 5778 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/server/build/icon.icns diff --git a/packages/server/build/icon.icns b/packages/server/build/icon.icns deleted file mode 100644 index 397a03bea3da7ecfce97f081a311f2ef42b378a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25550 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 diff --git a/packages/server/build/icon.png b/packages/server/build/icon.png index dd06244d96015a783846ba2c07c6fb5501dd7161..2c86dc1705f8abbd3cb9cbfdf42a7c6a8061e122 100644 GIT binary patch literal 5778 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 R{`(LJ4ph@nqe;yf_CIoPr&9m` From f82b137554f5a245002089dcb8d86b1c5b6389c1 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 9 Jul 2020 14:36:05 +0100 Subject: [PATCH 04/14] resize icon --- packages/server/build/icon.png | Bin 5778 -> 19431 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/server/build/icon.png b/packages/server/build/icon.png index 2c86dc1705f8abbd3cb9cbfdf42a7c6a8061e122..973898929353ab064c2fe87835fad668011c6ff5 100644 GIT binary patch literal 19431 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 Date: Thu, 9 Jul 2020 14:47:54 +0100 Subject: [PATCH 05/14] Default app template - added screens --- .../server/src/api/controllers/application.js | 20 +++- .../appDirectoryTemplate/pages/main/page.json | 97 +++++++++++++------ .../d834fea2-1b3e-4320-ab34-f9009f5ecc59.json | 61 ++++++++++++ .../f684460e-1f79-42b4-8ffd-1f708bca93ed.json | 41 ++++++++ 4 files changed, 190 insertions(+), 29 deletions(-) create mode 100644 packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/d834fea2-1b3e-4320-ab34-f9009f5ecc59.json create mode 100644 packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/f684460e-1f79-42b4-8ffd-1f708bca93ed.json diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js index e1b850a31f..a737572c62 100644 --- a/packages/server/src/api/controllers/application.js +++ b/packages/server/src/api/controllers/application.js @@ -147,7 +147,10 @@ const createEmptyAppPackage = async (ctx, app) => { app ) - await buildPage(ctx.config, app._id, "main", { page: mainJson }) + await buildPage(ctx.config, app._id, "main", { + page: mainJson, + screens: await loadScreens(newAppFolder, "main"), + }) const unauthenticatedJson = await updateJsonFile( join(appsFolder, app._id, "pages", "unauthenticated", "page.json"), @@ -156,11 +159,26 @@ const createEmptyAppPackage = async (ctx, app) => { await buildPage(ctx.config, app._id, "unauthenticated", { page: unauthenticatedJson, + screens: await loadScreens(newAppFolder, "unauthenticated"), }) return newAppFolder } +const loadScreens = async (appFolder, page) => { + const screensFolder = join(appFolder, "pages", page, "screens") + + const screenFiles = (await fs.readdir(screensFolder)).filter(s => + s.endsWith(".json") + ) + + let screens = [] + for (let file of screenFiles) { + screens.push(await fs.readJSON(join(screensFolder, file))) + } + return screens +} + const lookupClientId = async appId => { const masterDb = new CouchDB("client_app_lookup") const { clientId } = await masterDb.get(appId) diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json index 032848e68e..7f301e8e5f 100644 --- a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json +++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json @@ -3,47 +3,84 @@ "favicon": "./_shared/favicon.png", "stylesheets": [], "componentLibraries": ["@budibase/standard-components", "@budibase/materialdesign-components"], - "props" : { - "_id": "private-master-root", + "props": { + "_id": "private-master-root", "_component": "@budibase/standard-components/container", "_children": [ { - "_id": "c32dd256-a61c-4c41-876e-95e91c5e3a43", - "_component": "@budibase/standard-components/container", + "_id": "49e0e519-9e5e-4127-885a-ee6a0a49e2c1", + "_component": "@budibase/standard-components/Navigation", "_styles": { - "normal": { - "background": "#e8e8ef", - "padding": "8px", - "color": "#393C44", - "display": "N/A", - "flex-direction": "column" - }, + "normal": {}, "hover": {}, "active": {}, "selected": {} }, "_code": "", - "className": "", - "onLoad": [], - "type": "div", - "_instanceId": "inst_1808f0d_e1277174d255421784ef2467d470abc8", - "_instanceName": "Container", + "logoUrl": "http://acmelogos.com/images/logo-8.svg", + "title": "", + "backgroundColor": "", + "color": "", + "borderWidth": "", + "borderColor": "", + "borderStyle": "", + "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", + "_instanceName": "Navigation", "_children": [ { - "_id": "fbd9520f-6b34-4e3e-828d-0197144568a1", - "_component": "@budibase/standard-components/heading", + "_id": "48b35328-4c91-4343-a6a3-1a1fd77b3386", + "_component": "@budibase/standard-components/link", "_styles": { - "normal": {}, + "normal": { + "font-family": "Inter", + "font-weight": "400", + "color": "#000000", + "text-decoration-line": "none", + "font-size": "16px" + }, "hover": {}, "active": {}, "selected": {} }, "_code": "", - "className": "", - "text": "{{ name }}", - "type": "h1", - "_instanceId": "inst_1808f0d_e1277174d255421784ef2467d470abc8", - "_instanceName": "Heading", + "url": "/", + "openInNewTab": false, + "text": "Home", + "color": "", + "hoverColor": "", + "underline": false, + "fontSize": "", + "fontFamily": "initial", + "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", + "_instanceName": "Home Link", + "_children": [] + }, + { + "_id": "d3325634-0945-4387-8bb3-d9d9be186c1c", + "_component": "@budibase/standard-components/link", + "_styles": { + "normal": { + "font-family": "Inter", + "font-weight": "400", + "color": "#000000", + "text-decoration-line": "none", + "font-size": "16px" + }, + "hover": {}, + "active": {}, + "selected": {} + }, + "_code": "", + "url": "/screen1", + "openInNewTab": false, + "text": "Screen 1", + "color": "", + "hoverColor": "", + "underline": false, + "fontSize": "", + "fontFamily": "initial", + "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", + "_instanceName": "Screen 1 Link", "_children": [] } ] @@ -53,9 +90,10 @@ "_component": "##builtin/screenslot", "_styles": { "normal": { - "padding": "8px", + "padding": "0px", "align-items": "flex-start", - "height": "100vh" + "height": "100vh", + "background-image": "None" }, "hover": {}, "active": {}, @@ -74,14 +112,17 @@ "flex-direction": "column", "align-items": "stretch", "justify-content": "flex-start", - "height": "100vh" + "height": "", + "max-width": "", + "margin-right": "auto", + "margin-left": "auto" }, "selected": {} }, "_code": "", "className": "", "onLoad": [] - }, + }, "_css": "", "uiFunctions": "" } diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/d834fea2-1b3e-4320-ab34-f9009f5ecc59.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/d834fea2-1b3e-4320-ab34-f9009f5ecc59.json new file mode 100644 index 0000000000..35c4656a3d --- /dev/null +++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/d834fea2-1b3e-4320-ab34-f9009f5ecc59.json @@ -0,0 +1,61 @@ +{ + "description": "", + "url": "", + "props": { + "_id": "d834fea2-1b3e-4320-ab34-f9009f5ecc59", + "_component": "@budibase/standard-components/container", + "_styles": { + "normal": {}, + "hover": {}, + "active": {}, + "selected": {} + }, + "_code": "", + "className": "", + "onLoad": [], + "type": "div", + "_children": [ + { + "_id": "ef60083f-4a02-4df3-80f3-a0d3d16847e7", + "_component": "@budibase/standard-components/heading", + "_styles": { + "normal": {}, + "hover": {}, + "active": {}, + "selected": {} + }, + "_code": "", + "className": "", + "text": "Home", + "type": "h1", + "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", + "_instanceName": "Heading", + "_children": [] + }, + { + "_id": "6c256e06-784c-4ac0-a644-ed2f9b91d459", + "_component": "@budibase/standard-components/image", + "_styles": { + "normal": { + "width": "100%" + }, + "hover": {}, + "active": {}, + "selected": {} + }, + "_code": "", + "url": "https://source.unsplash.com/Vun-71Vy2hc", + "className": "", + "description": "", + "height": "", + "width": "", + "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", + "_instanceName": "Image", + "_children": [] + } + ], + "_instanceName": "Home" + }, + "route": "/*", + "name": "d834fea2-1b3e-4320-ab34-f9009f5ecc59" +} diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/f684460e-1f79-42b4-8ffd-1f708bca93ed.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/f684460e-1f79-42b4-8ffd-1f708bca93ed.json new file mode 100644 index 0000000000..ae054f8245 --- /dev/null +++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/f684460e-1f79-42b4-8ffd-1f708bca93ed.json @@ -0,0 +1,41 @@ +{ + "description": "", + "url": "", + "_css": "", + "props": { + "_id": "f684460e-1f79-42b4-8ffd-1f708bca93ed", + "_component": "@budibase/standard-components/container", + "_styles": { + "normal": {}, + "hover": {}, + "active": {}, + "selected": {} + }, + "_code": "", + "className": "", + "onLoad": [], + "type": "div", + "_children": [ + { + "_id": "7d1d6b43-b444-46a5-a75c-267fd6b5baf6", + "_component": "@budibase/standard-components/heading", + "_styles": { + "normal": {}, + "hover": {}, + "active": {}, + "selected": {} + }, + "_code": "", + "className": "", + "text": "Screen1", + "type": "h1", + "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", + "_instanceName": "Heading", + "_children": [] + } + ], + "_instanceName": "Screen 1" + }, + "route": "/screen1", + "name": "f684460e-1f79-42b4-8ffd-1f708bca93ed" +} From 0e225652bff3c11e2d29afa0731426d549f4b23d Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Thu, 9 Jul 2020 14:54:35 +0100 Subject: [PATCH 06/14] yarn lock --- packages/server/yarn.lock | 222 +------------------------------------- 1 file changed, 3 insertions(+), 219 deletions(-) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 895ddf858c..d13e02c10d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -194,21 +194,6 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@budibase/client@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.1.0.tgz#47e012c3b1e0b819e13cf8e034c9b25c0933400a" - integrity sha512-VUWjmZed2+4Z9Rnzwz8fJQoBl0U9QsC1vy9IxyZMgiZtF5oVNGGBoko/+ZbzjNkyzps6PZHAH/+QnVYgUkn4lQ== - dependencies: - "@nx-js/compiler-util" "^2.0.0" - bcryptjs "^2.4.3" - deep-equal "^2.0.1" - lodash "^4.17.15" - lunr "^2.3.5" - mustache "^4.0.1" - regexparam "^1.3.0" - shortid "^2.2.8" - svelte "^3.9.2" - "@budibase/core@^0.0.32": version "0.0.32" resolved "https://registry.yarnpkg.com/@budibase/core/-/core-0.0.32.tgz#c5d9ab869c5e9596a1ac337aaf041e795b1cc7fa" @@ -864,11 +849,6 @@ array-equal@^1.0.0: resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= -array-filter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" - integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= - array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" @@ -941,13 +921,6 @@ atomic-sleep@^1.0.0: resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== -available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" - integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== - dependencies: - array-filter "^1.0.0" - aws-sdk@^2.706.0: version "2.706.0" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.706.0.tgz#09f65e9a91ecac5a635daf934082abae30eca953" @@ -1694,26 +1667,6 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -deep-equal@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.3.tgz#cad1c15277ad78a5c01c49c2dee0f54de8a6a7b0" - integrity sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA== - dependencies: - es-abstract "^1.17.5" - es-get-iterator "^1.1.0" - is-arguments "^1.0.4" - is-date-object "^1.0.2" - is-regex "^1.0.5" - isarray "^2.0.5" - object-is "^1.1.2" - object-keys "^1.1.1" - object.assign "^4.1.0" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.2" - which-boxed-primitive "^1.0.1" - which-collection "^1.0.1" - which-typed-array "^1.1.2" - deep-equal@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" @@ -2089,36 +2042,6 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5: string.prototype.trimleft "^2.1.1" string.prototype.trimright "^2.1.1" -es-abstract@^1.17.4: - version "1.17.6" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a" - integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.2.0" - is-regex "^1.1.0" - object-inspect "^1.7.0" - object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" - -es-get-iterator@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8" - integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ== - dependencies: - es-abstract "^1.17.4" - has-symbols "^1.0.1" - is-arguments "^1.0.4" - is-map "^2.0.1" - is-set "^2.0.1" - is-string "^1.0.5" - isarray "^2.0.5" - es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -3116,21 +3039,11 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-arguments@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" - integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-bigint@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4" - integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g== - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -3138,11 +3051,6 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-boolean-object@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" - integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ== - is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -3153,11 +3061,6 @@ is-callable@^1.1.4, is-callable@^1.1.5: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== -is-callable@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" - integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== - is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -3184,7 +3087,7 @@ is-data-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-date-object@^1.0.1, is-date-object@^1.0.2: +is-date-object@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== @@ -3259,21 +3162,11 @@ is-installed-globally@^0.3.1: global-dirs "^2.0.1" is-path-inside "^3.0.1" -is-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" - integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== - is-npm@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== -is-number-object@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" - integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -3310,28 +3203,11 @@ is-regex@^1.0.5: dependencies: has "^1.0.3" -is-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" - integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== - dependencies: - has-symbols "^1.0.1" - -is-set@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" - integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= -is-string@^1.0.4, is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== - is-symbol@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" @@ -3348,31 +3224,11 @@ is-type-of@^1.0.0: is-class-hotfix "~0.0.6" isstream "~0.1.2" -is-typed-array@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d" - integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ== - dependencies: - available-typed-arrays "^1.0.0" - es-abstract "^1.17.4" - foreach "^2.0.5" - has-symbols "^1.0.1" - is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - -is-weakset@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" - integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== - is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -3398,11 +3254,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isarray@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== - isbinaryfile@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" @@ -4825,14 +4676,6 @@ object-inspect@^1.7.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== -object-is@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6" - integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.5" - object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -5564,19 +5407,6 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - -regexparam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" - integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== - regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -5910,14 +5740,6 @@ shortid@^2.2.8: dependencies: nanoid "^2.1.0" -side-channel@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" - integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== - dependencies: - es-abstract "^1.17.0-next.1" - object-inspect "^1.7.0" - signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -6170,7 +5992,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1: +string.prototype.trimend@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== @@ -6196,7 +6018,7 @@ string.prototype.trimright@^2.1.1: es-abstract "^1.17.5" string.prototype.trimend "^1.0.0" -string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1: +string.prototype.trimstart@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== @@ -6326,11 +6148,6 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -svelte@^3.9.2: - version "3.24.0" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.24.0.tgz#6565a42c9705796fa66c6abb4fedc09f4323a4a8" - integrity sha512-VFXom6EP2DK83kxy4ZlBbaZklSbZIrpNH3oNXlPYHJUuW4q1OuAr3ZoYbfIVTVYPDgrI7Yq0gQcOhDlAtO4qfw== - symbol-tree@^3.2.2: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -6834,44 +6651,11 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" -which-boxed-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1" - integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ== - dependencies: - is-bigint "^1.0.0" - is-boolean-object "^1.0.0" - is-number-object "^1.0.3" - is-string "^1.0.4" - is-symbol "^1.0.2" - -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which-typed-array@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2" - integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ== - dependencies: - available-typed-arrays "^1.0.2" - es-abstract "^1.17.5" - foreach "^2.0.5" - function-bind "^1.1.1" - has-symbols "^1.0.1" - is-typed-array "^1.1.3" - which@^1.2.9, which@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" From 7bab03ee01b9be99f738245fd81561cad0b54e51 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 9 Jul 2020 15:00:42 +0100 Subject: [PATCH 07/14] adding icns file --- packages/server/build/icon.icns | Bin 0 -> 17095 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/server/build/icon.icns diff --git a/packages/server/build/icon.icns b/packages/server/build/icon.icns new file mode 100644 index 0000000000000000000000000000000000000000..82da3dde6ef559062db9d6428ff3863588823245 GIT binary patch literal 17095 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 Date: Thu, 9 Jul 2020 15:05:56 +0100 Subject: [PATCH 08/14] lint fix --- packages/server/src/api/controllers/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js index a737572c62..eaa5b07be7 100644 --- a/packages/server/src/api/controllers/application.js +++ b/packages/server/src/api/controllers/application.js @@ -147,7 +147,7 @@ const createEmptyAppPackage = async (ctx, app) => { app ) - await buildPage(ctx.config, app._id, "main", { + await buildPage(ctx.config, app._id, "main", { page: mainJson, screens: await loadScreens(newAppFolder, "main"), }) From 9b23d9eb516b21c11101782fb4cfd1bc9405f40a Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 9 Jul 2020 15:30:11 +0100 Subject: [PATCH 09/14] v0.1.1 --- lerna.json | 2 +- packages/builder/package.json | 4 ++-- packages/cli/package.json | 4 ++-- packages/client/package.json | 2 +- packages/materialdesign-components/package.json | 6 +++--- packages/server/package.json | 4 ++-- packages/standard-components/package.json | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lerna.json b/lerna.json index 3b3a036fea..e366bb5485 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.1.0", + "version": "0.1.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/builder/package.json b/packages/builder/package.json index 1c9849730e..de3adaf5f2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.1.0", + "version": "0.1.1", "license": "AGPL-3.0", "private": true, "scripts": { @@ -56,7 +56,7 @@ }, "dependencies": { "@budibase/bbui": "^1.15.4", - "@budibase/client": "^0.1.0", + "@budibase/client": "^0.1.1", "@nx-js/compiler-util": "^2.0.0", "codemirror": "^5.51.0", "date-fns": "^1.29.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index bd6ac74806..cdfa6ebeba 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "budibase", - "version": "0.1.0", + "version": "0.1.1", "description": "Budibase CLI", "repository": "https://github.com/Budibase/Budibase", "homepage": "https://www.budibase.com", @@ -17,7 +17,7 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/server": "^0.1.0", + "@budibase/server": "^0.1.1", "@inquirer/password": "^0.0.6-alpha.0", "chalk": "^2.4.2", "dotenv": "^8.2.0", diff --git a/packages/client/package.json b/packages/client/package.json index 4df353df25..62d35fc0c7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.1.0", + "version": "0.1.1", "license": "MPL-2.0", "main": "dist/budibase-client.js", "module": "dist/budibase-client.esm.mjs", diff --git a/packages/materialdesign-components/package.json b/packages/materialdesign-components/package.json index f0bc663ef3..759909b6ba 100644 --- a/packages/materialdesign-components/package.json +++ b/packages/materialdesign-components/package.json @@ -12,8 +12,8 @@ "dev:builder": "rollup -cw" }, "devDependencies": { - "@budibase/client": "^0.1.0", - "@budibase/standard-components": "^0.1.0", + "@budibase/client": "^0.1.1", + "@budibase/standard-components": "^0.1.1", "@material/button": "^4.0.0", "@material/checkbox": "^4.0.0", "@material/data-table": "4.0.0", @@ -50,7 +50,7 @@ "keywords": [ "svelte" ], - "version": "0.1.0", + "version": "0.1.1", "license": "MIT", "gitHead": "e4e053cb6ff9a0ddc7115b44ccaa24b8ec41fb9a", "dependencies": { diff --git a/packages/server/package.json b/packages/server/package.json index c84ca9dc87..51b9071e63 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/server", - "version": "0.1.0", + "version": "0.1.1", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -42,7 +42,7 @@ "author": "Michael Shanks", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/client": "^0.1.0", + "@budibase/client": "^0.1.1", "@budibase/core": "^0.0.32", "@koa/router": "^8.0.0", "@sendgrid/mail": "^7.1.1", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index d434badff3..14ec2ec86a 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -12,7 +12,7 @@ "dev:builder": "rollup -cw" }, "devDependencies": { - "@budibase/client": "^0.1.0", + "@budibase/client": "^0.1.1", "@nx-js/compiler-util": "^2.0.0", "@rollup/plugin-commonjs": "^11.1.0", "bcryptjs": "2.4.3", @@ -33,7 +33,7 @@ "keywords": [ "svelte" ], - "version": "0.1.0", + "version": "0.1.1", "license": "MIT", "gitHead": "e4e053cb6ff9a0ddc7115b44ccaa24b8ec41fb9a", "dependencies": { From a664f622d95647489a9de287cc95ec5dfec39342 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Fri, 10 Jul 2020 09:22:36 +0200 Subject: [PATCH 10/14] corrects background on general tab and bumps bbui version --- packages/builder/package.json | 4 ++-- packages/builder/src/components/settings/tabs/General.svelte | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/builder/package.json b/packages/builder/package.json index de3adaf5f2..ea98efeef7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -55,7 +55,7 @@ ] }, "dependencies": { - "@budibase/bbui": "^1.15.4", + "@budibase/bbui": "^1.15.7", "@budibase/client": "^0.1.1", "@nx-js/compiler-util": "^2.0.0", "codemirror": "^5.51.0", @@ -110,4 +110,4 @@ "svelte-jester": "^1.0.6" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} +} \ No newline at end of file diff --git a/packages/builder/src/components/settings/tabs/General.svelte b/packages/builder/src/components/settings/tabs/General.svelte index be4acacc24..8cf8200f74 100644 --- a/packages/builder/src/components/settings/tabs/General.svelte +++ b/packages/builder/src/components/settings/tabs/General.svelte @@ -40,11 +40,11 @@ From f104b4207d18f21e1c22c1b2c8203df6ebe089c5 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Fri, 10 Jul 2020 09:27:50 +0200 Subject: [PATCH 11/14] updates error message when users are fetched --- packages/builder/src/components/settings/tabs/Users.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte index 7befa25da9..8cfb97fae7 100644 --- a/packages/builder/src/components/settings/tabs/Users.svelte +++ b/packages/builder/src/components/settings/tabs/Users.svelte @@ -87,7 +87,8 @@ {/each} {:catch error} - err0r + Something went wrong when trying to fetch users. Please refresh the page + and try again. {/await} From d821962ca276a6df691f055c55e4717add877d39 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Fri, 10 Jul 2020 09:53:00 +0200 Subject: [PATCH 12/14] fix: corrects border radii on some elements in the users and api keys panels --- packages/builder/package.json | 2 +- packages/builder/src/components/settings/tabs/Users.svelte | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/builder/package.json b/packages/builder/package.json index ea98efeef7..bd52e6a2d8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -55,7 +55,7 @@ ] }, "dependencies": { - "@budibase/bbui": "^1.15.7", + "@budibase/bbui": "^1.15.8", "@budibase/client": "^0.1.1", "@nx-js/compiler-util": "^2.0.0", "codemirror": "^5.51.0", diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte index 8cfb97fae7..6ed62ea28a 100644 --- a/packages/builder/src/components/settings/tabs/Users.svelte +++ b/packages/builder/src/components/settings/tabs/Users.svelte @@ -118,6 +118,11 @@ top: 12px; right: 12px; } + .create-button :global(button) { + font-size: var(--font-size-sm); + min-width: 100px; + border-radius: var(--rounded-small); + } .title { font-size: 14px; font-weight: 500; From 4a9c4a93e0d86b9affe703a442929a6dfebced15 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Fri, 10 Jul 2020 09:57:47 +0200 Subject: [PATCH 13/14] fix: fixes gap in danger zone and removes placeholder message --- .../builder/src/components/settings/tabs/DangerZone.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/settings/tabs/DangerZone.svelte b/packages/builder/src/components/settings/tabs/DangerZone.svelte index 524fee3351..352b33c426 100644 --- a/packages/builder/src/components/settings/tabs/DangerZone.svelte +++ b/packages/builder/src/components/settings/tabs/DangerZone.svelte @@ -30,7 +30,7 @@ on:input={e => (value = e.target.value)} thin disabled={loading} - placeholder="Enter your name" + placeholder="" label="Type DELETE into the textbox, then click the following button to delete your web app:" /> @@ -46,7 +46,7 @@ diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte index 6ed62ea28a..42059964d4 100644 --- a/packages/builder/src/components/settings/tabs/Users.svelte +++ b/packages/builder/src/components/settings/tabs/Users.svelte @@ -103,16 +103,12 @@ display: grid; grid-gap: 12px; border-radius: 5px; - background-color: var(--grey-2); + background-color: var(--grey-1); padding: 12px 12px 18px 12px; } .background.create { background-color: var(--blue-light); } - .inputs :global(select) { - padding: 12px 9px; - height: initial; - } .create-button { position: absolute; top: 12px; @@ -132,6 +128,14 @@ grid-gap: 18px; grid-template-columns: 1fr 1fr 1fr; } + .inputs :global(input) { + padding: 10px 12px; + border-radius: var(--rounded-small); + } + .inputs :global(select) { + padding: 9px 12px; + border-radius: var(--rounded-small); + } ul { list-style: none; padding: 0;