Merge branch 'main' of gwei.cz:ethbrno/eb2-website

.gitignore

@@ -7,3 +7,4 @@ node_modules
 .env.*
 !.env.example
 bun.lockb
+src/lib/data.json

data/data.yaml

@@ -1,5 +1,7 @@
 contributors:
 
+# ---- SPEAKERS ----
+
 - id: rachel-oleary
   name: Rachel-Rose O'Leary
   twitter: lunar_mining
@@ -22,3 +24,100 @@ contributors:
   bio: Nethemba, Hacktrophy, liberation.travel
   roles: [ speaker ]
   remote: true 
+
+- id: dcbuilder
+  name: dcbuilder.eth
+  twitter: DCbuild3r
+  bio: WorldCoin, devpill.me
+  roles: [ speaker ]
+
+- id: juraj-bednar
+  name: Juraj Bednar
+  twitter: jurbed
+  bio: Hacktrophy, Hackyourself.io
+  roles: [ speaker ]
+
+- id: owen-barnes
+  name: Owen Barnes
+  nickname: temporalwave
+  twitter: temporalwave
+  bio: independent freedom adviser
+  roles: [ speaker, mentor ]
+
+- id: william-mitsuda
+  name: Willian Mitsuda
+  twitter: wmitsuda
+  bio: creator of Otterscan
+  roles: [ speaker ]
+  remote: true
+
+- id: qedk
+  name: QEDK
+  twitter: qedk_
+  bio: engineering Polygon, Moonshot Collective
+  roles: [ speaker ]
+  remote: true
+
+- id: vojtech-simetka
+  name: Vojtěch Šimetka
+  twitter: vojtechsimetka
+  bio: Blockchain for Humanity, Swarm, Giveth
+  roles: [ speaker, mentor ]
+
+# ---- TEAM ----
+
+- id: tree
+  name: Tree
+  twitter: treecz
+  bio: Zakladatel Gwei.cz a BohemianDAO, organizátor UTXO.22
+  roles: [ team ]
+
+- id: tereza
+  name: Tereza
+  twitter: terkastarostova
+  bio: Spoluzakladatelka Holky v Kryptu, předsedkyně UTXO Foundation
+  roles: [ team ]
+
+- id: exez
+  name: Exez
+  twitter: OndraPulc
+  bio: TODO
+  roles: [ team ]
+
+- id: hedvika
+  name: Hedvika
+  twitter: HedvikaPa
+  nickname: headwitch
+  bio: TODO
+  roles: [ team ]
+
+- id: jacob
+  name: Jacob
+  twitter: jacobjelen
+  bio: TODO
+  roles: [ team ]
+
+- id: damsky
+  name: Damsky
+  twitter: helloitsdamsky
+  bio: TODO
+  roles: [ team ]
+
+- id: adam
+  name: Adam
+  nickname: vorcigernix
+  twitter: vorcigernix
+  bio: TODO
+  roles: [ team ]
+
+- id: clairee
+  name: Clairee
+  twitter: De_luneClaire
+  bio: TODO
+  roles: [ team ]
+
+- id: dominika
+  name: Dominika
+  twitter: DominikaV5
+  bio: TODO
+  roles: [ team ]

src/lib/Navigation.svelte

@@ -54,7 +54,7 @@
 						href="/contributors"
 						class="px-5 py-2 flex items-center leading-snug text-black hover:opacity-75"
 						class:active={$page.url.pathname === '/contributors' || $page.url.pathname === '/team'}
-						>Speakers</a
+						>Contributors</a
 					>
 				</li>
 				<li>

src/lib/data.json

@@ -1,35 +0,0 @@
-{
-  "contributors": [
-    {
-      "id": "rachel-oleary",
-      "name": "Rachel-Rose O'Leary",
-      "twitter": "lunar_mining",
-      "bio": "DarkFi core dev, writer",
-      "roles": [
-        "speaker"
-      ],
-      "desc": "Rachel-Rose O’Leary is a core dev at lunarpunk layer 1, DarkFi. She is also co-editor of the philosophy journal Agorism in the 21st Century. As a writer she has published in egirlcapital, CoinDesk, Defiant, Wired and elsewhere under anonymous accounts. She believes privacy is necessary for communities to define their own destinies.\n"
-    },
-    {
-      "id": "artem-vorotnikov",
-      "name": "Artem Vorotnikov",
-      "twitter": "vorot93",
-      "bio": "Ethereum Core Developer, creator of Akula",
-      "roles": [
-        "speaker"
-      ],
-      "remote": true
-    },
-    {
-      "id": "pavol-luptak",
-      "name": "Pavol Luptak",
-      "nickname": "wilder",
-      "twitter": "wilderco",
-      "bio": "Nethemba, Hacktrophy, liberation.travel",
-      "roles": [
-        "speaker"
-      ],
-      "remote": true
-    }
-  ]
-}

src/routes/+layout.js

@@ -1,13 +1,8 @@
 /** @type {import('./$types').PageLoad} */
 export const prerender = true;
-//import { contributors, sponsors } from "$lib/data.json";
-import { contributors } from "$lib/data.json";
+
+import data from '$lib/data.json';
 
 export async function load({ fetch }) {
-    //const { contributors, sponsors } = await fetch(`data.json`).then((r) => r.json());
-    //const { contributors, sponsors } = await fetch(`https://raw.githubusercontent.com/ethbrno/data/main/data.json`).then((r) => r.json());
-    return {
-        //data: { contributors, sponsors }
-        data: { contributors }
-    };
+    return data
 }

src/routes/+page.js

@@ -1 +0,0 @@
-export const csr = false;

src/routes/contributors/+page.js

@@ -1,7 +0,0 @@
-/** @type {import('./$types').PageLoad} */
-export async function load({ parent }) {
-    const { data: { contributors } } = await parent();
-    //console.log(contributors);
-
-    return contributors;
-}

src/routes/contributors/+page.svelte

@@ -1,65 +1,89 @@
 <script>
 	/** @type {import('./$types').PageData} */
 	export let data;
-	//console.log(data);
+
+	const categories = [
+		{
+			role: 'speaker',
+			title: 'Speakers'
+		},
+		{
+			role: 'mentor',
+			title: 'Mentors',
+		},
+		{
+			role: 'judge',
+			title: 'Judges',
+		},
+		{
+			role: 'team',
+			title: 'Core team'
+		}
+	]
+
 </script>
 
 <svelte:head>
 	<title>Contributors: ETHBrno²</title>
 </svelte:head>
 
-<section class="text-gray-400 body-font bg-black">
-	<div class=" px-5 py-24 mx-auto">
-		<div class="flex flex-col text-center w-full mb-12">
-			<h1 class="sm:text-4xl text-3xl font-medium title-font mb-2 text-white">Speakers</h1>
-		
-		</div>
-		<div class="flex flex-wrap justify-center">
-			{#each Object.values(data) as item}
-				{#if item.name !== undefined}
-					<div class="bg-black bg-opacity-40 p-6 h-full w-full md:w-1/3 lg:w-1/4">
-						<img
-							class="h-40 md:h-60 w-full object-cover object-center mb-6 grayscale hover:grayscale-0"
-							loading="lazy"
-							src={`/photos/${item.id}.jpg`}
-							alt={item.desc}
-						/>
-						<h3
-							class="tracking-widest text-gray-400 text-xs font-medium title-font flex flex-row divide-x"
-						>
-							{#each item.roles as role}
-								<span class="underline">{role}</span>
-							{/each}
-						</h3>
-						<div class="flex flex-row mb-2">
-							<a
-								class="text-lg text-white font-medium title-font"
-								href={`https://twitter.com/${item.twitter}`}
+<section class="text-gray-400 body-font bg-black py-12">
+	{#each categories as cat}
+		<div class=" px-5 py-12 mx-auto">
+			<div class="flex flex-col text-center w-full mb-12">
+				<h1 class="sm:text-4xl text-3xl font-medium title-font mb-2 text-white">{cat.title}</h1>
+			
+			</div>
+			<div class="flex flex-wrap justify-center">
+				{#each Object.values(data.contributors).filter(x => x.roles.includes(cat.role)) as item}
+					{#if item.name !== undefined}
+						<div class="bg-black bg-opacity-40 p-6 h-full w-full md:w-1/3 lg:w-1/4">
+							<img
+								class="h-40 md:h-60 w-full object-cover object-center mb-6 grayscale hover:grayscale-0"
+								loading="lazy"
+								src={`/photos/${item.id}.jpg`}
+								alt={item.desc}
+							/>
+							<h3
+								class="tracking-widest text-gray-400 text-xs font-medium title-font flex flex-row divide-x"
 							>
-								{item.name}
-							</a>
-							{#if item.remote}
-								<svg
-									xmlns="http://www.w3.org/2000/svg"
-									fill="none"
-									viewBox="0 0 24 24"
-									stroke-width="1.5"
-									stroke="currentColor"
-									class="w-4 h-4 ml-1 text-white"
+								{#each item.roles as role}
+									<span class="underline">{role}</span>
+								{/each}
+							</h3>
+							<div class="flex flex-row mb-2">
+								<a
+									class="text-lg text-white font-medium title-font"
+									href={`https://twitter.com/${item.twitter}`}
 								>
-									<path
-										stroke-linecap="round"
-										stroke-linejoin="round"
-										d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418"
-									/>
-								</svg>
-							{/if}
-						</div>
+									{item.name}
+									{#if item.nickname}
+										({item.nickname})
+									{/if}
+								</a>
+								{#if item.remote}
+									<svg
+										xmlns="http://www.w3.org/2000/svg"
+										fill="none"
+										viewBox="0 0 24 24"
+										stroke-width="1.5"
+										stroke="currentColor"
+										class="w-4 h-4 ml-1 text-white"
+									>
+										<path
+											stroke-linecap="round"
+											stroke-linejoin="round"
+											d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418"
+										/>
+									</svg>
+								{/if}
+							</div>
 
-						<p class="leading-relaxed text-sm">{item.bio}</p>
-					</div>
-				{/if}
-			{/each}
+							<p class="leading-relaxed text-sm">{item.bio}</p>
+						</div>
+					{/if}
+				{/each}
+			</div>
 		</div>
-	</div>
+	{/each}
 </section>

src/routes/team/+page.js

@@ -1,4 +0,0 @@
-/** @type {import('./$types').PageLoad} */
-export async function load() {
-    return {};
-};

src/routes/team/+page.svelte

@@ -1,5 +0,0 @@
-<script>
-    /** @type {import('./$types').PageData} */
-    //export let data;
-</script>
-<h1>yo dudes</h1>

static/data.json

@@ -30,6 +30,15 @@
         "speaker"
       ],
       "remote": true
+    },
+    {
+      "id": "tree",
+      "name": "Tree",
+      "twitter": "treecz",
+      "bio": "Zakladatel Gwei.cz a BohemianDAO, organizátor UTXO.22",
+      "roles": [
+        "team"
+      ]
     }
   ]
 }