From dbea36b6e96ad1223092e0aa5f07e85b58262792 Mon Sep 17 00:00:00 2001 From: Gregorio Maclen <80917975+GregoMac1@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:52:03 -0300 Subject: [PATCH] fix: add page title (#108) Closes #74 --- src/app.html | 1 + src/lib/components/Head.svelte | 11 +++++++++++ src/lib/sessions.ts | 5 +++++ src/routes/+layout.svelte | 2 -- src/routes/knowledge/+page.svelte | 2 ++ src/routes/knowledge/[id]/+page.svelte | 2 ++ src/routes/sessions/+layout.svelte | 5 ++--- src/routes/sessions/+page.svelte | 2 ++ src/routes/sessions/[id]/+page.svelte | 7 +++++-- src/routes/settings/+page.svelte | 22 +++++++--------------- 10 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 src/lib/components/Head.svelte diff --git a/src/app.html b/src/app.html index d2016cee..83718743 100644 --- a/src/app.html +++ b/src/app.html @@ -6,6 +6,7 @@ + Hollama %sveltekit.head% diff --git a/src/lib/components/Head.svelte b/src/lib/components/Head.svelte new file mode 100644 index 00000000..c76856b2 --- /dev/null +++ b/src/lib/components/Head.svelte @@ -0,0 +1,11 @@ + + + + {formattedTitle} + diff --git a/src/lib/sessions.ts b/src/lib/sessions.ts index b605f561..3e76c818 100644 --- a/src/lib/sessions.ts +++ b/src/lib/sessions.ts @@ -69,3 +69,8 @@ export function formatSessionMetadata(session: Session) { subtitles.push(session.model); return subtitles.join(' • '); } + +export function getSessionTitle(session: Session) { + const hasKnowledge = session.messages[0]?.knowledge; + return hasKnowledge ? session.messages[1]?.content : session.messages[0]?.content; +} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 94313bd3..410ddc43 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -37,8 +37,6 @@ src={env.PUBLIC_PLAUSIBLE_SRC} > {/if} - - Hollama
diff --git a/src/routes/knowledge/+page.svelte b/src/routes/knowledge/+page.svelte index 1a9c7b15..42dfbd62 100644 --- a/src/routes/knowledge/+page.svelte +++ b/src/routes/knowledge/+page.svelte @@ -1,5 +1,7 @@ + Create new knowlege or choose one from the list diff --git a/src/routes/knowledge/[id]/+page.svelte b/src/routes/knowledge/[id]/+page.svelte index 2592dd92..a5af7047 100644 --- a/src/routes/knowledge/[id]/+page.svelte +++ b/src/routes/knowledge/[id]/+page.svelte @@ -14,6 +14,7 @@ import FieldInput from '$lib/components/FieldInput.svelte'; import ButtonDelete from '$lib/components/ButtonDelete.svelte'; import Metadata from '$lib/components/Metadata.svelte'; + import Head from '$lib/components/Head.svelte'; export let data: PageData; @@ -37,6 +38,7 @@ }); +

diff --git a/src/routes/sessions/+layout.svelte b/src/routes/sessions/+layout.svelte index 50462284..9f8409b2 100644 --- a/src/routes/sessions/+layout.svelte +++ b/src/routes/sessions/+layout.svelte @@ -5,7 +5,7 @@ import Section from '$lib/components/Section.svelte'; import SectionListItem from '$lib/components/SectionListItem.svelte'; import RobotsNoIndex from '$lib/components/RobotsNoIndex.svelte'; - import { formatSessionMetadata } from '$lib/sessions'; + import { formatSessionMetadata, getSessionTitle } from '$lib/sessions'; @@ -14,11 +14,10 @@ {#if $sessionsStore && $sessionsStore.length > 0} {#each $sessionsStore as session} - {@const hasKnowledge = session.messages[0].knowledge} {/each} diff --git a/src/routes/sessions/+page.svelte b/src/routes/sessions/+page.svelte index a429578a..29e1f1a1 100644 --- a/src/routes/sessions/+page.svelte +++ b/src/routes/sessions/+page.svelte @@ -1,5 +1,7 @@ + Create a new session or choose an existing one from the list diff --git a/src/routes/sessions/[id]/+page.svelte b/src/routes/sessions/[id]/+page.svelte index 8f2580b8..99c5799c 100644 --- a/src/routes/sessions/[id]/+page.svelte +++ b/src/routes/sessions/[id]/+page.svelte @@ -13,9 +13,10 @@ import { saveSession, type Message, - type Session, loadSession, - formatSessionMetadata + formatSessionMetadata, + getSessionTitle, + type Session } from '$lib/sessions'; import { generateNewUrl } from '$lib/components/ButtonNew'; import { Sitemap } from '$lib/sitemap'; @@ -34,6 +35,7 @@ import ButtonCopy from '$lib/components/ButtonCopy.svelte'; import ButtonDelete from '$lib/components/ButtonDelete.svelte'; import Metadata from '$lib/components/Metadata.svelte'; + import Head from '$lib/components/Head.svelte'; export let data: PageData; @@ -214,6 +216,7 @@

+

Session diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 1dcdf9f8..1f5fb6ec 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -11,6 +11,7 @@ import type { OllamaTagResponse } from '$lib/ollama'; import { LOCAL_STORAGE_PREFIX, settingsStore, StorageKey } from '$lib/store'; + import Head from '$lib/components/Head.svelte'; export let ollamaURL: URL | null = null; @@ -65,6 +66,7 @@ }); +

@@ -141,27 +143,17 @@

About

Hollama is a minimalistic web interface for - servers. Code is available on -

Made by - +