From db87d1d62145a50d12935e112d42bea4e61bc4d1 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 17 May 2021 13:47:23 +0100 Subject: [PATCH 01/13] Work in progress, moving login form around a bit. --- packages/builder/assets/google-logo.png | Bin 0 -> 1771 bytes .../src/components/login/GoogleButton.svelte | 41 ++++++++++++++ .../src/components/login/LoginForm.svelte | 53 ++++++++++++++---- 3 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 packages/builder/assets/google-logo.png create mode 100644 packages/builder/src/components/login/GoogleButton.svelte diff --git a/packages/builder/assets/google-logo.png b/packages/builder/assets/google-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3f52a66ae9619e0bb383d220a449a327560d6135 GIT binary patch literal 1771 zcmV;P)`k0=zBfB zkn`M?`8j|fxCf@%+vGftwhhaK7Gne>{zi-5z}97RWX_k##(G@`1A@Tfqv4ShjOlj= zphhI~r^tOhfI^{jV1Q#XcL$;QC}b6l2+c-HubidYT6F>pC`u8`hnFI{1d(k#Oy=nf z2%sEvXhSsJ#(oz_YD$zwS~C=f)gv(~{{UAocEa z?)X43@~=l}TUX8p0B{uyZ~+ni%za=O`K8x{#=kx6((O;w)o{2GPc>YDyoUzoJujL3 zJ<`d{0Wg_k^(ZimGW6;8HJ{$r!qx{+C^!rT6hTD224SirJAQM->O6gz+s~FjXFl}M z3Fh{a$o3Dip^n>Ns>uanXhxYlNS!}?Ivm$@E=J>BfXT9T^uc8L26e#0cS^MoISy2U zvrOoNDN&g2gUg#KRbV2eFMTi|rMeG}Ehbcg6TYVlj(!UP*L`5$bfrpg%m;MA3Ey)9 z?3#qD1V_9`7o0Yj6W}W`tbqq{0t^SIo^?u}i&PCx_<=4s>P=379pdqxH7t3gD0^1n z;h&`%T((eqTRe)eXAbawgVY-t<~2z{VA=%d z)R6Sg=N&wST1~vB(3hrp4u#IUb0*hCo8Z&o7=185L&>~Nn-cWiXg7oVv@reLZE89i zwWDp50fYSrcdRM_#jp{7h5ub2S2M_aXy!$2)lMV+R2ahHwK^&T03bhVX$yURxpzOP zQk~P9Ke6k@)R;X8hxcR{hVU>=5&J3BmIS|H<~{~`=p?8*R&!bz2Bw~sA&tPrjU>Y3 zQbF+sfB(-0ULSjCroX#wY(ttRv;cth?g}LBq|-9A=fhI0eU#5s$Uw?JZdP7pA?#{# z0_@NjN;ELsd@CZLfk6&tUdBkA6|JCynsZT(sxibo6+(gHtg-pej1JI@YZ;@It-^+^5sS*AMWpQ}yF6 z)&r08yVS0ARj}}KsZcH%!<&vSWIz4R9~!nx@+htOVJW=Hu>gi!wy>zLyNxcG|GBzk z=-!HlPJJ`0NH$*(hlLazX1m`E<1}H=;n@4YE{Qn%O8_G3lKQw=>x9|GqW|g3w?`~E zsnFCSkNAcRSVHQ6`NoK~Vd(D0qrsSFm+_=F=fXyZj+pl)^3hkdpl?l50USuWmpa0G za(rWk_Lkz26bYL<=ye!7nHsjXNha)u#g-W@1=fK}w5&axb%mhFZd*=E0g7K4d8Z!K zWM+hK$QPCB#DZyz#2t!!MkRQ6#R= z^$$I0!#dncgO+aCO|l%uDdd&x+V+6SP#% zcP5-0!J=)b*Tk{B85RKx=S6LS!b=5Suq)PzwfBB-NiVn;+zWo>_8%1)ADpoFWwrnS N002ovPDHLkV1fkhT8IDu literal 0 HcmV?d00001 diff --git a/packages/builder/src/components/login/GoogleButton.svelte b/packages/builder/src/components/login/GoogleButton.svelte new file mode 100644 index 0000000000..ff04e82ebe --- /dev/null +++ b/packages/builder/src/components/login/GoogleButton.svelte @@ -0,0 +1,41 @@ + + +
+ +
+ google icon +

Sign in with Google

+
+ +
+ + diff --git a/packages/builder/src/components/login/LoginForm.svelte b/packages/builder/src/components/login/LoginForm.svelte index f6f4f314c8..2eecbe3078 100644 --- a/packages/builder/src/components/login/LoginForm.svelte +++ b/packages/builder/src/components/login/LoginForm.svelte @@ -2,11 +2,13 @@ import { goto } from "@roxi/routify" import { notifications, - Link, Input, Modal, ModalContent, + Button, + Divider, } from "@budibase/bbui" + import GoogleButton from "./GoogleButton.svelte" import { auth } from "stores/backend" let username = "" @@ -25,35 +27,66 @@ notifications.error("Invalid credentials") } } + + async function forgot() { + + } -
- - Sign In With Google - + +
+ +
+ OR +
+
+
+
From 75b1c25199930f16120c1555438001671cd9eb9a Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 17 May 2021 15:29:57 +0100 Subject: [PATCH 02/13] Further work towards login designs. --- packages/builder/assets/google-logo.png | Bin 1771 -> 11199 bytes .../src/components/login/GoogleButton.svelte | 16 +++++++---- .../src/components/login/LoginForm.svelte | 27 +++--------------- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/packages/builder/assets/google-logo.png b/packages/builder/assets/google-logo.png index 3f52a66ae9619e0bb383d220a449a327560d6135..371a6aee2bcf80fee8b886d2175a40c1d2ca80de 100644 GIT binary patch literal 11199 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 N002ovPDHLkV1fkhT8IDu diff --git a/packages/builder/src/components/login/GoogleButton.svelte b/packages/builder/src/components/login/GoogleButton.svelte index ff04e82ebe..d6396cb267 100644 --- a/packages/builder/src/components/login/GoogleButton.svelte +++ b/packages/builder/src/components/login/GoogleButton.svelte @@ -13,24 +13,30 @@
From 4bbeec595453cb6c719b3bff67ed6a8335328f4a Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 17 May 2021 16:48:26 +0100 Subject: [PATCH 03/13] Adding login form from designs. --- .../src/components/login/GoogleButton.svelte | 16 ++--- .../src/components/login/LoginForm.svelte | 66 ++++++++++++------- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/packages/builder/src/components/login/GoogleButton.svelte b/packages/builder/src/components/login/GoogleButton.svelte index d6396cb267..ef2c5ce81b 100644 --- a/packages/builder/src/components/login/GoogleButton.svelte +++ b/packages/builder/src/components/login/GoogleButton.svelte @@ -14,25 +14,24 @@ diff --git a/packages/builder/src/components/login/LoginForm.svelte b/packages/builder/src/components/login/LoginForm.svelte index 7e9b2d3dd8..2435896fcd 100644 --- a/packages/builder/src/components/login/LoginForm.svelte +++ b/packages/builder/src/components/login/LoginForm.svelte @@ -1,15 +1,16 @@ - - + From c90463e6a3bd6e176fc24a78f9703ce90a594e04 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 17 May 2021 17:42:12 +0100 Subject: [PATCH 04/13] Add option to layout to justify items --- packages/bbui/src/Layout/Layout.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Layout/Layout.svelte b/packages/bbui/src/Layout/Layout.svelte index acd064a16a..504db41133 100644 --- a/packages/bbui/src/Layout/Layout.svelte +++ b/packages/bbui/src/Layout/Layout.svelte @@ -6,10 +6,11 @@ export let gap = "M" export let noGap = false export let alignContent = "normal" + export let justifyItems = "stretch"
Date: Mon, 17 May 2021 17:49:40 +0100 Subject: [PATCH 05/13] Add option for text alignment to Body --- packages/bbui/src/Typography/Body.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/bbui/src/Typography/Body.svelte b/packages/bbui/src/Typography/Body.svelte index b18400862d..9d4e1e637f 100644 --- a/packages/bbui/src/Typography/Body.svelte +++ b/packages/bbui/src/Typography/Body.svelte @@ -4,9 +4,11 @@ export let size = "M" export let serif = false export let noPadding = false + export let textAlign = "left"

Date: Mon, 17 May 2021 17:51:13 +0100 Subject: [PATCH 06/13] Switching over to use layouts. --- .../src/components/login/LoginForm.svelte | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/packages/builder/src/components/login/LoginForm.svelte b/packages/builder/src/components/login/LoginForm.svelte index 2435896fcd..f13988dba2 100644 --- a/packages/builder/src/components/login/LoginForm.svelte +++ b/packages/builder/src/components/login/LoginForm.svelte @@ -8,6 +8,7 @@ ActionButton, Layout, Body, + Heading, } from "@budibase/bbui" import GoogleButton from "./GoogleButton.svelte" import {auth} from "stores/backend" @@ -36,21 +37,23 @@

@@ -65,25 +68,25 @@ } .main { - width: 240px; + width: 260px; + } + + .center { display: flex; flex-direction: column; justify-content: center; align-items: center; } - .main img { + img { width: 48px; } .sso { width: 100%; - margin-bottom: var(--spacing-l); - margin-top: var(--spacing-s); } .login-buttons :global(>*) { - margin-top: var(--spacing-l); width: 100%; } From 3f7adae0d5f577268646893be7d4c6f4024c78a4 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 17 May 2021 18:20:10 +0100 Subject: [PATCH 07/13] Switching everything over to proper layouts and removing any specified margins/padding. --- .../src/components/login/GoogleButton.svelte | 35 +++++-------------- .../src/components/login/LoginForm.svelte | 31 +++++----------- 2 files changed, 16 insertions(+), 50 deletions(-) diff --git a/packages/builder/src/components/login/GoogleButton.svelte b/packages/builder/src/components/login/GoogleButton.svelte index ef2c5ce81b..67aca57df5 100644 --- a/packages/builder/src/components/login/GoogleButton.svelte +++ b/packages/builder/src/components/login/GoogleButton.svelte @@ -1,25 +1,17 @@ -
- -
- google icon -

Sign in with Google

-
- -
+ goto("/api/admin/auth/google")}> +
+ google icon +
Sign in with Google
+
+ diff --git a/packages/builder/src/components/login/LoginForm.svelte b/packages/builder/src/components/login/LoginForm.svelte index f13988dba2..1e6e83111b 100644 --- a/packages/builder/src/components/login/LoginForm.svelte +++ b/packages/builder/src/components/login/LoginForm.svelte @@ -1,5 +1,5 @@ -

+

diff --git a/packages/builder/src/components/login/ForgotForm.svelte b/packages/builder/src/components/login/ForgotForm.svelte new file mode 100644 index 0000000000..e95660bb63 --- /dev/null +++ b/packages/builder/src/components/login/ForgotForm.svelte @@ -0,0 +1,51 @@ + + + + + diff --git a/packages/builder/src/components/login/GoogleButton.svelte b/packages/builder/src/components/login/GoogleButton.svelte index 67aca57df5..9f154df059 100644 --- a/packages/builder/src/components/login/GoogleButton.svelte +++ b/packages/builder/src/components/login/GoogleButton.svelte @@ -1,17 +1,25 @@ - goto("/api/admin/auth/google")}> -
- google icon -
Sign in with Google
-
- +
+ +
+ google icon +

Sign in with Google

+
+ +
+ diff --git a/packages/builder/src/components/login/LoginForm.svelte b/packages/builder/src/components/login/LoginForm.svelte index 1e6e83111b..92d32a3162 100644 --- a/packages/builder/src/components/login/LoginForm.svelte +++ b/packages/builder/src/components/login/LoginForm.svelte @@ -29,10 +29,6 @@ notifications.error("Invalid credentials") } } - - async function forgot() { - - } @@ -68,7 +64,7 @@ } .main { - width: 260px; + width: 300px; } img { diff --git a/packages/builder/src/components/login/ResetForm.svelte b/packages/builder/src/components/login/ResetForm.svelte new file mode 100644 index 0000000000..45202722a3 --- /dev/null +++ b/packages/builder/src/components/login/ResetForm.svelte @@ -0,0 +1,53 @@ + + + + + diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index b15001b788..dbc89131cb 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -1,6 +1,6 @@ + + diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte new file mode 100644 index 0000000000..4cb949921c --- /dev/null +++ b/packages/builder/src/pages/builder/auth/reset.svelte @@ -0,0 +1,5 @@ + + + From 6e858d2bbd3c9caa215340ec343fbbadcc4dd611 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 18 May 2021 15:08:57 +0100 Subject: [PATCH 09/13] Adding repeat password entry component. --- .../common/users/PasswordRepeatInput.svelte | 39 +++++++++++++++++ .../src/pages/builder/invite/index.svelte | 42 ++++--------------- 2 files changed, 46 insertions(+), 35 deletions(-) create mode 100644 packages/builder/src/components/common/users/PasswordRepeatInput.svelte diff --git a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte new file mode 100644 index 0000000000..98128ebd94 --- /dev/null +++ b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte @@ -0,0 +1,39 @@ + + + + + + \ No newline at end of file diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte index 85316dc008..c6a0f3fa04 100644 --- a/packages/builder/src/pages/builder/invite/index.svelte +++ b/packages/builder/src/pages/builder/invite/index.svelte @@ -3,27 +3,19 @@ Layout, Heading, Body, - Input, Button, notifications, } from "@budibase/bbui" import { goto, params } from "@roxi/routify" - import { createValidationStore, requiredValidator } from "helpers/validation" + import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte" import { users } from "stores/portal" - const [password, passwordError, passwordTouched] = createValidationStore( - "", - requiredValidator - ) - const [repeat, _, repeatTouched] = createValidationStore( - "", - requiredValidator - ) const inviteCode = $params["?code"] + let password, error async function acceptInvite() { try { - const res = await users.acceptInvite(inviteCode, $password) + const res = await users.acceptInvite(inviteCode, password) if (!res) { throw new Error(res.message) } @@ -40,31 +32,14 @@ -
- - Accept Invitation - Please enter a password to setup your user. - -
- - + Accept Invitation + Please enter a password to setup your user. + @@ -87,9 +62,6 @@ justify-content: flex-start; align-items: stretch; } - .center { - text-align: center; - } img { width: 40px; margin: 0 auto; From 46d572a8fcdd4958bc9e6c12d9cb5506040a90fb Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 18 May 2021 15:09:04 +0100 Subject: [PATCH 10/13] Formatting. --- packages/bbui/src/Typography/Heading.svelte | 8 +++-- .../common/users/PasswordRepeatInput.svelte | 36 ++++++++++--------- .../src/components/login/ForgotForm.svelte | 17 ++++----- .../src/components/login/GoogleButton.svelte | 1 - .../src/components/login/LoginForm.svelte | 11 ++++-- .../src/components/login/ResetForm.svelte | 16 +++------ .../src/pages/builder/invite/index.svelte | 17 +++------ 7 files changed, 50 insertions(+), 56 deletions(-) diff --git a/packages/bbui/src/Typography/Heading.svelte b/packages/bbui/src/Typography/Heading.svelte index 4d0814a22d..00951752af 100644 --- a/packages/bbui/src/Typography/Heading.svelte +++ b/packages/bbui/src/Typography/Heading.svelte @@ -7,8 +7,10 @@ export let noPadding = false -

+

diff --git a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte index 98128ebd94..f1cb6bb829 100644 --- a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte +++ b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte @@ -1,9 +1,9 @@ - \ No newline at end of file + diff --git a/packages/builder/src/components/login/ForgotForm.svelte b/packages/builder/src/components/login/ForgotForm.svelte index e95660bb63..df76f72c2d 100644 --- a/packages/builder/src/components/login/ForgotForm.svelte +++ b/packages/builder/src/components/login/ForgotForm.svelte @@ -1,18 +1,10 @@ -