Skip to content

Commit 098a27f

Browse files
SableRafSableRaf
committed
Better handling of missing descriptions and remove information from the popup
1 parent e0a22fe commit 098a27f

4 files changed

Lines changed: 26 additions & 62 deletions

File tree

‎pcd-website/src/components/NodePanel.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function getParagraphs(text: string): string[] {
114114

115115
<div class="panel-description">
116116
<p
117-
v-for="(para, i) in getParagraphs(node.long_description ?? node.description)"
117+
v-for="(para, i) in getParagraphs(node.long_description || node.short_description)"
118118
:key="i"
119119
>{{ para }}</p>
120120
</div>

‎pcd-website/src/data/nodes.json‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"end_date": "2026-10-18",
1313
"plus_code": "9F4MGCFM+PF",
1414
"website": "https://creativecode.berlin",
15-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
15+
"short_description": "",
1616
"long_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\n\nDuis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium.\n\nNemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet.\n\nAt vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident.\n\nNam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.",
1717
"tags": [],
1818
"organizers": [],
@@ -31,7 +31,7 @@
3131
"start_date": "2026-10-10",
3232
"plus_code": "8Q7XMP53+22",
3333
"website": "https://pcd.tokyo",
34-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.",
34+
"short_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.",
3535
"tags": [],
3636
"organizers": [],
3737
"contact_email": "hello@pcd.tokyo",
@@ -50,7 +50,7 @@
5050
"start_date": "2026-10-24",
5151
"plus_code": "87G7MPVQ+V9",
5252
"website": "https://pioneerworks.org",
53-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
53+
"short_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
5454
"long_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\n\nDuis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n\nSed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.\n\nNemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit.",
5555
"tags": [],
5656
"organizers": [],
@@ -69,7 +69,7 @@
6969
"start_date": "2026-10-17",
7070
"plus_code": "588MC3Q6+R3",
7171
"website": "https://atelie397.com.br",
72-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.",
72+
"short_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.",
7373
"tags": [],
7474
"organizers": [],
7575
"contact_email": "pcd@atelie397.com.br",
@@ -88,7 +88,8 @@
8888
"start_date": "2026-10-17",
8989
"plus_code": "9C3XGWPX+CQ",
9090
"website": "https://example.co.uk/pcd",
91-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
91+
"short_description": "",
92+
"long_description": "",
9293
"tags": [],
9394
"organizers": [],
9495
"contact_email": "organizer@example.co.uk",
@@ -107,7 +108,7 @@
107108
"start_date": "2026-10-10",
108109
"plus_code": "8FH49RMJ+4X",
109110
"website": "https://example.es/pcd",
110-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.",
111+
"short_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.",
111112
"tags": [],
112113
"organizers": [],
113114
"contact_email": "organizer@example.es",
@@ -126,7 +127,7 @@
126127
"start_date": "2026-10-24",
127128
"plus_code": "6GCRMQCX+3W",
128129
"website": "https://example.co.ke/pcd",
129-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris.",
130+
"short_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris.",
130131
"tags": [],
131132
"organizers": [],
132133
"contact_email": "organizer@example.co.ke",
@@ -145,7 +146,8 @@
145146
"start_date": "2026-10-03",
146147
"plus_code": "4RJ625RH+7V",
147148
"website": "https://example.com.au/pcd",
148-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris.",
149+
"short_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris.",
150+
"long_description": "",
149151
"tags": [],
150152
"organizers": [],
151153
"contact_email": "organizer@example.com.au",
@@ -164,7 +166,8 @@
164166
"start_date": "2026-10-17",
165167
"plus_code": "9F469WFW+9W",
166168
"website": "https://example.nl/pcd",
167-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
169+
"short_description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
170+
"long_description": "",
168171
"tags": [],
169172
"organizers": [],
170173
"contact_email": "organizer@example.nl",
@@ -183,7 +186,8 @@
183186
"start_date": "2026-10-10",
184187
"plus_code": "8Q98FV4V+VR",
185188
"website": "https://example.kr/pcd",
186-
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris.",
189+
"short_description": "",
190+
"long_description": "",
187191
"tags": [],
188192
"organizers": [],
189193
"contact_email": "organizer@example.kr",

‎pcd-website/src/lib/nodes.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface Node {
2020
start_date: string;
2121
end_date?: string;
2222
website: string;
23-
description: string;
23+
short_description: string;
2424
long_description?: string;
2525
tags: string[];
2626
organizers: string[];
@@ -43,7 +43,7 @@ interface NodeInput {
4343
start_date: string;
4444
end_date?: string;
4545
website: string;
46-
description: string;
46+
short_description: string;
4747
long_description?: string;
4848
tags: string[];
4949
organizers: string[];

‎pcd-website/src/lib/popup.ts‎

Lines changed: 9 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
import { getIcon, addCollection } from '@iconify/vue';
2-
import biIcons from '@iconify-json/bi/icons.json' assert { type: 'json' };
31
import type { Node } from './nodes';
4-
import { formatDateRange, calendarLinks } from './format';
5-
6-
addCollection(biIcons as Parameters<typeof addCollection>[0]);
2+
import { formatDateRange } from './format';
73

84
export function escapeHtml(str: string): string {
95
return str
@@ -14,35 +10,15 @@ export function escapeHtml(str: string): string {
1410
.replace(/'/g, '&#39;');
1511
}
1612

17-
function iconSvg(name: string, cssClass: string): string {
18-
const data = getIcon(name);
19-
if (!data) return '';
20-
const { body, width = 16, height = 16 } = data;
21-
return `<svg class="${cssClass}" width="13" height="13" viewBox="0 0 ${width} ${height}" fill="currentColor" aria-hidden="true">${body}</svg>`;
22-
}
23-
24-
const ICON_PIN = iconSvg('bi:geo-alt-fill', 'popup-icon');
25-
const ICON_GLOBE = iconSvg('bi:globe', 'popup-icon');
26-
const ICON_CALENDAR = iconSvg('bi:calendar', 'popup-icon');
27-
const ICON_EMAIL = iconSvg('bi:envelope-fill', 'popup-icon');
13+
const POPUP_PREVIEW_LENGTH = 120;
2814

2915
export function makePopupContent(node: Node): string {
30-
const { googleCalUrl, icsContent } = calendarLinks(node);
31-
const osmQuery = node.address
32-
? `${node.venue}, ${node.address}`
33-
: `${node.venue}, ${node.city}, ${node.country}`;
34-
const osmUrl = `https://www.openstreetmap.org/search?query=${encodeURIComponent(osmQuery)}`;
35-
const venueText = node.address
36-
? `${node.venue}, ${node.address}`
37-
: `${node.venue}, ${node.city}, ${node.country}`;
38-
const icsDataUri = `data:text/calendar;charset=utf-8,${encodeURIComponent(icsContent)}`;
3916
const date = escapeHtml(formatDateRange(node.start_date, node.end_date));
40-
const location = escapeHtml(`${node.city}, ${node.country}`);
41-
const descriptionParagraphs = node.description
42-
.split(/\n\n+/)
43-
.filter(Boolean)
44-
.map(p => `<p class="popup-description">${escapeHtml(p)}</p>`)
45-
.join('');
17+
const rawText = node.short_description.trim() || ((node.long_description ?? '').split(/\n\n+/)[0] ?? '');
18+
const blurb = rawText.length > POPUP_PREVIEW_LENGTH
19+
? escapeHtml(rawText.slice(0, POPUP_PREVIEW_LENGTH).trimEnd()) + '&hellip;'
20+
: escapeHtml(rawText);
21+
const descriptionHtml = blurb ? `<p class="popup-description">${blurb}</p>` : '';
4622

4723
const placeholderBanner = node.placeholder
4824
? `<div class="popup-placeholder">&#9888; This is placeholder data. No real event has been confirmed at this location.</div>`
@@ -54,25 +30,9 @@ export function makePopupContent(node: Node): string {
5430
<div class="popup-content">
5531
${placeholderBanner}
5632
<h3 class="popup-name">${escapeHtml(node.name)}</h3>
57-
<p class="popup-date"><strong>${date} &middot; ${location}</strong></p>
58-
<p class="popup-venue">
59-
${ICON_PIN}<a href="${escapeHtml(osmUrl)}" target="_blank" rel="noopener noreferrer">${escapeHtml(venueText)}</a>
60-
</p>
61-
<div class="popup-actions">
62-
<div class="popup-link-row">
63-
${ICON_GLOBE}<a href="${escapeHtml(node.website)}" target="_blank" rel="noopener noreferrer" class="popup-link">Visit event website</a>
64-
</div>
65-
<div class="popup-link-row popup-link-row--cal">
66-
${ICON_CALENDAR}<a href="${escapeHtml(googleCalUrl)}" target="_blank" rel="noopener noreferrer" class="popup-link">Google Calendar</a>
67-
<span class="popup-link-sep" aria-hidden="true">&middot;</span>
68-
${ICON_CALENDAR}<a href="${icsDataUri}" download="${escapeHtml(node.id)}.ics" class="popup-link">Download .ics</a>
69-
</div>
70-
<div class="popup-link-row">
71-
${ICON_EMAIL}<a href="mailto:${escapeHtml(node.contact_email)}" class="popup-link">${escapeHtml(node.contact_email)}</a>
72-
</div>
73-
</div>
33+
<p class="popup-date"><strong>${date}</strong></p>
7434
<div class="popup-body">
75-
${descriptionParagraphs}
35+
${descriptionHtml}
7636
<button class="read-more" data-node-id="${escapeHtml(node.id)}">Read more &rarr;</button>
7737
</div>
7838
</div>

0 commit comments

Comments
 (0)