From 7346dda1f4ca218545ddcabc0fbbcf9f7e383a6c Mon Sep 17 00:00:00 2001 From: tree Date: Tue, 24 Jan 2023 06:47:19 +0100 Subject: [PATCH] Update --- package-lock.json | 54 +++++++++++++++++-- package.json | 5 +- src/lib/CollectionList.svelte | 12 ++++- src/lib/dataApi.js | 2 + src/routes/[entry]/+page.svelte | 7 ++- src/routes/[entry]/[type]/[slug]/+page.svelte | 19 ++++++- 6 files changed, 90 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index df85169c..44600aef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,9 @@ "": { "name": "pbw-inspect", "version": "0.1.0", + "dependencies": { + "svelte-markdown": "^0.2.3" + }, "devDependencies": { "@playwright/test": "^1.28.1", "@sveltejs/adapter-auto": "^1.0.0", @@ -576,6 +579,11 @@ "integrity": "sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==", "dev": true }, + "node_modules/@types/marked": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.8.tgz", + "integrity": "sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==" + }, "node_modules/@types/node": { "version": "18.11.18", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", @@ -1781,6 +1789,17 @@ "node": ">=12" } }, + "node_modules/marked": { + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz", + "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 12" + } + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -2499,7 +2518,6 @@ "version": "3.55.0", "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.55.0.tgz", "integrity": "sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==", - "dev": true, "engines": { "node": ">= 8" } @@ -2516,6 +2534,18 @@ "svelte": ">=3.19.0" } }, + "node_modules/svelte-markdown": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/svelte-markdown/-/svelte-markdown-0.2.3.tgz", + "integrity": "sha512-2h680NzTXnAD0CXhxe3GeHl6W+ayG4iKQRl+BIDRw+R0mUE0OiNxP1Vt8Rn+aWevB/LBiBIPCAwvL+0BkG057A==", + "dependencies": { + "@types/marked": "^4.0.1", + "marked": "^4.0.10" + }, + "peerDependencies": { + "svelte": "^3.0.0" + } + }, "node_modules/tailwindcss": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz", @@ -3095,6 +3125,11 @@ "integrity": "sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==", "dev": true }, + "@types/marked": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.8.tgz", + "integrity": "sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==" + }, "@types/node": { "version": "18.11.18", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", @@ -3966,6 +4001,11 @@ "@jridgewell/sourcemap-codec": "^1.4.13" } }, + "marked": { + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz", + "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==" + }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -4418,8 +4458,7 @@ "svelte": { "version": "3.55.0", "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.55.0.tgz", - "integrity": "sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==", - "dev": true + "integrity": "sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==" }, "svelte-hmr": { "version": "0.15.1", @@ -4428,6 +4467,15 @@ "dev": true, "requires": {} }, + "svelte-markdown": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/svelte-markdown/-/svelte-markdown-0.2.3.tgz", + "integrity": "sha512-2h680NzTXnAD0CXhxe3GeHl6W+ayG4iKQRl+BIDRw+R0mUE0OiNxP1Vt8Rn+aWevB/LBiBIPCAwvL+0BkG057A==", + "requires": { + "@types/marked": "^4.0.1", + "marked": "^4.0.10" + } + }, "tailwindcss": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz", diff --git a/package.json b/package.json index d4417fb6..85988164 100644 --- a/package.json +++ b/package.json @@ -27,5 +27,8 @@ "tailwindcss": "^3.2.4", "vite": "^4.0.0" }, - "type": "module" + "type": "module", + "dependencies": { + "svelte-markdown": "^0.2.3" + } } diff --git a/src/lib/CollectionList.svelte b/src/lib/CollectionList.svelte index 1b003a86..f1655d95 100644 --- a/src/lib/CollectionList.svelte +++ b/src/lib/CollectionList.svelte @@ -6,6 +6,7 @@ export let aspect = "aspect-square"; import { format, addDays } from 'date-fns'; + import SvelteMarkdown from 'svelte-markdown'; function formateItemDate (item) { let dt = format(new Date(item.date), "MMMM d") @@ -28,11 +29,18 @@

{item.shortname || item.name}

{#if col === "event"}
- {formateItemDate(item)}
{item.attendees}+ ppl + {formateItemDate(item)} + {#if item.attendees}
{item.attendees}+ ppl{/if}
{/if} - {#if col === "media-partner"} + {#if col === "media-partner" && item.description}
{item.description}
{/if} + {#if col === "speaker" && (item.bio || item.orgs)} +
+ {/if} + {#if col === "union" && item.description} +
+ {/if} {/each} \ No newline at end of file diff --git a/src/lib/dataApi.js b/src/lib/dataApi.js index 7ce1ed1a..a1c6fbf5 100644 --- a/src/lib/dataApi.js +++ b/src/lib/dataApi.js @@ -10,6 +10,8 @@ export async function load(entry = "23", host = null) { ); data = await resp.json(); } + data.events.sort((a, b) => (a.attendees || 0) < (b.attendees || 0) ? 1 : -1) + //console.log(data.events) data.speakers = []; for (const event of data.events) { if (!event.speakers) continue; diff --git a/src/routes/[entry]/+page.svelte b/src/routes/[entry]/+page.svelte index 40e79cf4..ce8e348e 100644 --- a/src/routes/[entry]/+page.svelte +++ b/src/routes/[entry]/+page.svelte @@ -1,4 +1,3 @@ - + + PBW Inspector + +

Unions ({data.bundle.unions.length})

-
+

Events ({data.bundle.events.length})

diff --git a/src/routes/[entry]/[type]/[slug]/+page.svelte b/src/routes/[entry]/[type]/[slug]/+page.svelte index 51a265fe..4198fb69 100644 --- a/src/routes/[entry]/[type]/[slug]/+page.svelte +++ b/src/routes/[entry]/[type]/[slug]/+page.svelte @@ -2,6 +2,7 @@ export let data; import { page } from '$app/stores'; import CollectionList from '$lib/CollectionList.svelte'; + import SvelteMarkdown from 'svelte-markdown'; const colsDef = { union: "unions", @@ -18,6 +19,10 @@ let showSource = false; + + {item.name} | PBW Inspector + +
@@ -44,7 +49,13 @@ {item[key]?.join(", ")} {#if defs.properties[key].items?.enum}
Available choices: {defs.properties[key].items.enum.join(", ")}
- {/if} + {/if} + {:else if defs.properties[key].type === 'string' && defs.properties[key].__markdown} + {#if item[key]} +
+ {:else} + ❌ + {/if} {:else} {item[key] || "❌"} {/if} @@ -68,6 +79,12 @@
No speakers yet.
{/if} {/if} + {#if col === "union"} +

Events

+
+ e.union === item.id)} col="event" img="logo" /> +
+ {/if}

Source code / Edit