diff --git a/src/lib/Avatar.svelte b/src/lib/Avatar.svelte index a707113..0e91df8 100644 --- a/src/lib/Avatar.svelte +++ b/src/lib/Avatar.svelte @@ -63,8 +63,8 @@ {#if size === 'normal'}
- {speaker.name} -
{speaker.name} {country}
+ {speaker.name} +
{speaker.name} {country}
{#if speaker.bio || speaker.orgs}
{/if} @@ -85,13 +85,13 @@ {#if size === 'extra-small'}
- {speaker.name} + {speaker.name}
{/if} {#if size === 'micro'}
- {speaker.name} + {speaker.name}
{/if} diff --git a/src/lib/Event.svelte b/src/lib/Event.svelte index 904f518..0887389 100644 --- a/src/lib/Event.svelte +++ b/src/lib/Event.svelte @@ -44,13 +44,13 @@
- + {#if e.speakers && e.speakers.length > 0}
{#each speakersMap(e.speakers) as s} {/each}
@@ -65,13 +65,13 @@
{#each getParents(e) as pe}
- +
{#if pe.speakers.length === 0}
TBA
{:else} {#each speakersMap(pe.speakers) as s} - + {/each} {/if}
diff --git a/src/routes/lide/[id].svelte b/src/routes/lide.svelte similarity index 81% rename from src/routes/lide/[id].svelte rename to src/routes/lide.svelte index d540ff4..00a01d5 100644 --- a/src/routes/lide/[id].svelte +++ b/src/routes/lide.svelte @@ -5,14 +5,26 @@
- {#if $bundle} + {#if $bundle && s}
diff --git a/src/routes/udalosti/[id].svelte b/src/routes/udalosti.svelte similarity index 77% rename from src/routes/udalosti/[id].svelte rename to src/routes/udalosti.svelte index 63a3329..0195a8e 100644 --- a/src/routes/udalosti/[id].svelte +++ b/src/routes/udalosti.svelte @@ -6,11 +6,23 @@ import SvelteMarkdown from 'svelte-markdown'; import { page } from '$app/stores'; + import { goto } from '$app/navigation'; + import { onMount } from 'svelte'; import { bundle, userData } from '$lib/stores.js'; import EventTypeLabel from '$lib/EventTypeLabel.svelte'; import Avatar from '$lib/Avatar.svelte'; - $: e = $bundle ? $bundle.spec.events.find(ev => ev.id === $page.params.id) : null + let id = null + + $: e = $bundle ? $bundle.spec.events.find(ev => ev.id === id) : null + + onMount(() => { + const searchParams = new URLSearchParams($page.url.search) + id = searchParams.get('id') + if (!$bundle.spec.events.find(ev => ev.id === id)) { + goto('/program') + } + }) function speakersMap (arr) { if (!arr) return; @@ -27,7 +39,7 @@
- {#if $bundle} + {#if $bundle && e}
{trackRender(e.track)}