Merge branch 'main' into wip/mobile

2 files changed, 9 insertions, 2 deletions

diff --git a/ui/routes/(login)/invite/[invite]/+page.svelte b/ui/routes/(login)/invite/[invite]/+page.svelte
index b9a4a97..798dfb7 100644
--- a/ui/routes/(login)/invite/[invite]/+page.svelte
+++ b/ui/routes/(login)/invite/[invite]/+page.svelte
@@ -23,8 +23,12 @@
 </script>
 
 {#await data}
-<p>Loading invitation…</p>
+<div class="card m-4 p-4">
+    <p>Loading invitation…</p>
+</div>
 {:then { invite }}
-<p>Hi there! {invite.issuer} invites you to the conversation.</p>
+<div class="card m-4 p-4">
+    <p>Hi there! {invite.issuer} invites you to the conversation.</p>
+</div>
 <LogIn bind:disabled bind:username bind:password on:submit={onSubmit} />
 {/await}
diff --git a/ui/routes/+layout.svelte b/ui/routes/+layout.svelte
index 794a119..6e6a8d6 100644
--- a/ui/routes/+layout.svelte
+++ b/ui/routes/+layout.svelte
@@ -6,6 +6,7 @@
 
     import { showMenu, currentUser } from '$lib/store';
     import LogOut from '$lib/components/LogOut.svelte';
+    import Invite from '$lib/components/Invite.svelte';
 
     function toggleMenu() {
         showMenu.update((value) => !value);
@@ -23,11 +24,13 @@
             <a href="/">understory</a>
             <svelte:fragment slot="trail">
                 {#if $currentUser}
+                    <Invite />
                     <LogOut />
                 {/if}
             </svelte:fragment>
         </AppBar>
     </div>
+
     <slot />
 </div>