bookish-press 0.4.24 → 0.4.25

package/components/Auth.svelte

@@ -2,7 +2,7 @@
 import { onDestroy, setContext } from 'svelte';
 import { writable } from 'svelte/store';
 import { auth } from '../models/Firebase';
-import { AUTH } from './page/Contexts';
+import { USER } from './page/Contexts';
 // Track the user and user loading status in state
 let loading = true;
 // The store that tracks the auth context.
@@ -46,7 +46,7 @@ if (auth) {
     onDestroy(unsubscribe);
 }
 // Expose the state and the login/logout functionality.
-setContext(AUTH, authentication);
+setContext(USER, authentication);
 </script>
 
 <!-- Wrap whatever children are given in this context. -->

package/components/page/Acknowledgements.svelte

@@ -2,9 +2,9 @@
 import ChapterBody from '../chapter/ChapterBody.svelte';
 import BookishEditor from '../editor/BookishEditor.svelte';
 import Instructions from './Instructions.svelte';
-import { getAuth, getEdition, getLeasee, isEditionEditable, lease, } from './Contexts';
+import { getUser, getEdition, getLeasee, isEditionEditable, lease, } from './Contexts';
 import PageHeader from './PageHeader.svelte';
-let auth = getAuth();
+let auth = getUser();
 let edition = getEdition();
 let editable = isEditionEditable();
 $: acknowledgements = $edition?.getAcknowledgements();

package/components/page/BookLoader.svelte

@@ -2,9 +2,9 @@
 import Feedback from '../app/Feedback.svelte';
 import { onDestroy } from 'svelte';
 import { page } from '$app/stores';
-import { getBook, getAuth } from './Contexts';
+import { getBook, getUser } from './Contexts';
 import { listenToBookWithID as listenToBooksWithID, listenToBooksByName as listenToBooksWithName, } from '../../models/CRUD';
-let auth = getAuth();
+let auth = getUser();
 let book = getBook();
 // Keep track of the query updates
 let booksByName = undefined;

package/components/page/Chapter.svelte

@@ -11,7 +11,7 @@ import ChapterBody from '../chapter/ChapterBody.svelte';
 import PossibleReference from './PossibleReference.svelte';
 import ChapterNumber from './ChapterNumber.svelte';
 import Problem from '../chapter/Problem.svelte';
-import { CHAPTER, getAuth, getBook, getEdition, isBookEditable, isChapterEditable, isEditionPartiallyEditable, getLeasee, lease, setChapter, isEditionEditable, } from './Contexts';
+import { CHAPTER, getUser, getBook, getEdition, isBookEditable, isChapterEditable, isEditionPartiallyEditable, getLeasee, lease, setChapter, isEditionEditable, } from './Contexts';
 import { writable } from 'svelte/store';
 import { onMount, setContext } from 'svelte';
 import { hideOutlineIfObscured, layoutMarginals } from './margins';
@@ -26,7 +26,7 @@ export let chapter;
 export let print = false;
 let book = getBook();
 let edition = getEdition();
-let auth = getAuth();
+let auth = getUser();
 // Keep track of the scroll position to facilitate reading during reloads.
 function rememberPosition() {
     localStorage.setItem('scrollposition', '' + window.scrollY);

package/components/page/Contexts.d.ts

@@ -10,9 +10,9 @@ import type { DocumentReference } from 'firebase/firestore';
 export type DarkModeStore = Writable<boolean>;
 export declare const DARK_MODE: unique symbol;
 export declare function getDarkMode(): DarkModeStore;
-export type AuthStore = Writable<Authentication | undefined>;
-export declare const AUTH: unique symbol;
-export declare function getAuth(): AuthStore;
+export type UserStore = Writable<Authentication | undefined>;
+export declare const USER: unique symbol;
+export declare function getUser(): UserStore;
 export type BookStore = Writable<Book | undefined>;
 export declare const BOOK: unique symbol;
 export declare function getBook(): BookStore;
@@ -43,5 +43,5 @@ export declare function getCaret(): Writable<CaretState | undefined>;
 export declare const STATUS: unique symbol;
 export type StatusStore = Writable<BookSaveStatus>;
 export declare function getStatus(): StatusStore;
-export declare function lease(authStore: AuthStore, editionStore: EditionStore, contentID: string, lock: boolean): Promise<boolean>;
-export declare function getLeasee(authStore: AuthStore, editionStore: EditionStore, contentID: string): string | boolean;
+export declare function lease(authStore: UserStore, editionStore: EditionStore, contentID: string, lock: boolean): Promise<boolean>;
+export declare function getLeasee(authStore: UserStore, editionStore: EditionStore, contentID: string): string | boolean;

package/components/page/Contexts.js

@@ -10,9 +10,9 @@ export const DARK_MODE = Symbol('dark');
 export function getDarkMode() {
     return getContext(DARK_MODE);
 }
-export const AUTH = Symbol('auth');
-export function getAuth() {
-    return getContext(AUTH);
+export const USER = Symbol('user');
+export function getUser() {
+    return getContext(USER);
 }
 export const BOOK = Symbol('book');
 export function getBook() {
@@ -42,7 +42,7 @@ export function setChapter(store, previous, chapter) {
 export function isChapterEditable() {
     if (!get(page).route.id?.startsWith('/write'))
         return false;
-    const auth = get(getAuth());
+    const auth = get(getUser());
     const chapter = get(getChapter());
     const edition = get(getEdition());
     const book = get(getBook());
@@ -58,7 +58,7 @@ export function isChapterEditable() {
 export function isEditionEditable() {
     if (!get(page).route.id?.startsWith('/write'))
         return false;
-    const auth = get(getAuth());
+    const auth = get(getUser());
     const edition = get(getEdition());
     const book = get(getBook());
     return (edition !== undefined &&
@@ -70,7 +70,7 @@ export function isEditionEditable() {
 export function isEditionPartiallyEditable() {
     if (!get(page).route.id?.startsWith('/write'))
         return false;
-    const auth = get(getAuth());
+    const auth = get(getUser());
     const edition = get(getEdition());
     return (edition !== undefined &&
         auth !== undefined &&
@@ -80,7 +80,7 @@ export function isEditionPartiallyEditable() {
 export function isBookEditable() {
     if (!get(page).route.id?.startsWith('/write'))
         return false;
-    const auth = get(getAuth());
+    const auth = get(getUser());
     const book = get(getBook());
     return (book !== undefined &&
         auth !== undefined &&

package/components/page/DefinitionView.svelte

@@ -5,11 +5,11 @@ import BookishEditor from '../editor/BookishEditor.svelte';
 import Format from '../chapter/Format.svelte';
 import Note from '../editor/Note.svelte';
 import { afterUpdate } from 'svelte';
-import { getAuth, getEdition, getLeasee, isChapterEditable, lease, } from './Contexts';
+import { getUser, getEdition, getLeasee, isChapterEditable, lease, } from './Contexts';
 import Button from '../app/Button.svelte';
 export let id;
 export let definition;
-let auth = getAuth();
+let auth = getUser();
 let edition = getEdition();
 let editable = isChapterEditable();
 // Focus after adding a new synonym.

package/components/page/Description.svelte

@@ -1,8 +1,8 @@
 <script>import Parser from '../../models/chapter/Parser';
 import ChapterBody from '../chapter/ChapterBody.svelte';
 import BookishEditor from '../editor/BookishEditor.svelte';
-import { getAuth, getEdition, getLeasee, isEditionEditable, lease, } from './Contexts';
-let auth = getAuth();
+import { getUser, getEdition, getLeasee, isEditionEditable, lease, } from './Contexts';
+let auth = getUser();
 let editable = isEditionEditable();
 let edition = getEdition();
 </script>

package/components/page/EditionLoader.svelte

@@ -1,12 +1,12 @@
 <script>import Loading from './Loading.svelte';
 import Edition from './Edition.svelte';
 import Feedback from '../app/Feedback.svelte';
-import { getBook, getEdition, getAuth, CHAPTERTEXT, getChapterText, } from './Contexts';
+import { getBook, getEdition, getUser, CHAPTERTEXT, getChapterText, } from './Contexts';
 import { onDestroy } from 'svelte';
 import { page } from '$app/stores';
 import { listenToChapters, listenToEdition } from '../../models/CRUD';
 export let write;
-let auth = getAuth();
+let auth = getUser();
 let book = getBook();
 let edition = getEdition();
 let chapterText = getChapterText();

package/components/page/Editions.svelte

@@ -1,7 +1,7 @@
 <script>import { createNewEdition } from '../../models/CRUD';
 import Instructions from './Instructions.svelte';
 import Note from '../editor/Note.svelte';
-import { getAuth, getBook, isBookEditable } from './Contexts';
+import { getUser, getBook, isBookEditable } from './Contexts';
 import Button from '../app/Button.svelte';
 import Link from '../app/Link.svelte';
 import Format from '../chapter/Format.svelte';
@@ -9,7 +9,7 @@ import Parser from '../../models/chapter/Parser';
 import Permissions from '../editor/Permissions.svelte';
 let book = getBook();
 let editable = isBookEditable();
-let auth = getAuth();
+let auth = getUser();
 $: editions = $book?.getEditions();
 $: latestPublishedID = $book?.getLatestPublishedEditionID();
 async function handleDraftEdition() {

package/components/page/Glossary.svelte

@@ -3,10 +3,10 @@ import Outline from './Outline.svelte';
 import Page from './Page.svelte';
 import ChapterIDs from '../../models/book/ChapterID';
 import DefinitionView from './DefinitionView.svelte';
-import { getAuth, getEdition, isChapterEditable, isEditionEditable, } from './Contexts';
+import { getUser, getEdition, isEditionEditable } from './Contexts';
 import Instructions from './Instructions.svelte';
 import Button from '../app/Button.svelte';
-let auth = getAuth();
+let auth = getUser();
 let edition = getEdition();
 let editable = isEditionEditable();
 $: glossary = $edition?.getGlossary() ?? {};

package/components/page/Header.svelte

@@ -4,7 +4,7 @@ import BookishEditor from '../editor/BookishEditor.svelte';
 import Title from './Title.svelte';
 import { onMount } from 'svelte';
 import TextEditor from '../editor/TextEditor.svelte';
-import { getAuth, getEdition, getLeasee, lease } from './Contexts';
+import { getUser, getEdition, getLeasee, lease } from './Contexts';
 import Button from '../app/Button.svelte';
 /** True if an author should be able to edit this header. */
 export let editable;
@@ -19,7 +19,7 @@ export let setImage;
 export let save = null;
 let title = null;
 let showReminder = true;
-let auth = getAuth();
+let auth = getUser();
 let edition = getEdition();
 function updateScrollReminder() {
     // If the bottom of the window is below the top of the title, hide the reminder.

package/components/page/License.svelte

@@ -2,9 +2,9 @@
 import BookishEditor from '../editor/BookishEditor.svelte';
 import Instructions from './Instructions.svelte';
 import Format from '../chapter/Format.svelte';
-import { getAuth, getEdition, getLeasee, isEditionEditable, lease, } from './Contexts';
+import { getUser, getEdition, getLeasee, isEditionEditable, lease, } from './Contexts';
 import PageHeader from './PageHeader.svelte';
-let auth = getAuth();
+let auth = getUser();
 let edition = getEdition();
 let editable = isEditionEditable();
 </script>

package/components/page/Publish.svelte

@@ -1,7 +1,7 @@
 <script>import Parser from '../../models/chapter/Parser';
 import BookishEditor from '../editor/BookishEditor.svelte';
 import Switch from '../editor/Switch.svelte';
-import { getAuth, getEdition, getLeasee, isEditionEditable, lease, } from './Contexts';
+import { getUser, getEdition, getLeasee, isEditionEditable, lease, } from './Contexts';
 import Format from '../chapter/Format.svelte';
 import Note from '../editor/Note.svelte';
 import Instructions from './Instructions.svelte';
@@ -10,7 +10,7 @@ import { PUBLIC_CONTEXT } from '$env/static/public';
 import Button from '../app/Button.svelte';
 import { publish } from '../../models/CRUD';
 import Feedback from '../app/Feedback.svelte';
-let auth = getAuth();
+let auth = getUser();
 let edition = getEdition();
 let editable = isEditionEditable();
 let publishing = false;

package/components/page/References.svelte

@@ -4,8 +4,8 @@ import Page from './Page.svelte';
 import ChapterIDs from '../../models/book/ChapterID';
 import BulkReferenceEditor from './BulkReferenceEditor.svelte';
 import PossibleReference from './PossibleReference.svelte';
-import { getAuth, getEdition, isEditionEditable } from './Contexts';
-let auth = getAuth();
+import { getUser, getEdition, isEditionEditable } from './Contexts';
+let auth = getUser();
 let edition = getEdition();
 let editable = isEditionEditable();
 $: references = $edition?.hasReferences() ? $edition.getReferences() : null;

package/components/page/TableOfContents.svelte

@@ -13,7 +13,7 @@ import License from './License.svelte';
 import Authors from './Authors.svelte';
 import TextEditor from '../editor/TextEditor.svelte';
 import Toggle from '../editor/Toggle.svelte';
-import { getAuth, getBase, getBook, getEdition, isBookEditable, isEditionEditable, isEditionPartiallyEditable, setChapter, } from './Contexts';
+import { getUser, getBase, getBook, getEdition, isBookEditable, isEditionEditable, isEditionPartiallyEditable, setChapter, } from './Contexts';
 import Muted from './Muted.svelte';
 import Button from '../app/Button.svelte';
 import PageHeader from './PageHeader.svelte';
@@ -22,7 +22,7 @@ import PageParagraph from './PageParagraph.svelte';
 import Note from '../editor/Note.svelte';
 import Permissions from '../editor/Permissions.svelte';
 import Publish from './Publish.svelte';
-let auth = getAuth();
+let auth = getUser();
 let book = getBook();
 let edition = getEdition();
 let base = getBase();

package/models/Firebase.js

@@ -3,8 +3,8 @@ import { connectAuthEmulator, getAuth } from 'firebase/auth';
 import { connectFirestoreEmulator, getFirestore } from 'firebase/firestore';
 import { connectFunctionsEmulator, getFunctions } from 'firebase/functions';
 import { connectStorageEmulator, getStorage } from 'firebase/storage';
-import { PUBLIC_CONTEXT, PUBLIC_FIREBASE_API_KEY, PUBLIC_FIREBASE_AUTH_DOMAIN, PUBLIC_FIREBASE_PROJECT_ID, PUBLIC_FIREBASE_STORAGE_BUCKET, PUBLIC_FIREBASE_MESSAGING_SENDER_ID, PUBLIC_FIREBASE_APP_ID, } from '$env/static/public';
-const isReader = typeof PUBLIC_FIREBASE_API_KEY === 'undefined';
+import { PUBLIC_READER, PUBLIC_CONTEXT, PUBLIC_FIREBASE_API_KEY, PUBLIC_FIREBASE_AUTH_DOMAIN, PUBLIC_FIREBASE_PROJECT_ID, PUBLIC_FIREBASE_STORAGE_BUCKET, PUBLIC_FIREBASE_MESSAGING_SENDER_ID, PUBLIC_FIREBASE_APP_ID, } from '$env/static/public';
+const isReader = PUBLIC_READER === 'true';
 // Some feedback about context
 if (PUBLIC_CONTEXT !== 'prod')
     console.log(`*** ${PUBLIC_CONTEXT.toLocaleUpperCase()} ***`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bookish-press",
   "private": false,
-  "version": "0.4.24",
+  "version": "0.4.25",
   "type": "module",
   "description": "A platform for reading and writing readable, accessible, beautiful online books.",
   "license": "MIT",