diff --git a/public/gen-img/events/amsterdam01.png b/public/gen-img/events/amsterdam01.png index b8bb350..a73305f 100644 Binary files a/public/gen-img/events/amsterdam01.png and b/public/gen-img/events/amsterdam01.png differ diff --git a/public/gen-img/events/bangkok01.png b/public/gen-img/events/bangkok01.png new file mode 100644 index 0000000..912bc48 Binary files /dev/null and b/public/gen-img/events/bangkok01.png differ diff --git a/public/gen-img/events/barcelona02.png b/public/gen-img/events/barcelona02.png new file mode 100644 index 0000000..3ec0341 Binary files /dev/null and b/public/gen-img/events/barcelona02.png differ diff --git a/public/gen-img/events/berlin03.png b/public/gen-img/events/berlin03.png new file mode 100644 index 0000000..bb6429c Binary files /dev/null and b/public/gen-img/events/berlin03.png differ diff --git a/public/gen-img/events/brno01.png b/public/gen-img/events/brno01.png index 0c43627..a8a24a5 100644 Binary files a/public/gen-img/events/brno01.png and b/public/gen-img/events/brno01.png differ diff --git a/public/gen-img/events/brussels01.png b/public/gen-img/events/brussels01.png new file mode 100644 index 0000000..d0980ce Binary files /dev/null and b/public/gen-img/events/brussels01.png differ diff --git a/public/gen-img/events/bucharest01.png b/public/gen-img/events/bucharest01.png index 52306b0..2fb3261 100644 Binary files a/public/gen-img/events/bucharest01.png and b/public/gen-img/events/bucharest01.png differ diff --git a/public/gen-img/events/copenhagen02.png b/public/gen-img/events/copenhagen02.png new file mode 100644 index 0000000..c241f2d Binary files /dev/null and b/public/gen-img/events/copenhagen02.png differ diff --git a/public/gen-img/events/rome02.png b/public/gen-img/events/rome02.png new file mode 100644 index 0000000..3c7d0a4 Binary files /dev/null and b/public/gen-img/events/rome02.png differ diff --git a/public/gen-img/events/warsaw01.png b/public/gen-img/events/warsaw01.png new file mode 100644 index 0000000..fd8e117 Binary files /dev/null and b/public/gen-img/events/warsaw01.png differ diff --git a/src/components/EventImageGenerator.svelte b/src/components/EventImageGenerator.svelte index ff59235..fb93398 100644 --- a/src/components/EventImageGenerator.svelte +++ b/src/components/EventImageGenerator.svelte @@ -3,7 +3,7 @@ import core from '../core.json'; import { dateFormat } from '../lib/events.js'; import { marked } from 'marked'; -import { onMount } from 'svelte'; +import { onMount, afterUpdate } from 'svelte'; import { writable } from 'svelte/store'; import Square from './event-formats/square.svelte'; @@ -89,6 +89,7 @@ function getImageUrl(img) { $: image = $imageSelected ? getImageUrl($imageSelected) : ''; $: event = core.events.find(e => e.id === $eventSelected); $: speaker = core.people.find(p => p.id === $speakerSelected); +$: imgSrc = $deepImgSrc?.[image]; const tools = { dateFormat @@ -98,9 +99,26 @@ let imagesSrc = import.meta.glob("../../public/gen-img/events/*.png"); const images = []; for (const path in imagesSrc) { const splitted = path.split('/') - images.push(splitted[splitted.length-1].split('.')[0]) + const ph = splitted[splitted.length-1].split('.')[0]; + images.push(ph); } +const deepImgSrc = writable(null); +async function updateImages () { + + const col = {}; + for (const imgFn of images) { + const id = getImageUrl(imgFn) + let imgClass = await import("../../public"+id); + const i = imgClass.default; + i.ratio = i.width / i.height; + col[id] = i; + } + deepImgSrc.set(col); +} +onMount(updateImages); +afterUpdate(updateImages); + @@ -161,13 +179,15 @@ for (const path in imagesSrc) { {/each} + +{#if imgSrc}
Square (1:1)
- +
@@ -175,7 +195,7 @@ for (const path in imagesSrc) {
Wide-square (4:3)
- +
@@ -183,7 +203,7 @@ for (const path in imagesSrc) {
Wide (16:9)
- +
@@ -201,7 +221,7 @@ for (const path in imagesSrc) {
- +
@@ -209,7 +229,7 @@ for (const path in imagesSrc) {
Poster (1:1.414)
- +
@@ -217,8 +237,9 @@ for (const path in imagesSrc) {
Poster (simple) (1:1.414)
- +
+{/if} {/if} \ No newline at end of file diff --git a/src/components/event-formats/poster-simple.svelte b/src/components/event-formats/poster-simple.svelte index 27ca434..ff5c897 100644 --- a/src/components/event-formats/poster-simple.svelte +++ b/src/components/event-formats/poster-simple.svelte @@ -2,6 +2,7 @@ export let event; export let image; export let tools; + export let imgSrc;
@@ -10,7 +11,7 @@ {#if event.type === 'summit'}
-
+
@@ -26,7 +27,7 @@ {:else}
-
+
diff --git a/src/components/event-formats/poster.svelte b/src/components/event-formats/poster.svelte index f40d8a8..8c7442b 100644 --- a/src/components/event-formats/poster.svelte +++ b/src/components/event-formats/poster.svelte @@ -3,13 +3,14 @@ export let image; export let tools; export let topics; + export let imgSrc;
- +
diff --git a/src/components/event-formats/square-speaker.svelte b/src/components/event-formats/square-speaker.svelte index bfbdf15..5e853e3 100644 --- a/src/components/event-formats/square-speaker.svelte +++ b/src/components/event-formats/square-speaker.svelte @@ -11,7 +11,7 @@
- +
{tools.dateFormat(event.date)}
diff --git a/src/components/event-formats/square.svelte b/src/components/event-formats/square.svelte index e0523ca..6531149 100644 --- a/src/components/event-formats/square.svelte +++ b/src/components/event-formats/square.svelte @@ -10,7 +10,7 @@
- +
diff --git a/src/components/event-formats/wide-square.svelte b/src/components/event-formats/wide-square.svelte index a065245..09673af 100644 --- a/src/components/event-formats/wide-square.svelte +++ b/src/components/event-formats/wide-square.svelte @@ -1,16 +1,25 @@ + export let imgSrc; +
-
- +
+
+ +
+ +
+
diff --git a/src/components/event-formats/wide.svelte b/src/components/event-formats/wide.svelte index a2ef40f..29e5b9a 100644 --- a/src/components/event-formats/wide.svelte +++ b/src/components/event-formats/wide.svelte @@ -2,6 +2,7 @@ export let event; export let image; export let tools; + export let imgSrc; @@ -10,8 +11,13 @@ -
- +
+
+ +
+ +
+