From e91ca2af2231a2a6038aceeae09acbcfe39bcd92 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 12 Apr 2022 14:10:01 +0100 Subject: [PATCH 001/207] Initially navigate to design rather than data --- .../builder/src/pages/builder/app/[application]/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/index.svelte b/packages/builder/src/pages/builder/app/[application]/index.svelte index d3321037d5..76e4a2b032 100644 --- a/packages/builder/src/pages/builder/app/[application]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/index.svelte @@ -1,6 +1,6 @@ From aad7b4544171215bf79025eb6bd513081ee8870e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 12 Apr 2022 15:34:34 +0100 Subject: [PATCH 002/207] Update spectrum tabs, add tooltip to icon, add size option to tabs --- packages/bbui/package.json | 2 +- packages/bbui/src/Icon/Icon.svelte | 58 +- packages/bbui/src/Tabs/Tab.svelte | 6 + packages/bbui/src/Tabs/Tabs.svelte | 32 +- packages/bbui/src/Tooltip/Tooltip.svelte | 8 +- packages/bbui/yarn.lock | 943 +---------------------- 6 files changed, 85 insertions(+), 964 deletions(-) diff --git a/packages/bbui/package.json b/packages/bbui/package.json index d037ca9a86..21db7d691c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -70,7 +70,7 @@ "@spectrum-css/stepper": "^3.0.3", "@spectrum-css/switch": "^1.0.2", "@spectrum-css/table": "^3.0.1", - "@spectrum-css/tabs": "^3.0.1", + "@spectrum-css/tabs": "^3.2.12", "@spectrum-css/tags": "^3.0.2", "@spectrum-css/textfield": "^3.0.1", "@spectrum-css/toast": "^3.0.1", diff --git a/packages/bbui/src/Icon/Icon.svelte b/packages/bbui/src/Icon/Icon.svelte index fbaac7098c..801ec7b509 100644 --- a/packages/bbui/src/Icon/Icon.svelte +++ b/packages/bbui/src/Icon/Icon.svelte @@ -3,6 +3,9 @@ - (showTooltip = true)} + on:focus={() => (showTooltip = true)} + on:mouseleave={() => (showTooltip = false)} > - - + + + + {#if tooltip && showTooltip} +
+ +
+ {/if} + diff --git a/packages/bbui/src/Tabs/Tab.svelte b/packages/bbui/src/Tabs/Tab.svelte index 0aa59f7f8a..37882d08c0 100644 --- a/packages/bbui/src/Tabs/Tab.svelte +++ b/packages/bbui/src/Tabs/Tab.svelte @@ -63,4 +63,10 @@ .emphasized { color: var(--spectrum-global-color-blue-600); } + .spectrum-Tabs-item { + color: var(--spectrum-global-color-gray-600); + } + .spectrum-Tabs-item.is-selected { + color: var(--spectrum-global-color-gray-900); + } diff --git a/packages/bbui/src/Tabs/Tabs.svelte b/packages/bbui/src/Tabs/Tabs.svelte index 6930a6cdb5..c535cb3122 100644 --- a/packages/bbui/src/Tabs/Tabs.svelte +++ b/packages/bbui/src/Tabs/Tabs.svelte @@ -10,8 +10,7 @@ export let noHorizPadding = false export let quiet = false export let emphasized = false - // overlay content from the tab bar onto tabs e.g. for a dropdown - export let onTop = false + export let size = "M" let thisSelected = undefined @@ -74,20 +73,18 @@
{#if $tab.info}
{/if}
@@ -98,26 +95,29 @@ /> diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock index 2b6b15dd15..39ea673c4b 100644 --- a/packages/bbui/yarn.lock +++ b/packages/bbui/yarn.lock @@ -28,43 +28,6 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@budibase/handlebars-helpers@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" - integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== - dependencies: - array-sort "^1.0.0" - define-property "^2.0.2" - extend-shallow "^3.0.2" - for-in "^1.0.2" - get-object "^0.2.0" - get-value "^3.0.1" - handlebars "^4.7.7" - handlebars-utils "^1.0.6" - has-value "^2.0.2" - helper-md "^0.2.2" - html-tag "^2.0.0" - is-even "^1.0.0" - is-glob "^4.0.1" - kind-of "^6.0.3" - micromatch "^3.1.5" - relative "^3.0.2" - striptags "^3.1.1" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - -"@budibase/string-templates@^1.0.104": - version "1.0.104" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.104.tgz#f812700f2b21f638fd1e48dde065ae693fae2897" - integrity sha512-3caq3qwpIieyb9m8eSl8OhcE0ppzuyJ/0ubDlWmtpbmwmG2v3ynI+DwxpbG4CcVQFuebD2yxU0CZfioU76vKCQ== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - "@rollup/plugin-commonjs@^16.0.0": version "16.0.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz#169004d56cd0f0a1d0f35915d31a036b0efe281f" @@ -263,10 +226,10 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.2.tgz#c666743d569fef81ddc8810fac8cda53b315f8d7" integrity sha512-nt/QNC7NmUank0wozd4FySEX1UIYXuvuOKDyN1II3sxfwFSpJfp/Df9KVMhrYs4EsmB4XMGcoxp8ND/CrvH3ow== -"@spectrum-css/tabs@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.0.2.tgz#822316672e7b0dfba66faa988e638ddae18c700e" - integrity sha512-4RNcmwf0wxLpB7M54H02owlj0mKE8neL1+lytQpxOOhlwTO5zdsD82zjvx9tIc8tRnRKuhCCCwTuBxHYstnBmw== +"@spectrum-css/tabs@^3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" + integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== "@spectrum-css/tags@^3.0.2": version "3.0.2" @@ -367,21 +330,11 @@ accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-walk@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== - acorn@^7.3.1: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.7.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" - integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== - alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -409,87 +362,28 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== dependencies: sprintf-js "~1.0.2" -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= - async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -autolinker@~0.28.0: - version "0.28.1" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" - integrity sha1-BlK0kYgYefB3XazgzcoyM5QqTkc= - dependencies: - gulp-header "^1.7.1" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -529,22 +423,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -578,21 +456,6 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -672,16 +535,6 @@ chokidar@^3.0.0: optionalDependencies: fsevents "~2.3.1" -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - coa@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" @@ -703,14 +556,6 @@ codemirror@^5.63.1: resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.1.tgz#5988a812c974c467f964bcc1a00c944e373de502" integrity sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA== -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - color-convert@^1.9.0, color-convert@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -766,17 +611,12 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= -component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-with-sourcemaps@*, concat-with-sourcemaps@^1.1.0: +concat-with-sourcemaps@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== @@ -812,16 +652,6 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - cosmiconfig@^5.0.0: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" @@ -993,7 +823,7 @@ dayjs@^1.10.4: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2" integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw== -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: +debug@2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -1007,23 +837,11 @@ debug@^3.0.1: dependencies: ms "^2.1.1" -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= - deepmerge@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -1031,28 +849,6 @@ define-properties@^1.1.3: dependencies: object-keys "^1.0.12" -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -1127,11 +923,6 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -ent@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= - entities@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" @@ -1225,19 +1016,6 @@ eventemitter3@^4.0.4: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - express-history-api-fallback@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/express-history-api-fallback/-/express-history-api-fallback-2.2.1.tgz#3a2ad27f7bebc90fc533d110d7c6d83097bcd057" @@ -1295,45 +1073,6 @@ express@^4.16.3: utils-merge "1.0.1" vary "~1.1.2" -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -1359,33 +1098,16 @@ flatpickr@^4.5.2: resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499" integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw== -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1417,26 +1139,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.1" -get-object@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" - integrity sha1-2S/31RkMZFMM2gVD2sY6PUf+jAw= - dependencies: - is-number "^2.0.2" - isobject "^0.2.0" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - -get-value@^3.0.0, get-value@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" - integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== - dependencies: - isobject "^3.0.1" - glob-parent@~5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -1456,35 +1158,6 @@ glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -gulp-header@^1.7.1: - version "1.8.12" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" - integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== - dependencies: - concat-with-sourcemaps "*" - lodash.template "^4.4.0" - through2 "^2.0.0" - -handlebars-utils@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" - integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== - dependencies: - kind-of "^6.0.0" - typeof-article "^0.1.1" - -handlebars@^4.7.6, handlebars@^4.7.7: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - has-bigints@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" @@ -1505,52 +1178,6 @@ has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-value@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" - integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== - dependencies: - get-value "^3.0.0" - has-values "^2.0.1" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has-values@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" - integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== - dependencies: - kind-of "^6.0.2" - has@^1.0.0, has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -1558,16 +1185,6 @@ has@^1.0.0, has@^1.0.3: dependencies: function-bind "^1.1.1" -helper-md@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" - integrity sha1-wfWdflW7riM2L9ig6XFgeuxp1B8= - dependencies: - ent "^2.2.0" - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - remarkable "^1.6.2" - hex-color-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" @@ -1583,14 +1200,6 @@ hsla-regex@^1.0.0: resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= -html-tag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" - integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== - dependencies: - is-self-closing "^1.0.1" - kind-of "^6.0.0" - http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" @@ -1673,7 +1282,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@~2.0.3: +inherits@2, inherits@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -1693,20 +1302,6 @@ is-absolute-url@^2.0.0: resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -1736,11 +1331,6 @@ is-boolean-object@^1.1.0: dependencies: call-bind "^1.0.0" -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - is-callable@^1.1.4, is-callable@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" @@ -1765,67 +1355,16 @@ is-core-module@^2.2.0: dependencies: has "^1.0.3" -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - 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== -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= -is-even@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" - integrity sha1-drUFX7rY0pSoa2qUkBXhyXtxfAY= - dependencies: - is-odd "^0.1.2" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -1853,20 +1392,6 @@ is-number-object@^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@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - dependencies: - kind-of "^3.0.2" - is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -1877,20 +1402,6 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-odd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" - integrity sha1-vFc7XONx7yqtbm9JeZtyvvE5eKc= - dependencies: - is-number "^3.0.0" - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - is-reference@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" @@ -1911,13 +1422,6 @@ is-resolvable@^1.0.0: resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== -is-self-closing@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" - integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== - dependencies: - self-closing-tags "^1.0.1" - is-string@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" @@ -1930,38 +1434,11 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.1" -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isobject@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" - integrity sha1-o0MhkvObkQtfAsyYlIeDbscKqF4= - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - jest-worker@^26.2.1: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" @@ -2001,30 +1478,6 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0, kind-of@^5.0.2: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -2039,11 +1492,6 @@ loader-utils@^1.1.0: emojis-list "^3.0.0" json5 "^1.0.1" -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -2054,31 +1502,11 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.20: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - magic-string@^0.25.7: version "0.25.7" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" @@ -2086,18 +1514,6 @@ magic-string@^0.25.7: dependencies: sourcemap-codec "^1.4.4" -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - marked@^4.0.10: version "4.0.12" resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.12.tgz#2262a4e6fd1afd2f13557726238b69a48b982f7d" @@ -2133,25 +1549,6 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.1.5: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - mime-db@1.47.0: version "1.47.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" @@ -2181,14 +1578,6 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -2216,33 +1605,11 @@ nanoid@^3.1.22: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.0.tgz#5906f776fd886c66c24f3653e0c46fcb1d4ad6b0" integrity sha512-JzxqqT5u/x+/KOFSd7JP15DOo9nOoHpx6DYatqIHUW2+flybkm+mdcraotSQR5WcnZr+qhGVh8Ted0KdfSMxlg== -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - node-releases@^1.1.71: version "1.1.73" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" @@ -2283,15 +1650,6 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - object-inspect@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" @@ -2302,13 +1660,6 @@ object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" @@ -2328,13 +1679,6 @@ object.getownpropertydescriptors@^2.1.0: define-properties "^1.1.3" es-abstract "^1.18.0-next.2" -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - object.values@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee" @@ -2409,11 +1753,6 @@ parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -2449,11 +1788,6 @@ pify@^5.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - postcss-calc@^7.0.1: version "7.0.5" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" @@ -2797,11 +2131,6 @@ postcss@^8.2.9: nanoid "^3.1.22" source-map "^0.6.1" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - promise.series@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd" @@ -2857,19 +2186,6 @@ raw-body@^2.3.0: iconv-lite "0.4.24" unpipe "1.0.0" -readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - readdirp@~3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" @@ -2877,39 +2193,6 @@ readdirp@~3.5.0: dependencies: picomatch "^2.2.1" -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -relative@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha1-Dc2OxUpdNaPBXhBFA9ZTdbWlNn8= - dependencies: - isobject "^2.0.0" - -remarkable@^1.6.2: - version "1.7.4" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" - integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== - dependencies: - argparse "^1.0.10" - autolinker "~0.28.0" - -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= - require-relative@^0.8.7: version "0.8.7" resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" @@ -2930,11 +2213,6 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - resolve@^1.17.0, resolve@^1.19.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" @@ -2943,11 +2221,6 @@ resolve@^1.17.0, resolve@^1.19.0: is-core-module "^2.2.0" path-parse "^1.0.6" -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - rgb-regex@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" @@ -3009,7 +2282,7 @@ rollup@^2.45.2: optionalDependencies: fsevents "~2.3.1" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@5.1.2, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -3024,13 +2297,6 @@ safe-identifier@^0.4.2: resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb" integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w== -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" - "safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -3041,11 +2307,6 @@ sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -self-closing-tags@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" - integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== - send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -3082,16 +2343,6 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - setprototypeof@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" @@ -3116,53 +2367,12 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - "source-map-fast@npm:source-map@0.7.3", source-map@~0.7.2: name source-map-fast version "0.7.3" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -3171,11 +2381,6 @@ source-map-support@~0.5.19: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== - source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -3191,13 +2396,6 @@ sourcemap-codec@^1.4.4: resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -3208,14 +2406,6 @@ stable@^0.1.8: resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -3242,18 +2432,6 @@ string.prototype.trimstart@^1.0.4: call-bind "^1.0.2" define-properties "^1.1.3" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -striptags@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" - integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== - style-inject@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.3.0.tgz#d21c477affec91811cc82355832a700d22bf8dd3" @@ -3334,39 +2512,11 @@ terser@^5.0.0: source-map "~0.7.2" source-map-support "~0.5.19" -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - timsort@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= -to-gfm-code-block@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" - integrity sha1-JdBFpfrlUxielje1kJANpzLYqoI= - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -3374,16 +2524,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" @@ -3397,23 +2537,11 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typeof-article@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" - integrity sha1-nwfnM8P7tkb/qeYcCN66zUYOBq8= - dependencies: - kind-of "^3.1.0" - typo-js@*: version "1.2.1" resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.1.tgz#334a0d8c3f6c56f2f1e15fdf6c31677793cbbe9b" integrity sha512-bTGLjbD3WqZDR3CgEFkyi9Q/SS2oM29ipXrWfDb4M74ea69QwKAECVceYpaBu0GfdnASMg9Qfl67ttB23nePHg== -uglify-js@^3.1.4: - version "3.15.3" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz#9aa82ca22419ba4c0137642ba0df800cb06e0471" - integrity sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg== - unbox-primitive@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" @@ -3424,16 +2552,6 @@ unbox-primitive@^1.0.0: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - uniq@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" @@ -3454,25 +2572,7 @@ unquote@~1.1.1: resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - -util-deprecate@^1.0.2, util-deprecate@~1.0.1: +util-deprecate@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -3502,14 +2602,6 @@ vendors@^1.0.0: resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== -vm2@^3.9.4: - version "3.9.9" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.9.tgz#c0507bc5fbb99388fad837d228badaaeb499ddc5" - integrity sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -3528,11 +2620,6 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -3545,17 +2632,7 @@ ws@^5.2.0: dependencies: async-limiter "~1.0.0" -xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - yaml@^1.10.0: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -year@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" - integrity sha1-QIOuUgoxiyPshgN/MADLiSvfm7A= From df7fe0b8497fc979dbd8a03a8c24c5b5063fde28 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 12 Apr 2022 15:35:24 +0100 Subject: [PATCH 003/207] Update top bar with back arrow, app name, centered large tabs, new icons, tooltips on right icons and removal of version and self-host icons --- .../src/components/deploy/RevertModal.svelte | 7 +- packages/builder/src/global.css | 83 +++++------ .../builder/app/[application]/_layout.svelte | 137 +++++++++--------- .../app/[application]/data/_layout.svelte | 2 +- .../app/[application]/data/index.svelte | 1 - .../app/[application]/design/index.svelte | 2 - .../app/[application]/settings/_layout.svelte | 2 +- .../app/[application]/settings/index.svelte | 5 + 8 files changed, 125 insertions(+), 114 deletions(-) diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte index 717c55f05e..a8f9d8f6e3 100644 --- a/packages/builder/src/components/deploy/RevertModal.svelte +++ b/packages/builder/src/components/deploy/RevertModal.svelte @@ -28,7 +28,12 @@ } - + import { store, automationStore } from "builderStore" import { roles, flags } from "stores/backend" - import { Icon, ActionGroup, Tabs, Tab, notifications } from "@budibase/bbui" + import { Icon, Tabs, Tab, notifications, Heading } from "@budibase/bbui" import DeployModal from "components/deploy/DeployModal.svelte" import RevertModal from "components/deploy/RevertModal.svelte" - import VersionModal from "components/deploy/VersionModal.svelte" import { API } from "api" - import { auth, admin } from "stores/portal" + import { apps } from "stores/portal" import { isActive, goto, layout, redirect } from "@roxi/routify" - import Logo from "assets/bb-emblem.svg" import { capitalise } from "helpers" - import UpgradeModal from "components/upgrade/UpgradeModal.svelte" import { onMount, onDestroy } from "svelte" export let application @@ -20,14 +17,21 @@ // Sync once when you load the app let hasSynced = false + $: selected = capitalise( $layout.children.find(layout => $isActive(layout.path))?.title ?? "data" ) + $: appInfo = $apps?.find(app => app.devId === application) + $: published = appInfo?.status === "published" - function previewApp() { + const viewPreviewApp = () => { window.open(`/${application}`) } + const viewPublishedApp = () => { + window.open(`/app${appInfo?.url}`) + } + async function getPackage() { try { const pkg = await API.fetchAppPackage(application) @@ -67,6 +71,9 @@ } hasSynced = true } + if (!$apps?.length) { + apps.load() + } }) onDestroy(() => { @@ -81,37 +88,43 @@
- - -
- - {#each $layout.children as { path, title }} - - {/each} - -
- - - + $goto("../")} + /> + {$store.name || "App"} +
+
+ + {#each $layout.children as { path, title }} + + {/each} +
- {#if $admin.cloud && $auth.user.account} - - {/if} - - + +
@@ -138,16 +151,37 @@ } .top-nav { - flex: 0 0 auto; + flex: 0 0 60px; background: var(--background); padding: 0 var(--spacing-xl); display: flex; + flex-direction: row; box-sizing: border-box; justify-content: space-between; - align-items: center; + align-items: stretch; border-bottom: var(--border-light); } + .topleftnav { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + gap: var(--spacing-xl); + } + .topleftnav :global(.spectrum-Heading) { + font-weight: 600; + } + + .topcenternav { + display: flex; + position: relative; + margin-bottom: -2px; + } + .topcenternav :global(.spectrum-Tabs-itemLabel) { + font-weight: bold !important; + } + .toprightnav { display: flex; flex-direction: row; @@ -155,35 +189,4 @@ align-items: center; gap: var(--spacing-xl); } - - .topleftnav { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; - } - - .tabs { - display: flex; - position: relative; - margin-bottom: -1px; - } - - .home-logo { - border-style: none; - background-color: rgba(0, 0, 0, 0); - cursor: pointer; - outline: none; - padding: 0 10px 0 0; - align-items: center; - height: 32px; - } - - .home-logo:active { - outline: none; - } - - .home-logo img { - height: 30px; - } diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte index 9664ebbd09..f5f5c9d977 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -18,7 +18,7 @@ } - +
diff --git a/packages/builder/src/pages/builder/app/[application]/data/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/index.svelte index de9a392f9c..70c3d4481a 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/index.svelte @@ -20,4 +20,3 @@ - diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte index 1a454df4db..4c72ebe7a2 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte @@ -4,5 +4,3 @@ $goto(`./${FrontendTypes.SCREEN}`) - - diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte index eff7c155d3..597bf1518d 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte @@ -1,2 +1,2 @@ - + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte index 163d304af4..5008432fee 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte @@ -1 +1,6 @@ Settings + + From 60570456e7d088d1e04e9f6c76e44439ad2c5fd0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 19 Apr 2022 10:12:46 +0100 Subject: [PATCH 004/207] Remove z-index style from tabs --- packages/bbui/src/Tabs/Tabs.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/bbui/src/Tabs/Tabs.svelte b/packages/bbui/src/Tabs/Tabs.svelte index c535cb3122..9d01b92d46 100644 --- a/packages/bbui/src/Tabs/Tabs.svelte +++ b/packages/bbui/src/Tabs/Tabs.svelte @@ -104,7 +104,6 @@ padding-left: var(--spacing-xl); padding-right: var(--spacing-xl); position: relative; - z-index: 20; border-bottom-color: var(--spectrum-global-color-gray-200); } .spectrum-Tabs-content { From 6749dc4f1b125a58ab408833effb9adfa99d7691 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 21 Apr 2022 15:11:07 +0100 Subject: [PATCH 005/207] Add new design side nav and update routing --- .../bbui/src/IconSideNav/IconSideNav.svelte | 14 ++++ .../src/IconSideNav/IconSideNavItem.svelte | 55 ++++++++++++++++ packages/bbui/src/index.js | 2 + packages/builder/src/constants/index.js | 8 +++ .../[assetType]/[asset]/_fallback.svelte | 0 .../{ => [tab]}/[assetType]/_layout.svelte | 0 .../{ => [tab]}/[assetType]/index.svelte | 0 .../[application]/design/[tab]/_layout.svelte | 2 + .../[application]/design/[tab]/index.svelte | 6 ++ .../app/[application]/design/_layout.svelte | 64 ++++++++++++++++++- .../app/[application]/design/index.svelte | 4 +- 11 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 packages/bbui/src/IconSideNav/IconSideNav.svelte create mode 100644 packages/bbui/src/IconSideNav/IconSideNavItem.svelte rename packages/builder/src/pages/builder/app/[application]/design/{ => [tab]}/[assetType]/[asset]/_fallback.svelte (100%) rename packages/builder/src/pages/builder/app/[application]/design/{ => [tab]}/[assetType]/_layout.svelte (100%) rename packages/builder/src/pages/builder/app/[application]/design/{ => [tab]}/[assetType]/index.svelte (100%) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[tab]/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[tab]/index.svelte diff --git a/packages/bbui/src/IconSideNav/IconSideNav.svelte b/packages/bbui/src/IconSideNav/IconSideNav.svelte new file mode 100644 index 0000000000..e0723294d2 --- /dev/null +++ b/packages/bbui/src/IconSideNav/IconSideNav.svelte @@ -0,0 +1,14 @@ +
+ +
+ + \ No newline at end of file diff --git a/packages/bbui/src/IconSideNav/IconSideNavItem.svelte b/packages/bbui/src/IconSideNav/IconSideNavItem.svelte new file mode 100644 index 0000000000..446e6a0e5e --- /dev/null +++ b/packages/bbui/src/IconSideNav/IconSideNavItem.svelte @@ -0,0 +1,55 @@ + + +
(showTooltip = true)} + on:focus={() => (showTooltip = true)} + on:mouseleave={() => (showTooltip = false)} + on:click +> + + {#if tooltip && showTooltip} +
+ +
+ {/if} +
+ + diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 2b16f32b84..c20b0aecf6 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -64,6 +64,8 @@ export { default as BannerDisplay } from "./Banner/BannerDisplay.svelte" export { default as MarkdownEditor } from "./Markdown/MarkdownEditor.svelte" export { default as MarkdownViewer } from "./Markdown/MarkdownViewer.svelte" export { default as RichTextField } from "./Form/RichTextField.svelte" +export { default as IconSideNav } from "./IconSideNav/IconSideNav.svelte" +export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js index abeaadc718..0316a77550 100644 --- a/packages/builder/src/constants/index.js +++ b/packages/builder/src/constants/index.js @@ -2,6 +2,14 @@ export const TableNames = { USERS: "ta_users", } +export const DesignTabs = { + SCREENS: "screens", + COMPONENTS: "components", + THEME: "theme", + NAVIGATION: "navigation", + LAYOUTS: "layouts", +} + export const FrontendTypes = { PAGE: "page", SCREEN: "screen", diff --git a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/[asset]/_fallback.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[assetType]/[asset]/_fallback.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/[asset]/_fallback.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/_layout.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/index.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[tab]/_layout.svelte new file mode 100644 index 0000000000..d41fc0ee34 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[tab]/_layout.svelte @@ -0,0 +1,2 @@ + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[tab]/index.svelte new file mode 100644 index 0000000000..4c72ebe7a2 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[tab]/index.svelte @@ -0,0 +1,6 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte index d41fc0ee34..b7a20f24c5 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte @@ -1,2 +1,64 @@ + + - +
+
+ + $goto(`./${DesignTabs.SCREENS}`)} + /> + $goto(`./${DesignTabs.COMPONENTS}`)} + /> + $goto(`./${DesignTabs.THEME}`)} + /> + $goto(`./${DesignTabs.NAVIGATION}`)} + /> + $goto(`./${DesignTabs.LAYOUTS}`)} + /> + +
+ +
+ +
+
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte index 4c72ebe7a2..5002f4d1b7 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte @@ -1,6 +1,6 @@ From 4126e5884d10d5a0611b3851d551a13b2f0b08a2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 21 Apr 2022 17:06:11 +0100 Subject: [PATCH 006/207] Add reusable utility to sync URL params with state --- .../src/builderStore/store/frontend.js | 3 +- packages/builder/src/helpers/urlStateSync.js | 106 ++++++++++++++++++ .../app/[application]/design/_layout.svelte | 44 ++++++-- 3 files changed, 142 insertions(+), 11 deletions(-) create mode 100644 packages/builder/src/helpers/urlStateSync.js diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 3ffc890c7d..dd844ef5ab 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -15,7 +15,7 @@ import { tables, } from "stores/backend" import { API } from "api" -import { FrontendTypes } from "constants" +import { DesignTabs, FrontendTypes } from "constants" import analytics, { Events } from "analytics" import { findComponentType, @@ -48,6 +48,7 @@ const INITIAL_FRONTEND_STATE = { continueIfAction: false, }, currentFrontEndType: "none", + selectedDesignTab: DesignTabs.SCREENS, selectedScreenId: "", selectedLayoutId: "", selectedComponentId: "", diff --git a/packages/builder/src/helpers/urlStateSync.js b/packages/builder/src/helpers/urlStateSync.js new file mode 100644 index 0000000000..22ef98ded7 --- /dev/null +++ b/packages/builder/src/helpers/urlStateSync.js @@ -0,0 +1,106 @@ +import { get } from "svelte/store" + +export const syncURLToState = options => { + const { keys, params, store, goto } = options || {} + if ( + !keys?.length || + !params?.subscribe || + !store?.subscribe || + !goto?.subscribe + ) { + return + } + + // We can't dynamically fetch the value of routify stores so we need to + // just subscribe and cache the latest versions. + // We can grab their initial values as this is during component + // initialisation. + let cachedParams = get(params) + let cachedGoto = get(goto) + + // Updates state with new URL params + const mapUrlToState = params => { + // Determine any required state updates + let stateUpdates = [] + const state = get(store) + for (let key of keys) { + const urlValue = params?.[key.url] + const stateValue = state?.[key.state] + if (urlValue !== stateValue) { + console.log( + `state.${key.state} (${stateValue}) <= url.${key.url} (${urlValue})` + ) + stateUpdates.push(state => { + state[key.state] = urlValue + }) + } + } + + // Avoid updating the store at all if not necessary to prevent a wasted + // store invalidation + if (!stateUpdates.length) { + return + } + + // Apply the required state updates + console.log("Performing", stateUpdates.length, "state updates") + store.update(state => { + for (let update of stateUpdates) { + update(state) + } + return state + }) + } + + // Updates the URL with new state values + const mapStateToUrl = state => { + // Determine new URL while checking for changes + let url = "." + let needsUpdate = false + for (let key of keys) { + const urlValue = cachedParams?.[key.url] + const stateValue = state?.[key.state] + url += `/${stateValue}` + if (stateValue !== urlValue) { + console.log( + `url.${key.url} (${urlValue}) <= state.${key.state} (${stateValue})` + ) + needsUpdate = true + } + } + + // Avoid updating the URL if not necessary to prevent a wasted render + // cycle + if (!needsUpdate) { + return + } + + // Navigate to the new URL + console.log("Navigating to", url) + cachedGoto(url) + } + + // Initially hydrate state from URL + mapUrlToState(cachedParams) + + // Subscribe to URL changes and cache them + const unsubscribeParams = params.subscribe($urlParams => { + cachedParams = $urlParams + mapUrlToState($urlParams) + }) + + // Subscribe to goto changes and cache them + const unsubscribeGoto = goto.subscribe($goto => { + cachedGoto = $goto + }) + + // Subscribe to store changes and keep URL up to date + const unsubscribeStore = store.subscribe(mapStateToUrl) + + // Return an unsync function to cancel subscriptions + return () => { + unsubscribeParams() + unsubscribeGoto() + unsubscribeStore() + } +} diff --git a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte index b7a20f24c5..0ea4e8456d 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte @@ -2,6 +2,30 @@ import { IconSideNav, IconSideNavItem } from "@budibase/bbui" import { params, goto } from "@roxi/routify" import { DesignTabs } from "constants" + import { store } from "builderStore" + import { syncURLToState } from "helpers/urlStateSync" + import { onDestroy } from "svelte" + + const updateTab = tab => { + store.update(state => { + state.selectedDesignTab = tab + return state + }) + } + + const unsync = syncURLToState({ + keys: [ + { + url: "tab", + state: "selectedDesignTab", + }, + ], + store, + params, + goto, + }) + + onDestroy(unsync) @@ -11,32 +35,32 @@ $goto(`./${DesignTabs.SCREENS}`)} + active={$store.selectedDesignTab === DesignTabs.SCREENS} + on:click={() => updateTab(DesignTabs.SCREENS)} /> $goto(`./${DesignTabs.COMPONENTS}`)} + active={$store.selectedDesignTab === DesignTabs.COMPONENTS} + on:click={() => updateTab(DesignTabs.COMPONENTS)} /> $goto(`./${DesignTabs.THEME}`)} + active={$store.selectedDesignTab === DesignTabs.THEME} + on:click={() => updateTab(DesignTabs.THEME)} /> $goto(`./${DesignTabs.NAVIGATION}`)} + active={$store.selectedDesignTab === DesignTabs.NAVIGATION} + on:click={() => updateTab(DesignTabs.NAVIGATION)} /> $goto(`./${DesignTabs.LAYOUTS}`)} + active={$store.selectedDesignTab === DesignTabs.LAYOUTS} + on:click={() => updateTab(DesignTabs.LAYOUTS)} />
From c35906a8311272ddffa4d2b7ad220ec1fb1b36ae Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 22 Apr 2022 16:03:47 +0100 Subject: [PATCH 007/207] Refactor routes and start updating core design UI into new components --- .../bbui/src/StatusLight/StatusLight.svelte | 13 ++++ .../src/builderStore/store/frontend.js | 7 +- .../src/components/common/NavItem.svelte | 22 ++++-- .../design/AppPanel/AppPanel.svelte | 57 +++++++++++++++ .../AppPreview.svelte} | 13 ++-- .../AppThemeSelect.svelte | 0 .../ComponentSelectionList.svelte | 0 .../DevicePreviewSelect.svelte | 0 .../ThemeEditor.svelte | 3 - .../componentStructure.json | 0 .../iframeTemplate.js | 0 .../src/components/design/AppPreview/index.js | 1 - .../ComponentNavigationTree/PathTree.svelte | 44 +----------- .../FrontendNavigatePane.svelte | 16 +---- .../NavigationPanel/NavigationPanel.svelte | 70 +++++++++++++++++++ packages/builder/src/constants/index.js | 13 ++-- packages/builder/src/helpers/urlStateSync.js | 2 +- .../design/{ => [screenId]}/_layout.svelte | 42 +++++------ .../design/[screenId]/components/index.svelte | 1 + .../design/[screenId]/index.svelte | 5 ++ .../design/[screenId]/layouts/index.svelte | 1 + .../design/[screenId]/navigation/index.svelte | 1 + .../_components}/ScreenDetailsModal.svelte | 0 .../_components}/ScreenDropdownMenu.svelte | 2 +- .../design/[screenId]/screens/_layout.svelte | 1 + .../[assetType]/[asset]/_fallback.svelte | 0 .../screens/_old}/[assetType]/_layout.svelte | 47 +------------ .../screens/_old}/[assetType]/index.svelte | 0 .../design/[screenId]/screens/index.svelte | 69 ++++++++++++++++++ .../design/[screenId]/theme/index.svelte | 1 + .../[application]/design/[tab]/_layout.svelte | 2 - .../[application]/design/[tab]/index.svelte | 6 -- .../app/[application]/design/index.svelte | 19 ++++- .../client/src/components/ClientApp.svelte | 2 +- 34 files changed, 292 insertions(+), 168 deletions(-) create mode 100644 packages/builder/src/components/design/AppPanel/AppPanel.svelte rename packages/builder/src/components/design/{AppPreview/CurrentItemPreview.svelte => AppPanel/AppPreview.svelte} (96%) rename packages/builder/src/components/design/{AppPreview => AppPanel}/AppThemeSelect.svelte (100%) rename packages/builder/src/components/design/{AppPreview => AppPanel}/ComponentSelectionList.svelte (100%) rename packages/builder/src/components/design/{AppPreview => AppPanel}/DevicePreviewSelect.svelte (100%) rename packages/builder/src/components/design/{AppPreview => AppPanel}/ThemeEditor.svelte (98%) rename packages/builder/src/components/design/{AppPreview => AppPanel}/componentStructure.json (100%) rename packages/builder/src/components/design/{AppPreview => AppPanel}/iframeTemplate.js (100%) delete mode 100644 packages/builder/src/components/design/AppPreview/index.js create mode 100644 packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte rename packages/builder/src/pages/builder/app/[application]/design/{ => [screenId]}/_layout.svelte (55%) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte rename packages/builder/src/{components/design/NavigationPanel => pages/builder/app/[application]/design/[screenId]/screens/_components}/ScreenDetailsModal.svelte (100%) rename packages/builder/src/{components/design/NavigationPanel/ComponentNavigationTree => pages/builder/app/[application]/design/[screenId]/screens/_components}/ScreenDropdownMenu.svelte (97%) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte rename packages/builder/src/pages/builder/app/[application]/design/{[tab] => [screenId]/screens/_old}/[assetType]/[asset]/_fallback.svelte (100%) rename packages/builder/src/pages/builder/app/[application]/design/{[tab] => [screenId]/screens/_old}/[assetType]/_layout.svelte (86%) rename packages/builder/src/pages/builder/app/[application]/design/{[tab] => [screenId]/screens/_old}/[assetType]/index.svelte (100%) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/design/[tab]/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/design/[tab]/index.svelte diff --git a/packages/bbui/src/StatusLight/StatusLight.svelte b/packages/bbui/src/StatusLight/StatusLight.svelte index f56fee0c2a..6bd1ead558 100644 --- a/packages/bbui/src/StatusLight/StatusLight.svelte +++ b/packages/bbui/src/StatusLight/StatusLight.svelte @@ -17,10 +17,13 @@ export let negative = false export let disabled = false export let active = false + export let color = null
+ + diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index dd844ef5ab..909bbcf9f8 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -15,7 +15,7 @@ import { tables, } from "stores/backend" import { API } from "api" -import { DesignTabs, FrontendTypes } from "constants" +import { FrontendTypes } from "constants" import analytics, { Events } from "analytics" import { findComponentType, @@ -48,8 +48,6 @@ const INITIAL_FRONTEND_STATE = { continueIfAction: false, }, currentFrontEndType: "none", - selectedDesignTab: DesignTabs.SCREENS, - selectedScreenId: "", selectedLayoutId: "", selectedComponentId: "", errors: [], @@ -61,6 +59,9 @@ const INITIAL_FRONTEND_STATE = { theme: "", customTheme: {}, previewDevice: "desktop", + + // URL params + selectedScreenId: null, } export const getFrontendStore = () => { diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index 364ae50f64..3aba4c7a1b 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -1,5 +1,5 @@ + +
+
+ + {#if $store.clientFeatures.devicePreview} + + {/if} + {#if $store.clientFeatures.customThemes} + + {:else if $store.clientFeatures.spectrumThemes} + + {/if} +
+
+ {#key $store.version} + + {/key} +
+
+ + diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPanel/AppPreview.svelte similarity index 96% rename from packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte rename to packages/builder/src/components/design/AppPanel/AppPreview.svelte index 28bc50d15a..5eda3ce080 100644 --- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte +++ b/packages/builder/src/components/design/AppPanel/AppPreview.svelte @@ -1,7 +1,7 @@ + +
+
+
+ {title || ""} +
+ {#if showAddButton} +
+ +
+ {/if} +
+ +
+ + diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js index 0316a77550..d4b7116c01 100644 --- a/packages/builder/src/constants/index.js +++ b/packages/builder/src/constants/index.js @@ -1,13 +1,14 @@ +import { Roles } from "./backend" + export const TableNames = { USERS: "ta_users", } -export const DesignTabs = { - SCREENS: "screens", - COMPONENTS: "components", - THEME: "theme", - NAVIGATION: "navigation", - LAYOUTS: "layouts", +export const RoleColours = { + [Roles.ADMIN]: "var(--spectrum-global-color-static-seafoam-400)", + [Roles.POWER]: "var(--spectrum-global-color-static-purple-400)", + [Roles.BASIC]: "var(--spectrum-global-color-static-magenta-400)", + [Roles.PUBLIC]: "var(--spectrum-global-color-static-yellow-400)", } export const FrontendTypes = { diff --git a/packages/builder/src/helpers/urlStateSync.js b/packages/builder/src/helpers/urlStateSync.js index 22ef98ded7..7b33caf042 100644 --- a/packages/builder/src/helpers/urlStateSync.js +++ b/packages/builder/src/helpers/urlStateSync.js @@ -55,7 +55,7 @@ export const syncURLToState = options => { // Updates the URL with new state values const mapStateToUrl = state => { // Determine new URL while checking for changes - let url = "." + let url = ".." let needsUpdate = false for (let key of keys) { const urlValue = cachedParams?.[key.url] diff --git a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte similarity index 55% rename from packages/builder/src/pages/builder/app/[application]/design/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte index 0ea4e8456d..5a93854033 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte @@ -1,23 +1,15 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte new file mode 100644 index 0000000000..b0615c5c1f --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte @@ -0,0 +1 @@ +Layouts diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte new file mode 100644 index 0000000000..06b36d1aae --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte @@ -0,0 +1 @@ +Navigation diff --git a/packages/builder/src/components/design/NavigationPanel/ScreenDetailsModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte similarity index 100% rename from packages/builder/src/components/design/NavigationPanel/ScreenDetailsModal.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte similarity index 97% rename from packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte index 76bb48a26c..b4b612d655 100644 --- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte @@ -10,7 +10,7 @@ Helpers, notifications, } from "@budibase/bbui" - import ScreenDetailsModal from "../ScreenDetailsModal.svelte" + import ScreenDetailsModal from "./ScreenDetailsModal.svelte" import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl" import analytics, { Events } from "analytics" import { makeComponentUnique } from "builderStore/componentUtils" diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte new file mode 100644 index 0000000000..4fa864ce7a --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte @@ -0,0 +1 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/[asset]/_fallback.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/[asset]/_fallback.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/[asset]/_fallback.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/_layout.svelte similarity index 86% rename from packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/_layout.svelte index 44240c61f1..e79ae0287c 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/_layout.svelte @@ -156,24 +156,7 @@
- {#if $currentAsset} -
- - {#if $store.clientFeatures.devicePreview} - - {/if} - {#if $store.clientFeatures.customThemes} - - {:else if $store.clientFeatures.spectrumThemes} - - {/if} -
-
- {#key $store.version} - - {/key} -
- {:else} + {#if $currentAsset}{:else}
@@ -247,34 +230,6 @@ border-right: var(--border-light); } - .preview-pane { - grid-column: 2; - overflow-y: auto; - display: flex; - flex-direction: column; - justify-content: flex-start; - align-items: stretch; - gap: var(--spacing-m); - padding: var(--spacing-xl) 40px; - } - .preview-header { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: flex-start; - gap: 1rem; - } - .preview-header > :global(*) { - flex: 0 0 auto; - } - .preview-header > :global(*:first-child) { - flex: 1 1 auto; - } - - .preview-content { - flex: 1 1 auto; - } - .components-pane { grid-column: 3; background-color: var(--background); diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/index.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte new file mode 100644 index 0000000000..abd49b91e1 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte @@ -0,0 +1,69 @@ + + + + + (searchString = e.detail)} + /> + role.name} getOptionValue={role => role._id} - options={$roles} + options={[{ name: "All screens", _id: "all" }, ...$roles]} /> {#each filteredScreens as screen (screen._id)} @@ -66,4 +75,6 @@ {/each} + + From 03249d98692f6a4065bbd67bf8b851ca2a5cbf46 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 25 Apr 2022 14:57:12 +0100 Subject: [PATCH 010/207] Tidy up new screen workflow and integrate with new UI --- .../builder/app/[application]/_layout.svelte | 2 +- .../_components/DatasourceModal.svelte | 34 +++++++++++-------- .../screens/_components/NewScreenModal.svelte | 5 ++- .../_components/ScreenDetailsModal.svelte | 2 ++ 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index bbdc1c50b4..c533e9d232 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -195,7 +195,7 @@ size="M" name="ArrowLeft" hoverable - on:click={() => $goto("../")} + on:click={() => $goto("../../portal/apps")} /> {$store.name || "App"}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte index e9233113bb..874a109952 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte @@ -1,6 +1,12 @@ From 4132b56a4ab155d52fd48b314d9ed77f7e310fc4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 25 Apr 2022 14:58:41 +0100 Subject: [PATCH 011/207] Make publish button CTA and tidy up alignment --- .../src/components/deploy/DeployModal.svelte | 54 +++++++++---------- .../design/AppPanel/AppPanel.svelte | 2 +- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte index ffda399440..338a76e470 100644 --- a/packages/builder/src/components/deploy/DeployModal.svelte +++ b/packages/builder/src/components/deploy/DeployModal.svelte @@ -58,7 +58,7 @@ } - + - - - -
- - - - App Published! -
- - - - + + +
+ + + + App Published! +
+ + + diff --git a/packages/builder/src/components/design/AppPanel/AppPreview.svelte b/packages/builder/src/components/design/AppPanel/AppPreview.svelte index 5eda3ce080..2e117ecfb3 100644 --- a/packages/builder/src/components/design/AppPanel/AppPreview.svelte +++ b/packages/builder/src/components/design/AppPanel/AppPreview.svelte @@ -1,7 +1,7 @@ + +
+ {#if title} +
+ {#if icon} + + {/if} +
+ {title || ""} +
+
+ {/if} + +
+ + diff --git a/packages/builder/src/helpers/urlStateSync.js b/packages/builder/src/helpers/urlStateSync.js index cbe4ad0e4a..2e043fbcf5 100644 --- a/packages/builder/src/helpers/urlStateSync.js +++ b/packages/builder/src/helpers/urlStateSync.js @@ -2,7 +2,7 @@ import { get } from "svelte/store" import { isChangingPage } from "@roxi/routify" export const syncURLToState = options => { - const { keys, params, store, goto, redirect } = options || {} + const { keys, params, store, goto, redirect, baseUrl = "." } = options || {} if ( !keys?.length || !params?.subscribe || @@ -22,13 +22,15 @@ export const syncURLToState = options => { let cachedGoto = get(goto) let cachedRedirect = get(redirect) let hydrated = false + let debug = false + const log = (...params) => debug && console.log(...params) // Navigate to a certain URL const gotoUrl = url => { if (get(isChangingPage) && hydrated) { return } - console.log("Navigating to", url) + log("Navigating to", url) cachedGoto(url) } @@ -37,7 +39,7 @@ export const syncURLToState = options => { if (get(isChangingPage) && hydrated) { return } - console.log("Redirecting to", url) + log("Redirecting to", url) cachedRedirect(url) } @@ -50,7 +52,7 @@ export const syncURLToState = options => { const urlValue = params?.[key.url] const stateValue = state?.[key.state] if (urlValue && urlValue !== stateValue) { - console.log( + log( `state.${key.state} (${stateValue}) <= url.${key.url} (${urlValue})` ) stateUpdates.push(state => { @@ -58,7 +60,7 @@ export const syncURLToState = options => { }) if (key.validate && key.fallbackUrl) { if (!key.validate(urlValue)) { - console.log("Invalid URL param!") + log("Invalid URL param!") redirectUrl(key.fallbackUrl) hydrated = true return @@ -77,7 +79,7 @@ export const syncURLToState = options => { } // Apply the required state updates - console.log("Performing", stateUpdates.length, "state updates") + log("Performing", stateUpdates.length, "state updates") store.update(state => { for (let update of stateUpdates) { update(state) @@ -89,7 +91,7 @@ export const syncURLToState = options => { // Updates the URL with new state values const mapStateToUrl = state => { // Determine new URL while checking for changes - let url = ".." + let url = baseUrl let needsUpdate = false for (let key of keys) { const urlValue = cachedParams?.[key.url] @@ -97,12 +99,12 @@ export const syncURLToState = options => { url += `/${stateValue}` if (stateValue !== urlValue) { needsUpdate = true - console.log( + log( `url.${key.url} (${urlValue}) <= state.${key.state} (${stateValue})` ) if (key.validate && key.fallbackUrl) { if (!key.validate(stateValue)) { - console.log("Invalid state param!") + log("Invalid state param!") redirectUrl(key.fallbackUrl) return } diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte deleted file mode 100644 index d70922c14a..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte deleted file mode 100644 index 4fa864ce7a..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte +++ /dev/null @@ -1 +0,0 @@ - diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte similarity index 70% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/design/_layout.svelte index ad17c127b6..01b21d8cc5 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte @@ -1,30 +1,8 @@ -
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/components/index.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte index ff5cb19fdc..d70922c14a 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte @@ -1,19 +1,5 @@ - -{#if loaded} - You need to create a screen! -{/if} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/layouts/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/layouts/index.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/navigation/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/navigation/index.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/[screenId].svelte similarity index 70% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/screens/[screenId].svelte index b40f246f5b..a56978404b 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/screens/[screenId].svelte @@ -2,18 +2,26 @@ import { Search, Layout, Select } from "@budibase/bbui" import NavigationPanel from "components/design/NavigationPanel/NavigationPanel.svelte" import { roles } from "stores/backend" - import { store, allScreens } from "builderStore" + import { store, selectedScreen } from "builderStore" import NavItem from "components/common/NavItem.svelte" import ScreenDropdownMenu from "./_components/ScreenDropdownMenu.svelte" - import AppPanel from "components/design/AppPanel/AppPanel.svelte" import { RoleColours } from "constants" import ScreenWizard from "./_components/ScreenWizard.svelte" + import { onDestroy } from "svelte" + import { syncURLToState } from "helpers/urlStateSync" + import { goto, params, redirect } from "@roxi/routify" + import AppPanel from "components/design/AppPanel/AppPanel.svelte" + import SettingsPanel from "components/design/SettingsPanel/SettingsPanel.svelte" let searchString let accessRole = "all" let showNewScreenModal - $: filteredScreens = getFilteredScreens($allScreens, searchString, accessRole) + $: filteredScreens = getFilteredScreens( + $store.screens, + searchString, + accessRole + ) const getFilteredScreens = (screens, search, role) => { return screens @@ -32,6 +40,24 @@ const getRoleColor = roleId => { return RoleColours[roleId] || "pink" } + + // Keep URL and state in sync for selected screen ID + const stopSyncing = syncURLToState({ + keys: [ + { + url: "screenId", + state: "selectedScreenId", + validate: screenId => $store.screens.some(x => x._id === screenId), + fallbackUrl: "../", + }, + ], + store, + params, + goto, + redirect, + }) + + onDestroy(stopSyncing) - - - - - - - - {/each} - - + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/DatasourceModal.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte rename to packages/builder/src/pages/builder/app/[application]/design/screens/_components/DatasourceModal.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/NewScreenModal.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte rename to packages/builder/src/pages/builder/app/[application]/design/screens/_components/NewScreenModal.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenDetailsModal.svelte similarity index 94% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte rename to packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenDetailsModal.svelte index 42bc68f7c4..f8f390c582 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenDetailsModal.svelte @@ -1,7 +1,7 @@ + +{#if loaded} + You need to create a screen! +{/if} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/theme/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/theme/index.svelte From f3fc57a94db1db1c5dc511d93730239068451260 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 25 Apr 2022 19:59:30 +0100 Subject: [PATCH 015/207] Add screen settings panel --- packages/builder/src/builderStore/index.js | 9 +- .../src/components/common/NavItem.svelte | 2 +- .../NavigationPanel/NavigationPanel.svelte | 6 +- .../ScreenSettingsSection.svelte | 17 +- .../design/SettingsPanel/SettingsPanel.svelte | 2 +- .../_old/[assetType]/[asset]/_fallback.svelte | 0 .../design}/_old/[assetType]/_layout.svelte | 0 .../design}/_old/[assetType]/index.svelte | 0 .../design/screens/[screenId].svelte | 82 +--------- .../_components/ScreenNavigationPanel.svelte | 72 +++++++++ .../_components/ScreenSettingsPanel.svelte | 146 ++++++++++++++++++ 11 files changed, 230 insertions(+), 106 deletions(-) rename packages/builder/src/{pages/builder/app/[application]/design/screens => components/design}/_old/[assetType]/[asset]/_fallback.svelte (100%) rename packages/builder/src/{pages/builder/app/[application]/design/screens => components/design}/_old/[assetType]/_layout.svelte (100%) rename packages/builder/src/{pages/builder/app/[application]/design/screens => components/design}/_old/[assetType]/index.svelte (100%) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js index 3fb8eb7ab6..9d7c3ca128 100644 --- a/packages/builder/src/builderStore/index.js +++ b/packages/builder/src/builderStore/index.js @@ -13,14 +13,7 @@ export const selectedScreen = derived(store, $store => { return $store.screens.find(screen => screen._id === $store.selectedScreenId) }) -export const currentAsset = derived(store, $store => { - const type = $store.currentFrontEndType - if (type === FrontendTypes.SCREEN) { - } else if (type === FrontendTypes.LAYOUT) { - return $store.layouts.find(layout => layout._id === $store.selectedLayoutId) - } - return null -}) +export const currentAsset = selectedScreen export const selectedComponent = derived( [store, currentAsset], diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index a7649ca5dc..2601640ca7 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -46,7 +46,7 @@ class:border class:selected class:withActions - style={`padding-left: ${14 + indentLevel * 14}px`} + style={`padding-left: calc(var(--spacing-l) + ${indentLevel * 14}px)`} {draggable} on:dragend on:dragstart diff --git a/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte b/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte index 09dab3003c..04c0d93618 100644 --- a/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte +++ b/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte @@ -31,7 +31,7 @@ align-items: stretch; } .header { - height: 55px; + height: 48px; display: flex; flex-direction: row; justify-content: space-between; @@ -51,8 +51,8 @@ white-space: nowrap; } .add-button { - flex: 0 0 32px; - height: 32px; + flex: 0 0 30px; + height: 30px; display: grid; place-items: center; border-radius: 4px; diff --git a/packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte b/packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte index 3abeabc8d3..c8371e66ab 100644 --- a/packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte @@ -108,19 +108,4 @@ ] -{#if $store.currentView !== "component" && $currentAsset && $store.currentFrontEndType === FrontendTypes.SCREEN} - - {#each screenSettings as def (`${componentInstance._id}-${def.key}`)} - setAssetProps(def.key, val, def.parser, def.validate)} - {bindings} - props={{ error: errors[def.key] }} - /> - {/each} - -{/if} +{#if $store.currentView !== "component" && $currentAsset && $store.currentFrontEndType === FrontendTypes.SCREEN}{/if} diff --git a/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte b/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte index 3006130f8b..d5c217c4e7 100644 --- a/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte +++ b/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte @@ -30,7 +30,7 @@ align-items: stretch; } .header { - height: 55px; + height: 50px; display: flex; flex-direction: row; justify-content: flex-start; diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_old/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/components/design/_old/[assetType]/[asset]/_fallback.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/screens/_old/[assetType]/[asset]/_fallback.svelte rename to packages/builder/src/components/design/_old/[assetType]/[asset]/_fallback.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_old/[assetType]/_layout.svelte b/packages/builder/src/components/design/_old/[assetType]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/screens/_old/[assetType]/_layout.svelte rename to packages/builder/src/components/design/_old/[assetType]/_layout.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_old/[assetType]/index.svelte b/packages/builder/src/components/design/_old/[assetType]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/screens/_old/[assetType]/index.svelte rename to packages/builder/src/components/design/_old/[assetType]/index.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/[screenId].svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/[screenId].svelte index a56978404b..f88314521f 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/screens/[screenId].svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/screens/[screenId].svelte @@ -1,45 +1,11 @@ - - - (searchString = e.detail)} - /> - role.name} + getOptionValue={role => role._id} + options={[{ name: "All screens", _id: "all" }, ...$roles]} + /> + + {#each filteredScreens as screen (screen._id)} + ($store.selectedScreenId = screen._id)} + color={getRoleColor(screen.routing.roleId)} + > + + + {/each} + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte new file mode 100644 index 0000000000..573d629183 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte @@ -0,0 +1,146 @@ + + + + + {#each screenSettings as def (def.key)} + setAssetProps(def.key, val, def.parser, def.validate)} + props={{ ...def.props, error: errors[def.key] }} + /> + {/each} + + + From 3ae05668871cf9e5bc5bf5420d4d5f52a9c0a8d0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 25 Apr 2022 20:10:52 +0100 Subject: [PATCH 016/207] Tidy up and polish screen settings panel --- .../design/SettingsPanel/SettingsPanel.svelte | 2 +- .../_components/ScreenSettingsPanel.svelte | 55 +++++++++---------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte b/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte index d5c217c4e7..959c0d22c3 100644 --- a/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte +++ b/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte @@ -11,7 +11,7 @@ {#if icon} {/if} -
+
{title || ""}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte index 573d629183..0d0366d924 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte @@ -1,5 +1,4 @@ @@ -13,11 +11,6 @@ {#if $store.clientFeatures.devicePreview} {/if} - {#if $store.clientFeatures.customThemes} - - {:else if $store.clientFeatures.spectrumThemes} - - {/if}
{#key $store.version} diff --git a/packages/builder/src/components/design/AppPanel/AppThemeSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/theme/_components/AppThemeSelect.svelte similarity index 100% rename from packages/builder/src/components/design/AppPanel/AppThemeSelect.svelte rename to packages/builder/src/pages/builder/app/[application]/design/theme/_components/AppThemeSelect.svelte diff --git a/packages/builder/src/components/design/AppPanel/ThemeEditor.svelte b/packages/builder/src/pages/builder/app/[application]/design/theme/_components/ThemeEditor.svelte similarity index 98% rename from packages/builder/src/components/design/AppPanel/ThemeEditor.svelte rename to packages/builder/src/pages/builder/app/[application]/design/theme/_components/ThemeEditor.svelte index 933c9b27a7..9fb0c0c1b8 100644 --- a/packages/builder/src/components/design/AppPanel/ThemeEditor.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/theme/_components/ThemeEditor.svelte @@ -73,7 +73,7 @@
- Theme + Edit theme
+ import NavigationPanel from "components/design/NavigationPanel/NavigationPanel.svelte" + import { Body, Layout } from "@budibase/bbui" + import AppPanel from "components/design/AppPanel/AppPanel.svelte" + import ThemeEditor from "./_components/ThemeEditor.svelte" + + + + + Your theme is set across all the screens within your app + + + + + From 4b624e37c4e6e2dcd607fce7da4f94e4b967fb43 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 26 Apr 2022 07:41:58 +0100 Subject: [PATCH 019/207] Fix overflow not scrolling properly in side panels --- .../app/[application]/design/_layout.svelte | 7 +++++-- .../ComponentNavigationPanel.svelte | 21 +++++++++++++++++++ .../_components/ComponentSettingsPanel.svelte | 5 +++++ .../[screenId]/[componentId]/index.svelte | 10 +++++++++ .../components/[screenId]/_layout.svelte | 0 .../design/components/[screenId]/index.svelte | 0 .../new/_components/ComponentListPanel.svelte | 21 +++++++++++++++++++ .../new/_components}/componentStructure.json | 0 .../components/[screenId]/new/index.svelte | 0 9 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentSettingsPanel.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte rename packages/builder/src/{components/design/AppPanel => pages/builder/app/[application]/design/components/[screenId]/new/_components}/componentStructure.json (100%) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte index 01b21d8cc5..a29749472c 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte @@ -47,9 +47,11 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte new file mode 100644 index 0000000000..ccaebb2dde --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte @@ -0,0 +1,21 @@ + + + $goto("./new")} +> + + (searchString = e.detail)} + /> + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentSettingsPanel.svelte new file mode 100644 index 0000000000..335e46b447 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentSettingsPanel.svelte @@ -0,0 +1,5 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/index.svelte new file mode 100644 index 0000000000..255678ab0b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/index.svelte @@ -0,0 +1,10 @@ + + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte new file mode 100644 index 0000000000..e54925fbae --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte @@ -0,0 +1,21 @@ + + + $goto("../new")} +> + + (searchString = e.detail)} + /> + + diff --git a/packages/builder/src/components/design/AppPanel/componentStructure.json b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/componentStructure.json similarity index 100% rename from packages/builder/src/components/design/AppPanel/componentStructure.json rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/componentStructure.json diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte new file mode 100644 index 0000000000..e69de29bb2 From af93c329adeaba7d34314bcd361f77b6d304daba Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 26 Apr 2022 07:42:27 +0100 Subject: [PATCH 020/207] Fix overflow not scrolling properly in settings panel --- .../src/components/design/SettingsPanel/SettingsPanel.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte b/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte index 959c0d22c3..1f20bfa542 100644 --- a/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte +++ b/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte @@ -28,9 +28,10 @@ flex-direction: column; justify-content: flex-start; align-items: stretch; + overflow: auto; } .header { - height: 50px; + flex: 0 0 48px; display: flex; flex-direction: row; justify-content: flex-start; From cf0e3abb9021cc749829a651bde43d427615e23c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 26 Apr 2022 08:23:53 +0100 Subject: [PATCH 021/207] Add initial new 'add component' panel --- .../design/AppPanel/AppPanel.svelte | 2 - .../NavigationPanel/NavigationPanel.svelte | 16 ++- .../ComponentNavigationPanel.svelte | 2 +- .../[screenId]/[componentId]/index.svelte | 1 - .../components/[screenId]/_layout.svelte | 26 ++++ .../design/components/[screenId]/index.svelte | 15 ++ .../new/_components/ComponentListPanel.svelte | 130 +++++++++++++++++- .../components/[screenId]/new/index.svelte | 7 + .../design/components/index.svelte | 20 ++- .../_components/ScreenNavigationPanel.svelte | 2 +- 10 files changed, 208 insertions(+), 13 deletions(-) diff --git a/packages/builder/src/components/design/AppPanel/AppPanel.svelte b/packages/builder/src/components/design/AppPanel/AppPanel.svelte index 78b6dce457..96f5a24872 100644 --- a/packages/builder/src/components/design/AppPanel/AppPanel.svelte +++ b/packages/builder/src/components/design/AppPanel/AppPanel.svelte @@ -1,5 +1,4 @@ -
+
+ {#if showBackButton} + + {/if}
{title || ""}
@@ -29,9 +35,13 @@ flex-direction: column; justify-content: flex-start; align-items: stretch; + overflow: auto; + } + .navigation-panel.wide { + width: 360px; } .header { - height: 48px; + flex: 0 0 48px; display: flex; flex-direction: row; justify-content: space-between; diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte index ccaebb2dde..e54925fbae 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte @@ -9,7 +9,7 @@ $goto("./new")} + onClickAddButton={() => $goto("../new")} > - import { store } from "builderStore" import AppPanel from "components/design/AppPanel/AppPanel.svelte" import ComponentNavigationPanel from "./_components/ComponentNavigationPanel.svelte" import ComponentSettingsPanel from "./_components/ComponentSettingsPanel.svelte" diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte index e69de29bb2..5a8d26a452 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte @@ -0,0 +1,26 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte index e69de29bb2..e7f6eca5d7 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte @@ -0,0 +1,15 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte index e54925fbae..170a50e44d 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte @@ -1,21 +1,143 @@ $goto("../new")} + title="Add component" + showBackButton + onClickBackButton={() => $goto("../slot")} + wide > + + (section = "components")}>Components + (section = "blocks")}>Blocks + (searchString = e.detail)} /> + {#each filteredStructure as category} + +
+ {#each category.children as component} +
addComponent(component)}> + + {component.name} +
+ {/each} +
+ + {/each} + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte index e69de29bb2..8127a6b095 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte @@ -0,0 +1,7 @@ + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte index 908ffbc531..554ac89d94 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte @@ -1 +1,19 @@ -Components + + +{#if loaded} + You need to create a screen! +{/if} diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte index 6cc3b80426..5f37f1f4a5 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte @@ -43,7 +43,7 @@ > (searchString = e.detail)} /> From 2d6383a432f81c74e0c47682aee5d2f19d398044 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 26 Apr 2022 09:44:31 +0100 Subject: [PATCH 022/207] Update status light spacing --- packages/bbui/src/StatusLight/StatusLight.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bbui/src/StatusLight/StatusLight.svelte b/packages/bbui/src/StatusLight/StatusLight.svelte index eb065ab99a..e02cfb222e 100644 --- a/packages/bbui/src/StatusLight/StatusLight.svelte +++ b/packages/bbui/src/StatusLight/StatusLight.svelte @@ -53,7 +53,7 @@ --spectrum-statuslight-info-text-gap: 4px; } .spectrum-StatusLight.withText::before { - margin-right: 12px; + margin-right: 10px; } .custom::before { background: var(--color) !important; From a063011c4786bcf5ba0c1edfed94acb1aa9e7ffd Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 26 Apr 2022 09:44:59 +0100 Subject: [PATCH 023/207] Add new components above app preview --- .../design/AppPanel/AppPanel.svelte | 59 +++++++++++++++---- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/design/AppPanel/AppPanel.svelte b/packages/builder/src/components/design/AppPanel/AppPanel.svelte index 96f5a24872..a2b924ecef 100644 --- a/packages/builder/src/components/design/AppPanel/AppPanel.svelte +++ b/packages/builder/src/components/design/AppPanel/AppPanel.svelte @@ -1,14 +1,47 @@
- {#if $store.clientFeatures.devicePreview} - - {/if} +
+ updateNavigation("logoUrl", e.detail)} + placeholder="Add logo URL" + updateOnChange={false} + /> + {/if} + + + updateNavigation("hideTitle", !e.detail)} + /> + {#if !$store.navigation.hideTitle} + updateNavigation("title", e.detail)} + placeholder="Add title" + updateOnChange={false} + /> + {/if} + + @@ -103,7 +96,8 @@
@@ -112,27 +106,10 @@
-
- - -
-
- - -
diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 4df9087904..298ad34466 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -9,6 +9,7 @@ const component = getContext("component") const context = getContext("context") + // Legacy props which must remain unchanged for backwards compatibility export let title export let hideTitle = false export let logoUrl @@ -18,12 +19,18 @@ export let links export let width = "Large" - const navigationClasses = { + // New props from new design UI + export let navBackground + export let navTextColor + export let navWidth + export let pageWidth + + const NavigationClasses = { Top: "top", Left: "left", None: "none", } - const widthClasses = { + const WidthClasses = { Max: "max", Large: "l", Medium: "m", @@ -49,8 +56,15 @@ } $: validLinks = links?.filter(link => link.text && link.url) || [] - $: typeClass = navigationClasses[navigation] || "none" - $: widthClass = widthClasses[width] || "l" + $: typeClass = NavigationClasses[navigation] || NavigationClasses.None + $: navWidthClass = WidthClasses[navWidth || width] || WidthClasses.Large + $: pageWidthClass = WidthClasses[pageWidth || width] || WidthClasses.Large + $: navStyle = getNavStyle( + navBackground, + navTextColor, + $context.device.width, + $context.device.height + ) let mobileOpen = false const isInternal = url => { @@ -83,6 +97,17 @@ return navigation === "Top" ? "137px" : "0px" } } + + const getNavStyle = (backgroundColor, textColor, width, height) => { + let style = `--width:${width}px;--height:${height}px;` + if (backgroundColor) { + style += `--navBackground: ${backgroundColor};` + } + if (textColor) { + style += `--navTextColor: ${textColor};` + } + return style + }
-
+
{#if validLinks?.length}
@@ -165,7 +190,7 @@
{/if}
-
+
diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js index d527e69ef9..4daa8f684c 100644 --- a/packages/client/src/stores/screens.js +++ b/packages/client/src/stores/screens.js @@ -47,18 +47,17 @@ const createScreenStore = () => { } if (activeScreen?.showNavigation) { navigationSettings = - $builderStore.navigation || $appStore.application?.navigation + $builderStore.navigation || $appStore.application?.navigation || {} - // Legacy - if this is a legacy screen without any navigation - // settings fall back to just showing the app title - if (!navigationSettings) { - navigationSettings = { - title: $appStore.application?.name, - } - } + // Default navigation to top if (!navigationSettings.navigation) { navigationSettings.navigation = "Top" } + + // Default title to app name + if (!navigationSettings.title && !navigationSettings.hideTitle) { + navigationSettings.title = $appStore.application?.name + } } activeLayout = { _id: "layout", From c96b268c2f9dc08a5a1a47ec89048ee97ddcb1f4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 6 May 2022 13:59:16 +0100 Subject: [PATCH 055/207] Automatically go to navigation section when clicking navigation in preview --- .../design/[screenId]/_components/AppPreview.svelte | 4 ++++ packages/client/src/components/app/Layout.svelte | 8 ++++++++ packages/client/src/stores/builder.js | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte index 0c8cadff45..a9b344ce41 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte @@ -182,6 +182,10 @@ store.actions.components.copy(source, true) await store.actions.components.paste(destination, data.mode) } + } else if (type === "click-nav") { + if (!$isActive("./navigation")) { + $goto("./navigation") + } } else { console.warn(`Client sent unknown event type: ${type}`) } diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 298ad34466..0aa65474d3 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -121,6 +121,8 @@ class="nav-wrapper" class:sticky class:hidden={isPeeking} + class:clickable={$builderStore.inBuilder} + on:click={$builderStore.inBuilder ? builderStore.actions.clickNav : null} style={navStyle} >
@@ -221,6 +223,12 @@ border-bottom: 1px solid var(--spectrum-global-color-gray-300); box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.05); } + .nav-wrapper.clickable { + cursor: pointer; + } + .nav-wrapper.clickable .nav { + pointer-events: none; + } .nav-wrapper.hidden { display: none; } diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js index ae6e5db74b..742419048b 100644 --- a/packages/client/src/stores/builder.js +++ b/packages/client/src/stores/builder.js @@ -76,6 +76,10 @@ const createBuilderStore = () => { } store.update(state => ({ ...state, editMode: enabled })) }, + clickNav: () => { + console.log("click nav") + dispatchEvent("click-nav") + }, } return { ...store, From b5264fd93de4d0215762f8b121310f5f831a38f2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 6 May 2022 14:09:35 +0100 Subject: [PATCH 056/207] Hide dev tools when in screen peek modal --- packages/client/src/components/ClientApp.svelte | 5 ++++- packages/client/src/components/app/Layout.svelte | 10 +--------- packages/client/src/stores/builder.js | 1 - 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 601b6cb491..3232a01527 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -42,7 +42,10 @@ let permissionError = false // Determine if we should show devtools or not - $: isDevPreview = $appStore.isDevApp && !$builderStore.inBuilder + $: isDevPreview = + $appStore.isDevApp && + !$builderStore.inBuilder && + !$routeStore.queryParams?.peek // Handle no matching route $: { diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 0aa65474d3..93cbb84e6d 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -47,14 +47,6 @@ }) setContext("layout", store) - // Permanently go into peek mode if we ever get the peek flag - let isPeeking = false - $: { - if ($routeStore.queryParams?.peek) { - isPeeking = true - } - } - $: validLinks = links?.filter(link => link.text && link.url) || [] $: typeClass = NavigationClasses[navigation] || NavigationClasses.None $: navWidthClass = WidthClasses[navWidth || width] || WidthClasses.Large @@ -120,7 +112,7 @@
{ store.update(state => ({ ...state, editMode: enabled })) }, clickNav: () => { - console.log("click nav") dispatchEvent("click-nav") }, } From 475fc3e127a73ab8134b4f83ea48719644d33294 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 6 May 2022 14:52:38 +0100 Subject: [PATCH 057/207] Add majority of new theme panel --- .../design/[screenId]/navigation/index.svelte | 16 +-- .../theme/_components/ThemeEditor.svelte | 12 -- .../design/[screenId]/theme/index.svelte | 110 +++++++++++++++++- 3 files changed, 115 insertions(+), 23 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte index d69012966a..d520674e61 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte @@ -17,7 +17,7 @@ import { onMount } from "svelte" import { DefaultAppTheme } from "constants" - const updateNavigation = async (key, value) => { + const update = async (key, value) => { try { let navigation = $store.navigation navigation[key] = value @@ -65,13 +65,13 @@ selected={$store.navigation.navigation === "Top"} quiet={$store.navigation.navigation !== "Top"} icon="PaddingTop" - on:click={() => updateNavigation("navigation", "Top")} + on:click={() => update("navigation", "Top")} /> updateNavigation("navigation", "Left")} + on:click={() => update("navigation", "Left")} /> @@ -79,19 +79,19 @@ updateNavigation("sticky", e.detail)} + on:change={e => update("sticky", e.detail)} /> {/if} updateNavigation("hideLogo", !e.detail)} + on:change={e => update("hideLogo", !e.detail)} /> {#if !$store.navigation.hideLogo} updateNavigation("logoUrl", e.detail)} + on:change={e => update("logoUrl", e.detail)} placeholder="Add logo URL" updateOnChange={false} /> @@ -101,12 +101,12 @@ updateNavigation("hideTitle", !e.detail)} + on:change={e => update("hideTitle", !e.detail)} /> {#if !$store.navigation.hideTitle} updateNavigation("title", e.detail)} + on:change={e => update("title", e.detail)} placeholder="Add title" updateOnChange={false} /> diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeEditor.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeEditor.svelte index a592ce3c15..418789e7d5 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeEditor.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeEditor.svelte @@ -94,21 +94,9 @@
-
-
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte index 8f6fe37f2c..177940a94c 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte @@ -1,7 +1,48 @@ @@ -9,6 +50,69 @@ Your theme is set across all the screens within your app - + + + + + +
+ {#each ButtonBorderRadiusOptions as option} +
+ +
+ {/each} +
+ + + + update("primaryColor", e.detail)} + /> + + + + update("primaryColorHover", e.detail)} + /> + + + From 8fbad1b6dd3b28268eeda32b81bd871ff226a467 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 May 2022 09:39:44 +0100 Subject: [PATCH 058/207] Add theme slider and completed theme panel to new design UI --- packages/bbui/package.json | 1 + packages/bbui/src/Form/Core/Slider.svelte | 71 +++++++++++++++++++ packages/bbui/src/Form/Core/index.js | 1 + packages/bbui/src/Form/Slider.svelte | 24 +++++++ packages/bbui/src/index.js | 1 + packages/bbui/yarn.lock | 5 ++ .../theme/_components/AppThemeSelect.svelte | 54 +++++++------- .../theme/_components/ThemeEditor.svelte | 1 - .../design/[screenId]/theme/index.svelte | 2 + 9 files changed, 133 insertions(+), 27 deletions(-) create mode 100644 packages/bbui/src/Form/Core/Slider.svelte create mode 100644 packages/bbui/src/Form/Slider.svelte diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4e71266659..07df005e8c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -66,6 +66,7 @@ "@spectrum-css/radio": "^3.0.2", "@spectrum-css/search": "^3.0.2", "@spectrum-css/sidenav": "^3.0.2", + "@spectrum-css/slider": "3.0.1", "@spectrum-css/statuslight": "^3.0.2", "@spectrum-css/stepper": "^3.0.3", "@spectrum-css/switch": "^1.0.2", diff --git a/packages/bbui/src/Form/Core/Slider.svelte b/packages/bbui/src/Form/Core/Slider.svelte new file mode 100644 index 0000000000..b49f648d88 --- /dev/null +++ b/packages/bbui/src/Form/Core/Slider.svelte @@ -0,0 +1,71 @@ + + +
+ +
+ + diff --git a/packages/bbui/src/Form/Core/index.js b/packages/bbui/src/Form/Core/index.js index 3c3f9acb4d..caf791e757 100644 --- a/packages/bbui/src/Form/Core/index.js +++ b/packages/bbui/src/Form/Core/index.js @@ -11,3 +11,4 @@ export { default as CoreDatePicker } from "./DatePicker.svelte" export { default as CoreDropzone } from "./Dropzone.svelte" export { default as CoreStepper } from "./Stepper.svelte" export { default as CoreRichTextField } from "./RichTextField.svelte" +export { default as CoreSlider } from "./Slider.svelte" diff --git a/packages/bbui/src/Form/Slider.svelte b/packages/bbui/src/Form/Slider.svelte new file mode 100644 index 0000000000..34b2251b35 --- /dev/null +++ b/packages/bbui/src/Form/Slider.svelte @@ -0,0 +1,24 @@ + + + + + diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index c20b0aecf6..7d5baad474 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -66,6 +66,7 @@ export { default as MarkdownViewer } from "./Markdown/MarkdownViewer.svelte" export { default as RichTextField } from "./Form/RichTextField.svelte" export { default as IconSideNav } from "./IconSideNav/IconSideNav.svelte" export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte" +export { default as Slider } from "./Form/Slider.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock index 39ea673c4b..d301afea53 100644 --- a/packages/bbui/yarn.lock +++ b/packages/bbui/yarn.lock @@ -206,6 +206,11 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== +"@spectrum-css/slider@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" + integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== + "@spectrum-css/statuslight@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte index cdab47db66..2165e3bec9 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte @@ -1,29 +1,21 @@ -
- -
-
-
- -
-
- -
- -
- -
- - - - From dfc8faa73cf32dc0808f00772e1c98f5667d2b69 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 11:36:42 +0100 Subject: [PATCH 060/207] Unset home screen flag when duplicating screen --- .../[screenId]/screens/_components/ScreenDropdownMenu.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte index e9179ee828..90b2649deb 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte @@ -35,6 +35,7 @@ // Attach the new name and URL duplicateScreen.routing.route = sanitizeUrl(screenUrl) + duplicateScreen.routing.homeScreen = false duplicateScreen.props._instanceName = screenName try { From 39be0aac69869a7d56782ac5fd1600f139712314 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 11:47:21 +0100 Subject: [PATCH 061/207] Prevent multiple home screen assignment for the same role by changing role on existing screens --- .../_components/ScreenSettingsPanel.svelte | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte index 7764ea04bf..850b56eac4 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte @@ -69,14 +69,21 @@ } // Update screen object in store - store.update(state => { - setWith(get(selectedScreen), key.split("."), value, Object) - return state + // If there are 2 home screens after this change, remove this screen as a + // home screen + const screen = get(selectedScreen) + setWith(screen, key.split("."), value, Object) + const roleId = screen.routing.roleId + const homeScreens = get(store).screens.filter(screen => { + return screen.routing.roleId === roleId && screen.routing.homeScreen }) + if (homeScreens.length > 1) { + screen.routing.homeScreen = false + } // Save new definition try { - store.actions.preview.saveSelected() + store.actions.screens.save(screen) } catch (error) { notifications.error("Error saving screen settings") } From 9ddfa02b577a2f6eae2b7199dde26b9cbfe9c597 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 11:50:04 +0100 Subject: [PATCH 062/207] Fix navigation setting panel bugs --- .../design/[screenId]/navigation/index.svelte | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte index d520674e61..f3dc9017f4 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte @@ -81,6 +81,13 @@ value={$store.navigation.sticky} on:change={e => update("sticky", e.detail)} /> + updateNavigation("navWidth", e.detail)} - /> updateNavigation("navBackground", e.detail)} + on:change={e => update("navBackground", e.detail)} /> @@ -132,7 +132,7 @@ updateNavigation("navTextColor", e.detail)} + on:change={e => update("navTextColor", e.detail)} /> From 018e2c4c1b8b9dcdc83d7d346b811f9d6ccf175b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 13:32:09 +0100 Subject: [PATCH 063/207] Allow status lights to be added to pickers --- packages/bbui/src/Form/Core/Picker.svelte | 32 +++++++++++---- packages/bbui/src/Form/Core/Select.svelte | 41 ++++++++----------- packages/bbui/src/Form/Select.svelte | 2 + .../bbui/src/StatusLight/StatusLight.svelte | 3 ++ 4 files changed, 48 insertions(+), 30 deletions(-) diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index 513bb35132..a3b5c147e5 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -7,12 +7,14 @@ import clickOutside from "../../Actions/click_outside" import Search from "./Search.svelte" import Icon from "../../Icon/Icon.svelte" + import StatusLight from "../../StatusLight/StatusLight.svelte" export let id = null export let disabled = false export let error = null export let fieldText = "" export let fieldIcon = "" + export let fieldColour = "" export let isPlaceholder = false export let placeholderOption = null export let options = [] @@ -21,6 +23,7 @@ export let getOptionLabel = option => option export let getOptionValue = option => option export let getOptionIcon = () => null + export let getOptionColour = () => null export let open = false export let readonly = false export let quiet = false @@ -83,11 +86,10 @@ on:mousedown={onClick} > {#if fieldIcon} - + {/if} - {/if} + {#if fieldColour} + + + + {/if} onSelectOption(getOptionValue(option, idx))} > {#if getOptionIcon(option, idx)} - + {/if} @@ -173,6 +180,11 @@ > + {#if getOptionColour(option, idx)} + + + + {/if} {/each} {/if} @@ -208,12 +220,18 @@ padding-right: 2px; } - .icon-Padding { - padding-right: 10px; + /* Icon and colour alignment */ + .spectrum-Menu-checkmark { + align-self: center; + margin-top: 0; } - .icon-Placeholder-Padding { - padding-right: 10px; + .option-colour { + padding-left: 8px; } + .option-icon { + padding-right: 8px; + } + .spectrum-Popover :global(.spectrum-Search) { margin-top: -1px; margin-left: -1px; diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte index 413b11dd34..81d7ec8e6c 100644 --- a/packages/bbui/src/Form/Core/Select.svelte +++ b/packages/bbui/src/Form/Core/Select.svelte @@ -11,6 +11,7 @@ export let getOptionLabel = option => option export let getOptionValue = option => option export let getOptionIcon = () => null + export let getOptionColour = () => null export let readonly = false export let quiet = false export let autoWidth = false @@ -20,7 +21,19 @@ const dispatch = createEventDispatcher() let open = false $: fieldText = getFieldText(value, options, placeholder) - $: fieldIcon = getFieldIcon(value, options, placeholder) + $: fieldIcon = getFieldAttribute(getOptionIcon, value, options) + $: fieldColour = getFieldAttribute(getOptionColour, value, options) + + const getFieldAttribute = (getAttribute, value, options) => { + // Wait for options to load if there is a value but no options + if (!options?.length) { + return "" + } + const index = options.findIndex( + (option, idx) => getOptionValue(option, idx) === value + ) + return index !== -1 ? getAttribute(options[index], index) : null + } const getFieldText = (value, options, placeholder) => { // Always use placeholder if no value @@ -28,27 +41,7 @@ return placeholder || "Choose an option" } - // Wait for options to load if there is a value but no options - if (!options?.length) { - return "" - } - - // Render the label if the selected option is found, otherwise raw value - const index = options.findIndex( - (option, idx) => getOptionValue(option, idx) === value - ) - return index !== -1 ? getOptionLabel(options[index], index) : value - } - - const getFieldIcon = (value, options) => { - // Wait for options to load if there is a value but no options - if (!options?.length) { - return "" - } - const index = options.findIndex( - (option, idx) => getOptionValue(option, idx) === value - ) - return index !== -1 ? getOptionIcon(options[index], index) : null + return getFieldAttribute(getOptionLabel, value, options) } const selectOption = value => { @@ -66,12 +59,14 @@ {disabled} {readonly} {fieldText} + {fieldIcon} + {fieldColour} {options} {autoWidth} {getOptionLabel} {getOptionValue} {getOptionIcon} - {fieldIcon} + {getOptionColour} {autocomplete} {sort} isPlaceholder={value == null || value === ""} diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte index 0df27e2ff0..1b68746c5e 100644 --- a/packages/bbui/src/Form/Select.svelte +++ b/packages/bbui/src/Form/Select.svelte @@ -14,6 +14,7 @@ export let getOptionLabel = option => extractProperty(option, "label") export let getOptionValue = option => extractProperty(option, "value") export let getOptionIcon = option => option?.icon + export let getOptionColour = option => option?.colour export let quiet = false export let autoWidth = false export let sort = false @@ -47,6 +48,7 @@ {getOptionLabel} {getOptionValue} {getOptionIcon} + {getOptionColour} on:change={onChange} on:click /> diff --git a/packages/bbui/src/StatusLight/StatusLight.svelte b/packages/bbui/src/StatusLight/StatusLight.svelte index e02cfb222e..a0c72443a6 100644 --- a/packages/bbui/src/StatusLight/StatusLight.svelte +++ b/packages/bbui/src/StatusLight/StatusLight.svelte @@ -51,6 +51,9 @@ justify-content: center; align-items: center; --spectrum-statuslight-info-text-gap: 4px; + min-height: 0; + padding-top: 0; + padding-bottom: 0; } .spectrum-StatusLight.withText::before { margin-right: 10px; From 088c7123e6592b8595199002d3de9a1c5cc3647a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 13:32:34 +0100 Subject: [PATCH 064/207] Centrally sort screens to allow consistency across design UI --- packages/builder/src/builderStore/index.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js index 3a9b84b2c5..3eb5a89a85 100644 --- a/packages/builder/src/builderStore/index.js +++ b/packages/builder/src/builderStore/index.js @@ -4,6 +4,7 @@ import { getThemeStore } from "./store/theme" import { derived, writable } from "svelte/store" import { LAYOUT_NAMES } from "../constants" import { findComponent, findComponentPath } from "./componentUtils" +import { RoleUtils } from "@budibase/frontend-core" export const store = getFrontendStore() export const automationStore = getAutomationStore() @@ -13,6 +14,25 @@ export const selectedScreen = derived(store, $store => { return $store.screens.find(screen => screen._id === $store.selectedScreenId) }) +export const sortedScreens = derived(store, $store => { + return $store.screens.slice().sort((a, b) => { + // Sort by role first + const roleA = RoleUtils.getRolePriority(a.routing.roleId) + const roleB = RoleUtils.getRolePriority(b.routing.roleId) + if (roleA !== roleB) { + return roleA > roleB ? -1 : 1 + } + // Then put home screens first + const homeA = !!a.routing.homeScreen + const homeB = !!b.routing.homeScreen + if (homeA !== homeB) { + return homeA ? -1 : 1 + } + // Finally sort alphabetically by route + return a.routing.route < b.routing.route ? -1 : 1 + }) +}) + export const selectedComponent = derived( [store, selectedScreen], ([$store, $selectedScreen]) => { From faa3ad2ac40d7280e00df64e02cb137db65a34f0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 13:33:05 +0100 Subject: [PATCH 065/207] Use sorted screens in both screen navigation panel and above preview --- .../[screenId]/_components/AppPanel.svelte | 14 +++----- .../_components/ScreenNavigationPanel.svelte | 34 +++++-------------- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte index 29114dfff5..3a91dbee88 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte @@ -1,8 +1,8 @@ From 7679be9199a5366e3d6c1b1a41f6508ada7e4ac7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 13:33:42 +0100 Subject: [PATCH 066/207] Remove deprecated code --- .../design/[screenId]/_components/AppPanel.svelte | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte index 3a91dbee88..85e17bd3b8 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte @@ -2,14 +2,9 @@ import DevicePreviewSelect from "./DevicePreviewSelect.svelte" import AppPreview from "./AppPreview.svelte" import { store, selectedScreen, sortedScreens } from "builderStore" - import { Button, Select, StatusLight, Body, Badge } from "@budibase/bbui" + import { Button, Select } from "@budibase/bbui" import { RoleUtils } from "@budibase/frontend-core" - import { roles } from "stores/backend" import { goto } from "@roxi/routify" - - $: roleId = $selectedScreen?.routing.roleId - $: roleColor = RoleUtils.getRoleColour(roleId) - $: roleName = $roles.find(x => x._id === roleId)?.name || "Unknown"
From 1078fa3f780de7abb28363e45053b5b139473e4f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 13:34:10 +0100 Subject: [PATCH 067/207] Remove border around client app preview --- packages/client/src/components/ClientApp.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 3232a01527..9c42d55d4c 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -296,8 +296,8 @@ } .preview #app-root { - border: 1px solid var(--spectrum-global-color-gray-300); - border-radius: 2px; + /*border: 1px solid var(--spectrum-global-color-gray-300);*/ + border-radius: 4px; } /* Print styles */ From 070ec8abd41042f883358f5657c6e328c86c358d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 14:02:00 +0100 Subject: [PATCH 068/207] Improve role colours and ordering --- packages/bbui/src/Form/Core/Picker.svelte | 4 ++-- .../design/settings/controls/RoleSelect.svelte | 2 ++ packages/builder/src/stores/backend/roles.js | 9 ++++++++- packages/frontend-core/src/utils/roles.js | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index a3b5c147e5..e184ca8246 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -109,7 +109,7 @@ {/if} {#if fieldColour} - + {/if} {#if getOptionColour(option, idx)} - + {/if} diff --git a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte index 9571cf9a92..578578a987 100644 --- a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte @@ -1,6 +1,7 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte index 74ff403aa7..c5c14ad402 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte @@ -149,8 +149,17 @@ const removeCustomLayout = async () => { let screen = get(selectedScreen) + + // Pull relevant settings from old layout, if required + const layout = get(store).layouts.find(x => x._id === screen.layoutId) screen.layoutId = null - screen.showNavigation = true + if (screen.showNavigation == null) { + screen.showNavigation = layout?.props.navigation !== "None" + } + if (screen.width == null) { + screen.width = layout?.props.width || "Large" + } + await store.actions.screens.save(screen) } From 0f200680be1e8ace49301e7fec8f6667c87de904 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 16:30:13 +0100 Subject: [PATCH 073/207] Ensure nav background colour is properly updated when changing theme --- .../design/[screenId]/theme/_components/AppThemeSelect.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte index 7a003a72a2..66994cd232 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte @@ -16,8 +16,8 @@ try { const theme = ThemeOptions[e.detail] ?? ThemeOptions[2] await store.actions.theme.save(theme) - await store.actions.customTheme.save({ - ...get(store).customTheme, + await store.actions.navigation.save({ + ...get(store).navigation, navBackground: theme === "spectrum--light" ? "var(--spectrum-global-color-gray-50)" From d3cfdd8a2d0044e08c11bdd1c4da4c939b944603 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 16:30:21 +0100 Subject: [PATCH 074/207] Restore app preview border --- packages/client/src/components/ClientApp.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 9c42d55d4c..347df9aab8 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -296,7 +296,7 @@ } .preview #app-root { - /*border: 1px solid var(--spectrum-global-color-gray-300);*/ + border: 1px solid var(--spectrum-global-color-gray-300); border-radius: 4px; } From 12f704ea7a6544cd52c8bcb6dc5b8831f4bda850 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 16:57:57 +0100 Subject: [PATCH 075/207] Add new navigation settings to new apps --- packages/server/src/api/controllers/application.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index aa76dd403c..5d05592f32 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -272,6 +272,13 @@ const performAppCreate = async (ctx: any) => { updatedAt: new Date().toISOString(), createdAt: new Date().toISOString(), status: AppStatus.DEV, + navigation: { + navigation: "Top", + title: name, + navWidth: "Large", + navBackground: "var(--spectrum-global-color-gray-50)", + }, + theme: "spectrum--light", } const response = await db.put(newApplication, { force: true }) newApplication._rev = response.rev From a8ac919a71472e6de4b2e39506524f332f71aabd Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 17:00:03 +0100 Subject: [PATCH 076/207] Add new settings to new screens upon creation --- .../src/builderStore/store/screenTemplates/utils/Screen.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js b/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js index c2072f3ced..6fc79e53b0 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js +++ b/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js @@ -6,6 +6,7 @@ export class Screen extends BaseStructure { super(true) this._json = { showNavigation: true, + width: "Large", props: { _id: Helpers.uuid(), _component: "@budibase/standard-components/container", @@ -26,6 +27,7 @@ export class Screen extends BaseStructure { routing: { route: "", roleId: "BASIC", + homeScreen: false, }, name: "screen-id", } From 8f0602a453d76c5ee36f6483a12ea577086a2717 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 18:20:26 +0100 Subject: [PATCH 077/207] Add fallback UI when no screens exist and add custom theme metadata to new apps --- .../design/_old/[assetType]/_layout.svelte | 61 +------------------ .../app/[application]/design/index.svelte | 48 ++++++++++++++- .../server/src/api/controllers/application.ts | 9 +++ 3 files changed, 57 insertions(+), 61 deletions(-) diff --git a/packages/builder/src/components/design/_old/[assetType]/_layout.svelte b/packages/builder/src/components/design/_old/[assetType]/_layout.svelte index 264e245d95..6132eaa32c 100644 --- a/packages/builder/src/components/design/_old/[assetType]/_layout.svelte +++ b/packages/builder/src/components/design/_old/[assetType]/_layout.svelte @@ -13,7 +13,6 @@ import AppThemeSelect from "components/design/AppPreview/AppThemeSelect.svelte" import ThemeEditor from "components/design/AppPreview/ThemeEditor.svelte" import DevicePreviewSelect from "components/design/AppPreview/DevicePreviewSelect.svelte" - import Logo from "assets/bb-space-man.svg" import ScreenWizard from "components/design/navigation/ScreenWizard.svelte" // Cache previous values so we don't update the URL more than necessary @@ -150,28 +149,7 @@
-
- {#if $currentAsset}{:else} -
-
- - logo -
- LET’S BRING THIS APP TO LIFE -
- - -
-
- {/if} -
+
{#if $selectedComponent != null}
@@ -192,30 +170,7 @@ flex: 1 1 auto; height: 0; } - .new-screen-text { - width: 160px; - text-align: center; - color: #2c2c2c; - font-weight: 600; - } - .new-screen-button { - margin-left: 5px; - height: 20px; - width: 100px; - display: flex; - align-items: center; - } - - .background-icon { - margin-top: 4px; - margin-right: 4px; - } - - .img-size { - width: 160px; - height: 160px; - } .ui-nav { grid-column: 1; background-color: var(--background); @@ -236,18 +191,4 @@ border-left: var(--border-light); overflow-x: hidden; } - - .centered { - width: calc(100% - 350px); - height: calc(100% - 100px); - position: absolute; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - } - - .main { - width: 300px; - } diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte index 3f66f1511d..6490000b35 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte @@ -2,9 +2,28 @@ import { store, selectedScreen } from "builderStore" import { onMount } from "svelte" import { redirect } from "@roxi/routify" + import { Layout, Button, Detail, notifications } from "@budibase/bbui" + import Logo from "assets/bb-space-man.svg" + import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen" + import { Roles } from "constants/backend" let loaded = false + const createFirstScreen = async () => { + let screen = createFromScratchScreen.create() + screen.routing.route = "/home" + screen.routing.roldId = Roles.BASIC + screen.routing.homeScreen = true + try { + const savedScreen = await store.actions.screens.save(screen) + notifications.success("Screen created successfully") + $redirect(`./${savedScreen._id}`) + } catch (err) { + console.error("Could not create screen", err) + notifications.error("Error creating screen") + } + } + onMount(() => { if ($selectedScreen) { $redirect(`./${$selectedScreen._id}`) @@ -17,5 +36,32 @@ {#if loaded} - You need to create a screen! +
+ + logo +
+ LET’S BRING THIS APP TO LIFE +
+ + +
{/if} + + diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 5d05592f32..337c8b9e09 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -277,8 +277,17 @@ const performAppCreate = async (ctx: any) => { title: name, navWidth: "Large", navBackground: "var(--spectrum-global-color-gray-50)", + links: [ + { + url: "/home", + text: "Home", + }, + ], }, theme: "spectrum--light", + customTheme: { + buttonBorderRadius: "16px", + }, } const response = await db.put(newApplication, { force: true }) newApplication._rev = response.rev From 0f82af036de01e28f6743ea8171464d5e861597c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 18:35:00 +0100 Subject: [PATCH 078/207] Handle overflowing app titles and center main navigation relative to actual screen center --- .../src/pages/builder/app/[application]/_layout.svelte | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 03bb545780..09b4a35f3c 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -7,7 +7,7 @@ import { API } from "api" import { isActive, goto, layout, redirect } from "@roxi/routify" import { capitalise } from "helpers" - import { onMount, onDestroy } from "svelte" + import { onMount } from "svelte" export let application @@ -131,10 +131,10 @@ flex: 0 0 60px; background: var(--background); padding: 0 var(--spacing-xl); - display: flex; + display: grid; + grid-template-columns: 1fr auto 1fr; flex-direction: row; box-sizing: border-box; - justify-content: space-between; align-items: stretch; border-bottom: var(--border-light); } @@ -147,7 +147,11 @@ gap: var(--spacing-xl); } .topleftnav :global(.spectrum-Heading) { + flex: 1 1 auto; + width: 0; font-weight: 600; + overflow: hidden; + text-overflow: ellipsis; } .topcenternav { From a9f64abb78fdcce803f17ffe3e02a4d8d9aa1e4f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 18:43:34 +0100 Subject: [PATCH 079/207] Unset app ID from builder store when unmounting to prevent stale app ID header --- .../src/pages/builder/app/[application]/_layout.svelte | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 09b4a35f3c..c96880aa6a 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -7,7 +7,7 @@ import { API } from "api" import { isActive, goto, layout, redirect } from "@roxi/routify" import { capitalise } from "helpers" - import { onMount } from "svelte" + import { onMount, onDestroy } from "svelte" export let application @@ -66,6 +66,13 @@ hasSynced = true } }) + + onDestroy(() => { + store.update(state => { + state.appId = null + return state + }) + }) {#await promise} From bfd9eff7a6c2fefdaadad827403b8efc74307dc8 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 10 May 2022 18:48:43 +0100 Subject: [PATCH 080/207] Auto focus search input when adding component --- packages/bbui/src/Form/Core/Search.svelte | 3 +++ packages/bbui/src/Form/Search.svelte | 2 ++ .../components/new/_components/NewComponentPanel.svelte | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Core/Search.svelte b/packages/bbui/src/Form/Core/Search.svelte index e6384e242a..f19c2a7f4c 100644 --- a/packages/bbui/src/Form/Core/Search.svelte +++ b/packages/bbui/src/Form/Core/Search.svelte @@ -8,6 +8,8 @@ export let id = null export let updateOnChange = true export let quiet = false + export let inputRef + const dispatch = createEventDispatcher() let focus = false @@ -68,6 +70,7 @@ type="search" class="spectrum-Textfield-input spectrum-Search-input" autocomplete="off" + bind:this={inputRef} />
-
- {/each} -
- - - - update("primaryColor", e.detail)} - /> - - - - update("primaryColorHover", e.detail)} - /> - - - - - + From 5d5b10723406286cd50ea6a59aa03d3176f33ec7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 May 2022 13:06:41 +0100 Subject: [PATCH 088/207] Add initial layouts panel and add explicit panels for theme and navigation tabs --- .../NavigationPanel.svelte => Panel.svelte} | 15 ++++- .../design/settings/SettingsPanel.svelte | 66 ------------------- ...Panel.svelte => ComponentListPanel.svelte} | 0 ...ionPanel.svelte => LayoutListPanel.svelte} | 6 +- ...ionPanel.svelte => ScreenListPanel.svelte} | 0 5 files changed, 16 insertions(+), 71 deletions(-) rename packages/builder/src/components/design/{navigation/NavigationPanel.svelte => Panel.svelte} (87%) delete mode 100644 packages/builder/src/components/design/settings/SettingsPanel.svelte rename packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/{ComponentNavigationPanel.svelte => ComponentListPanel.svelte} (100%) rename packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/{LayoutNavigationPanel.svelte => LayoutListPanel.svelte} (87%) rename packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/{ScreenNavigationPanel.svelte => ScreenListPanel.svelte} (100%) diff --git a/packages/builder/src/components/design/navigation/NavigationPanel.svelte b/packages/builder/src/components/design/Panel.svelte similarity index 87% rename from packages/builder/src/components/design/navigation/NavigationPanel.svelte rename to packages/builder/src/components/design/Panel.svelte index ebcf0c534d..8dabbd40da 100644 --- a/packages/builder/src/components/design/navigation/NavigationPanel.svelte +++ b/packages/builder/src/components/design/Panel.svelte @@ -2,20 +2,26 @@ import { Icon, Heading } from "@budibase/bbui" export let title + export let icon export let showAddButton = false export let showBackButton = false export let showExpandIcon = false export let onClickAddButton export let onClickBackButton + export let borderLeft = false + export let borderRight = false let wide = false -
+
{#if showBackButton} {/if} + {#if icon} + + {/if}
{title || ""}
@@ -41,13 +47,18 @@ .navigation-panel { width: 280px; background: var(--background); - border-right: var(--border-light); display: flex; flex-direction: column; justify-content: flex-start; align-items: stretch; transition: width 130ms ease-out; } + .navigation-panel.border-left { + border-left: var(--border-light); + } + .navigation-panel.border-right { + border-right: var(--border-light); + } .navigation-panel.wide { width: 420px; } diff --git a/packages/builder/src/components/design/settings/SettingsPanel.svelte b/packages/builder/src/components/design/settings/SettingsPanel.svelte deleted file mode 100644 index 968cb4e957..0000000000 --- a/packages/builder/src/components/design/settings/SettingsPanel.svelte +++ /dev/null @@ -1,66 +0,0 @@ - - -
- {#if title} -
- {#if icon} - - {/if} -
- {title || ""} -
-
- {/if} -
- -
-
- - diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentNavigationPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentNavigationPanel.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutNavigationPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte similarity index 87% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutNavigationPanel.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte index 5158c11352..6dbc728ca5 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutNavigationPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte @@ -1,12 +1,12 @@ - + {/each} - + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenNavigationPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenNavigationPanel.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte From 155a60160d224bb64d0c10dc96c7c57a8a18304a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 May 2022 13:09:21 +0100 Subject: [PATCH 089/207] Refactor design panels into core panel component and update usages --- packages/builder/src/components/design/Panel.svelte | 10 +++++----- .../_components/navigation/ComponentListPanel.svelte | 7 ++++--- .../_components/settings/ComponentSettingsPanel.svelte | 6 +++--- .../[screenId]/components/[componentId]/index.svelte | 4 ++-- .../new/_components/NewComponentPanel.svelte | 7 ++++--- .../new/_components/NewComponentTargetPanel.svelte | 6 +++--- .../[layoutId]/_components/LayoutListPanel.svelte | 3 --- .../[layoutId]/_components/LayoutSettingsPanel.svelte | 4 ++-- .../design/[screenId]/layouts/[layoutId]/index.svelte | 6 ++++-- .../_components/NavigationSettingsPanel.svelte | 6 +++--- .../screens/_components/ScreenListPanel.svelte | 7 ++++--- .../screens/_components/ScreenSettingsPanel.svelte | 7 ++++--- .../design/[screenId]/screens/index.svelte | 4 ++-- .../theme/_components/ThemeSettingsPanel.svelte | 6 +++--- 14 files changed, 43 insertions(+), 40 deletions(-) diff --git a/packages/builder/src/components/design/Panel.svelte b/packages/builder/src/components/design/Panel.svelte index 8dabbd40da..fba2cc22e4 100644 --- a/packages/builder/src/components/design/Panel.svelte +++ b/packages/builder/src/components/design/Panel.svelte @@ -14,7 +14,7 @@ let wide = false -
+
{#if showBackButton} @@ -44,7 +44,7 @@
diff --git a/packages/builder/src/components/design/_old/FrontendNavigatePane.svelte b/packages/builder/src/components/design/_old/FrontendNavigatePane.svelte deleted file mode 100644 index 6e319f06a0..0000000000 --- a/packages/builder/src/components/design/_old/FrontendNavigatePane.svelte +++ /dev/null @@ -1,198 +0,0 @@ - - -
- - -
- -
- - -
-
-
- {#each $store.layouts as layout, idx (layout._id)} - 0} /> - {/each} -
-
- - - -
- - -
- -
-
- - diff --git a/packages/builder/src/components/design/_old/Layout.svelte b/packages/builder/src/components/design/_old/Layout.svelte deleted file mode 100644 index d3c89fc9e5..0000000000 --- a/packages/builder/src/components/design/_old/Layout.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - -{#if $store.selectedLayoutId === layout._id && layout.props?._children} - -{/if} diff --git a/packages/builder/src/components/design/_old/NavigationSelectionModal.svelte b/packages/builder/src/components/design/_old/NavigationSelectionModal.svelte deleted file mode 100644 index 52a8e91451..0000000000 --- a/packages/builder/src/components/design/_old/NavigationSelectionModal.svelte +++ /dev/null @@ -1,93 +0,0 @@ - - - (blankSelected ? chooseModal(1) : chooseModal(0))} - size="M" - onConfirm={() => { - save(createdScreens) - }} - disabled={!selectedNav} -> - Please select your preferred layout for the new application: - -
-
(selectedNav = "Left")} - class:unselected={selectedNav && selectedNav !== "Left"} - > -
-
-
-
Side Nav
-
-
(selectedNav = "Top")} - class:unselected={selectedNav && selectedNav !== "Top"} - > -
-
-
-
Top Nav
-
-
(selectedNav = "None")} - class:unselected={selectedNav && selectedNav !== "None"} - > -
-
No Nav
-
-
- - - diff --git a/packages/builder/src/components/design/_old/NewLayoutModal.svelte b/packages/builder/src/components/design/_old/NewLayoutModal.svelte deleted file mode 100644 index d7288fbe23..0000000000 --- a/packages/builder/src/components/design/_old/NewLayoutModal.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/packages/builder/src/components/design/_old/PathDropdownMenu.svelte b/packages/builder/src/components/design/_old/PathDropdownMenu.svelte deleted file mode 100644 index 6de656b6b5..0000000000 --- a/packages/builder/src/components/design/_old/PathDropdownMenu.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - - -
- -
- - Delete all screens - - - - - -
- Are you sure you want to delete all screens under the {path} route? -
-
The following screens will be deleted:
-
- {#each screens as screen} -
{screen.route}
- {/each} -
- - - - diff --git a/packages/builder/src/components/design/_old/PathTree.svelte b/packages/builder/src/components/design/_old/PathTree.svelte deleted file mode 100644 index 110338e733..0000000000 --- a/packages/builder/src/components/design/_old/PathTree.svelte +++ /dev/null @@ -1,59 +0,0 @@ - - -{#if !noSearchMatch} - - - - - {#if routeOpened}{/if} -{/if} diff --git a/packages/builder/src/components/design/_old/PropertiesPanel/PropertiesPanel.svelte b/packages/builder/src/components/design/_old/PropertiesPanel/PropertiesPanel.svelte deleted file mode 100644 index df91a87456..0000000000 --- a/packages/builder/src/components/design/_old/PropertiesPanel/PropertiesPanel.svelte +++ /dev/null @@ -1,63 +0,0 @@ - - - - -
- {#key componentInstance?._id} - - - - - - {/key} -
- - - - diff --git a/packages/builder/src/components/design/_old/PropertiesPanel/ScreenSettingsSection.svelte b/packages/builder/src/components/design/_old/PropertiesPanel/ScreenSettingsSection.svelte deleted file mode 100644 index c8371e66ab..0000000000 --- a/packages/builder/src/components/design/_old/PropertiesPanel/ScreenSettingsSection.svelte +++ /dev/null @@ -1,111 +0,0 @@ - - -{#if $store.currentView !== "component" && $currentAsset && $store.currentFrontEndType === FrontendTypes.SCREEN}{/if} diff --git a/packages/builder/src/components/design/_old/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/components/design/_old/[assetType]/[asset]/_fallback.svelte deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/builder/src/components/design/_old/[assetType]/_layout.svelte b/packages/builder/src/components/design/_old/[assetType]/_layout.svelte deleted file mode 100644 index 6132eaa32c..0000000000 --- a/packages/builder/src/components/design/_old/[assetType]/_layout.svelte +++ /dev/null @@ -1,194 +0,0 @@ - - - -
-
- -
- -
- - {#if $selectedComponent != null} -
- -
- {/if} -
- - - - - - diff --git a/packages/builder/src/components/design/_old/[assetType]/index.svelte b/packages/builder/src/components/design/_old/[assetType]/index.svelte deleted file mode 100644 index 444835de22..0000000000 --- a/packages/builder/src/components/design/_old/[assetType]/index.svelte +++ /dev/null @@ -1,59 +0,0 @@ - - - From 5f7940d9a129f31f51fc16f26d31830ccefd5a51 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 May 2022 09:42:25 +0100 Subject: [PATCH 091/207] Render screenslot when showing legacy layouts and remove concept of preview type --- .../builder/src/builderStore/store/frontend.js | 11 +---------- .../[screenId]/_components/AppPreview.svelte | 14 +++++++++++--- .../[screenId]/_components/iframeTemplate.js | 2 -- packages/client/src/components/ClientApp.svelte | 2 +- packages/client/src/components/Component.svelte | 6 ++---- packages/client/src/index.js | 1 - packages/client/src/stores/builder.js | 1 - packages/client/src/stores/components.js | 4 ++-- 8 files changed, 17 insertions(+), 24 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 286e44d868..285e4607a3 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -42,7 +42,6 @@ const INITIAL_FRONTEND_STATE = { messagePassing: false, continueIfAction: false, }, - currentFrontEndType: "none", errors: [], hasAppPackage: false, libraries: null, @@ -191,7 +190,6 @@ export const getFrontendStore = () => { screens.find(screen => screen._id === screenId) || screens[0] if (!screen) return state - state.currentFrontEndType = FrontendTypes.SCREEN state.selectedScreenId = screen._id state.currentView = "detail" state.selectedComponentId = screen.props?._id @@ -287,13 +285,8 @@ export const getFrontendStore = () => { }, preview: { saveSelected: async () => { - const state = get(store) const selectedAsset = get(currentAsset) - if (state.currentFrontEndType !== FrontendTypes.LAYOUT) { - return await store.actions.screens.save(selectedAsset) - } else { - return await store.actions.layouts.save(selectedAsset) - } + return await store.actions.screens.save(selectedAsset) }, setDevice: device => { store.update(state => { @@ -308,8 +301,6 @@ export const getFrontendStore = () => { const layout = store.actions.layouts.find(layoutId) || get(store).layouts[0] if (!layout) return - state.currentFrontEndType = FrontendTypes.LAYOUT - state.currentView = "detail" state.selectedLayoutId = layout._id state.selectedComponentId = layout.props?._id return state diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte index 38ad9b73b7..b4dbf715a4 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte @@ -19,6 +19,7 @@ import ErrorSVG from "@budibase/frontend-core/assets/error.svg?raw" import { findComponent, findComponentPath } from "builderStore/componentUtils" import { isActive, goto } from "@roxi/routify" + import { Screen } from "builderStore/store/screenTemplates/utils/Screen" let iframe let layout @@ -42,14 +43,22 @@ $store.clientLibPath ) + const placeholderScreen = new Screen() + .name("Screen Placeholder") + .route("/") + .component("@budibase/standard-components/screenslot") + .instanceName("Content Placeholder") + .normalStyle({ flex: "1 1 auto" }) + .json() + // Extract data to pass to the iframe $: { - screen = $selectedScreen - // If viewing legacy layouts, always show the custom layout if ($isActive("./layouts")) { + screen = placeholderScreen layout = $selectedLayout } else { + screen = $selectedScreen layout = $store.layouts.find(layout => layout._id === screen?.layoutId) } } @@ -63,7 +72,6 @@ layout, screen, selectedComponentId, - previewType: $store.currentFrontEndType, theme: $store.theme, customTheme: $store.customTheme, previewDevice: $store.previewDevice, diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/iframeTemplate.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/iframeTemplate.js index 3555194263..def32dd45f 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/iframeTemplate.js +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/iframeTemplate.js @@ -61,7 +61,6 @@ export default ` selectedComponentId, layout, screen, - previewType, appId, theme, customTheme, @@ -76,7 +75,6 @@ export default ` window["##BUDIBASE_PREVIEW_SCREEN##"] = screen window["##BUDIBASE_SELECTED_COMPONENT_ID##"] = selectedComponentId window["##BUDIBASE_PREVIEW_ID##"] = Math.random() - window["##BUDIBASE_PREVIEW_TYPE##"] = previewType window["##BUDIBASE_PREVIEW_THEME##"] = theme window["##BUDIBASE_PREVIEW_CUSTOM_THEME##"] = customTheme window["##BUDIBASE_PREVIEW_DEVICE##"] = previewDevice diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 347df9aab8..8d73afb24a 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -156,7 +156,7 @@
- {#key `${$screenStore.activeLayout._id}-${$builderStore.previewType}`} + {#key $screenStore.activeLayout._id} { const split = component?.split("/") const name = split?.[split.length - 1] - if (name === "screenslot" && $builderStore.previewType !== "layout") { + if (name === "screenslot" && !insideScreenslot) { return Router } return AppComponents[name] diff --git a/packages/client/src/index.js b/packages/client/src/index.js index d43af38ff5..10062cb2da 100644 --- a/packages/client/src/index.js +++ b/packages/client/src/index.js @@ -15,7 +15,6 @@ const loadBudibase = () => { screen: window["##BUDIBASE_PREVIEW_SCREEN##"], selectedComponentId: window["##BUDIBASE_SELECTED_COMPONENT_ID##"], previewId: window["##BUDIBASE_PREVIEW_ID##"], - previewType: window["##BUDIBASE_PREVIEW_TYPE##"], theme: window["##BUDIBASE_PREVIEW_THEME##"], customTheme: window["##BUDIBASE_PREVIEW_CUSTOM_THEME##"], previewDevice: window["##BUDIBASE_PREVIEW_DEVICE##"], diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js index d78fedd896..bc3e933079 100644 --- a/packages/client/src/stores/builder.js +++ b/packages/client/src/stores/builder.js @@ -13,7 +13,6 @@ const createBuilderStore = () => { selectedComponentId: null, editMode: false, previewId: null, - previewType: null, selectedPath: [], theme: null, customTheme: null, diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js index 4f972b23c7..a836ca150d 100644 --- a/packages/client/src/stores/components.js +++ b/packages/client/src/stores/components.js @@ -18,9 +18,9 @@ const createComponentStore = () => { // Derive the selected component instance and definition let asset - const { layout, screen, previewType, selectedComponentId } = $builderState + const { screen, selectedComponentId } = $builderState if ($builderState.inBuilder) { - asset = previewType === "layout" ? layout : screen + asset = screen } else { asset = $screenState.activeScreen } From 8331b72b1a4d4cff80430587ff73d670e2442d77 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 May 2022 09:42:57 +0100 Subject: [PATCH 092/207] Remove currentView flag from builder store --- packages/builder/src/builderStore/store/frontend.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 285e4607a3..d14fcb2cd4 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -191,7 +191,6 @@ export const getFrontendStore = () => { if (!screen) return state state.selectedScreenId = screen._id - state.currentView = "detail" state.selectedComponentId = screen.props?._id return state }) @@ -446,7 +445,6 @@ export const getFrontendStore = () => { // Save components and update UI await store.actions.preview.saveSelected() store.update(state => { - state.currentView = "component" state.selectedComponentId = componentInstance._id return state }) From b041700ea8bb2388bcb18f0a1da5becc78254877 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 May 2022 09:46:21 +0100 Subject: [PATCH 093/207] Remove concept of frontend preview types --- packages/builder/src/builderStore/store/frontend.js | 1 - packages/builder/src/constants/index.js | 7 ------- 2 files changed, 8 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index d14fcb2cd4..5d6e3a6bfc 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -9,7 +9,6 @@ import { tables, } from "stores/backend" import { API } from "api" -import { FrontendTypes } from "constants" import analytics, { Events } from "analytics" import { findComponentType, diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js index 065b4ead06..4e2ca37b9c 100644 --- a/packages/builder/src/constants/index.js +++ b/packages/builder/src/constants/index.js @@ -2,13 +2,6 @@ export const TableNames = { USERS: "ta_users", } -export const FrontendTypes = { - PAGE: "page", - SCREEN: "screen", - LAYOUT: "layout", - NONE: "none", -} - export const AppStatus = { ALL: "all", DEV: "development", From e7605b65a972e5c72967130aa6ebb0546f0be1c7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 May 2022 10:43:01 +0100 Subject: [PATCH 094/207] Add ability to copy components from legacy layouts for backwards compatibility --- .../_components/LayoutSettingsPanel.svelte | 46 ++++++++++++++++++- .../design/[screenId]/layouts/index.svelte | 4 +- .../NavigationSettingsPanel.svelte | 4 +- .../_components/ThemeSettingsPanel.svelte | 2 +- 4 files changed, 50 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte index 10372378bf..77431c7038 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte @@ -1,5 +1,49 @@ - + + + + You can save the content of this layout by pressing the button below. + + + This will copy all components inside your layout, which you can then paste + into a screen. + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte index 83d4e6e585..a730949499 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte @@ -6,8 +6,8 @@ onMount(() => { if ($store.layouts?.length) { $redirect(`./${$store.layouts[0]._id}`) + } else { + $redirect("../") } }) - -You don't have any layouts diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte index 20e1a44553..e3edcdffed 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte @@ -30,11 +30,11 @@ - Your navigation is configured for all the screens within your app + Your navigation is configured for all the screens within your app. You can hide and show your navigation for each screen in the screen - settings + settings. diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte index d2c9574008..2a7772cc72 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte @@ -49,7 +49,7 @@ - Your theme is set across all the screens within your app + Your theme is set across all the screens within your app. From 7f15a39c9047aca1297ba3948240a7491121c6d9 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 May 2022 13:00:20 +0100 Subject: [PATCH 095/207] Update text --- .../layouts/[layoutId]/_components/LayoutListPanel.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte index ce504843f9..4379099725 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte @@ -14,7 +14,7 @@ extraButtonText="View details" extraButtonAction={() => {}} > - Custom layouts are being deprecated. They will be removed from June 1st. + Custom layouts are being deprecated. They will be removed on [date]. {#each $store.layouts as layout (layout._id)} From 22f4c6e98b9182a92932a6ac259e0aab2bcd27af Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 10:12:16 +0100 Subject: [PATCH 096/207] Add icons to component list and update style of nav items --- .../DatasourceNavigator.svelte | 5 +-- .../src/components/common/NavItem.svelte | 36 +++++++++++++++---- .../navigation/ComponentListPanel.svelte | 2 +- .../navigation/ComponentTree.svelte | 20 ++++++++++- 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 453cdced51..9faf00a199 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -157,7 +157,8 @@ diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index f9c5d82753..8f9813c9af 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -46,7 +46,7 @@ class:border class:selected class:withActions - style={`padding-left: calc(var(--spacing-l) + ${indentLevel * 14}px)`} + style={`padding-left: calc(${indentLevel * 14}px)`} {draggable} on:dragend on:dragstart @@ -59,7 +59,13 @@ >
{#if withArrow} -
+
0} + class="icon arrow" + on:click={onIconClick} + >
{/if} @@ -126,25 +132,40 @@ width: max-content; overflow: hidden; position: relative; + padding-left: var(--spacing-l); } .icon { font-size: 16px; - flex: 0 0 20px; + flex: 0 0 24px; display: flex; flex-direction: row; justify-content: center; align-items: center; + color: var(--spectrum-global-color-gray-600); } .icon.arrow { - margin: 0 -2px 0 -6px; - font-size: 12px; + flex: 0 0 20px; + } + .icon.arrow.absolute { + position: absolute; + left: 0; + padding: 8px; + margin-left: -8px; + } + .icon.arrow :global(svg) { + width: 12px; + height: 12px; + } + .icon.arrow.relative { + position: relative; + margin: 0 -6px 0 -4px; } .icon.arrow.opened { transform: rotate(90deg); } .icon + .icon { - margin-left: -4px; + /*margin-left: -4px;*/ } .iconText { margin-top: 1px; @@ -154,11 +175,12 @@ .text { font-weight: 600; - font-size: var(--spectrum-global-dimension-font-size-75); + font-size: 12px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; flex: 1 1 auto; + color: var(--spectrum-global-color-gray-800); } .scrollable .text { flex: 0 0 auto; diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte index a5e5e8fb12..e5a5018f3a 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte @@ -70,11 +70,11 @@
{ $store.selectedComponentId = $selectedScreen?.props._id }} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte index e0a40cda30..0290f72757 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte @@ -51,6 +51,16 @@ return capitalise(type) } + const getComponentIcon = component => { + const def = store.actions.components.getDefinition(component?._component) + return def?.icon + } + + const componentHasChildren = component => { + const def = store.actions.components.getDefinition(component?._component) + return def?.hasChildren && component._children?.length + } + function toggleNodeOpen(componentId) { if (closedNodes[componentId]) { delete closedNodes[componentId] @@ -105,7 +115,8 @@ on:iconClick={() => toggleNodeOpen(component._id)} on:drop={onDrop} text={getComponentText(component)} - withArrow + icon={getComponentIcon(component)} + withArrow={componentHasChildren(component)} indentLevel={level + 1} selected={$store.selectedComponentId === component._id} opened={isOpen(component, $selectedComponentPath, closedNodes)} @@ -143,6 +154,13 @@ padding-left: 0; margin: 0; } + ul :global(.icon.arrow) { + transition: opacity 130ms ease-out; + opacity: 0; + } + ul:hover :global(.icon.arrow) { + opacity: 1; + } ul, li { min-width: max-content; From b14440065c599845727b892656f4b6b80930cad5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 10:14:52 +0100 Subject: [PATCH 097/207] Clear screen validation errors when changing screen --- .../app/[application]/design/[screenId]/screens/index.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte index 21020cc097..d1a5df68e1 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte @@ -1,7 +1,10 @@ - +{#key $selectedScreen?._id} + +{/key} From 68156fee3d41f47fae0a8b6c19a2965571d8f618 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 11:09:20 +0100 Subject: [PATCH 098/207] Fix theme resetting navigation background and update layout UI --- .../_components/LayoutListPanel.svelte | 36 ++++++++----------- .../_components/LayoutSettingsPanel.svelte | 10 +++++- .../theme/_components/AppThemeSelect.svelte | 7 ---- .../server/src/api/controllers/application.ts | 2 +- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte index 4379099725..b481280c28 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte @@ -1,31 +1,25 @@ - - {}} - > - Custom layouts are being deprecated. They will be removed on [date]. - + +
+ {#each $store.layouts as layout (layout._id)} + ($store.selectedLayoutId = layout._id)} + > + + + {/each} +
- {#each $store.layouts as layout (layout._id)} - ($store.selectedLayoutId = layout._id)} - > - - - {/each} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte index 77431c7038..8e1228d5ab 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte @@ -1,7 +1,7 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte index b481280c28..fd38f08ceb 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte @@ -1,25 +1,29 @@ - -
- {#each $store.layouts as layout (layout._id)} - ($store.selectedLayoutId = layout._id)} - > - - - {/each} -
- +
+ {#each $store.layouts as layout (layout._id)} + ($store.selectedLayoutId = layout._id)} + > + + + {/each} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/_layout.svelte new file mode 100644 index 0000000000..1333c6afe3 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/_layout.svelte @@ -0,0 +1,12 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte index a730949499..09d45f8fde 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte @@ -6,8 +6,7 @@ onMount(() => { if ($store.layouts?.length) { $redirect(`./${$store.layouts[0]._id}`) - } else { - $redirect("../") } + // The redirection when no layouts exist is handled by the routify layout }) diff --git a/packages/server/src/api/controllers/layout.js b/packages/server/src/api/controllers/layout.js index a92eec424a..826922a047 100644 --- a/packages/server/src/api/controllers/layout.js +++ b/packages/server/src/api/controllers/layout.js @@ -30,19 +30,15 @@ exports.destroy = async function (ctx) { const layoutId = ctx.params.layoutId, layoutRev = ctx.params.layoutRev - if (Object.values(BASE_LAYOUT_PROP_IDS).includes(layoutId)) { - ctx.throw(400, "Cannot delete a built-in layout") - } else { - const layoutsUsedByScreens = ( - await db.allDocs( - getScreenParams(null, { - include_docs: true, - }) - ) - ).rows.map(element => element.doc.layoutId) - if (layoutsUsedByScreens.includes(layoutId)) { - ctx.throw(400, "Cannot delete a layout that's being used by a screen") - } + const layoutsUsedByScreens = ( + await db.allDocs( + getScreenParams(null, { + include_docs: true, + }) + ) + ).rows.map(element => element.doc.layoutId) + if (layoutsUsedByScreens.includes(layoutId)) { + ctx.throw(400, "Cannot delete a layout that's being used by a screen") } await db.remove(layoutId, layoutRev) From 2d5966e74285892d6cbaf1bbb4ae7e2ff2c7aa26 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 11:26:11 +0100 Subject: [PATCH 100/207] Don't create layouts for new apps --- .../server/src/api/controllers/application.ts | 18 ------------------ packages/server/src/api/controllers/layout.js | 5 +---- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index a1a0c6df7a..61ba794e44 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -292,12 +292,6 @@ const performAppCreate = async (ctx: any) => { const response = await db.put(newApplication, { force: true }) newApplication._rev = response.rev - // Only create the default home screens and layout if we aren't importing - // an app - if (useTemplate !== "true") { - await createEmptyAppPackage(ctx, newApplication) - } - /* istanbul ignore next */ if (!env.isTest()) { await createApp(appId) @@ -524,15 +518,3 @@ const updateAppPackage = async (appPackage: any, appId: any) => { await appCache.invalidateAppMetadata(appId) return response } - -const createEmptyAppPackage = async (ctx: any, app: any) => { - const db = getAppDB() - - let screensAndLayouts = [] - for (let layout of BASE_LAYOUTS) { - const cloned = cloneDeep(layout) - screensAndLayouts.push(await processObject(cloned, app)) - } - - await db.bulkDocs(screensAndLayouts) -} diff --git a/packages/server/src/api/controllers/layout.js b/packages/server/src/api/controllers/layout.js index 826922a047..98130dbec5 100644 --- a/packages/server/src/api/controllers/layout.js +++ b/packages/server/src/api/controllers/layout.js @@ -1,7 +1,4 @@ -const { - EMPTY_LAYOUT, - BASE_LAYOUT_PROP_IDS, -} = require("../../constants/layouts") +const { EMPTY_LAYOUT } = require("../../constants/layouts") const { generateLayoutID, getScreenParams } = require("../../db/utils") const { getAppDB } = require("@budibase/backend-core/context") From 84811159594fc551f05a39a81380e59132a02557 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 11:35:30 +0100 Subject: [PATCH 101/207] Add secondary panel for theme tab --- .../theme/_components/ThemeInfoPanel.svelte | 12 ++++++++++++ .../theme/_components/ThemeSettingsPanel.svelte | 3 --- .../design/[screenId]/theme/index.svelte | 2 ++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte new file mode 100644 index 0000000000..4fe630fc7e --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte @@ -0,0 +1,12 @@ + + + + + + Your theme is set across all the screens within your app. + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte index 2a7772cc72..c50d55ac88 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte @@ -48,9 +48,6 @@ - - Your theme is set across all the screens within your app. - diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte index c4f2f7aad5..013257d8e1 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte @@ -1,5 +1,7 @@ + From 6f382b84c1ea797cbbdc93f3be1792d3fc2617ec Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 11:38:19 +0100 Subject: [PATCH 102/207] Add second panel for navigation tab --- .../_components/NavigationInfoPanel.svelte | 16 ++++++++++++++++ .../_components/NavigationSettingsPanel.svelte | 7 ------- .../design/[screenId]/navigation/index.svelte | 2 ++ .../theme/_components/ThemeInfoPanel.svelte | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte new file mode 100644 index 0000000000..f18730307d --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte @@ -0,0 +1,16 @@ + + + + + + Your navigation is configured for all the screens within your app. + + + You can hide and show your navigation for each screen in the screen + settings. + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte index e3edcdffed..6490c7f198 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte @@ -29,13 +29,6 @@ - - Your navigation is configured for all the screens within your app. - - - You can hide and show your navigation for each screen in the screen - settings. - diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte index 203cb2f0a9..fc2e03d8e8 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte @@ -1,5 +1,7 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte index 4fe630fc7e..9593f0bff5 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte @@ -3,7 +3,7 @@ import { Body, Layout } from "@budibase/bbui" - + Your theme is set across all the screens within your app. From a7395a40cfd8a14a3abf9348850b436695046a94 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 12:05:55 +0100 Subject: [PATCH 103/207] Allow pasting inside screens on screens tab and fix icon overflow in nav items --- .../builder/src/components/common/NavItem.svelte | 9 +++++---- .../_components/ScreenDropdownMenu.svelte | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index 8f9813c9af..e7b9b33471 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -135,8 +135,12 @@ padding-left: var(--spacing-l); } + /* Needed to fully display the actions icon */ + .nav-item.scrollable .nav-item-content { + padding-right: 1px; + } + .icon { - font-size: 16px; flex: 0 0 24px; display: flex; flex-direction: row; @@ -164,9 +168,6 @@ .icon.arrow.opened { transform: rotate(90deg); } - .icon + .icon { - /*margin-left: -4px;*/ - } .iconText { margin-top: 1px; font-size: var(--spectrum-global-dimension-font-size-50); diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte index d99b72beef..2f14766d8e 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte @@ -21,6 +21,15 @@ let screenDetailsModal $: screen = $store.screens.find(screen => screen._id === screenId) + $: noPaste = !$store.componentToPaste + + const pasteComponent = mode => { + try { + store.actions.components.paste(screen.props, mode) + } catch (error) { + notifications.error("Error saving component") + } + } const duplicateScreen = () => { screenDetailsModal.show() @@ -69,6 +78,13 @@
+ pasteComponent("inside")} + disabled={noPaste} + > + Paste inside + Duplicate Delete From b488293e926987e946b84fde03a227ffdd8f8be2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 13:50:15 +0100 Subject: [PATCH 104/207] Add warning to navigation section when using an old screen with a custom layout, and allow upgrading --- .../src/builderStore/store/frontend.js | 20 ++++++++++++++++++- .../_components/NavigationInfoPanel.svelte | 19 +++++++++++++++++- .../_components/ScreenSettingsPanel.svelte | 16 ++------------- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 5d6e3a6bfc..53da1c3c4d 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -1,6 +1,12 @@ import { get, writable } from "svelte/store" import { cloneDeep } from "lodash/fp" -import { currentAsset, mainLayout, selectedComponent } from "builderStore" +import { + currentAsset, + mainLayout, + selectedComponent, + selectedScreen, + store, +} from "builderStore" import { datasources, integrations, @@ -280,6 +286,18 @@ export const getFrontendStore = () => { promises.push(store.actions.screens.save(screen)) return await Promise.all(promises) }, + removeCustomLayout: async screen => { + // Pull relevant settings from old layout, if required + const layout = get(store).layouts.find(x => x._id === screen.layoutId) + screen.layoutId = null + if (screen.showNavigation == null) { + screen.showNavigation = layout?.props.navigation !== "None" + } + if (screen.width == null) { + screen.width = layout?.props.width || "Large" + } + await store.actions.screens.save(screen) + }, }, preview: { saveSelected: async () => { diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte index f18730307d..dbd23c462f 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte @@ -1,10 +1,27 @@ + {#if $selectedScreen.layoutId} + + You can't preview your navigation settings using this screen as it uses + a custom layout, which is deprecated + + {/if} Your navigation is configured for all the screens within your app. diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte index b33f3609ba..71a1a1d0ac 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte @@ -148,19 +148,7 @@ ] const removeCustomLayout = async () => { - let screen = get(selectedScreen) - - // Pull relevant settings from old layout, if required - const layout = get(store).layouts.find(x => x._id === screen.layoutId) - screen.layoutId = null - if (screen.showNavigation == null) { - screen.showNavigation = layout?.props.navigation !== "None" - } - if (screen.width == null) { - screen.width = layout?.props.width || "Large" - } - - await store.actions.screens.save(screen) + return store.actions.screens.removeCustomLayout(get(selectedScreen)) } @@ -173,7 +161,7 @@ {#if $selectedScreen.layoutId} From 47631a47e7f157fdc8e5cfabb5de9b3179da826f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 16 May 2022 08:48:03 +0100 Subject: [PATCH 105/207] Disable new screens settings when viewing an old screen and correctly upgrade all screen settings when detaching from custom layouts --- packages/builder/src/builderStore/store/frontend.js | 8 ++------ .../screens/_components/ScreenSettingsPanel.svelte | 4 +++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 53da1c3c4d..00e8d4c1fd 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -290,12 +290,8 @@ export const getFrontendStore = () => { // Pull relevant settings from old layout, if required const layout = get(store).layouts.find(x => x._id === screen.layoutId) screen.layoutId = null - if (screen.showNavigation == null) { - screen.showNavigation = layout?.props.navigation !== "None" - } - if (screen.width == null) { - screen.width = layout?.props.width || "Large" - } + screen.showNavigation = layout?.props.navigation !== "None" + screen.width = layout?.props.width || "Large" await store.actions.screens.save(screen) }, }, diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte index 71a1a1d0ac..f17caf55cb 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte @@ -90,7 +90,7 @@ } } - const screenSettings = [ + $: screenSettings = [ { key: "routing.homeScreen", control: Checkbox, @@ -134,6 +134,7 @@ control: Toggle, props: { text: "Show navigation", + disabled: !!$selectedScreen.layoutId, }, }, { @@ -143,6 +144,7 @@ props: { options: ["Extra small", "Small", "Medium", "Large", "Max"], placeholder: "Default", + disabled: !!$selectedScreen.layoutId, }, }, ] From a2d8f143e945ea744cc18c3e93e5b01550afcd7c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 17 May 2022 13:32:16 +0100 Subject: [PATCH 106/207] Highlighted child components of selected component --- .../src/components/common/NavItem.svelte | 11 ++++++++--- .../navigation/ComponentTree.svelte | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index e7b9b33471..5b8c416260 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -15,6 +15,7 @@ export let iconColor export let scrollable = false export let color + export let highlighted = false const scrollApi = getContext("scroll") const dispatch = createEventDispatcher() @@ -46,6 +47,8 @@ class:border class:selected class:withActions + class:scrollable + class:highlighted style={`padding-left: calc(${indentLevel * 14}px)`} {draggable} on:dragend @@ -55,7 +58,6 @@ on:click={onClick} ondragover="return false" ondragenter="return false" - class:scrollable >
{#if withArrow} @@ -112,12 +114,15 @@ justify-content: center; align-items: flex-start; } + .nav-item.highlighted { + background-color: var(--spectrum-global-color-gray-200); + } .nav-item.selected { - background-color: var(--grey-2); + background-color: var(--spectrum-global-color-gray-300); color: var(--ink); } .nav-item:hover { - background-color: var(--grey-3); + background-color: var(--spectrum-global-color-gray-300); } .nav-item:hover .actions { visibility: visible; diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte index 0290f72757..fc5e5fb148 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte @@ -5,7 +5,13 @@ import NavItem from "components/common/NavItem.svelte" import { capitalise } from "helpers" import { notifications } from "@budibase/bbui" - import { selectedComponentPath } from "builderStore" + import { + selectedComponentPath, + selectedComponent, + selectedScreen, + } from "builderStore" + import { findComponentPath } from "builderStore/componentUtils" + import { get } from "svelte/store" export let components = [] export let currentComponent @@ -87,6 +93,15 @@ } return !closedNodes[component._id] } + + const isChildOfSelectedComponent = component => { + const selectedComponentId = get(selectedComponent)?._id + const selectedScreenId = get(selectedScreen)?.props._id + if (!selectedComponentId || selectedComponentId === selectedScreenId) { + return false + } + return findComponentPath($selectedComponent, component._id)?.length > 0 + }
    @@ -120,6 +135,7 @@ indentLevel={level + 1} selected={$store.selectedComponentId === component._id} opened={isOpen(component, $selectedComponentPath, closedNodes)} + highlighted={isChildOfSelectedComponent(component)} > From 2b5b6ae282b8c87bd392576697f41076ae392012 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 17 May 2022 14:10:21 +0100 Subject: [PATCH 107/207] Scroll to the selected component inside the app preview --- packages/client/src/components/Component.svelte | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte index 4c1fe69258..7a9a5cfb08 100644 --- a/packages/client/src/components/Component.svelte +++ b/packages/client/src/components/Component.svelte @@ -136,6 +136,9 @@ // Determine and apply settings to the component $: applySettings(staticSettings, enrichedSettings, conditionalSettings) + // Scroll the selected element into view + $: selected && scrollIntoView() + // Update component context $: store.set({ id, @@ -374,6 +377,19 @@ } } + const scrollIntoView = () => { + const node = document.getElementsByClassName(id)?.[0]?.childNodes[0] + if (!node) { + return + } + node.style.scrollMargin = "80px" + node.scrollIntoView({ + behavior: "smooth", + block: "start", + inline: "start", + }) + } + onMount(() => { if ( $appStore.isDevApp && From 976904686e37a59aea181805a03c234a7e3358d7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 17 May 2022 14:33:12 +0100 Subject: [PATCH 108/207] Add icons to app preview selection indicators --- .../client/src/components/Component.svelte | 15 ++---- .../src/components/preview/Indicator.svelte | 46 ++++++++++++++----- .../components/preview/IndicatorSet.svelte | 15 +++++- .../src/components/preview/SettingsBar.svelte | 2 +- packages/client/src/stores/components.js | 7 +++ 5 files changed, 60 insertions(+), 25 deletions(-) diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte index 7a9a5cfb08..ae6db62282 100644 --- a/packages/client/src/components/Component.svelte +++ b/packages/client/src/components/Component.svelte @@ -20,7 +20,6 @@ } from "utils/componentProps" import { builderStore, devToolsStore, componentStore, appStore } from "stores" import { Helpers } from "@budibase/bbui" - import Manifest from "manifest.json" import { getActiveConditions, reduceConditionActions } from "utils/conditions" import Placeholder from "components/app/Placeholder.svelte" @@ -171,8 +170,9 @@ } // Pull definition and constructor - constructor = getComponentConstructor(instance._component) - definition = getComponentDefinition(instance._component) + const component = instance._component + constructor = getComponentConstructor(component) + definition = componentStore.actions.getComponentDefinition(component) if (!definition) { return } @@ -217,13 +217,6 @@ return AppComponents[name] } - // Gets this component's definition from the manifest - const getComponentDefinition = component => { - const prefix = "@budibase/standard-components/" - const type = component?.replace(prefix, "") - return type ? Manifest[type] : null - } - const getSettingsDefinitionMap = settingsDefinition => { let map = {} settingsDefinition?.forEach(setting => { @@ -382,7 +375,7 @@ if (!node) { return } - node.style.scrollMargin = "80px" + node.style.scrollMargin = "86px" node.scrollIntoView({ behavior: "smooth", block: "start", diff --git a/packages/client/src/components/preview/Indicator.svelte b/packages/client/src/components/preview/Indicator.svelte index ee969e3395..23051c73d1 100644 --- a/packages/client/src/components/preview/Indicator.svelte +++ b/packages/client/src/components/preview/Indicator.svelte @@ -1,18 +1,20 @@
    - {#if text} -
    - {text} + {#if text || icon} +
    + {#if icon} + + {/if} + {#if text} +
    + {text} +
    + {/if}
    {/if}
    diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte index 6fcf552d21..298b65fbf0 100644 --- a/packages/client/src/components/preview/IndicatorSet.svelte +++ b/packages/client/src/components/preview/IndicatorSet.svelte @@ -2,7 +2,7 @@ import { onMount, onDestroy } from "svelte" import Indicator from "./Indicator.svelte" import { domDebounce } from "utils/domDebounce" - import { builderStore } from "stores" + import { builderStore, componentStore } from "stores" export let componentId export let color @@ -15,12 +15,24 @@ let text $: visibleIndicators = indicators.filter(x => x.visible) $: offset = $builderStore.inBuilder ? 0 : 2 + $: icon = getComponentIcon(componentId) + $: console.log(icon) let updating = false let observers = [] let callbackCount = 0 let nextIndicators = [] + const getComponentIcon = id => { + if (!id) { + return null + } + const component = componentStore.actions.getComponentById(id) + const type = component?._component + const definition = componentStore.actions.getComponentDefinition(type) + return definition?.icon + } + const createIntersectionCallback = idx => entries => { if (callbackCount >= observers.length) { return @@ -121,6 +133,7 @@ width={indicator.width} height={indicator.height} text={idx === 0 ? text : null} + icon={idx === 0 ? icon : null} {transition} {zIndex} {color} diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte index 154a115c98..02589277c3 100644 --- a/packages/client/src/components/preview/SettingsBar.svelte +++ b/packages/client/src/components/preview/SettingsBar.svelte @@ -6,7 +6,7 @@ import { builderStore, componentStore } from "stores" import { domDebounce } from "utils/domDebounce" - const verticalOffset = 28 + const verticalOffset = 34 const horizontalOffset = 2 let top = 0 diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js index a836ca150d..a7426113e2 100644 --- a/packages/client/src/stores/components.js +++ b/packages/client/src/stores/components.js @@ -67,6 +67,12 @@ const createComponentStore = () => { return findComponentById(asset?.props, id) } + const getComponentDefinition = type => { + const prefix = "@budibase/standard-components/" + type = type?.replace(prefix, "") + return type ? Manifest[type] : null + } + return { ...derivedStore, actions: { @@ -74,6 +80,7 @@ const createComponentStore = () => { unregisterInstance, isComponentRegistered, getComponentById, + getComponentDefinition, }, } } From 4256ee47029a4d0fcbbece12eb7a718599645054 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 17 May 2022 14:34:54 +0100 Subject: [PATCH 109/207] Update preview indicator offsets --- packages/client/src/components/Component.svelte | 2 +- packages/client/src/components/preview/SettingsBar.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte index ae6db62282..80e187135c 100644 --- a/packages/client/src/components/Component.svelte +++ b/packages/client/src/components/Component.svelte @@ -375,7 +375,7 @@ if (!node) { return } - node.style.scrollMargin = "86px" + node.style.scrollMargin = "100px" node.scrollIntoView({ behavior: "smooth", block: "start", diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte index 02589277c3..bc227c87d9 100644 --- a/packages/client/src/components/preview/SettingsBar.svelte +++ b/packages/client/src/components/preview/SettingsBar.svelte @@ -6,7 +6,7 @@ import { builderStore, componentStore } from "stores" import { domDebounce } from "utils/domDebounce" - const verticalOffset = 34 + const verticalOffset = 36 const horizontalOffset = 2 let top = 0 From f91c8f43fd75c8019732d30c2e7e585778e2d744 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 19 May 2022 09:17:09 +0100 Subject: [PATCH 110/207] Remove some log statements --- packages/client/src/components/app/charts/BarChart.svelte | 1 - packages/client/src/components/preview/IndicatorSet.svelte | 1 - packages/frontend-core/src/api/attachments.js | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/client/src/components/app/charts/BarChart.svelte b/packages/client/src/components/app/charts/BarChart.svelte index af1bb478fe..f1e02d8af6 100644 --- a/packages/client/src/components/app/charts/BarChart.svelte +++ b/packages/client/src/components/app/charts/BarChart.svelte @@ -53,7 +53,6 @@ palette, horizontal ) => { - console.log("new chart") const allCols = [labelColumn, ...(valueColumns || [null])] if ( !dataProvider || diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte index 298b65fbf0..a6ca57aef0 100644 --- a/packages/client/src/components/preview/IndicatorSet.svelte +++ b/packages/client/src/components/preview/IndicatorSet.svelte @@ -16,7 +16,6 @@ $: visibleIndicators = indicators.filter(x => x.visible) $: offset = $builderStore.inBuilder ? 0 : 2 $: icon = getComponentIcon(componentId) - $: console.log(icon) let updating = false let observers = [] diff --git a/packages/frontend-core/src/api/attachments.js b/packages/frontend-core/src/api/attachments.js index e2eb348f9d..e3b1b74e5b 100644 --- a/packages/frontend-core/src/api/attachments.js +++ b/packages/frontend-core/src/api/attachments.js @@ -48,7 +48,6 @@ export const buildAttachmentEndpoints = API => { * @param data the file to upload */ externalUpload: async ({ datasourceId, bucket, key, data }) => { - console.log(API) const { signedUrl, publicUrl } = await getSignedDatasourceURL({ datasourceId, bucket, From 050f4900b3673972dff148200214171d38d4ef56 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 19 May 2022 19:14:12 +0100 Subject: [PATCH 111/207] Add initial work on component drag and drop refactor --- .../src/components/common/NavItem.svelte | 1 + .../navigation/ComponentTree.svelte | 57 ++++++++++++------- .../_components/navigation/dragDropStore.js | 35 ++++-------- 3 files changed, 47 insertions(+), 46 deletions(-) diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index 5b8c416260..f0c447826e 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -138,6 +138,7 @@ overflow: hidden; position: relative; padding-left: var(--spacing-l); + pointer-events: none; } /* Needed to fully display the actions icon */ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte index fc5e5fb148..d7e6500dd1 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte @@ -19,6 +19,7 @@ export let dragDropStore let closedNodes = {} + let indicatorY = 0 const dragstart = component => e => { e.dataTransfer.dropEffect = DropEffect.MOVE @@ -29,18 +30,19 @@ const definition = store.actions.components.getDefinition( component._component ) - const canHaveChildrenButIsEmpty = - definition?.hasChildren && !component._children?.length + const canHaveChildren = definition?.hasChildren e.dataTransfer.dropEffect = DropEffect.COPY // how far down the mouse pointer is on the drop target const mousePosition = e.offsetY / e.currentTarget.offsetHeight + indicatorY = e.currentTarget.offsetTop + dragDropStore.actions.dragover({ component, index, - canHaveChildrenButIsEmpty, + canHaveChildren, mousePosition, }) @@ -62,9 +64,13 @@ return def?.icon } - const componentHasChildren = component => { + const componentSupportsChildren = component => { const def = store.actions.components.getDefinition(component?._component) - return def?.hasChildren && component._children?.length + return def?.hasChildren + } + + const componentHasChildren = component => { + return componentSupportsChildren(component) && component._children?.length } function toggleNodeOpen(componentId) { @@ -111,13 +117,17 @@ $store.selectedComponentId = component._id }} > - {#if $dragDropStore?.targetComponent === component && $dragDropStore.dropPosition === DropPosition.ABOVE} + {#if dragDropStore && $dragDropStore?.targetComponent === component}
    {/if} @@ -148,18 +158,6 @@ level={level + 1} /> {/if} - - {#if $dragDropStore?.targetComponent === component && ($dragDropStore.dropPosition === DropPosition.INSIDE || $dragDropStore.dropPosition === DropPosition.BELOW)} -
    - {/if} {/each}
@@ -183,8 +181,25 @@ } .drop-item { - border-radius: var(--border-radius-m); + height: 2px; + background: green; + z-index: 999; + position: absolute; + top: calc(var(--indicatorY) - 1px); + left: var(--indicatorX); + width: 100px; + } + .drop-item.above { + background: red; + } + .drop-item.below { + background: blue; + margin-top: 32px; + } + .drop-item.inside { + background: transparent; + border: 2px solid green; height: 32px; - background: var(--grey-3); + pointer-events: none; } diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js index d965a2456d..3355c876bc 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js @@ -23,44 +23,29 @@ export default function () { return state }) }, - dragover: ({ - component, - index, - canHaveChildrenButIsEmpty, - mousePosition, - }) => { + dragover: ({ component, canHaveChildren, mousePosition }) => { store.update(state => { state.targetComponent = component // only allow dropping inside when container is empty // if container has children, drag over them - if (canHaveChildrenButIsEmpty && index === 0) { - // hovered above center of target - if (mousePosition < 0.4) { + if (canHaveChildren) { + if (mousePosition <= 0.33) { + // hovered above center of target state.dropPosition = DropPosition.ABOVE - } - - // hovered around bottom of target - if (mousePosition > 0.8) { + } else if (mousePosition >= 0.66) { + // hovered around bottom of target state.dropPosition = DropPosition.BELOW - } - - // hovered in center of target - if (mousePosition > 0.4 && mousePosition < 0.8) { + } else { + // hovered in center of target state.dropPosition = DropPosition.INSIDE } return state } // bottom half - if (mousePosition > 0.5) { - state.dropPosition = DropPosition.BELOW - } else { - state.dropPosition = canHaveChildrenButIsEmpty - ? DropPosition.INSIDE - : DropPosition.ABOVE - } - + state.dropPosition = + mousePosition > 0.5 ? DropPosition.BELOW : DropPosition.ABOVE return state }) }, From 8ee95c0779f027485d7a5039525175b706d73bd1 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 19 May 2022 20:11:04 +0100 Subject: [PATCH 112/207] Update new component DND to use proper styles --- .../_components/navigation/ComponentTree.svelte | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte index d7e6500dd1..1ec961de15 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte @@ -182,24 +182,23 @@ .drop-item { height: 2px; - background: green; + background: var(--spectrum-global-color-static-green-500); z-index: 999; position: absolute; top: calc(var(--indicatorY) - 1px); left: var(--indicatorX); width: 100px; + border-radius: 4px; } .drop-item.above { - background: red; } .drop-item.below { - background: blue; margin-top: 32px; } .drop-item.inside { background: transparent; - border: 2px solid green; - height: 32px; + border: 2px solid var(--spectrum-global-color-static-green-500); + height: 29px; pointer-events: none; } From b281e233b35ae1616d4ab43630e2d7c9b6c8790d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 19 May 2022 21:02:54 +0100 Subject: [PATCH 113/207] Scroll preview to the top to show navigation whenever editing navigation settings --- .../client/src/components/app/Layout.svelte | 164 +++++++++++------- 1 file changed, 98 insertions(+), 66 deletions(-) diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index fccdef7dcc..d7517b06b8 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -38,6 +38,8 @@ "Extra small": "xs", } + let mobileOpen = false + // Set some layout context. This isn't used in bindings but can be used // determine things about the current app layout. $: mobile = $context.device.mobile @@ -58,7 +60,25 @@ $context.device.width, $context.device.height ) - let mobileOpen = false + + // Scroll navigation into view if selected + $: { + if ( + $builderStore.inBuilder && + $builderStore.selectedComponentId === "navigation" + ) { + const node = document.getElementsByClassName("nav-wrapper")?.[0] + if (node) { + console.log("scroll") + node.style.scrollMargin = "100px" + node.scrollIntoView({ + behavior: "smooth", + block: "start", + inline: "start", + }) + } + } + } const isInternal = url => { return url.startsWith("/") @@ -111,76 +131,85 @@ > {#if typeClass !== "none"}
-
-
+
+
+
+ {#if validLinks?.length} +
+ (mobileOpen = !mobileOpen)} + /> +
+ {/if} + +
+ +
+
+
(mobileOpen = false)} + /> {#if validLinks?.length} -
- (mobileOpen = !mobileOpen)} - /> +
+ {#each validLinks as { text, url }} + {#if isInternal(url)} + + {text} + + {:else} + + {text} + + {/if} + {/each} +
+ (mobileOpen = false)} + /> +
{/if} - -
- -
-
(mobileOpen = false)} - /> - {#if validLinks?.length} -
- {#each validLinks as { text, url }} - {#if isInternal(url)} - - {text} - - {:else} - - {text} - - {/if} - {/each} -
- (mobileOpen = false)} - /> -
-
- {/if}
{/if} @@ -193,6 +222,9 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js index 3355c876bc..bd51507ec5 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js @@ -23,29 +23,30 @@ export default function () { return state }) }, - dragover: ({ component, canHaveChildren, mousePosition }) => { + dragover: ({ component, canHaveChildren, hasChildren, mousePosition }) => { store.update(state => { - state.targetComponent = component - // only allow dropping inside when container is empty - // if container has children, drag over them - if (canHaveChildren) { if (mousePosition <= 0.33) { - // hovered above center of target state.dropPosition = DropPosition.ABOVE } else if (mousePosition >= 0.66) { - // hovered around bottom of target state.dropPosition = DropPosition.BELOW } else { - // hovered in center of target state.dropPosition = DropPosition.INSIDE } - return state + } else { + state.dropPosition = + mousePosition > 0.5 ? DropPosition.BELOW : DropPosition.ABOVE + } + + // If hovering over a component with children and attempting to drop + // below, we need to change this to be above the first child instead + if (state.dropPosition === DropPosition.BELOW && hasChildren) { + state.targetComponent = component._children[0] + state.dropPosition = DropPosition.ABOVE + } else { + state.targetComponent = component } - // bottom half - state.dropPosition = - mousePosition > 0.5 ? DropPosition.BELOW : DropPosition.ABOVE return state }) }, @@ -76,7 +77,7 @@ export default function () { } // Cut and paste the component - frontendStore.actions.components.copy(state.dragged, true) + frontendStore.actions.components.copy(state.dragged, true, false) await frontendStore.actions.components.paste( state.targetComponent, state.dropPosition From b9dd1068f2d11f383caa3086561dc800ae5a60b4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 23 May 2022 09:42:55 +0100 Subject: [PATCH 119/207] Add WIP component DND indicator refactor --- packages/builder/package.json | 2 +- .../navigation/ComponentListPanel.svelte | 9 +- .../navigation/ComponentTree.svelte | 84 +- .../DNDParentPositionIndicator.svelte | 9 + .../navigation/DNDPositionIndicator.svelte | 47 + .../_components/navigation/dndStore.js | 127 +++ .../_components/navigation/dragDropStore.js | 90 -- packages/builder/yarn.lock | 954 +----------------- 8 files changed, 217 insertions(+), 1105 deletions(-) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDParentPositionIndicator.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js delete mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js diff --git a/packages/builder/package.json b/packages/builder/package.json index 17e625b115..7f3534b093 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -106,7 +106,7 @@ "rollup": "^2.44.0", "rollup-plugin-copy": "^3.4.0", "start-server-and-test": "^1.12.1", - "svelte": "^3.38.2", + "svelte": "^3.48.0", "svelte-jester": "^1.3.2", "ts-node": "^10.4.0", "typescript": "^4.5.5", diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte index e5a5018f3a..c887735ce7 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte @@ -1,14 +1,14 @@ + +{#if $dndStore.targetParent?._id === component._id && $dndStore.dropPosition !== DropPosition.INSIDE} +
+{/if} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte new file mode 100644 index 0000000000..8dbdc29c02 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte @@ -0,0 +1,47 @@ + + +{#if $dndStore.dragging && $dndStore.valid} + {#if $dndStore?.target?._id === componentId} +
+ {/if} +{/if} +] + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js new file mode 100644 index 0000000000..e512ddcca2 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js @@ -0,0 +1,127 @@ +import { writable, get } from "svelte/store" +import { store as frontendStore, selectedScreen } from "builderStore" +import { + findComponentParent, + findComponentPath, +} from "builderStore/componentUtils" + +export const DropPosition = { + ABOVE: "above", + BELOW: "below", + INSIDE: "inside", +} + +const initialState = { + source: null, + target: null, + targetParent: null, + dropPosition: null, + dragging: false, + valid: false, +} + +export default function () { + const store = writable(initialState) + const actions = { + dragstart: component => { + if (!component) { + return + } + store.set({ + source: component, + target: null, + dropPosition: null, + dragging: true, + valid: false, + }) + }, + dragover: ({ component, mousePosition }) => { + const definition = frontendStore.actions.components.getDefinition( + component._component + ) + const canHaveChildren = definition?.hasChildren + const hasChildren = component._children?.length > 0 + + let dropPosition + let target + let targetParent + + // If the component has children, it cannot be dropped below + if (hasChildren) { + if (mousePosition <= 0.33) { + dropPosition = DropPosition.ABOVE + } else { + dropPosition = DropPosition.INSIDE + } + } + + // If it can have children then it can be any position + else if (canHaveChildren) { + if (mousePosition <= 0.33) { + dropPosition = DropPosition.ABOVE + } else if (mousePosition >= 0.66) { + dropPosition = DropPosition.BELOW + } else { + dropPosition = DropPosition.INSIDE + } + } + + // Otherwise drop either above or below + else { + dropPosition = + mousePosition > 0.5 ? DropPosition.BELOW : DropPosition.ABOVE + } + + // If hovering over a component with children and attempting to drop + // below, we need to change this to be above the first child instead + if (dropPosition === DropPosition.BELOW && hasChildren) { + target = component._children[0] + dropPosition = DropPosition.ABOVE + } else { + target = component + } + + // Find the parent of the target component + if (target) { + targetParent = findComponentParent( + get(selectedScreen).props, + target._id + ) + } + + store.update(state => { + return { + ...state, + dropPosition, + target, + targetParent, + + /// Mark as invalid if the target is a child of the source + valid: findComponentPath(state.source, target._id)?.length === 0, + } + }) + }, + reset: () => { + store.set(initialState) + }, + drop: async () => { + const state = get(store) + if (!state.valid || !state.source || !state.target) { + return + } + actions.reset() + + // Cut and paste the component + frontendStore.actions.components.copy(state.source, true, false) + await frontendStore.actions.components.paste( + state.target, + state.dropPosition + ) + }, + } + + return { + subscribe: store.subscribe, + actions, + } +} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js deleted file mode 100644 index bd51507ec5..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dragDropStore.js +++ /dev/null @@ -1,90 +0,0 @@ -import { writable, get } from "svelte/store" -import { store as frontendStore } from "builderStore" -import { findComponentPath } from "builderStore/componentUtils" - -export const DropEffect = { - MOVE: "move", - COPY: "copy", -} - -export const DropPosition = { - ABOVE: "above", - BELOW: "below", - INSIDE: "inside", -} - -export default function () { - const store = writable({}) - - store.actions = { - dragstart: component => { - store.update(state => { - state.dragged = component - return state - }) - }, - dragover: ({ component, canHaveChildren, hasChildren, mousePosition }) => { - store.update(state => { - if (canHaveChildren) { - if (mousePosition <= 0.33) { - state.dropPosition = DropPosition.ABOVE - } else if (mousePosition >= 0.66) { - state.dropPosition = DropPosition.BELOW - } else { - state.dropPosition = DropPosition.INSIDE - } - } else { - state.dropPosition = - mousePosition > 0.5 ? DropPosition.BELOW : DropPosition.ABOVE - } - - // If hovering over a component with children and attempting to drop - // below, we need to change this to be above the first child instead - if (state.dropPosition === DropPosition.BELOW && hasChildren) { - state.targetComponent = component._children[0] - state.dropPosition = DropPosition.ABOVE - } else { - state.targetComponent = component - } - - return state - }) - }, - reset: () => { - store.update(state => { - state.dropPosition = "" - state.targetComponent = null - state.dragged = null - return state - }) - }, - drop: async () => { - const state = get(store) - - // Stop if the target and source are the same - if (state.targetComponent === state.dragged) { - return - } - // Stop if the target or source are null - if (!state.targetComponent || !state.dragged) { - return - } - // Stop if the target is a child of source - const path = findComponentPath(state.dragged, state.targetComponent._id) - const ids = path.map(component => component._id) - if (ids.includes(state.targetComponent._id)) { - return - } - - // Cut and paste the component - frontendStore.actions.components.copy(state.dragged, true, false) - await frontendStore.actions.components.paste( - state.targetComponent, - state.dropPosition - ) - store.actions.reset() - }, - } - - return store -} diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 2559c6c108..e87e664423 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@adobe/spectrum-css-workflow-icons@^1.2.1": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.3.tgz#5e31ce842b7626f4b99f9d5cd0b17599d287b0bf" - integrity sha512-lWzRWun9kQWHj46Za7riJsl82LasYI90WpeKpJJ9ibZ7s0VT+sStFaRq/zqmp5IxQBfY3xwD4TsKSI26mHdmCA== - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" @@ -920,134 +915,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/bbui@^1.0.155-alpha.3", "@budibase/bbui@^1.0.161": - version "1.0.161" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.0.161.tgz#44cedcecdb43aad377a7b32e1b5b261a263f44b3" - integrity sha512-UpMeNUmiLTNcdHSFmoCrHUKncFjS9h1ihBKf1ZLUY36g4S9G9xPC1fCZadGgigvcd+By6YeRaMqUR/VSabLi+Q== - dependencies: - "@adobe/spectrum-css-workflow-icons" "^1.2.1" - "@budibase/string-templates" "^1.0.161" - "@spectrum-css/actionbutton" "^1.0.1" - "@spectrum-css/actiongroup" "^1.0.1" - "@spectrum-css/avatar" "^3.0.2" - "@spectrum-css/button" "^3.0.1" - "@spectrum-css/buttongroup" "^3.0.2" - "@spectrum-css/checkbox" "^3.0.2" - "@spectrum-css/dialog" "^3.0.1" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/dropzone" "^3.0.2" - "@spectrum-css/fieldgroup" "^3.0.2" - "@spectrum-css/fieldlabel" "^3.0.1" - "@spectrum-css/icon" "^3.0.1" - "@spectrum-css/illustratedmessage" "^3.0.2" - "@spectrum-css/inlinealert" "^2.0.1" - "@spectrum-css/inputgroup" "^3.0.2" - "@spectrum-css/label" "^2.0.10" - "@spectrum-css/link" "^3.1.1" - "@spectrum-css/menu" "^3.0.1" - "@spectrum-css/modal" "^3.0.1" - "@spectrum-css/pagination" "^3.0.3" - "@spectrum-css/picker" "^1.0.1" - "@spectrum-css/popover" "^3.0.1" - "@spectrum-css/progressbar" "^1.0.2" - "@spectrum-css/progresscircle" "^1.0.2" - "@spectrum-css/radio" "^3.0.2" - "@spectrum-css/search" "^3.0.2" - "@spectrum-css/sidenav" "^3.0.2" - "@spectrum-css/statuslight" "^3.0.2" - "@spectrum-css/stepper" "^3.0.3" - "@spectrum-css/switch" "^1.0.2" - "@spectrum-css/table" "^3.0.1" - "@spectrum-css/tabs" "^3.0.1" - "@spectrum-css/tags" "^3.0.2" - "@spectrum-css/textfield" "^3.0.1" - "@spectrum-css/toast" "^3.0.1" - "@spectrum-css/tooltip" "^3.0.3" - "@spectrum-css/treeview" "^3.0.2" - "@spectrum-css/typography" "^3.0.1" - "@spectrum-css/underlay" "^2.0.9" - "@spectrum-css/vars" "^3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@^1.0.155-alpha.3": - version "1.0.161" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-1.0.161.tgz#f25ef26c49b04db098f3aab704b972648284d929" - integrity sha512-26hor/dyUlzNr3awHsQXXVEHi6qv/7tXaBQ3iDBbDJD5pUoYtpkSdQ5LzeAoWqacP06ZGMWSUxx53yNdUUELQQ== - dependencies: - "@budibase/bbui" "^1.0.161" - "@budibase/frontend-core" "^1.0.161" - "@budibase/string-templates" "^1.0.161" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - leaflet "^1.7.1" - regexparam "^1.3.0" - rollup-plugin-polyfill-node "^0.8.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - svelte "^3.38.2" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@^1.0.155-alpha.3", "@budibase/frontend-core@^1.0.161": - version "1.0.161" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-1.0.161.tgz#16b137a31846fc18bd046669988ff8d6be2debaf" - integrity sha512-VAbCc/9p64OG0op7W8ktc6F2sHNQn7nKoJne/sVrA1xVzIYyhppgbjwpnCRSI4vWSVXNgloKogLfGbiiUKVnuQ== - dependencies: - "@budibase/bbui" "^1.0.161" - lodash "^4.17.21" - svelte "^3.46.2" - -"@budibase/handlebars-helpers@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" - integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== - dependencies: - array-sort "^1.0.0" - define-property "^2.0.2" - extend-shallow "^3.0.2" - for-in "^1.0.2" - get-object "^0.2.0" - get-value "^3.0.1" - handlebars "^4.7.7" - handlebars-utils "^1.0.6" - has-value "^2.0.2" - helper-md "^0.2.2" - html-tag "^2.0.0" - is-even "^1.0.0" - is-glob "^4.0.1" - kind-of "^6.0.3" - micromatch "^3.1.5" - relative "^3.0.2" - striptags "^3.1.1" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - -"@budibase/string-templates@^1.0.155-alpha.3", "@budibase/string-templates@^1.0.161": - version "1.0.161" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.161.tgz#a352f5fefea132c5c6a46af77f00e9c1f61f9531" - integrity sha512-HaXNbjufIWQN4/UdibLcXd7RC5cHPYGSYknfXGdCMC0nX08z++twNfT8tcrexGiby4EuCjkaOXRWX0V+GKsGUA== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1331,15 +1198,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@rollup/plugin-inject@^4.0.0": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-4.0.4.tgz#fbeee66e9a700782c4f65c8b0edbafe58678fbc2" - integrity sha512-4pbcU4J/nS+zuHk+c+OL3WtmEQhqxlZ9uqfjQMQDOHOPld7PsCd8k5LWs8h5wjwJN7MgnAn768F2sDxEP4eNFQ== - dependencies: - "@rollup/pluginutils" "^3.1.0" - estree-walker "^2.0.1" - magic-string "^0.25.7" - "@rollup/plugin-replace@^2.4.2": version "2.4.2" resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a" @@ -1475,108 +1333,6 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@spectrum-css/actionbutton@^1.0.1": - version "1.1.13" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.13.tgz#2150079c16465dba2fc8c9ea6c1e5c6ab6c9cea3" - integrity sha512-s0i7gcXLdf3UNL5RDsqHkJLbEkdC1SRbfLUHDxmra6Y5wfgcSxzk7sSGYblOOJW/RYH14YbnUbKl1npGV/UCsQ== - -"@spectrum-css/actiongroup@^1.0.1": - version "1.0.25" - resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.25.tgz#e9bfb9f98aacc5f0807bdec608a7a89de0354e24" - integrity sha512-cmLQylqtVFR4t2udXe30F8KykdIYb0NeYqXcrlxA1F9V6rlNRjUwdqbOn1SCK6cBe7ilCASuIx+FOXaU+OC2tg== - -"@spectrum-css/avatar@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" - integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== - -"@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" - integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== - -"@spectrum-css/buttongroup@^3.0.2": - version "3.0.10" - resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d" - integrity sha512-U7D24vgHYhlqOyaLJZ5LPskDAuD7cGZktmWvXtvLqG6RFyTr7JHn5oPRuo6mLzaggIHqCdJylOjZ4FHqT4LpTQ== - -"@spectrum-css/card@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" - integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== - -"@spectrum-css/checkbox@^3.0.2": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.1.tgz#21fff2406e03a1066e426b3d8624d64fd594ef8f" - integrity sha512-vu+2Si9shB2n8jyxCMpFJZOEMcdiBzP1Cj7miL7av1mUQyNP7uQJP+AAPS5umjIJh9Bm2SUAWL3RM76ZQUEstQ== - -"@spectrum-css/dialog@^3.0.1": - version "3.0.12" - resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004" - integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q== - -"@spectrum-css/divider@^1.0.3": - version "1.0.25" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.25.tgz#7d541a14b403ff572ce62a03845d8ca47cfb3f9d" - integrity sha512-TQgvR32TTx2mCoA2JIODHCctcqL9hpJDene+RjbSRXbWNn0umk84NAgZ5/6Y9UZcexreAiM5uHDXO8Dv/M0eug== - dependencies: - "@spectrum-css/vars" "^8.0.0" - -"@spectrum-css/dropzone@^3.0.2": - version "3.0.23" - resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.23.tgz#c606f5aff728a7bf0361a487aac178c7b66a43dd" - integrity sha512-qzIN09298KoOJRyGwRK7gwHQqXYfOZS55AzlvCAiODKDIFM3xDQEUCOeeedQ0+EBXA89Krv99LBuxZYM0+eUjw== - -"@spectrum-css/fieldgroup@^3.0.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.2.tgz#dbe4c1de235e845caca18b0d2a30063ad2727bb1" - integrity sha512-bGzEfCGArX1dpgiMpS4Mwq9OIE1elENxS7fmSNz4Yhcdncsl0uBCU+J5J1IA/ThSXwMMfrYp1MF14oRdli6oRA== - -"@spectrum-css/fieldlabel@^3.0.1": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449" - integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ== - -"@spectrum-css/icon@^3.0.1": - version "3.0.21" - resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.21.tgz#086d30fd659975bc932e847140531dcae9a57ffd" - integrity sha512-GlpqVotZ2c6nsMfQOBzBb855aZ6L1mtbAcgcwhKzACJhJxw0MKUD5euA8mUzMtCnlLZ0XCgoJbU+PLNrx/yz0A== - -"@spectrum-css/illustratedmessage@^3.0.2": - version "3.0.17" - resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11" - integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA== - -"@spectrum-css/inlinealert@^2.0.1": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376" - integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA== - -"@spectrum-css/inputgroup@^3.0.2": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b" - integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g== - -"@spectrum-css/label@^2.0.10": - version "2.0.10" - resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" - integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== - -"@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3": - version "3.1.21" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.21.tgz#41e815d9f15900c11e621d3992e37e04e2690178" - integrity sha512-iTycfJRnW3WzyDDh9CrSMH6npuNI5yaZ7TDcCmOFinoSZ6ZQPaTnz6tI3jYAtg2minEmwF2lUa7k16MtwmoUTg== - -"@spectrum-css/menu@^3.0.1": - version "3.0.21" - resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab" - integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A== - -"@spectrum-css/modal@^3.0.1": - version "3.0.20" - resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.20.tgz#351166199ecd45d6e0ef34ddced2668f6d24e53b" - integrity sha512-+Lrs8ybpRaXtd8pfpOHgyWWO/Xd0H9cJnckWBN8wb0Q4kyMeHGchOYnAMP9OnLNkHRowA1CToJjuWUmK3thbUA== - "@spectrum-css/page@^3.0.1": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.8.tgz#001efa9e4c10095df9b2b37cf7d7d6eb60140190" @@ -1584,111 +1340,6 @@ dependencies: "@spectrum-css/vars" "^4.3.0" -"@spectrum-css/pagination@^3.0.3": - version "3.0.11" - resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41" - integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw== - -"@spectrum-css/picker@^1.0.1": - version "1.2.7" - resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.7.tgz#ae6185f6e59ce19c75adeabfd3246d7d85d2621a" - integrity sha512-k+tNqRPZXu3ayYfk1r94VrOCPdNP9G6RTIgxiQphFjrYnoI1qDpThajcqIqQT7XsGFDcbzPoLjCV0BS04/9i8A== - -"@spectrum-css/popover@^3.0.1": - version "3.0.11" - resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1" - integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q== - -"@spectrum-css/progressbar@^1.0.2": - version "1.0.28" - resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.28.tgz#831ea157b2457c6dee88cbd6b249818077a52396" - integrity sha512-l98LzqanA2EzE/8g/Om2Bvrw5gdbtyTq+PmtLLr8HbUVsVC+Ej4t4R9P5/hUavJzDJHcJYg3bdGY/K/Qo2Gq9A== - -"@spectrum-css/progresscircle@^1.0.2": - version "1.0.21" - resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.21.tgz#0db84f3e02922d46c12e338e77275b26f63224eb" - integrity sha512-p2FDwrCZwRNIiGD2xIiOEuk3BfvVGb6oEA9KM7npSp2fP4W8/1GrEqnYqGya2ii+lJKZ9qzuaqhaeLs97pcMGQ== - -"@spectrum-css/radio@^3.0.2": - version "3.0.22" - resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.22.tgz#bf607b7020ef50c4b1e16beee44976418cac50b2" - integrity sha512-JZzfgLQn97p2A5+76KACDIORkWCUuGQ1rxtsG/TmoHQhJIQMBMnxBiqCg+q+16gQ/b0wnJftKThNqZW33LKs3Q== - -"@spectrum-css/search@^3.0.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0" - integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ== - -"@spectrum-css/sidenav@^3.0.2": - version "3.0.22" - resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.22.tgz#2bd81227807ec9fd42ac82f84268d1aaea3192ad" - integrity sha512-YvvR1pTjSEo+JgiD9pauNg2ho7B0V10IEPwLdC0TBexmvbWGZNxKPkdv5L9XExU7RMesOqD1/diGXG8n9/QP0A== - -"@spectrum-css/statuslight@^3.0.2": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7" - integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ== - -"@spectrum-css/stepper@^3.0.3": - version "3.0.24" - resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.24.tgz#8ba89f7bd38acf3041e22b5dfa11c3b4fc582de5" - integrity sha512-f+pHJ3LJbOt8AahldyIUOaG6+fiI4taPNKzPFilmEQAJv/8EwrjUNlJKEj2OmylOy5h8OxhMtSz7Uovr8nJ0GQ== - -"@spectrum-css/switch@^1.0.2": - version "1.0.21" - resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.21.tgz#6ebf92c9bccb8ad9eeecad69c903d4d819d4a274" - integrity sha512-qEXM8LU+DmzL4tHyXCQWO1K4556Js/b6mnW+nx+aq1mfqd95TCakK3WweNGdDX1Blueywep+baT/zD24C/feUA== - -"@spectrum-css/table@^3.0.1": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf" - integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg== - -"@spectrum-css/tabs@^3.0.1": - version "3.2.14" - resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.14.tgz#43eba35a625f62317f08cd313acd89389ad4efc0" - integrity sha512-uZMJmramWEVC4y8litdIsZxGB8T9t8rbH1O/93WHQiFJQfPrCy+sGCYuHurxVHGQmHbAvi4eQ5ZuiyPQ11Q0QQ== - -"@spectrum-css/tag@^3.1.4": - version "3.3.12" - resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.12.tgz#a1d908cac50cd0a8bd1fe7341bd6df221359dc69" - integrity sha512-SZMAkzdEYNPK2FLt7IgogNszkEzLLd8DQYCTlXeQRfNy3FxpHLsvrhnoXt0zTsYOrmfhJFNC0ixYhEMQS10auA== - -"@spectrum-css/tags@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac" - integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw== - -"@spectrum-css/textfield@^3.0.1": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.2.tgz#007cd2216ab5c6c792ca758a7bb50ba07afdf5c2" - integrity sha512-1RDJ4hlxQAW2SGcRPNgOnr7XoJlfs5wsfRr0rAxuG09+i3IwOBNkcldncCQAC+hPDSz1fhaJxiskvX03tBmUqQ== - -"@spectrum-css/toast@^3.0.1": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f" - integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w== - -"@spectrum-css/tooltip@^3.0.3": - version "3.1.16" - resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.16.tgz#46d3a7abe3329f9a290fa5177ea8364927c5002f" - integrity sha512-3lKzSgeBUDgs75ruxIFYpO7MlkkXkPMxiUySOr7PCrwdmsF0C+gb9Jwye0GXRIsAvOBPg3SQt/LxzACU2bYOZA== - -"@spectrum-css/treeview@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046" - integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw== - -"@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" - integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== - -"@spectrum-css/underlay@^2.0.9": - version "2.0.29" - resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.29.tgz#488f7f03da934089e1558c87789f00d4c0df89b4" - integrity sha512-VMvY00YiVKi39YcgqkMIWnizmOFIXdozGeCB7Ja/ltDOGV4U1fRUl/ysKrqvZeIsnvSHaJXC/ExN0NjQ9zrIDw== - "@spectrum-css/vars@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" @@ -1699,11 +1350,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.0.tgz#03ddf67d3aa8a9a4cb0edbbd259465c9ced7e70d" integrity sha512-ZQ2XAhgu4G9yBeXQNDAz07Z8oZNnMt5o9vzf/mpBA7Teb/JI+8qXp2wt8D245SzmtNlFkG/bzRYvQc0scgZeCQ== -"@spectrum-css/vars@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-8.0.0.tgz#b88a3b1165b63de50ab01f20ccafb42115d67443" - integrity sha512-cClQgNyH1VdNu6zdiZ5M7kbQDZS4/wPAclk5IPO5+nMhSzqTesUL/zfiaPB95MTCKFyVJrFpOeJ37HmUifWJ3A== - "@sveltejs/vite-plugin-svelte@1.0.0-next.19": version "1.0.0-next.19" resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.0-next.19.tgz#9646abc2cd1982146db4bb341aafdb5f32f19dd2" @@ -1815,18 +1461,6 @@ dependencies: "@babel/types" "^7.3.0" -"@types/codemirror@^5.60.4": - version "5.60.5" - resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.5.tgz#5b989a3b4bbe657458cf372c92b6bfda6061a2b7" - integrity sha512-TiECZmm8St5YxjFUp64LK0c8WU5bxMDt9YaAek1UqUb9swrSCoJhh92fWu1p3mTEqlHjhB5sY7OFBhWroJXZVg== - dependencies: - "@types/tern" "*" - -"@types/estree@*": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -1881,11 +1515,6 @@ jest-diff "^27.0.0" pretty-format "^27.0.0" -"@types/marked@^4.0.1": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.3.tgz#2098f4a77adaba9ce881c9e0b6baf29116e5acc4" - integrity sha512-HnMWQkLJEf/PnxZIfbm0yGJRRZYYMhb++O9M36UCTA9z53uPvVoSlAwJr3XOpDEryb7Hwl1qAx/MV6YIW1RXxg== - "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -1931,13 +1560,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/tern@*": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" - integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== - dependencies: - "@types/estree" "*" - "@types/testing-library__jest-dom@^5.9.1": version "5.14.1" resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz#014162a5cee6571819d48e999980694e2f657c3c" @@ -1989,7 +1611,7 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.1.1, acorn-walk@^8.2.0: +acorn-walk@^8.1.1: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -2009,11 +1631,6 @@ acorn@^8.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== -acorn@^8.7.0: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2081,18 +1698,6 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -apexcharts@^3.19.2, apexcharts@^3.22.1: - version "3.35.2" - resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.35.2.tgz#90faafffa055ce502f73b11008ba77238e94228f" - integrity sha512-VOSb25mrcSv/JjaWKjnasL8277cqnA0Gp20uV1+rlgE4U6j44fdTYW850Powl+S8RkXd/lPwzBB2jvKkEOHl0Q== - dependencies: - svg.draggable.js "^2.2.2" - svg.easing.js "^2.0.0" - svg.filter.js "^2.0.2" - svg.pathmorphing.js "^0.1.3" - svg.resize.js "^1.4.3" - svg.select.js "^3.0.1" - arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" @@ -2103,7 +1708,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -2133,15 +1738,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -2194,13 +1790,6 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autolinker@~0.28.0: - version "0.28.1" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" - integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== - dependencies: - gulp-header "^1.7.1" - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -2597,23 +2186,11 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -codemirror-spell-checker@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" - integrity sha1-HGYPkIlIPMtRE7m6nKGcP0mTNx4= - dependencies: - typo-js "*" - codemirror@^5.59.0: version "5.63.3" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.63.3.tgz#97042a242027fe0c87c09b36bc01931d37b76527" integrity sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw== -codemirror@^5.63.1: - version "5.65.3" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.3.tgz#2d029930d5a293bc5fb96ceea64654803c0d4ac7" - integrity sha512-kCC0iwGZOVZXHEKW3NDTObvM7pTIyowjty4BUqeREROc/3I6bWbgZDA3fGDwlA+rbgRjvnRnfqs9SfXynel1AQ== - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -2698,13 +2275,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-with-sourcemaps@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" - integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== - dependencies: - source-map "^0.6.1" - configent@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994" @@ -2742,11 +2312,6 @@ core-util-is@1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -2880,11 +2445,6 @@ dayjs@^1.10.4: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== -dayjs@^1.10.5: - version "1.11.2" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" - integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw== - debug@4, debug@4.3.2, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" @@ -2931,13 +2491,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -3004,20 +2557,6 @@ dom-accessibility-api@^0.5.6: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz#caa6d08f60388d0bb4539dd75fe458a9a1d0014c" integrity sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g== -dom-serializer@^1.0.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" - integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -3025,22 +2564,6 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^4.0.0, domhandler@^4.2.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" - integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== - dependencies: - domelementtype "^2.2.0" - -domutils@^2.5.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -3056,17 +2579,6 @@ duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -easymde@^2.16.1: - version "2.16.1" - resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.16.1.tgz#f4c2380312615cb33826f1a1fecfaa4022ff551a" - integrity sha512-FihYgjRsKfhGNk89SHSqxKLC4aJ1kfybPWW6iAmtb5GnXu+tnFPSzSaGBmk1RRlCuhFSjhF0SnIMGVPjEzkr6g== - dependencies: - "@types/codemirror" "^5.60.4" - "@types/marked" "^4.0.1" - codemirror "^5.63.1" - codemirror-spell-checker "1.1.2" - marked "^4.0.10" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -3104,16 +2616,6 @@ enquirer@^2.3.6: dependencies: ansi-colors "^4.1.1" -ent@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= - -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -3244,11 +2746,6 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -3528,11 +3025,6 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -flatpickr@^4.5.2: - version "4.6.13" - resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" - integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== - fn-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c" @@ -3583,11 +3075,6 @@ from@~0: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= - fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -3641,14 +3128,6 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -get-object@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" - integrity sha1-2S/31RkMZFMM2gVD2sY6PUf+jAw= - dependencies: - is-number "^2.0.2" - isobject "^0.2.0" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -3678,13 +3157,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -get-value@^3.0.0, get-value@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" - integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== - dependencies: - isobject "^3.0.1" - getos@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" @@ -3754,35 +3226,6 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -gulp-header@^1.7.1: - version "1.8.12" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" - integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== - dependencies: - concat-with-sourcemaps "*" - lodash.template "^4.4.0" - through2 "^2.0.0" - -handlebars-utils@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" - integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== - dependencies: - kind-of "^6.0.0" - typeof-article "^0.1.1" - -handlebars@^4.7.6, handlebars@^4.7.7: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - harmony-reflect@^1.4.6: version "1.6.2" resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" @@ -3821,14 +3264,6 @@ has-value@^1.0.0: has-values "^1.0.0" isobject "^3.0.0" -has-value@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" - integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== - dependencies: - get-value "^3.0.0" - has-values "^2.0.1" - has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" @@ -3842,13 +3277,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has-values@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" - integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== - dependencies: - kind-of "^6.0.2" - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -3856,16 +3284,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -helper-md@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" - integrity sha1-wfWdflW7riM2L9ig6XFgeuxp1B8= - dependencies: - ent "^2.2.0" - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - remarkable "^1.6.2" - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -3883,24 +3301,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-tag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" - integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== - dependencies: - is-self-closing "^1.0.1" - kind-of "^6.0.0" - -htmlparser2@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" - http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" @@ -3987,7 +3387,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.4, inherits@~2.0.3: +inherits@2, inherits@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -4079,13 +3479,6 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-even@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" - integrity sha1-drUFX7rY0pSoa2qUkBXhyXtxfAY= - dependencies: - is-odd "^0.1.2" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -4128,13 +3521,6 @@ is-installed-globally@~0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" -is-number@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= - dependencies: - kind-of "^3.0.2" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -4147,13 +3533,6 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-odd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" - integrity sha1-vFc7XONx7yqtbm9JeZtyvvE5eKc= - dependencies: - is-number "^3.0.0" - is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -4171,23 +3550,11 @@ is-plain-object@^3.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-self-closing@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" - integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== - dependencies: - self-closing-tags "^1.0.1" - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -4220,7 +3587,7 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@1.0.0, isarray@~1.0.0: +isarray@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -4230,11 +3597,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isobject@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" - integrity sha1-o0MhkvObkQtfAsyYlIeDbscKqF4= - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -4812,7 +4174,7 @@ jsprim@^2.0.2: json-schema "0.4.0" verror "1.10.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= @@ -4826,12 +4188,12 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0, kind-of@^5.0.2: +kind-of@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: +kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -4851,11 +4213,6 @@ lazy-ass@1.6.0, lazy-ass@^1.6.0: resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM= -leaflet@^1.7.1: - version "1.8.0" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.8.0.tgz#4615db4a22a304e8e692cae9270b983b38a2055e" - integrity sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA== - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -4900,11 +4257,6 @@ lodash-es@^4.17.11: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -4915,22 +4267,7 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5015,11 +4352,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@^4.0.10: - version "4.0.15" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.15.tgz#0216b7c9d5fcf6ac5042343c41d81a8b1b5e1b4a" - integrity sha512-esX5lPdTfG4p8LDkv+obbRCyOKzB+820ZZyMOXJZygZBHrH9b3xXR64X4kT3sPe9Nx8qQXbmcz6kFSMt4Nfk6Q== - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -5035,7 +4367,7 @@ methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.1.4, micromatch@^3.1.5: +micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -5129,11 +4461,6 @@ nanoid@^3.1.30: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== -nanoid@^3.3.3: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -5161,11 +4488,6 @@ ncp@^2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -5366,11 +4688,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-srcset@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" - integrity sha1-8r0iH2zJcKk42IVWq8WJyqqiveE= - parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -5462,15 +4779,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss@^8.3.11: - version "8.4.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575" - integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA== - dependencies: - nanoid "^3.3.3" - picocolors "^1.0.0" - source-map-js "^1.0.2" - postcss@^8.3.8: version "8.3.11" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858" @@ -5515,11 +4823,6 @@ pretty-format@^27.0.0, pretty-format@^27.3.1: ansi-styles "^5.0.0" react-is "^17.0.1" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -5597,19 +4900,6 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -5650,16 +4940,6 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexparam@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.0.tgz#059476767d5f5f87f735fc7922d133fd1a118c8c" - integrity sha512-gJKwd2MVPWHAIFLsaYDZfyKzHNS4o7E/v8YmNf44vmeV2e4YfVoDToTOKTvE7ab68cRJ++kLuEXJBaEeJVt5ow== - -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== - regexpu-core@^4.7.1: version "4.8.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" @@ -5684,21 +4964,6 @@ regjsparser@^0.7.0: dependencies: jsesc "~0.5.0" -relative@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha1-Dc2OxUpdNaPBXhBFA9ZTdbWlNn8= - dependencies: - isobject "^2.0.0" - -remarkable@^1.6.2: - version "1.7.4" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" - integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== - dependencies: - argparse "^1.0.10" - autolinker "~0.28.0" - remixicon@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41" @@ -5807,13 +5072,6 @@ rollup-plugin-copy@^3.4.0: globby "10.0.1" is-plain-object "^3.0.0" -rollup-plugin-polyfill-node@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-polyfill-node/-/rollup-plugin-polyfill-node-0.8.0.tgz#859c070822f5e38d221e5b4238cb34aa894c2b19" - integrity sha512-C4UeKedOmOBkB3FgR+z/v9kzRwV1Q/H8xWs1u1+CNe4XOV6hINfOrcO+TredKxYvopCmr+WKUSNsFUnD1RLHgQ== - dependencies: - "@rollup/plugin-inject" "^4.0.0" - rollup-pluginutils@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" @@ -5859,7 +5117,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -5891,18 +5149,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sanitize-html@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.0.tgz#e106205b468aca932e2f9baf241f24660d34e279" - integrity sha512-jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA== - dependencies: - deepmerge "^4.2.2" - escape-string-regexp "^4.0.0" - htmlparser2 "^6.0.0" - is-plain-object "^5.0.0" - parse-srcset "^1.0.2" - postcss "^8.3.11" - saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -5910,16 +5156,6 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -screenfull@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.1.tgz#3b71e6f06b72d817a8d3be73c45ebe71fa8da1ce" - integrity sha512-yzQW+j4zMUBQC51xxWaoDYjxOtl8Kn+xvue3p6v/fv2pIi1jH4AldgVLU8TBfFVgH2x3VXlf3+YiA/AYIPlaew== - -self-closing-tags@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" - integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== - "semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -5993,13 +5229,6 @@ shortid@2.2.15: dependencies: nanoid "^2.1.0" -shortid@^2.2.15: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== - dependencies: - nanoid "^2.1.0" - signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.5" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" @@ -6068,11 +5297,6 @@ source-map-js@^0.6.2: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -6237,13 +5461,6 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -6273,11 +5490,6 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -striptags@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" - integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -6307,25 +5519,11 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" -svelte-apexcharts@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/svelte-apexcharts/-/svelte-apexcharts-1.0.2.tgz#4e000f8b8f7c901c05658c845457dfc8314d54c1" - integrity sha512-6qlx4rE+XsonZ0FZudfwqOQ34Pq+3wpxgAD75zgEmGoYhYBJcwmikTuTf3o8ZBsZue9U/pAwhNy3ed1Bkq1gmA== - dependencies: - apexcharts "^3.19.2" - svelte-dnd-action@^0.9.8: version "0.9.12" resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.12.tgz#78cf33097986488c6d069eca517af473cd998730" integrity sha512-GlXIB3/56IMR5A0+qUx+FX7Q7n8uCAIeuYdgSBmn9iOlxWc+mgM8P1kNwAKCMSTdQ4IQETVQILNgWVY1KIFzsg== -svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3: - version "3.2.6" - resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.6.tgz#595a97b2f25a669e61fe743f90a10dce783bbd49" - integrity sha512-0ePUyE9OjInYFqQwRKOxnFSu4dQX9+/rzFMynq2fKYXx406ZUThzSx72gebtjr0DoAQbsH2///BBZa5qk4qZXg== - dependencies: - flatpickr "^4.5.2" - svelte-hmr@^0.14.7: version "0.14.7" resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.7.tgz#7fa8261c7b225d9409f0a86f3b9ea5c3ca6f6607" @@ -6346,83 +5544,11 @@ svelte-portal@0.1.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742" integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg== -svelte-portal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" - integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== - -svelte-spa-router@^3.0.5: - version "3.2.0" - resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.2.0.tgz#fae3311d292451236cb57131262406cf312b15ee" - integrity sha512-igemo5Vs82TGBBw+DjWt6qKameXYzNs6aDXcTxou5XbEvOjiRcAM6MLkdVRCatn6u8r42dE99bt/br7T4qe/AQ== - dependencies: - regexparam "2.0.0" - -svelte@^3.38.2: - version "3.44.1" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.44.1.tgz#5cc772a8340f4519a4ecd1ac1a842325466b1a63" - integrity sha512-4DrCEJoBvdR689efHNSxIQn2pnFwB7E7j2yLEJtHE/P8hxwZWIphCtJ8are7bjl/iVMlcEf5uh5pJ68IwR09vQ== - -svelte@^3.46.2: +svelte@^3.48.0: version "3.48.0" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.48.0.tgz#f98c866d45e155bad8e1e88f15f9c03cd28753d3" integrity sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ== -svg.draggable.js@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" - integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw== - dependencies: - svg.js "^2.0.1" - -svg.easing.js@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12" - integrity sha1-iqmUawqOJ4V6XEChDrpAkeVpHxI= - dependencies: - svg.js ">=2.3.x" - -svg.filter.js@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203" - integrity sha1-kQCOFROJ3ZIwd5/L5uLJo2LRwgM= - dependencies: - svg.js "^2.2.5" - -svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d" - integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA== - -svg.pathmorphing.js@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65" - integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww== - dependencies: - svg.js "^2.4.0" - -svg.resize.js@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332" - integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw== - dependencies: - svg.js "^2.6.5" - svg.select.js "^2.1.2" - -svg.select.js@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73" - integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ== - dependencies: - svg.js "^2.2.5" - -svg.select.js@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917" - integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw== - dependencies: - svg.js "^2.6.5" - symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -6460,14 +5586,6 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - through@2, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -6490,11 +5608,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= -to-gfm-code-block@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" - integrity sha1-JdBFpfrlUxielje1kJANpzLYqoI= - to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -6640,28 +5753,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typeof-article@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" - integrity sha1-nwfnM8P7tkb/qeYcCN66zUYOBq8= - dependencies: - kind-of "^3.1.0" - typescript@^4.5.5: version "4.5.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== -typo-js@*: - version "1.2.1" - resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.1.tgz#334a0d8c3f6c56f2f1e15fdf6c31677793cbbe9b" - integrity sha512-bTGLjbD3WqZDR3CgEFkyi9Q/SS2oM29ipXrWfDb4M74ea69QwKAECVceYpaBu0GfdnASMg9Qfl67ttB23nePHg== - -uglify-js@^3.1.4: - version "3.15.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.5.tgz#2b10f9e0bfb3f5c15a8e8404393b6361eaeb33b3" - integrity sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ== - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" @@ -6735,11 +5831,6 @@ utf-8-validate@^5.0.2: dependencies: node-gyp-build "^4.3.0" -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - uuid@8.3.1: version "8.3.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" @@ -6788,14 +5879,6 @@ vite@^2.1.5: optionalDependencies: fsevents "~2.3.2" -vm2@^3.9.4: - version "3.9.9" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.9.tgz#c0507bc5fbb99388fad837d228badaaeb499ddc5" - integrity sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -6896,11 +5979,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -6949,11 +6027,6 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" @@ -6997,11 +6070,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -year@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" - integrity sha1-QIOuUgoxiyPshgN/MADLiSvfm7A= - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 05d627b846189f076c33e9fa99840d11f62d204f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 23 May 2022 11:50:26 +0100 Subject: [PATCH 120/207] Finish new component DND experience --- .../src/components/common/NavItem.svelte | 1 + .../navigation/ComponentListPanel.svelte | 69 +++++++++++++------ .../navigation/ComponentTree.svelte | 20 ++---- .../DNDParentPositionIndicator.svelte | 9 --- .../navigation/DNDPositionIndicator.svelte | 66 +++++++++++------- .../_components/navigation/dndStore.js | 24 ++++--- 6 files changed, 109 insertions(+), 80 deletions(-) delete mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDParentPositionIndicator.svelte diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index f0c447826e..4cb67dc9c4 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -156,6 +156,7 @@ } .icon.arrow { flex: 0 0 20px; + pointer-events: all; } .icon.arrow.absolute { position: absolute; diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte index c887735ce7..5b86d4da29 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte @@ -1,14 +1,15 @@ - -{#if $dndStore.targetParent?._id === component._id && $dndStore.dropPosition !== DropPosition.INSIDE} -
-{/if} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte index 8dbdc29c02..24b5839019 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte @@ -1,47 +1,65 @@ -{#if $dndStore.dragging && $dndStore.valid} - {#if $dndStore?.target?._id === componentId} -
- {/if} +{#if component && position} +
{/if} -] diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js index e512ddcca2..8a9e7ed915 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js @@ -20,7 +20,7 @@ const initialState = { valid: false, } -export default function () { +const createDNDStore = () => { const store = writable(initialState) const actions = { dragstart: component => { @@ -46,17 +46,8 @@ export default function () { let target let targetParent - // If the component has children, it cannot be dropped below - if (hasChildren) { - if (mousePosition <= 0.33) { - dropPosition = DropPosition.ABOVE - } else { - dropPosition = DropPosition.INSIDE - } - } - // If it can have children then it can be any position - else if (canHaveChildren) { + if (canHaveChildren) { if (mousePosition <= 0.33) { dropPosition = DropPosition.ABOVE } else if (mousePosition >= 0.66) { @@ -81,6 +72,15 @@ export default function () { target = component } + // If drop position and target are the same then we can skip this update + const state = get(store) + if ( + dropPosition === state.dropPosition && + target?._id === state.target?._id + ) { + return + } + // Find the parent of the target component if (target) { targetParent = findComponentParent( @@ -125,3 +125,5 @@ export default function () { actions, } } + +export const dndStore = createDNDStore() From b5ded3d8b2ea02bcd8f15d1801eb662c83674123 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 23 May 2022 11:52:50 +0100 Subject: [PATCH 121/207] Add fade to DND position indicators --- .../_components/navigation/DNDPositionIndicator.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte index 24b5839019..c01bcaf36f 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte @@ -1,5 +1,6 @@ + +{#if $builderStore.inBuilder} +
+ Your screen is empty + Bring your app to life by adding some components! + +
+{/if} + + diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js index bc3e933079..0c3969c03c 100644 --- a/packages/client/src/stores/builder.js +++ b/packages/client/src/stores/builder.js @@ -78,6 +78,9 @@ const createBuilderStore = () => { clickNav: () => { dispatchEvent("click-nav") }, + requestAddComponent: () => { + dispatchEvent("request-add-component") + }, } return { ...store, From aa6d483713c9a3a0a4db5c269fb85387e295ee7f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 7 Jun 2022 15:08:46 +0100 Subject: [PATCH 126/207] Include block results when searching for components --- .../new/_components/NewComponentPanel.svelte | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentPanel.svelte index 39ee1cb44a..c540af5d4f 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentPanel.svelte @@ -76,11 +76,9 @@ return [] } - // Split list into either components or blocks initially - if (section === "components") { + // Remove blocks if there is no search string + if (!search) { structure = structure.filter(category => category.name !== "Blocks") - } else { - structure = structure.filter(category => category.name === "Blocks") } // Return only items which match the search string @@ -159,33 +157,31 @@ borderRight > - - (section = "components")}>Components - (section = "blocks")}>Blocks - + (searchString = e.detail)} + bind:inputRef={searchRef} + /> + {#if !searchString} + + (section = "components")}>Components + (section = "blocks")}>Blocks + + {/if}
- {#if section === "components"} - - (searchString = e.detail)} - bind:inputRef={searchRef} - /> - - {/if} - {#if section === "components"} + {#if searchString || section === "components"} {#each filteredStructure as category}
From c873b422420f9cad12c4eb2963b5d7f93580fe49 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 7 Jun 2022 15:19:51 +0100 Subject: [PATCH 127/207] Lint --- packages/client/src/components/preview/IndicatorSet.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte index 32ff8cc748..b9113f9532 100644 --- a/packages/client/src/components/preview/IndicatorSet.svelte +++ b/packages/client/src/components/preview/IndicatorSet.svelte @@ -2,7 +2,7 @@ import { onMount, onDestroy } from "svelte" import Indicator from "./Indicator.svelte" import { domDebounce } from "utils/domDebounce" - import { builderStore, componentStore } from "stores" + import { builderStore } from "stores" export let componentId export let color From 5b58981a53734dba27770285761e908bc1494803 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 7 Jun 2022 16:40:43 +0100 Subject: [PATCH 128/207] start of beta panel --- .../src/components/beta/BetaTab.svelte | 26 +++++++++++++++++++ .../app/[application]/beta/_layout.svelte | 8 ++++++ .../app/[application]/beta/index.svelte | 5 ++++ .../overview/[application]/index.svelte | 4 +++ .../components/preview/IndicatorSet.svelte | 2 +- packages/server/yarn.lock | 9 ------- packages/worker/yarn.lock | 9 ------- 7 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 packages/builder/src/components/beta/BetaTab.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/beta/index.svelte diff --git a/packages/builder/src/components/beta/BetaTab.svelte b/packages/builder/src/components/beta/BetaTab.svelte new file mode 100644 index 0000000000..e8c484eba1 --- /dev/null +++ b/packages/builder/src/components/beta/BetaTab.svelte @@ -0,0 +1,26 @@ + + + + Beta Builder + + Your account has been given access to the budibase beta program. We would + love to hear what you think and get your feedback and suggestions on the new + Design UI. + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte new file mode 100644 index 0000000000..8d61c96488 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte @@ -0,0 +1,8 @@ + + + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/beta/index.svelte b/packages/builder/src/pages/builder/app/[application]/beta/index.svelte new file mode 100644 index 0000000000..79125ea2c2 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/beta/index.svelte @@ -0,0 +1,5 @@ + + + diff --git a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte index 807110e03e..d4a5cb745a 100644 --- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte @@ -27,6 +27,7 @@ import AppLockModal from "components/common/AppLockModal.svelte" import EditableIcon from "components/common/EditableIcon.svelte" import ConfirmDialog from "components/common/ConfirmDialog.svelte" + import BetaTab from "components/beta/BetaTab.svelte" import { checkIncomingDeploymentStatus } from "components/deploy/utils" import { onDestroy, onMount } from "svelte" @@ -318,6 +319,9 @@ + + +
>>>>>> eaf3eea73d7d2927f5b87f5fede628947362297a node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 39f2be96e2..619a4f2808 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -322,21 +322,12 @@ uuid "^8.3.2" zlib "^1.0.5" -<<<<<<< HEAD "@budibase/pro@1.0.178-alpha.0": version "1.0.178-alpha.0" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178-alpha.0.tgz#40a137cdde7f467034d0684882b97e3e4e34a706" integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg== dependencies: "@budibase/backend-core" "1.0.178-alpha.0" -======= -"@budibase/pro@^1.0.175": - version "1.0.175" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47" - integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg== - dependencies: - "@budibase/backend-core" "1.0.175" ->>>>>>> eaf3eea73d7d2927f5b87f5fede628947362297a node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0": From a479c7c55c8c89131ad7d3cc2305189c10a77dd0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 8 Jun 2022 10:20:47 +0100 Subject: [PATCH 129/207] Beta tab initial test for E2E, needs styled --- packages/builder/src/components/beta/BetaTab.svelte | 6 +++--- packages/builder/src/stores/backend/flags.js | 3 +++ packages/frontend-core/src/api/flags.js | 9 +++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/beta/BetaTab.svelte b/packages/builder/src/components/beta/BetaTab.svelte index e8c484eba1..145fcf9b68 100644 --- a/packages/builder/src/components/beta/BetaTab.svelte +++ b/packages/builder/src/components/beta/BetaTab.svelte @@ -1,13 +1,13 @@ diff --git a/packages/builder/src/stores/backend/flags.js b/packages/builder/src/stores/backend/flags.js index 449d010640..9f1652676c 100644 --- a/packages/builder/src/stores/backend/flags.js +++ b/packages/builder/src/stores/backend/flags.js @@ -16,6 +16,9 @@ export function createFlagsStore() { }) await actions.fetch() }, + toggleUiFeature: async feature => { + await API.toggleUiFeature({ value: feature }) + }, } return { diff --git a/packages/frontend-core/src/api/flags.js b/packages/frontend-core/src/api/flags.js index bb545e83b9..16adeb7b5d 100644 --- a/packages/frontend-core/src/api/flags.js +++ b/packages/frontend-core/src/api/flags.js @@ -22,4 +22,13 @@ export const buildFlagEndpoints = API => ({ }, }) }, + /** + * Allows us to experimentally toggle a beta UI feature through a cookie. + * @param value the feature to toggle + */ + toggleUiFeature: async ({ value }) => { + return await API.post({ + url: `/api/beta/${value}`, + }) + }, }) From dd6f35e81645e0c93c2916455f36c540026d2f0e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 8 Jun 2022 12:50:04 +0100 Subject: [PATCH 130/207] Fix custom options drawer layout --- .../OptionsEditor/OptionsDrawer.svelte | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte b/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte index 340c1eb107..ba8e297189 100644 --- a/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte @@ -6,6 +6,7 @@ DrawerContent, Layout, Body, + Label, } from "@budibase/bbui" import { generate } from "shortid" @@ -35,19 +36,12 @@ {/if} {#if options?.length}
+ + +
{#each options as option (option.id)} - - + + Date: Wed, 8 Jun 2022 15:13:47 +0100 Subject: [PATCH 131/207] Update select settings to match the settings bar style where possible --- .../bbui/src/ActionButton/ActionButton.svelte | 3 +++ .../design/settings/componentSettings.js | 13 +++++++++++- .../settings/controls/BarButtonList.svelte | 17 +++++++++++++++ .../settings/ComponentSettingsSection.svelte | 13 ++++++++---- .../settings/ConditionalUIDrawer.svelte | 21 +++++++------------ 5 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 packages/builder/src/components/design/settings/controls/BarButtonList.svelte diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index b518ac3d92..2b4d1076c2 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -80,4 +80,7 @@ .active svg { color: var(--spectrum-global-color-blue-600); } + :global([dir="ltr"] .spectrum-ActionButton .spectrum-Icon) { + margin-left: 0; + } diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js index 7f504c4ea8..56ae3de490 100644 --- a/packages/builder/src/components/design/settings/componentSettings.js +++ b/packages/builder/src/components/design/settings/componentSettings.js @@ -18,6 +18,7 @@ import FormFieldSelect from "./controls/FormFieldSelect.svelte" import ValidationEditor from "./controls/ValidationEditor/ValidationEditor.svelte" import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte" import ColumnEditor from "./controls/ColumnEditor/ColumnEditor.svelte" +import BarButtonList from "./controls/BarButtonList.svelte" const componentMap = { text: DrawerBindableCombobox, @@ -61,6 +62,16 @@ const componentMap = { "validation/link": ValidationEditor, } -export const getComponentForSettingType = type => { +export const getComponentForSetting = setting => { + const { type, showInBar, barStyle } = setting || {} + if (!type) { + return null + } + + // We can show a clone of the bar settings for certain select settings + if (showInBar && type === "select" && barStyle === "buttons") { + return BarButtonList + } + return componentMap[type] } diff --git a/packages/builder/src/components/design/settings/controls/BarButtonList.svelte b/packages/builder/src/components/design/settings/controls/BarButtonList.svelte new file mode 100644 index 0000000000..01f198c5ec --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/BarButtonList.svelte @@ -0,0 +1,17 @@ + + + + {#each options as option} + onChange(option.value)} + /> + {/each} + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte index 2e04401b0a..60b0b1b5df 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte @@ -6,7 +6,7 @@ import LayoutSelect from "components/design/settings/controls/LayoutSelect.svelte" import RoleSelect from "components/design/settings/controls/RoleSelect.svelte" import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte" - import { getComponentForSettingType } from "components/design/settings/componentSettings" + import { getComponentForSetting } from "components/design/settings/componentSettings" import { Utils } from "@budibase/frontend-core" export let componentDefinition @@ -51,7 +51,7 @@ }) const canRenderControl = setting => { - const control = getComponentForSettingType(setting?.type) + const control = getComponentForSetting(setting) if (!control) { return false } @@ -104,7 +104,7 @@ {#if canRenderControl(setting)} updateProp(setting.key, val)} props={{ - options: setting.options || [], + // Generic settings placeholder: setting.placeholder || null, + + // Select settings + options: setting.options || [], + + // Number fields min: setting.min || null, max: setting.max || null, }} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte index 2605343c45..b40b33744f 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte @@ -14,7 +14,7 @@ import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte" import { LuceneUtils, Constants } from "@budibase/frontend-core" import { selectedComponent } from "builderStore" - import { getComponentForSettingType } from "components/design/settings/componentSettings" + import { getComponentForSetting } from "components/design/settings/componentSettings" import PropertyControl from "components/design/settings/controls/PropertyControl.svelte" import { getComponentSettings } from "builderStore/componentUtils" @@ -71,11 +71,6 @@ return settings.find(setting => setting.key === key) } - const getComponentForSetting = key => { - const settingDefinition = getSettingDefinition(key) - return getComponentForSettingType(settingDefinition?.type || "text") - } - const addCondition = () => { conditions = [ ...conditions, @@ -154,6 +149,7 @@ on:consider={updateConditions} > {#each conditions as condition (condition.id)} + {@const definition = getSettingDefinition(condition.setting)}
TO
- {#if getSettingDefinition(condition.setting)} + {#if definition} (condition.settingValue = val)} props={{ - options: getSettingDefinition(condition.setting).options, - placeholder: getSettingDefinition(condition.setting) - .placeholder, + options: definition.options, + placeholder: definition.placeholder, }} {bindings} /> From feb8bff299dd5d07af5761b09077249b66500761 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 8 Jun 2022 16:51:14 +0100 Subject: [PATCH 132/207] Update action button style for component settings to match designs --- packages/bbui/src/ActionButton/ActionButton.svelte | 3 +++ .../components/design/settings/controls/BarButtonList.svelte | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index 2b4d1076c2..b7c217c0d9 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -83,4 +83,7 @@ :global([dir="ltr"] .spectrum-ActionButton .spectrum-Icon) { margin-left: 0; } + .is-selected { + background: var(--spectrum-global-color-gray-300); + } diff --git a/packages/builder/src/components/design/settings/controls/BarButtonList.svelte b/packages/builder/src/components/design/settings/controls/BarButtonList.svelte index 01f198c5ec..339edb1f74 100644 --- a/packages/builder/src/components/design/settings/controls/BarButtonList.svelte +++ b/packages/builder/src/components/design/settings/controls/BarButtonList.svelte @@ -10,8 +10,9 @@ {#each options as option} onChange(option.value)} + selected={option.value === value} /> {/each} From a34eced805305235a2df056db6f658b05c2a3208 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 8 Jun 2022 16:51:43 +0100 Subject: [PATCH 133/207] Update layout deprecation notice --- .../layouts/[layoutId]/_components/LayoutSettingsPanel.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte index 8e1228d5ab..e3e09bddee 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte @@ -43,7 +43,8 @@ extraButtonText="View details" extraButtonAction={() => {}} > - Custom layouts are being deprecated. They will be removed on [date]. + Custom layouts are being deprecated. They will be removed in a future + release. You can save the content of this layout by pressing the button below. From 0e8a3f1769181cb3d28ae3f12e3be44a42cd4c3d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Jun 2022 07:57:57 +0100 Subject: [PATCH 134/207] Remove background from icon side nav --- packages/bbui/src/IconSideNav/IconSideNavItem.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/bbui/src/IconSideNav/IconSideNavItem.svelte b/packages/bbui/src/IconSideNav/IconSideNavItem.svelte index 73b2b5196b..40dcb60a20 100644 --- a/packages/bbui/src/IconSideNav/IconSideNavItem.svelte +++ b/packages/bbui/src/IconSideNav/IconSideNavItem.svelte @@ -41,7 +41,6 @@ .active :global(svg) { color: white; } - .icon-side-nav-item:hover, .active { background: var(--spectrum-global-color-gray-300); } From 98ac9af88b9d24a8b447d4d859ae8bd2c845a4a1 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Jun 2022 13:34:41 +0100 Subject: [PATCH 135/207] Update order of builder tabs to put data before design again --- .../src/pages/builder/app/[application]/beta/_layout.svelte | 2 +- .../src/pages/builder/app/[application]/data/_layout.svelte | 2 +- .../pages/builder/app/[application]/design/_layout.svelte | 2 ++ .../pages/builder/app/[application]/settings/_layout.svelte | 2 -- .../pages/builder/app/[application]/settings/index.svelte | 6 ------ 5 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/settings/index.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte index 8d61c96488..3326a99114 100644 --- a/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte @@ -2,7 +2,7 @@ import { Layout } from "@budibase/bbui" - + diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte index 87c648bd4f..a1e95cf10b 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -18,7 +18,7 @@ } - +
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte new file mode 100644 index 0000000000..ec21d909aa --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte @@ -0,0 +1,2 @@ + + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte deleted file mode 100644 index 597bf1518d..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte deleted file mode 100644 index 5008432fee..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte +++ /dev/null @@ -1,6 +0,0 @@ -Settings - - From a0f1657087aa49d0fc10da6cda163b182bfdce65 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Jun 2022 13:35:38 +0100 Subject: [PATCH 136/207] Revert default builder tab to data instead of design --- .../builder/src/pages/builder/app/[application]/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/index.svelte b/packages/builder/src/pages/builder/app/[application]/index.svelte index efcb3d1f44..0143f38324 100644 --- a/packages/builder/src/pages/builder/app/[application]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/index.svelte @@ -1,4 +1,4 @@ From 71b18a426000e83cbf2a9644fcdae54dbdd72257 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Jun 2022 14:26:56 +0100 Subject: [PATCH 137/207] Delete user builder and admin flags when specifying a custom role via dev tools --- packages/server/src/middleware/currentapp.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js index 8ddf608572..61be834d45 100644 --- a/packages/server/src/middleware/currentapp.js +++ b/packages/server/src/middleware/currentapp.js @@ -74,6 +74,10 @@ module.exports = async (ctx, next) => { try { await getRole(roleHeader) roleId = roleHeader + + // Delete admin and builder flags so that the specified role is honoured + delete ctx.user.builder + delete ctx.user.admin } catch (error) { // Swallow error and do nothing } From f351fb001943a0fb1caa48ff7633a1f3b8a1b204 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Jun 2022 14:27:29 +0100 Subject: [PATCH 138/207] Allow role select to accept a placeholder --- .../src/components/design/settings/controls/RoleSelect.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte index 2c2f3b4ac1..d1e326219b 100644 --- a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte @@ -5,15 +5,16 @@ export let value export let error + export let placeholder = null