Logged-out handling on document pages

MuckRock · Dec 10, 2024 · dcfe1bf · dcfe1bf
1 parent 678f802
commit dcfe1bf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/src/lib/components/documents/Header.svelte b/src/lib/components/documents/Header.svelte
@@ -11,8 +11,9 @@
   import { _ } from "svelte-i18n";
 
   import { ALLOWED_TAGS, ALLOWED_ATTR } from "@/config/config.js";
-  import { remToPx } from "@/lib/utils/layout";
-  import Access, { getLevel } from "../common/Access.svelte";
+  import Access, { getLevel } from "$lib/components/common/Access.svelte";
+  import { remToPx } from "$lib/utils/layout";
+  import SignedIn from "../common/SignedIn.svelte";
 
   export let document: Document;
 
@@ -33,11 +34,13 @@
 </script>
 
 <header bind:clientWidth={width}>
-  {#if access}
-    <div class="access">
-      <Access level={access} />
-    </div>
-  {/if}
+  <SignedIn>
+    {#if access}
+      <div class="access">
+        <Access level={access} />
+      </div>
+    {/if}
+  </SignedIn>
   <h1 class="title">{document.title}</h1>
   {#if description}
     <div class="description" class:twoColumn={BREAKPOINTS.TWO_COLUMN}>

diff --git a/src/lib/components/layouts/DocumentLayout.svelte b/src/lib/components/layouts/DocumentLayout.svelte
@@ -22,6 +22,7 @@ Assumes it's a child of a ViewerContext
   import { getCurrentUser } from "$lib/utils/permissions";
   import { isOrg } from "$lib/api/accounts";
   import { getDocument, getText } from "../viewer/ViewerContext.svelte";
+  import SignedIn from "../common/SignedIn.svelte";
 
   const me = getCurrentUser();
 
@@ -34,11 +35,13 @@ Assumes it's a child of a ViewerContext
 </script>
 
 <SidebarLayout>
-  <nav class="column" slot="navigation">
-    <Projects {projects} {document} />
-    <Data {document} />
-    <Notes {document} />
-  </nav>
+  <SignedIn>
+    <nav class="column" slot="navigation">
+      <Projects {projects} {document} />
+      <Data {document} />
+      <Notes {document} />
+    </nav>
+  </SignedIn>
 
   <article slot="content">
     <header><DocumentHeader {document} /></header>
@@ -55,10 +58,10 @@ Assumes it's a child of a ViewerContext
           </Flex>
         </Metadata>
       {/if}
-      {#if $me}
-        <ViewerActions {document} user={$me} {action} />
-      {/if}
-      <AddOns query="+document:{document.id}" />
+      <ViewerActions {document} user={$me} {action} />
+      <SignedIn>
+        <AddOns query="+document:{document.id}" />
+      </SignedIn>
     </Flex>
     {#await text then text}
       <DocumentMetadata {document} {text} />

diff --git a/src/lib/components/sidebar/ViewerActions.svelte b/src/lib/components/sidebar/ViewerActions.svelte
@@ -1,7 +1,7 @@
 <!-- Assumes its a child of ViewerContext -->
 
 <script lang="ts">
-  import type { Document, Org, User } from "$lib/api/types";
+  import type { Document, Nullable, Org, User } from "$lib/api/types";
 
   import { _ } from "svelte-i18n";
   import {
@@ -33,7 +33,7 @@
   import { getCurrentPage } from "../viewer/ViewerContext.svelte";
 
   export let document: Document;
-  export let user: User;
+  export let user: Nullable<User>;
   export let action: string = "";
 
   const page = getCurrentPage();