diff --git a/public/fonts/KyivTypeSerif-Medium3.woff2 b/public/fonts/KyivTypeSerif-Medium3.woff2 new file mode 100644 index 0000000..88767a9 Binary files /dev/null and b/public/fonts/KyivTypeSerif-Medium3.woff2 differ diff --git a/public/gen-img/events/prague01.png b/public/gen-img/events/prague01.png new file mode 100644 index 0000000..d3395bd Binary files /dev/null and b/public/gen-img/events/prague01.png differ diff --git a/public/gen-img/summit-title2.svg b/public/gen-img/summit-title2.svg new file mode 100644 index 0000000..d3dfaa6 --- /dev/null +++ b/public/gen-img/summit-title2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/public/gen-img/summit-title3.svg b/public/gen-img/summit-title3.svg new file mode 100644 index 0000000..017e5c0 --- /dev/null +++ b/public/gen-img/summit-title3.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/EventImageGenerator.svelte b/src/components/EventImageGenerator.svelte index 7a01ce6..2afcd7e 100644 --- a/src/components/EventImageGenerator.svelte +++ b/src/components/EventImageGenerator.svelte @@ -66,7 +66,6 @@ onMount(() => { const img = searchParams.get('img'); if (img) { imageSelected.set(img); - updateImages(); } }); diff --git a/src/components/event-formats/poster-simple.svelte b/src/components/event-formats/poster-simple.svelte index f4bcd2c..7ea6333 100644 --- a/src/components/event-formats/poster-simple.svelte +++ b/src/components/event-formats/poster-simple.svelte @@ -8,19 +8,17 @@ {#if event.type === 'summit'} - -
-
-
+ +
+
+
-
-
-
- {tools.dateFormat(event.date)} -
-
- {event.city}, {event.country} -
+
+
+ {tools.dateFormat(event.date, "dd/MM/yyyy")} +
+
+ {event.city}
diff --git a/src/components/event-formats/poster.svelte b/src/components/event-formats/poster.svelte index 4a14180..37b96ce 100644 --- a/src/components/event-formats/poster.svelte +++ b/src/components/event-formats/poster.svelte @@ -8,25 +8,40 @@
-
- -
-
-
-
- {tools.dateFormat(event.date)} + {#if event.type === 'summit'} + +
+ +
+
+
+ {tools.dateFormat(event.date, "dd/MM/yyyy")}
-
- {event.city}, {event.country} +
+ {event.city}
-
-
- {event.type} -
-
-
+ {:else} +
+ +
+
+
+
+ {tools.dateFormat(event.date)} +
+
+ {event.city}, {event.country} +
+
+
+
+ {event.type} +
+
+
+ {/if}
{#each topics as topic}
{topic}
diff --git a/src/components/event-formats/square.svelte b/src/components/event-formats/square.svelte index c125ef6..a6f45ac 100644 --- a/src/components/event-formats/square.svelte +++ b/src/components/event-formats/square.svelte @@ -12,19 +12,34 @@
-
-
-
- {tools.dateFormat(event.date)} + + {#if event.type === 'summit'} + +
+ +
+
+ {tools.dateFormat(event.date, "dd/MM/yyyy")}
-
- {event.city}, {event.country} +
+ {event.city}
-
-
- {event.type} -
+ {:else} +
+
+
+ {tools.dateFormat(event.date)} +
+
+ {event.city}, {event.country} +
+
+
+
+ {event.type} +
+
-
+ {/if}
\ No newline at end of file diff --git a/src/components/event-formats/wide-square.svelte b/src/components/event-formats/wide-square.svelte index 4d9dd2c..76ba335 100644 --- a/src/components/event-formats/wide-square.svelte +++ b/src/components/event-formats/wide-square.svelte @@ -13,13 +13,30 @@
-
+
+ +{#if event.type === 'summit'} + +
+ +
+
+ +
+
+ {tools.dateFormat(event.date, "dd/MM/yyyy")} +
+
+ {event.city} +
+
+{:else}
@@ -37,4 +54,5 @@
+{/if}
\ No newline at end of file diff --git a/src/components/event-formats/wide.svelte b/src/components/event-formats/wide.svelte index d3f8dab..ea1d718 100644 --- a/src/components/event-formats/wide.svelte +++ b/src/components/event-formats/wide.svelte @@ -10,29 +10,48 @@ -
-
+ -
-
-
- {tools.dateFormat(event.date)} +
+ + + {#if event.type === 'summit'} + +
+
+
+ +
+
+ {tools.dateFormat(event.date, "dd/MM/yyyy")} +
+
+ {event.city}
-
-
- {event.city}, {event.country} + {:else} +
+
+
+ {tools.dateFormat(event.date)} +
+
+
+
+ {event.city}, {event.country} +
+
+
+
+ {event.type} +
-
-
- {event.type} -
-
-
+ {/if}
diff --git a/src/gen-images-offsets.yaml b/src/gen-images-offsets.yaml index 5a2e3c9..85f2f73 100644 --- a/src/gen-images-offsets.yaml +++ b/src/gen-images-offsets.yaml @@ -25,4 +25,10 @@ copenhagen02: wide-square: { x: 100% } wide: { x: 100% } poster: { x: 100% } - poster-simple: { x: 108% } \ No newline at end of file + poster-simple: { x: 108% } +prague01: + square: { x: 67% } + wide-square: { x: 70% } + wide: { x: 110% } + poster: { x: 60% } + poster-simple: { x: 60% } \ No newline at end of file diff --git a/src/gen-images.json b/src/gen-images.json index fbcc51d..83491e9 100644 --- a/src/gen-images.json +++ b/src/gen-images.json @@ -29,6 +29,12 @@ "height": 2100, "ratio": 1 }, + "prague01": { + "format": "PNG", + "width": 7000, + "height": 3517, + "ratio": 1.99033266988911 + }, "summit02": { "format": "PNG", "width": 2600, diff --git a/src/layouts/generator.astro b/src/layouts/generator.astro index 73c9f8f..031c4ce 100644 --- a/src/layouts/generator.astro +++ b/src/layouts/generator.astro @@ -14,8 +14,21 @@ const { title } = Astro.props; type="font/woff2" crossorigin /> + + - +
diff --git a/src/lib/events.js b/src/lib/events.js index 9f03191..49efb75 100644 --- a/src/lib/events.js +++ b/src/lib/events.js @@ -35,9 +35,9 @@ export function dateInfo (item) { return { isDate, isFuture: future, year } } -export function dateFormat (str) { +export function dateFormat (str, fmt) { if (str.match(/^\d{4}-\d{2}-\d{2}$/)) { - return format(new Date(str), 'MMM d, yyyy') + return format(new Date(str), fmt || 'MMM d, yyyy') } const qm = str.match(/^(\d{4})\/(\w+)$/) if (qm) { diff --git a/src/styles/base.css b/src/styles/base.css index 273e0b8..2a5ee89 100644 --- a/src/styles/base.css +++ b/src/styles/base.css @@ -28,6 +28,7 @@ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } + @tailwind components; @layer components { diff --git a/tailwind.config.mjs b/tailwind.config.mjs index 35d32a9..312afe1 100644 --- a/tailwind.config.mjs +++ b/tailwind.config.mjs @@ -8,6 +8,7 @@ export default { fontFamily: { sans: ["Archivo", ...defaultTheme.fontFamily.sans], mono: ["DM Mono", ...defaultTheme.fontFamily.mono], + kyiv: ["KyivTypeSerif"], }, }, },