diff --git a/packages/builder/src/components/common/ConfigChecklist.svelte b/packages/builder/src/components/common/ConfigChecklist.svelte index b784656d23..79470b3638 100644 --- a/packages/builder/src/components/common/ConfigChecklist.svelte +++ b/packages/builder/src/components/common/ConfigChecklist.svelte @@ -41,4 +41,7 @@ align-items: center; grid-template-columns: 200px 20px; } + .icon { + cursor: pointer; + } diff --git a/packages/builder/src/components/login/ForgotForm.svelte b/packages/builder/src/components/login/ForgotForm.svelte deleted file mode 100644 index f26c3bfc2b..0000000000 --- a/packages/builder/src/components/login/ForgotForm.svelte +++ /dev/null @@ -1,62 +0,0 @@ - - -
-
- - - - - - 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/LoginForm.svelte b/packages/builder/src/components/login/LoginForm.svelte deleted file mode 100644 index b5ec67da8c..0000000000 --- a/packages/builder/src/components/login/LoginForm.svelte +++ /dev/null @@ -1,91 +0,0 @@ - - -
-
- - - - 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 deleted file mode 100644 index a0a56a2523..0000000000 --- a/packages/builder/src/components/login/ResetForm.svelte +++ /dev/null @@ -1,59 +0,0 @@ - - -
-
- - - - - - Reset your password - - Please enter the new password you'd like to use. - - - - - -
-
- - diff --git a/packages/builder/src/components/login/index.js b/packages/builder/src/components/login/index.js deleted file mode 100644 index 6a35637cea..0000000000 --- a/packages/builder/src/components/login/index.js +++ /dev/null @@ -1 +0,0 @@ -export { LoginForm } from "./LoginForm.svelte" diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index 7f0f8a1ae0..43a5d205d9 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -1,7 +1,7 @@ diff --git a/packages/builder/src/components/login/GoogleButton.svelte b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte similarity index 100% rename from packages/builder/src/components/login/GoogleButton.svelte rename to packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte diff --git a/packages/builder/src/pages/builder/auth/forgot.svelte b/packages/builder/src/pages/builder/auth/forgot.svelte index 59f048c4c3..f26c3bfc2b 100644 --- a/packages/builder/src/pages/builder/auth/forgot.svelte +++ b/packages/builder/src/pages/builder/auth/forgot.svelte @@ -1,5 +1,62 @@ - +
+
+ + + + + + 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/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte index b3efe9c121..043bbd6f04 100644 --- a/packages/builder/src/pages/builder/auth/login.svelte +++ b/packages/builder/src/pages/builder/auth/login.svelte @@ -1,5 +1,96 @@ - + + + diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte index 4cb949921c..da7e2a7073 100644 --- a/packages/builder/src/pages/builder/auth/reset.svelte +++ b/packages/builder/src/pages/builder/auth/reset.svelte @@ -1,5 +1,76 @@ - + + + diff --git a/packages/builder/src/pages/builder/portal/manage/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/auth/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/_layout.svelte rename to packages/builder/src/pages/builder/portal/manage/auth/_layout.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte index ff5b2d4737..b3613a09a1 100644 --- a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte +++ b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte @@ -1,35 +1,32 @@ - -
$goto("./")}> - - Back -
-
- - Email Template: {template} - - -
- + + +
+ $goto("./")} + quiet + size="S" + icon="BackAndroid" + > + Back to email settings + +
+
+ + Email Template: {template} + + +
+ Change the email template here. Add dynamic content by using the bindings + menu on the right. + +
{ selectedTemplate.contents = e.detail.value }} - value={selectedTemplate.contents} + value={selectedTemplate?.contents} />
Bindings - - - - - - - - + {#if mounted} + + + + + + + + + {/if}
-
- {@html selectedTemplate.contents} +
+ {@html selectedTemplate?.contents}
@@ -101,7 +125,7 @@ diff --git a/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte b/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte index bafa225d21..7b1b0fdd2f 100644 --- a/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte +++ b/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte @@ -1,12 +1,5 @@ + + diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/manage/email/index.svelte index 95fe0de40a..0e2e2e98fd 100644 --- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte @@ -1,29 +1,18 @@ - - - Email - - Sending email is not required, but highly recommended for processes such - as password recovery. To setup automated auth emails, simply add the - values below and click activate. - - - - {#if smtpConfig} - - SMTP - - To allow your app to benefit from automated auth emails, add your SMTP - details below. + + + + Email + + Sending email is not required, but highly recommended for processes such + as password recovery. To setup automated auth emails, simply add the + values below and click activate. - -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
- -
- - Templates - - Budibase comes out of the box with ready-made email templates to help - with user onboarding. Please refrain from changing the links. - - - - {/if} - + {#if smtpConfig} + + SMTP + + To allow your app to benefit from automated auth emails, add your SMTP + details below. + + + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+ + + Templates + + Budibase comes out of the box with ready-made email templates to help + with user onboarding. Please refrain from changing the links. + + +
$goto(`./${detail.purpose}`)} + allowEditRows={false} + allowSelectRows={false} + allowEditColumns={false} + /> + {/if} + +