From b05e620670653ce68a55b42ed57a94b5c6d8c7f4 Mon Sep 17 00:00:00 2001
From: Giovanni Abbatepaolo <30571828+bbtgnn@users.noreply.github.com>
Date: Fri, 1 Mar 2024 20:59:51 +0100
Subject: [PATCH] feat: update cv

---
 src/lib/components/Link.svelte                | 10 ++++++
 src/lib/components/Navbar.svelte              |  7 +++++
 .../organizations/isia-urbino/+page.svelte    |  8 +++++
 .../liceo-scientifico-s-simone/+page.svelte   |  8 +++++
 src/routes/+layout.svelte                     |  7 ++++-
 src/routes/cv/+page.svelte                    | 31 +++++++++++++------
 6 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 src/lib/components/Link.svelte
 create mode 100644 src/lib/components/Navbar.svelte

diff --git a/src/lib/components/Link.svelte b/src/lib/components/Link.svelte
new file mode 100644
index 0000000..e7cc218
--- /dev/null
+++ b/src/lib/components/Link.svelte
@@ -0,0 +1,10 @@
+<script lang="ts">
+	import { href as hrefAdapter } from '$modules/utils';
+
+	export let href: string;
+
+	let className = '';
+	export { className as class };
+</script>
+
+<a class={className} href={hrefAdapter(href)}><slot /></a>
diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte
new file mode 100644
index 0000000..aa6cba7
--- /dev/null
+++ b/src/lib/components/Navbar.svelte
@@ -0,0 +1,7 @@
+<script>
+	import Link from '$lib/components/Link.svelte';
+</script>
+
+<div class="bg-stone-200 p-4">
+	<Link href="/" class="hover:underline">Giovanni Abbatepaolo</Link>
+</div>
diff --git a/src/routes/(database)/organizations/isia-urbino/+page.svelte b/src/routes/(database)/organizations/isia-urbino/+page.svelte
index e69de29..53a2a07 100644
--- a/src/routes/(database)/organizations/isia-urbino/+page.svelte
+++ b/src/routes/(database)/organizations/isia-urbino/+page.svelte
@@ -0,0 +1,8 @@
+<script lang="ts" context="module">
+	import { db } from '$modules';
+
+	export const props = db.create('organizations', {
+		name: 'ISIA Urbino',
+		location: 'Urbino, Italia'
+	});
+</script>
diff --git a/src/routes/(database)/organizations/liceo-scientifico-s-simone/+page.svelte b/src/routes/(database)/organizations/liceo-scientifico-s-simone/+page.svelte
index e69de29..30c7c69 100644
--- a/src/routes/(database)/organizations/liceo-scientifico-s-simone/+page.svelte
+++ b/src/routes/(database)/organizations/liceo-scientifico-s-simone/+page.svelte
@@ -0,0 +1,8 @@
+<script lang="ts" context="module">
+	import { db } from '$modules';
+
+	export const props = db.create('organizations', {
+		name: 'Liceo Scientifico Sante Simone',
+		location: 'Conversano, Italia'
+	});
+</script>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 7f8c73e..68beffc 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,5 +1,10 @@
 <script lang="ts">
+	import Navbar from '$lib/components/Navbar.svelte';
 	import '../app.pcss';
 </script>
 
-<slot />
+<Navbar />
+
+<div class="pt-8">
+	<slot />
+</div>
diff --git a/src/routes/cv/+page.svelte b/src/routes/cv/+page.svelte
index b0cf4b9..1820675 100644
--- a/src/routes/cv/+page.svelte
+++ b/src/routes/cv/+page.svelte
@@ -1,31 +1,44 @@
 <script lang="ts">
 	import CvCard from '$lib/components/CvCard.svelte';
 	import Collection from '$modules/components/Collection.svelte';
-	import Document from '$modules/components/Document.svelte';
 	import Relation from '$modules/components/Relation.svelte';
-	import { href } from '$modules/utils';
 	import { formatDate } from 'date-fns/format';
 </script>
 
-<a href={href('/')} class="button">Home</a>
-
 <div class="mx-auto max-w-xl space-y-6">
 	<h1>Curriculum Vitae</h1>
 
 	<hr />
 
-	<Collection name="work_experiences" sort={['date_start', 'desc']} let:documents>
-		<!--  -->
+	<Collection name="education" sort={['date_start', 'desc']} let:documents>
+		<div class="space-y-4">
+			<h2>Formazione</h2>
+
+			{#each documents as document}
+				<Relation to={document.institution} let:doc={institution}>
+					<CvCard
+						title={document.title}
+						subtitle={`${institution.name} (${institution.location})`}
+						date_start={formatDate(document.date_start, 'MM/yyyy')}
+						current={document.current}
+					/>
+				</Relation>
+			{/each}
+		</div>
+	</Collection>
+
+	<hr />
 
+	<Collection name="work_experiences" sort={['date_start', 'desc']} let:documents>
 		<div class="space-y-4">
 			<h2>Esperienze lavorative attuali</h2>
 
 			{#each documents as document}
 				{#if document.current}
-					<Relation to={document.employer} let:doc>
+					<Relation to={document.employer} let:doc={employer}>
 						<CvCard
 							title={document.roles.join(', ')}
-							subtitle={doc.name}
+							subtitle={`${employer.name} (${employer.location})`}
 							date_start={formatDate(document.date_start, 'MM/yyyy')}
 							current={document.current}
 						/>
@@ -44,7 +57,7 @@
 					<Relation to={document.employer} let:doc={employer}>
 						<CvCard
 							title={document.roles.join(', ')}
-							subtitle={employer.name}
+							subtitle={`${employer.name} (${employer.location})`}
 							date_start={formatDate(document.date_start, 'MM/yyyy')}
 							date_end={formatDate(document.date_end, 'MM/yyyy')}
 						/>