MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix double page component issue in email section

This commit is contained in:
Keviin Åberg Kultalahti 2021-05-25 15:25:56 +02:00
parent f1b4bcc440
commit b6cddb5adc
3 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/pages/builder/portal/manage/_layout.svelte
View File

@ -1,7 +1,7 @@
<script> <script>
import { Page } from "@budibase/bbui" import { Page } from "@budibase/bbui"
import { auth } from "stores/portal" import { auth } from "stores/portal"
import { redirect } from "@roxi/routify" import { page, redirect } from "@roxi/routify"
// Only admins allowed here // Only admins allowed here
$: { $: {
@ -9,8 +9,12 @@
$redirect("../") $redirect("../")
} }
} }
$: console.log($page)
</script> </script>
{#if $auth.isAdmin} {#if $auth.isAdmin}
<Page wide={$page.path.includes("email/:template")}>
<slot /> <slot />
</Page>
{/if} {/if}

10
packages/builder/src/pages/builder/portal/manage/email/[template].svelte
View File

@ -69,8 +69,7 @@
} }
</script> </script>
<Page wide> <Layout gap="XS" noPadding>
<Layout gap="XS" noPadding>
<div class="back"> <div class="back">
<ActionButton <ActionButton
on:click={() => $goto("./")} on:click={() => $goto("./")}
@ -91,8 +90,8 @@
>Change the email template here. Add dynamic content by using the bindings >Change the email template here. Add dynamic content by using the bindings
menu on the right.</Body menu on the right.</Body
> >
</Layout> </Layout>
<Tabs selected="Edit" on:select={fixMountBug}> <Tabs selected="Edit" on:select={fixMountBug}>
<Tab title="Edit"> <Tab title="Edit">
<div class="template-editor"> <div class="template-editor">
<Editor <Editor
@ -132,8 +131,7 @@
<iframe srcdoc={previewContent} /> <iframe srcdoc={previewContent} />
</div> </div>
</Tab> </Tab>
</Tabs> </Tabs>
</Page>
<style> <style>
.template-editor { .template-editor {

6
packages/builder/src/pages/builder/portal/manage/email/index.svelte
View File

@ -76,8 +76,7 @@
fetchSmtp() fetchSmtp()
</script> </script>
<Page> <Layout>
<Layout>
<Layout noPadding gap="XS"> <Layout noPadding gap="XS">
<Heading size="M">Email</Heading> <Heading size="M">Email</Heading>
<Body> <Body>
@ -139,8 +138,7 @@
allowEditColumns={false} allowEditColumns={false}
/> />
{/if} {/if}
</Layout> </Layout>
</Page>
<style> <style>
.form-row { .form-row {