diff --git a/package.json b/package.json index a73f14a..7f7b5db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utxo22-web", - "version": "1.2.0", + "version": "1.2.1", "scripts": { "dev": "svelte-kit dev", "build": "svelte-kit build", diff --git a/src/lib/version.js b/src/lib/version.js index 6d08288..f9494c6 100644 --- a/src/lib/version.js +++ b/src/lib/version.js @@ -1 +1 @@ -export const version = "1.1-dev"; +export const version = "1.3-dev"; diff --git a/src/routes/casova-osa.svelte b/src/routes/casova-osa.svelte index aa33688..386fc72 100644 --- a/src/routes/casova-osa.svelte +++ b/src/routes/casova-osa.svelte @@ -1,161 +1,193 @@ Časová osa | UTXO.22 -
+

Časová osa

{#if $bundle}
Plán (řešení)
-
- + {#each $bundle.spec["schedule-candidates"] as p, i} + {/each}
@@ -167,67 +199,137 @@
Sál / Místo
- + {#each $bundle.spec.stages as et} -
$schedulePref.stages = [et.id]}>{et.name}
+
+ + ($schedulePref.stages = [et.id])} + >{et.name} +
{/each}
Kategorie
- + {#each $bundle.spec.tracks as et} -
$schedulePref.tracks = [et.id]}> {et.shortname || et.name}
+
+ + ($schedulePref.tracks = [et.id])} + > + {et.shortname || et.name} +
{/each}
{#each scheduleTimes($bundle) as st}
-

{format(new Date(st.date), 'iiii d.M.y', { locale: cs })}

+

+ {format(new Date(st.date), "iiii d.M.y", { locale: cs })} +

- + + {/if} {/each} {#each dateSlots(plan, st.period, $bundle, $schedulePref) as ds} - - - {#each $bundle.spec.stages as stage} - {#if $schedulePref && $schedulePref.stages.includes(stage.id)} - {#if ds.stages[stage.id] === undefined} - - {:else if ds.stages[stage.id] !== null} - {#each [[ds.stages[stage.id], findEvent($bundle, ds.stages[stage.id].event)]] as [si, event]} - + + {#each $bundle.spec.stages as stage} + {#if $schedulePref && $schedulePref.stages.includes(stage.id)} + {#if ds.stages[stage.id] === undefined} + - {/each} + + {/each} + {/if} {/if} - {/if} - {/each} - - + {/each} + + {/each}
{#each $bundle.spec.stages as stage} {#if $schedulePref && $schedulePref.stages.includes(stage.id)} - {stage.name}{stage.name}
{ds.title} -
-
{format(new Date(si.period.start), 'HH:mm')}-{format(new Date(si.period.end), 'HH:mm')} {#if event.track}[{#each [$bundle.spec.tracks.find(t => t.id === event.track)] as track}{track.shortname || track.name}{/each}]{/if}
- -
- {@html showEventDetail($bundle, event)} +
{ds.title} + {:else if ds.stages[stage.id] !== null} + {#each [[ds.stages[stage.id], findEvent($bundle, ds.stages[stage.id].event)]] as [si, event]} + +
+
+ {format( + new Date(si.period.start), + "HH:mm" + )}-{format(new Date(si.period.end), "HH:mm")} + {#if event.track}[{#each [$bundle.spec.tracks.find((t) => t.id === event.track)] as track}{track.shortname || + track.name}{/each}]{/if} +
+ +
+ {@html showEventDetail($bundle, event)} +
+
+ {event.tags.map((t) => `#${t}`).join(", ")} +
-
- {event.tags.map(t => `#${t}`).join(', ')} -
- -
diff --git a/src/routes/index.svelte b/src/routes/index.svelte index cdf95ad..cab9071 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -21,7 +21,11 @@ ? [ { name: "Hlavní přednášející (" + leadSpeakersCount + ")", id: "top" }, { name: "Vše", id: null }, - ].concat(currentBundle.spec.tracks.filter(t => t.hidden === undefined || t.hidden !== true)) + ].concat( + currentBundle.spec.tracks.filter( + (t) => t.hidden === undefined || t.hidden !== true + ) + ) : null; function changeTrack(tId) { @@ -41,8 +45,8 @@ }); } - function statsIcon (ico = 'fa-regular fa-calendar') { - return `` + function statsIcon(ico = "fa-regular fa-calendar") { + return ``; } @@ -54,10 +58,21 @@ {#if $apiStatus}
-
-
{@html statsIcon('fa-solid fa-user-check')} {$bundle.spec.speakers.length} přednášejících
-
{@html statsIcon('fa-regular fa-calendar')} {$bundle.spec.events.length} událostí
-
{@html statsIcon('fa-solid fa-users')} {$apiStatus.global.tickets} návstěvníků
+
+
+ {@html statsIcon("fa-solid fa-user-check")} + {$bundle.spec.speakers.length} přednášejících +
+
+ {@html statsIcon("fa-regular fa-calendar")} + {$bundle.spec.events.length} událostí +
+
+ {@html statsIcon("fa-solid fa-users")} + {$apiStatus.global.tickets} návstěvníků +
diff --git a/src/routes/udalosti.svelte b/src/routes/udalosti.svelte index 0c21c24..2fc758e 100644 --- a/src/routes/udalosti.svelte +++ b/src/routes/udalosti.svelte @@ -94,7 +94,10 @@ {/each}