fix double page component issue in email section

2021-05-25 15:25:56 +02:00 · 2021-05-25 15:25:56 +02:00 · b6cddb5adc
parent f1b4bcc440
commit b6cddb5adc
3 changed files with 127 additions and 127 deletions
--- a/packages/builder/src/pages/builder/portal/manage/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/_layout.svelte
@ -1,7 +1,7 @@
 <script>
  import { Page } from "@budibase/bbui"
  import { auth } from "stores/portal"
-  import { redirect } from "@roxi/routify"
+  import { page, redirect } from "@roxi/routify"

  // Only admins allowed here
  $: {
@ -9,8 +9,12 @@
      $redirect("../")
    }
  }
+
+  $: console.log($page)
 </script>

 {#if $auth.isAdmin}
+  <Page wide={$page.path.includes("email/:template")}>
    <slot />
+  </Page>
 {/if}
--- a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
@ -69,8 +69,7 @@
  }
 </script>

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

 <style>
  .template-editor {
--- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
@ -76,8 +76,7 @@
  fetchSmtp()
 </script>

-<Page>
-  <Layout>
+<Layout>
  <Layout noPadding gap="XS">
    <Heading size="M">Email</Heading>
    <Body>
@ -139,8 +138,7 @@
      allowEditColumns={false}
    />
  {/if}
-  </Layout>
-</Page>
+</Layout>

 <style>
  .form-row {