diff --git a/package-lock.json b/package-lock.json index 44fb753..4241eb4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,8 @@ "@sveltejs/kit": "next", "autoprefixer": "^10.4.4", "postcss": "^8.4.12", + "prettier": "^2.6.2", + "prettier-plugin-svelte": "^2.7.0", "svelte": "^3.46.0", "svelte-markdown": "^0.2.2", "tailwindcss": "^3.0.23" @@ -1571,6 +1573,31 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "node_modules/prettier": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", + "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-svelte": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.0.tgz", + "integrity": "sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==", + "dev": true, + "peerDependencies": { + "prettier": "^1.16.4 || ^2.0.0", + "svelte": "^3.2.0" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -2895,6 +2922,19 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "prettier": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", + "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", + "dev": true + }, + "prettier-plugin-svelte": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.0.tgz", + "integrity": "sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==", + "dev": true, + "requires": {} + }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", diff --git a/package.json b/package.json index 9da9d78..27c6bc5 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,9 @@ "build": "svelte-kit build", "package": "svelte-kit package", "preview": "svelte-kit preview", - "prepare": "svelte-kit sync" + "prepare": "svelte-kit sync", + "prettier": "prettier --write --plugin-search-dir=. ./**/*.svelte" + }, "devDependencies": { "@faker-js/faker": "^6.1.2", @@ -15,6 +17,8 @@ "@sveltejs/kit": "next", "autoprefixer": "^10.4.4", "postcss": "^8.4.12", + "prettier": "^2.6.2", + "prettier-plugin-svelte": "^2.7.0", "svelte": "^3.46.0", "svelte-markdown": "^0.2.2", "tailwindcss": "^3.0.23" diff --git a/src/lib/Avatar.svelte b/src/lib/Avatar.svelte index 99d5ce5..8b7839e 100644 --- a/src/lib/Avatar.svelte +++ b/src/lib/Avatar.svelte @@ -1,112 +1,150 @@ -{#if size === 'custom'} -
- {speaker.name} -
+{#if size === "custom"} +
+ {speaker.name} +
{/if} -{#if size === 'big'} -
- {speaker.name} -
+{#if size === "big"} +
+ {speaker.name} +
{/if} -{#if size === 'normal'} -
- {speaker.name} -
{speaker.name} {country}
- {#if speaker.bio || speaker.orgs} -
- {/if} -
+{#if size === "normal"} +
+ {speaker.name} +
+ {speaker.name} + {country} +
+ {#if speaker.bio || speaker.orgs} +
+ +
+ {/if} +
{/if} -{#if size === 'small'} -
- {speaker.name} -
+{#if size === "small"} +
+ {speaker.name} +
{/if} -{#if size === 'semi-small'} -
- {speaker.name} -
+{#if size === "semi-small"} +
+ {speaker.name} +
{/if} -{#if size === 'extra-small'} -
- {speaker.name} -
+{#if size === "extra-small"} +
+ {speaker.name} +
{/if} -{#if size === 'micro'} -
- {speaker.name} -
+{#if size === "micro"} +
+ {speaker.name} +
{/if} - diff --git a/src/lib/Event.svelte b/src/lib/Event.svelte index 0887389..b6a8d86 100644 --- a/src/lib/Event.svelte +++ b/src/lib/Event.svelte @@ -3,53 +3,70 @@ const e = event; - import Avatar from '$lib/Avatar.svelte'; - import EventTypeLabel from '$lib/EventTypeLabel.svelte'; + import Avatar from "$lib/Avatar.svelte"; + import EventTypeLabel from "$lib/EventTypeLabel.svelte"; - import { bundle, userData } from '$lib/stores.js'; + import { bundle, userData } from "$lib/stores.js"; - function speakersMap (arr) { + function speakersMap(arr) { if (!arr) return; - return arr.map(sId => { - return $bundle.spec.speakers.find(sp => sp.id === sId) - }) + return arr.map((sId) => { + return $bundle.spec.speakers.find((sp) => sp.id === sId); + }); } - function trackRender (trackId) { - const track = $bundle.spec.tracks.find(t => t.id === trackId) - return track.shortname || track.name + function trackRender(trackId) { + const track = $bundle.spec.tracks.find((t) => t.id === trackId); + return track.shortname || track.name; } - function getParents (e) { - return $bundle.spec.events.filter(i => i.parent === e.id) + function getParents(e) { + return $bundle.spec.events.filter((i) => i.parent === e.id); } - function handleFavorite (el) { - const t = el.target.getAttribute('utxo-event-id') - userData.update(data => { - const fe = data.favoriteEvents - let output = null + function handleFavorite(el) { + const t = el.target.getAttribute("utxo-event-id"); + userData.update((data) => { + const fe = data.favoriteEvents; + let output = null; if (fe.includes(t)) { - output = Object.assign($userData, { favoriteEvents: fe.filter(f => f !== t) } ) + output = Object.assign($userData, { + favoriteEvents: fe.filter((f) => f !== t), + }); } else { - fe.push(t) - output = Object.assign($userData, { favoriteEvents: fe }) + fe.push(t); + output = Object.assign($userData, { favoriteEvents: fe }); } //localStorage.setItem('userData', JSON.stringify(output)) - return output - }) + return output; + }); } - -
-
-
{e.name}
+
+
+ +
+
+ {e.name} +
{#if e.speakers && e.speakers.length > 0}
{#each speakersMap(e.speakers) as s}
- +
{/each} @@ -65,13 +82,18 @@
{#each getParents(e) as pe}
- +
+ {pe.name} +
{#if pe.speakers.length === 0}
TBA
{:else} {#each speakersMap(pe.speakers) as s} - +
+ + +
{/each} {/if}
diff --git a/src/lib/EventTypeLabel.svelte b/src/lib/EventTypeLabel.svelte index 36a1b2d..c69bc88 100644 --- a/src/lib/EventTypeLabel.svelte +++ b/src/lib/EventTypeLabel.svelte @@ -3,19 +3,23 @@ export let size = null; const config = { - panel: { title: 'Panelová debata', style: 'bg-custom-red text-white' }, - talk: { title: 'Přednáška', style: 'bg-custom-green text-white' }, - workshop: { title: 'Workshop', style: 'bg-custom-blue text-white' }, - other: { title: 'Ostatní', style: 'bg-custom-yellow' }, - lightning: { title: 'Lightning talk', style: 'bg-pink-400' }, - } + panel: { title: "Panelová debata", style: "bg-custom-red text-white" }, + talk: { title: "Přednáška", style: "bg-custom-green text-white" }, + workshop: { title: "Workshop", style: "bg-custom-blue text-white" }, + other: { title: "Ostatní", style: "bg-custom-yellow" }, + lightning: { title: "Lightning talk", style: "bg-pink-400" }, + }; const current = config[event.type]; - -
-
-
{current.title}
+
+
+
+ {current.title} +
- diff --git a/src/lib/Footer.svelte b/src/lib/Footer.svelte index afb526a..9ff027f 100644 --- a/src/lib/Footer.svelte +++ b/src/lib/Footer.svelte @@ -1,38 +1,63 @@ {#if $bundle} -
-
-
+
+
+
+
+ UTXO.22 +
+
+ 4.-5. červen 2022 @ Gabriel Loci, Praha +
+
+ Otevřená komunitní kryptoměnová konference +
+ +
+
+ +
+
+
+
+ S láskou organizuje + UTXO Foundation, z.s. +
- UTXO.22 + v0.9.1 + | powered by + Svelte Svelte + | grafický návrh + Pen&Production
-
- 4.-5. červen 2022 @ Gabriel Loci, Praha -
-
- Otevřená komunitní kryptoměnová konference -
- -
-
-
-
-
- S láskou organizuje UTXO Foundation, z.s. -
-
- v0.9.1 | powered by - Svelte Svelte | - grafický návrh Pen&Production -
-
-
{/if} diff --git a/src/lib/Link.svelte b/src/lib/Link.svelte index 74a08fb..7f7bc85 100644 --- a/src/lib/Link.svelte +++ b/src/lib/Link.svelte @@ -1,6 +1,8 @@ - + diff --git a/src/lib/SocialButtons.svelte b/src/lib/SocialButtons.svelte index df063d9..7111839 100644 --- a/src/lib/SocialButtons.svelte +++ b/src/lib/SocialButtons.svelte @@ -1,34 +1,42 @@ {#if $bundle} - {#if size === 'small'} + {#if size === "small"}
{#each socials as soc} - - + + {/each}
{/if} - {#if size === 'normal'} + {#if size === "normal"}
{#each socials as soc} - + {/each}
diff --git a/src/lib/header/Header.svelte b/src/lib/header/Header.svelte index de77cb1..d9f9374 100644 --- a/src/lib/header/Header.svelte +++ b/src/lib/header/Header.svelte @@ -1,36 +1,66 @@
-