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"

-

+

diff --git a/packages/builder/assets/google-logo.png b/packages/builder/assets/google-logo.png new file mode 100644 index 0000000000..371a6aee2b Binary files /dev/null and b/packages/builder/assets/google-logo.png differ 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 @@ + + +
+
+ + + + + + Forgotten your password? + No problem! Just enter your account's email address and we'll send you a link to reset it. + + + + +
+
+ + diff --git a/packages/builder/src/components/login/GoogleButton.svelte b/packages/builder/src/components/login/GoogleButton.svelte new file mode 100644 index 0000000000..9f154df059 --- /dev/null +++ b/packages/builder/src/components/login/GoogleButton.svelte @@ -0,0 +1,44 @@ + + +
+ +
+ 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..92d32a3162 100644 --- a/packages/builder/src/components/login/LoginForm.svelte +++ b/packages/builder/src/components/login/LoginForm.svelte @@ -2,11 +2,15 @@ import { goto } from "@roxi/routify" import { notifications, - Link, Input, - Modal, - ModalContent, + Button, + Divider, + ActionButton, + Layout, + Body, + Heading, } from "@budibase/bbui" + import GoogleButton from "./GoogleButton.svelte" import { auth } from "stores/backend" let username = "" @@ -27,33 +31,43 @@ } - - - - -
- - Sign In With Google - -
- - +
+
+ + + + Sign in to Budibase + + + + + Sign in with email + + + + + + $goto("./forgot")}>Forgot password? + + +
+
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 @@ + + +
+
+ + + + + + Reset your password + Please enter the new password you'd like to use. + + + + +
+
+ + diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index 0a5a88168b..04ff8383e7 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 @@ + + +