update

ethereumeg · Oct 21, 2023 · 835a681 · 835a681
1 parent c6502d0
commit 835a681
Show file tree

Hide file tree

Showing 11 changed files with 2,215 additions and 1,065 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,12 +10,12 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/image": "^0.16.6",
-    "@astrojs/svelte": "^2.1.0",
-    "@astrojs/tailwind": "^3.1.1",
-    "astro": "^2.3.0",
-    "svelte": "^3.58.0",
-    "tailwindcss": "^3.3.1"
+    "@astrojs/image": "^0.18.0",
+    "@astrojs/svelte": "^3.1.1",
+    "@astrojs/tailwind": "^4.0.0",
+    "astro": "^2.10.15",
+    "svelte": "^4.2.2",
+    "tailwindcss": "^3.3.3"
   },
   "devDependencies": {
     "date-fns": "^2.29.3"

diff --git a/src/components/EventDetail.svelte b/src/components/EventDetail.svelte
@@ -16,17 +16,27 @@
     const serie = item.series ? data.series.find(s => s.id === item.series) : null
 </script>
 
+<div class="bg-gradient-to-br from-white to-gray-300">
+    <div class="py-10 text-center">
+        <div class="text-3xl font-semibold">{normalizedName(item)}</div>
+        <div class="text-lg mt-2">
+            {formatPeriod(item.date, item.days)} ({item.days} days)
+            <div class="text-lg inline-block ml-2">👥 {@html item.attendees_real ? `${item.attendees_real} <span class="text-sm">(≈${item.attendees})</span>` : (item.attendees ? '≈'+item.attendees : '?')}</div>
+        </div>
+        <div class="text-lg mt-2"><CountryIco country={item.country} /> {item.place} [{item.region}]</div>
+        <div class="inline-block mt-3">
+            <div class="flex gap-2">
+                {#each item.types as type}
+                    <EventType {type} />
+                {/each}
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="event-detail">
-    <div class="detail-header">{normalizedName(item)}</div>
+
     <div class="flex flex-wrap mt-2 gap-4 items-center">
-        <div class="flex gap-2">
-            {#each item.types as type}
-                <EventType {type} />
-            {/each}
-        </div>
-        <div class="text-lg">{formatPeriod(item.date, item.days)} ({item.days} days)</div>
-        <div class="text-lg"><CountryIco country={item.country} /> {item.place} [{item.region}]</div>
-        <div class="text-lg">👥 {@html item.attendees_real ? `${item.attendees_real} <span class="text-sm">(≈${item.attendees})</span>` : (item.attendees ? '≈'+item.attendees : '?')}</div>
     </div>
     <div class="flex flex-wrap gap-2 mt-3">
         {#if serie}

diff --git a/src/components/EventType.svelte b/src/components/EventType.svelte
@@ -2,10 +2,10 @@
     export let type;
 
     const defs = {
-        "conference": { color: "bg-teal-500" },
-        "hackathon": { color: "bg-blue-500" },
-        "collaborative-week": { color: "bg-orange-500", name: 'Collaborative week' }
+        "conference": { color: "border-teal-500/50 text-teal-500" },
+        "hackathon": { color: "border-red-500/50 text-red-500" },
+        "collaborative-week": { color: "border-orange-500 text-orange-500", name: 'Collaborative week' }
     }
 </script>
 
-<div class="text-xs px-1.5 py-0.5 text-white rounded uppercase {defs[type].color}">{defs[type].name || type}</div>
+<div class="text-sm px-2.5 text-black rounded capitalize border {defs[type].color}">{defs[type].name || type}</div>
diff --git a/src/data.json b/src/data.json
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -15,12 +15,12 @@ const { title } = Astro.props;
 		<title>{title ? title+' | ' : ''} {config.site_name} {!title ? ' - '+config.site_desc : ''}</title>
 	</head>
 	<body>
-		<div class="bg-gray-200 px-4 md:px-0">
-			<div class="md:w-4/5 mx-auto">
+		<div class="bg-white px-4 md:px-0 border-b">
+			<div class="md:w-4/5 mx-auto px-4">
 				<Header />
 			</div>
 		</div>
-		<div class="mt-8 mb-20 px-4 md:px-0">
+		<div class="mb-20 px-4 md:px-0">
 			<div class="md:w-4/5 mx-auto">
 				<slot />
 			</div>

diff --git a/src/pages/[id].astro b/src/pages/[id].astro
@@ -1,9 +1,14 @@
 ---
 import Layout from '../layouts/Layout.astro';
 import EventDetail from '../components/EventDetail.svelte';
-import data from '../data.json';
+//import data from '../data.json';
 
-export function getStaticPaths() {
+const response = await fetch('https://chronicle.ethevents.club/data/index.json');
+const data = await response.json()
+
+export async function getStaticPaths() {
+  const response = await fetch('https://chronicle.ethevents.club/data/index.json');
+  const data = await response.json()
   return data.events.map(e => ({params: {id: e.id}}))
 }
 
@@ -12,7 +17,7 @@ const item = data.events.find(i => i.id === id);
 ---
 
 <Layout title={item.name}>
-  <EventDetail item={item} data={data} />
+    <EventDetail item={item} data={data} />
 </Layout>
 
 <style>

diff --git a/src/pages/[id]/hackathon.astro b/src/pages/[id]/hackathon.astro
@@ -0,0 +1,24 @@
+---
+import Layout from '../../layouts/Layout.astro';
+import EventDetail from '../../components/EventDetail.svelte';
+//import data from '../data.json';
+
+const response = await fetch('https://chronicle.ethevents.club/data/index.json');
+const data = await response.json()
+
+export async function getStaticPaths() {
+  const response = await fetch('https://chronicle.ethevents.club/data/index.json');
+  const data = await response.json()
+  return data.events.map(e => ({params: {id: e.id}}))
+}
+
+const { id } = Astro.params;
+const item = data.events.find(i => i.id === id);
+---
+
+<Layout title={item.name}>
+    <EventDetail item={item} data={data} />
+</Layout>
+
+<style>
+</style>
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -3,7 +3,8 @@ import Layout from '../layouts/Layout.astro';
 import Card from '../components/Card.astro';
 import EventOverview from '../components/EventOverview.svelte';
 import { config } from '../lib/config.js';
-import data from '../data.json';
+const response = await fetch('https://chronicle.ethevents.club/data/index.json');
+const data = await response.json()
 
 ---
 

diff --git a/src/pages/s/[id].astro b/src/pages/s/[id].astro
@@ -1,9 +1,12 @@
 ---
 import Layout from '../../layouts/Layout.astro';
 import SeriesDetail from '../../components/SeriesDetail.astro';
-import data from '../../data.json';
+const response = await fetch('https://chronicle.ethevents.club/data/index.json');
+const data = await response.json()
 
-export function getStaticPaths() {
+export async function getStaticPaths() {
+  const response = await fetch('https://chronicle.ethevents.club/data/index.json');
+  const data = await response.json()
   return data.series.map(s => ({params: {id: s.id}}))
 }
 

diff --git a/src/pages/series/index.astro b/src/pages/series/index.astro
@@ -1,7 +1,8 @@
 ---
 import Layout from '../../layouts/Layout.astro';
 import SeriesDetail from '../../components/SeriesDetail.astro';
-import data from '../../data.json';
+const response = await fetch('https://chronicle.ethevents.club/data/index.json');
+const data = await response.json()
 
 const series = data.series
     .map(s => {