From 0e6a888e8f993b043b064d1770910e83bf95bbda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 4 May 2021 16:05:53 +0200 Subject: [PATCH 01/28] allow navigation to other URLs than /builder --- hosting/envoy.dev.yaml.hbs | 6 +-- packages/builder/index.html | 2 +- packages/builder/src/pages/index.svelte | 1 + .../builder/src/pages/portal/_layout.svelte | 1 + .../builder/src/pages/portal/index.svelte | 1 + packages/builder/vite.config.js | 2 +- packages/server/yarn.lock | 53 +------------------ 7 files changed, 7 insertions(+), 59 deletions(-) create mode 100644 packages/builder/src/pages/index.svelte create mode 100644 packages/builder/src/pages/portal/_layout.svelte create mode 100644 packages/builder/src/pages/portal/index.svelte diff --git a/hosting/envoy.dev.yaml.hbs b/hosting/envoy.dev.yaml.hbs index a4e2a97118..9c924b995b 100644 --- a/hosting/envoy.dev.yaml.hbs +++ b/hosting/envoy.dev.yaml.hbs @@ -38,7 +38,7 @@ static_resources: route: cluster: server-dev - - match: { prefix: "/builder/" } + - match: { prefix: "/" } route: cluster: builder-dev @@ -46,10 +46,6 @@ static_resources: route: cluster: builder-dev prefix_rewrite: "/builder/" - - # special case in dev to redirect no path to builder - - match: { path: "/" } - redirect: { path_redirect: "/builder/" } # minio is on the default route because this works # best, minio + AWS SDK doesn't handle path proxy diff --git a/packages/builder/index.html b/packages/builder/index.html index d6f19a2d43..de8f8a6beb 100644 --- a/packages/builder/index.html +++ b/packages/builder/index.html @@ -3,7 +3,7 @@ - Budibase Builder + Budibase diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte new file mode 100644 index 0000000000..bb0361f273 --- /dev/null +++ b/packages/builder/src/pages/index.svelte @@ -0,0 +1 @@ +Index route diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte new file mode 100644 index 0000000000..bf7e89904e --- /dev/null +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -0,0 +1 @@ +asdasd diff --git a/packages/builder/src/pages/portal/index.svelte b/packages/builder/src/pages/portal/index.svelte new file mode 100644 index 0000000000..f672f3e491 --- /dev/null +++ b/packages/builder/src/pages/portal/index.svelte @@ -0,0 +1 @@ +Top top! diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js index db02790ffd..b67aae0a2e 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.js @@ -6,7 +6,7 @@ import path from "path" export default ({ mode }) => { const isProduction = mode === "production" return { - base: "/builder/", + base: "/", build: { minify: isProduction, outDir: "../server/builder", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 61bb1aac1d..da88ffcdf5 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -5198,22 +5198,6 @@ jsonschema@1.4.0: resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2" integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw== -jsonwebtoken@8.5.1: - version "8.5.1" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" - integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w== - dependencies: - jws "^3.2.2" - lodash.includes "^4.3.0" - lodash.isboolean "^3.0.3" - lodash.isinteger "^4.0.4" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.once "^4.0.0" - ms "^2.1.1" - semver "^5.6.0" - jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -5253,7 +5237,7 @@ jwa@^1.4.1: ecdsa-sig-formatter "1.0.11" safe-buffer "^5.0.1" -jws@3.x.x, jws@^3.2.2: +jws@3.x.x: version "3.2.2" resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== @@ -5650,41 +5634,11 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.includes@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" - integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8= - -lodash.isboolean@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= - lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= -lodash.isinteger@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" - integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M= - -lodash.isnumber@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= - lodash.keys@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" @@ -5700,11 +5654,6 @@ lodash.omit@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= -lodash.once@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= - lodash.pick@^4.0.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" From bb1eaf8ee0159b90e506b5985164e6944f5e8b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 08:48:05 +0200 Subject: [PATCH 02/28] remove unused styling --- .../design/NavigationPanel/FrontendNavigatePane.svelte | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte index 4f73791820..ef9b5bdd69 100644 --- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte +++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte @@ -120,10 +120,6 @@ top: var(--spacing-l); right: var(--spacing-xl); } - .title i:hover { - cursor: pointer; - color: var(--blue); - } .role-select { display: flex; From d1e6875e25b37efa6d5dcc7fd79030684859ab4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 09:12:16 +0200 Subject: [PATCH 03/28] more structure to layout --- .../builder/src/pages/portal/_layout.svelte | 90 ++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index bf7e89904e..4de7a6e9a1 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -1 +1,89 @@ -asdasd + + +
+ +
+
+
+ Logotype + {orgName} +
+
+ +
+
+
+ + Apps + Drafts + Users + Groups + Auth + Email + General + Theming + Account + +
+
+ +
+
+ +
+ +
+
+
+ +
+
+
+ + From 69583d11514b0a35a0e6c2228984b155d803418f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 09:12:25 +0200 Subject: [PATCH 04/28] adds wip initial mode to Avatar --- packages/bbui/src/Avatar/Avatar.svelte | 35 +++++++++++++++++++++----- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte index d2aef72446..ae3ebda82c 100644 --- a/packages/bbui/src/Avatar/Avatar.svelte +++ b/packages/bbui/src/Avatar/Avatar.svelte @@ -2,11 +2,34 @@ import "@spectrum-css/avatar/dist/index-vars.css" export let url = "" export let disabled = false + export let initials = "KA" -Avatar +{#if url} + Avatar +{:else} +
{initials}
+{/if} + + From ff7d222273e33220ac1f5a7d6c5179928f1ea837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 09:30:52 +0200 Subject: [PATCH 05/28] wip: update ProgressCircle to take values --- .../src/ProgressCircle/ProgressCircle.svelte | 63 +++++++++++++------ 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte index ba1dc10965..f5ecccde79 100644 --- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte +++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte @@ -1,29 +1,52 @@ -
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
- +
From 93c0fb204778872610b9b39875a7905508797c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 09:43:01 +0200 Subject: [PATCH 06/28] fix progress not showing correctly --- .../bbui/src/ProgressCircle/ProgressCircle.svelte | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte index f5ecccde79..c574c86adb 100644 --- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte +++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte @@ -9,21 +9,21 @@ export let value = false export let minValue = 0 - export let maxValue = 0 + export let maxValue = 100 let subMask1Style let subMask2Style - if (!value) { + if (value) { let percentage = ((value - minValue) / (maxValue - minValue)) * 100 let angle if (percentage > 0 && percentage <= 50) { angle = -180 + (percentage / 50) * 180 - subMask1Style = `rotate(${angle}deg)` - subMask2Style = "rotate(-180deg)" + subMask1Style = `transform: rotate(${angle}deg);` + subMask2Style = "transform: rotate(-180deg);" } else if (percentage > 50) { angle = -180 + ((percentage - 50) / 50) * 180 - subMask1Style = "rotate(0deg)" - subMask2Style = `rotate(${angle}deg)` + subMask1Style = "transform: rotate(0deg);" + subMask2Style = `transform: rotate(${angle}deg);` } } @@ -34,6 +34,7 @@ class:spectrum-ProgressBar--indeterminate={!value} class:spectrum-ProgressCircle--small={small} class:spectrum-ProgressCircle--large={large} + class:spectrum-ProgressCircle--overBackground={overBackground} class="spectrum-ProgressCircle" >
From 5c13d775b80ef74129f1ab31156a15fbbcdd50fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 10:02:48 +0200 Subject: [PATCH 07/28] working ProgressCircle --- .../src/ProgressCircle/ProgressCircle.svelte | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte index c574c86adb..711517ec7b 100644 --- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte +++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte @@ -1,11 +1,17 @@
From 6cee25d16f4c0698072b0f14527c4d482ecd1dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 10:21:55 +0200 Subject: [PATCH 08/28] update layout --- .../builder/src/pages/portal/_layout.svelte | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index 4de7a6e9a1..ea2fd18ed0 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -9,15 +9,18 @@ SideNavigationItem as Item, } from "@budibase/bbui" - let orgName, orgLogo + let orgName, orgLogo, onBoardingProgress - async function getOrgInfo() { + async function getInfo() { // fetch orgInfo orgName = "ACME Inc." - orgLogo = "https://via.placeholder.com/32" + orgLogo = "https://via.placeholder.com/150" + + // set onBoardingProgress + onBoardingProgress = 20 } - onMount(getOrgInfo) + onMount(getInfo)
@@ -29,7 +32,7 @@ {orgName}
- +
@@ -51,7 +54,7 @@
- +
@@ -75,6 +78,14 @@ display: grid; grid-template-columns: auto auto; justify-content: space-between; + align-items: center; + margin-bottom: var(--spacing-xl); + } + .name { + display: grid; + grid-template-columns: auto auto; + grid-gap: var(--spacing-m); + align-items: center; } .content { padding: var(--spacing-m); @@ -86,4 +97,8 @@ justify-content: space-between; padding: var(--spacing-m) calc(var(--spacing-xl) * 2); } + img { + width: 32px; + height: 32px; + } From 01db60162c6c462c9fdbb7a34ccbd52ede67d629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 10:43:06 +0200 Subject: [PATCH 09/28] add sizing prop to Avatar --- packages/bbui/src/Avatar/Avatar.svelte | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte index ae3ebda82c..be8172b05d 100644 --- a/packages/bbui/src/Avatar/Avatar.svelte +++ b/packages/bbui/src/Avatar/Avatar.svelte @@ -1,5 +1,15 @@ {#if url} @@ -25,11 +30,12 @@ /> {:else}
- {initials} + {getInitials(name)}
{/if} @@ -38,7 +44,7 @@ color: white; display: grid; place-items: center; - font-weight: bold; + font-weight: 500; background: rgb(63, 94, 251); background: linear-gradient( 155deg, @@ -47,5 +53,6 @@ ); border-radius: 50%; overflow: hidden; + user-select: none; } From 63ba8838d67bd751dc6df15c51a2e65baf3f9103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 11:00:20 +0200 Subject: [PATCH 12/28] remove dummy text from index page --- packages/builder/src/pages/portal/index.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/pages/portal/index.svelte b/packages/builder/src/pages/portal/index.svelte index f672f3e491..e69de29bb2 100644 --- a/packages/builder/src/pages/portal/index.svelte +++ b/packages/builder/src/pages/portal/index.svelte @@ -1 +0,0 @@ -Top top! From d39f0547b0d7917c789955189254d293b19752a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 11:00:33 +0200 Subject: [PATCH 13/28] passes in dummy user.name data to Avatar component --- packages/builder/src/pages/portal/_layout.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index ea2fd18ed0..23bf9579ca 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -9,7 +9,7 @@ SideNavigationItem as Item, } from "@budibase/bbui" - let orgName, orgLogo, onBoardingProgress + let orgName, orgLogo, onBoardingProgress, user async function getInfo() { // fetch orgInfo @@ -18,6 +18,7 @@ // set onBoardingProgress onBoardingProgress = 20 + user = { name: "John Doe" } } onMount(getInfo) @@ -54,7 +55,7 @@
- +
From 31741975d49291e8a76233406140a95f1c72888f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 11:14:08 +0200 Subject: [PATCH 14/28] adds active indicator to sidenav --- .../builder/src/pages/portal/_layout.svelte | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index 23bf9579ca..866695be24 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -1,6 +1,8 @@
@@ -38,15 +52,9 @@
- Apps - Drafts - Users - Groups - Auth - Email - General - Theming - Account + {#each menu as { title, href, heading }} + {title} + {/each}
@@ -55,7 +63,8 @@
- + +
@@ -91,6 +100,16 @@ .content { padding: var(--spacing-m); } + .avatar { + display: grid; + grid-template-columns: auto auto; + place-items: center; + grid-gap: var(--spacing-xs); + } + .avatar:hover { + cursor: pointer; + filter: brightness(110%); + } .toolbar { border-bottom: 2px solid var(--spectrum-alias-background-color-primary); display: grid; From df30e594df50681e1c4ca9c4fe92ead642b70fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 4 May 2021 16:05:53 +0200 Subject: [PATCH 15/28] allow navigation to other URLs than /builder --- hosting/envoy.dev.yaml.hbs | 6 +- packages/builder/index.html | 2 +- packages/builder/src/pages/index.svelte | 1 + .../builder/src/pages/portal/_layout.svelte | 1 + .../builder/src/pages/portal/index.svelte | 1 + packages/builder/vite.config.js | 2 +- packages/server/yarn.lock | 63 +------------------ 7 files changed, 7 insertions(+), 69 deletions(-) create mode 100644 packages/builder/src/pages/index.svelte create mode 100644 packages/builder/src/pages/portal/_layout.svelte create mode 100644 packages/builder/src/pages/portal/index.svelte diff --git a/hosting/envoy.dev.yaml.hbs b/hosting/envoy.dev.yaml.hbs index a4e2a97118..9c924b995b 100644 --- a/hosting/envoy.dev.yaml.hbs +++ b/hosting/envoy.dev.yaml.hbs @@ -38,7 +38,7 @@ static_resources: route: cluster: server-dev - - match: { prefix: "/builder/" } + - match: { prefix: "/" } route: cluster: builder-dev @@ -46,10 +46,6 @@ static_resources: route: cluster: builder-dev prefix_rewrite: "/builder/" - - # special case in dev to redirect no path to builder - - match: { path: "/" } - redirect: { path_redirect: "/builder/" } # minio is on the default route because this works # best, minio + AWS SDK doesn't handle path proxy diff --git a/packages/builder/index.html b/packages/builder/index.html index d6f19a2d43..de8f8a6beb 100644 --- a/packages/builder/index.html +++ b/packages/builder/index.html @@ -3,7 +3,7 @@ - Budibase Builder + Budibase diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte new file mode 100644 index 0000000000..bb0361f273 --- /dev/null +++ b/packages/builder/src/pages/index.svelte @@ -0,0 +1 @@ +Index route diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte new file mode 100644 index 0000000000..bf7e89904e --- /dev/null +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -0,0 +1 @@ +asdasd diff --git a/packages/builder/src/pages/portal/index.svelte b/packages/builder/src/pages/portal/index.svelte new file mode 100644 index 0000000000..f672f3e491 --- /dev/null +++ b/packages/builder/src/pages/portal/index.svelte @@ -0,0 +1 @@ +Top top! diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js index db02790ffd..b67aae0a2e 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.js @@ -6,7 +6,7 @@ import path from "path" export default ({ mode }) => { const isProduction = mode === "production" return { - base: "/builder/", + base: "/", build: { minify: isProduction, outDir: "../server/builder", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 980217dc75..7b343abc6c 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -6270,22 +6270,6 @@ jsonschema@1.4.0: resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2" integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw== -jsonwebtoken@^8.2.0, jsonwebtoken@^8.5.1: - version "8.5.1" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" - integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w== - dependencies: - jws "^3.2.2" - lodash.includes "^4.3.0" - lodash.isboolean "^3.0.3" - lodash.isinteger "^4.0.4" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.once "^4.0.0" - ms "^2.1.1" - semver "^5.6.0" - jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -6325,7 +6309,7 @@ jwa@^1.4.1: ecdsa-sig-formatter "1.0.11" safe-buffer "^5.0.1" -jws@3.x.x, jws@^3.0.0, jws@^3.1.4, jws@^3.2.2: +jws@3.x.x: version "3.2.2" resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== @@ -6763,51 +6747,11 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.defaults@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= - -lodash.flatten@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= - -lodash.includes@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" - integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8= - -lodash.isboolean@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= - lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= -lodash.isinteger@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" - integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M= - -lodash.isnumber@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= - lodash.keys@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" @@ -6828,11 +6772,6 @@ lodash.omit@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= -lodash.once@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= - lodash.pick@^4.0.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" From 80564e2b7dc5a01bce8d721397a14bc5769bd510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 08:48:05 +0200 Subject: [PATCH 16/28] remove unused styling --- .../design/NavigationPanel/FrontendNavigatePane.svelte | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte index 36e0d1661c..de5400d0ba 100644 --- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte +++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte @@ -119,10 +119,6 @@ top: var(--spacing-l); right: var(--spacing-xl); } - .title i:hover { - cursor: pointer; - color: var(--blue); - } .role-select { display: flex; From a826fbf60e87311bd1c5df9685b9959eddc0de3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 09:12:16 +0200 Subject: [PATCH 17/28] more structure to layout --- .../builder/src/pages/portal/_layout.svelte | 90 ++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index bf7e89904e..4de7a6e9a1 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -1 +1,89 @@ -asdasd + + +
+ +
+
+
+ Logotype + {orgName} +
+
+ +
+
+
+ + Apps + Drafts + Users + Groups + Auth + Email + General + Theming + Account + +
+
+ +
+
+ +
+ +
+
+
+ +
+
+
+ + From 6ca0a46d4529e941119e4a5cab5170aac0b3190f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 09:12:25 +0200 Subject: [PATCH 18/28] adds wip initial mode to Avatar --- packages/bbui/src/Avatar/Avatar.svelte | 35 +++++++++++++++++++++----- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte index d2aef72446..ae3ebda82c 100644 --- a/packages/bbui/src/Avatar/Avatar.svelte +++ b/packages/bbui/src/Avatar/Avatar.svelte @@ -2,11 +2,34 @@ import "@spectrum-css/avatar/dist/index-vars.css" export let url = "" export let disabled = false + export let initials = "KA" -Avatar +{#if url} + Avatar +{:else} +
{initials}
+{/if} + + From 1b2a0e879b8c0e8c8f2b54563a31639248641969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 09:30:52 +0200 Subject: [PATCH 19/28] wip: update ProgressCircle to take values --- .../src/ProgressCircle/ProgressCircle.svelte | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte index c3c0fb39d6..f5ecccde79 100644 --- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte +++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte @@ -4,10 +4,29 @@ import { tweened } from "svelte/motion" import { cubicOut } from "svelte/easing" - export let value = false export let small export let large + export let value = false + export let minValue = 0 + export let maxValue = 0 + + let subMask1Style + let subMask2Style + if (!value) { + let percentage = ((value - minValue) / (maxValue - minValue)) * 100 + let angle + if (percentage > 0 && percentage <= 50) { + angle = -180 + (percentage / 50) * 180 + subMask1Style = `rotate(${angle}deg)` + subMask2Style = "rotate(-180deg)" + } else if (percentage > 50) { + angle = -180 + ((percentage - 50) / 50) * 180 + subMask1Style = "rotate(0deg)" + subMask2Style = `rotate(${angle}deg)` + } + } + export let overBackground @@ -20,12 +39,12 @@
-
+
-
+
From b9ec7568d891e1faed38f953e857475d2561303a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 09:43:01 +0200 Subject: [PATCH 20/28] fix progress not showing correctly --- .../bbui/src/ProgressCircle/ProgressCircle.svelte | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte index f5ecccde79..c574c86adb 100644 --- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte +++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte @@ -9,21 +9,21 @@ export let value = false export let minValue = 0 - export let maxValue = 0 + export let maxValue = 100 let subMask1Style let subMask2Style - if (!value) { + if (value) { let percentage = ((value - minValue) / (maxValue - minValue)) * 100 let angle if (percentage > 0 && percentage <= 50) { angle = -180 + (percentage / 50) * 180 - subMask1Style = `rotate(${angle}deg)` - subMask2Style = "rotate(-180deg)" + subMask1Style = `transform: rotate(${angle}deg);` + subMask2Style = "transform: rotate(-180deg);" } else if (percentage > 50) { angle = -180 + ((percentage - 50) / 50) * 180 - subMask1Style = "rotate(0deg)" - subMask2Style = `rotate(${angle}deg)` + subMask1Style = "transform: rotate(0deg);" + subMask2Style = `transform: rotate(${angle}deg);` } } @@ -34,6 +34,7 @@ class:spectrum-ProgressBar--indeterminate={!value} class:spectrum-ProgressCircle--small={small} class:spectrum-ProgressCircle--large={large} + class:spectrum-ProgressCircle--overBackground={overBackground} class="spectrum-ProgressCircle" >
From 341b71cfd9c15f43f84ce99be50505699f250246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 10:02:48 +0200 Subject: [PATCH 21/28] working ProgressCircle --- .../src/ProgressCircle/ProgressCircle.svelte | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte index c574c86adb..711517ec7b 100644 --- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte +++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte @@ -1,11 +1,17 @@
From e46ea324b5fb6372801da1253cbac601d7951dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 10:21:55 +0200 Subject: [PATCH 22/28] update layout --- .../builder/src/pages/portal/_layout.svelte | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index 4de7a6e9a1..ea2fd18ed0 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -9,15 +9,18 @@ SideNavigationItem as Item, } from "@budibase/bbui" - let orgName, orgLogo + let orgName, orgLogo, onBoardingProgress - async function getOrgInfo() { + async function getInfo() { // fetch orgInfo orgName = "ACME Inc." - orgLogo = "https://via.placeholder.com/32" + orgLogo = "https://via.placeholder.com/150" + + // set onBoardingProgress + onBoardingProgress = 20 } - onMount(getOrgInfo) + onMount(getInfo)
@@ -29,7 +32,7 @@ {orgName}
- +
@@ -51,7 +54,7 @@
- +
@@ -75,6 +78,14 @@ display: grid; grid-template-columns: auto auto; justify-content: space-between; + align-items: center; + margin-bottom: var(--spacing-xl); + } + .name { + display: grid; + grid-template-columns: auto auto; + grid-gap: var(--spacing-m); + align-items: center; } .content { padding: var(--spacing-m); @@ -86,4 +97,8 @@ justify-content: space-between; padding: var(--spacing-m) calc(var(--spacing-xl) * 2); } + img { + width: 32px; + height: 32px; + } From 0a8babd24d9dc38ffdde5a6724073713b7f66547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 10:43:06 +0200 Subject: [PATCH 23/28] add sizing prop to Avatar --- packages/bbui/src/Avatar/Avatar.svelte | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte index ae3ebda82c..be8172b05d 100644 --- a/packages/bbui/src/Avatar/Avatar.svelte +++ b/packages/bbui/src/Avatar/Avatar.svelte @@ -1,5 +1,15 @@ {#if url} @@ -25,11 +30,12 @@ /> {:else}
- {initials} + {getInitials(name)}
{/if} @@ -38,7 +44,7 @@ color: white; display: grid; place-items: center; - font-weight: bold; + font-weight: 500; background: rgb(63, 94, 251); background: linear-gradient( 155deg, @@ -47,5 +53,6 @@ ); border-radius: 50%; overflow: hidden; + user-select: none; } From 40a3b7324b2a9a86c72fd44bfc550753760a9ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 11:00:20 +0200 Subject: [PATCH 26/28] remove dummy text from index page --- packages/builder/src/pages/portal/index.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/pages/portal/index.svelte b/packages/builder/src/pages/portal/index.svelte index f672f3e491..e69de29bb2 100644 --- a/packages/builder/src/pages/portal/index.svelte +++ b/packages/builder/src/pages/portal/index.svelte @@ -1 +0,0 @@ -Top top! From b837474bd86cff4c75672804fde77eb754acc8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 11:00:33 +0200 Subject: [PATCH 27/28] passes in dummy user.name data to Avatar component --- packages/builder/src/pages/portal/_layout.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index ea2fd18ed0..23bf9579ca 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -9,7 +9,7 @@ SideNavigationItem as Item, } from "@budibase/bbui" - let orgName, orgLogo, onBoardingProgress + let orgName, orgLogo, onBoardingProgress, user async function getInfo() { // fetch orgInfo @@ -18,6 +18,7 @@ // set onBoardingProgress onBoardingProgress = 20 + user = { name: "John Doe" } } onMount(getInfo) @@ -54,7 +55,7 @@
- +
From 5af66591da086ef9e7565e23123ec91bff79c619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Wed, 5 May 2021 11:14:08 +0200 Subject: [PATCH 28/28] adds active indicator to sidenav --- .../builder/src/pages/portal/_layout.svelte | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index 23bf9579ca..866695be24 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -1,6 +1,8 @@
@@ -38,15 +52,9 @@
- Apps - Drafts - Users - Groups - Auth - Email - General - Theming - Account + {#each menu as { title, href, heading }} + {title} + {/each}
@@ -55,7 +63,8 @@
- + +
@@ -91,6 +100,16 @@ .content { padding: var(--spacing-m); } + .avatar { + display: grid; + grid-template-columns: auto auto; + place-items: center; + grid-gap: var(--spacing-xs); + } + .avatar:hover { + cursor: pointer; + filter: brightness(110%); + } .toolbar { border-bottom: 2px solid var(--spectrum-alias-background-color-primary); display: grid;