From 63b6bccf942f1987c470a592581d16609ea66467 Mon Sep 17 00:00:00 2001
From: matthieu42morin <matthieu.bernard.morin@gmail.com>
Date: Tue, 13 Feb 2024 16:46:15 +0100
Subject: [PATCH] Projects

---
 src/content/projects.ts                       | 11 --------
 src/content/skills.ts                         | 11 +++++---
 .../{+layout.server.ts => +page.server.ts}    |  2 +-
 src/routes/projects/+page.svelte              | 16 +++++++++--
 src/routes/projects/[slug]/+layout.server.ts  | 27 +++++++++++++++++++
 src/routes/projects/[slug]/+page.svelte       |  2 +-
 src/routes/sitemap.xml/+server.ts             | 24 +++++------------
 7 files changed, 57 insertions(+), 36 deletions(-)
 rename src/routes/projects/{+layout.server.ts => +page.server.ts} (75%)
 create mode 100644 src/routes/projects/[slug]/+layout.server.ts

diff --git a/src/content/projects.ts b/src/content/projects.ts
index c635221..d1f0242 100644
--- a/src/content/projects.ts
+++ b/src/content/projects.ts
@@ -2,17 +2,6 @@ import type { MarkdownMetadata, MdsvexImport } from './types';
 import { parseReadContent } from './utils';
 import { error } from '@sveltejs/kit';
 
-export interface Project extends MarkdownMetadata {
-	title: string;
-	excerpt: string;
-	slug: string;
-	image: string;
-	date: string;
-	pageTitle: string;
-	pageDescription: string;
-	keywords: string;
-}
-
 /**
  * Gets all the projects metadata
  */
diff --git a/src/content/skills.ts b/src/content/skills.ts
index fc5d5be..d07a0e8 100644
--- a/src/content/skills.ts
+++ b/src/content/skills.ts
@@ -5,15 +5,18 @@ type Skill = {
 
 // prettier-ignore
 const skills: Skill[] = [
-	{title:'Langs/Frameworks', list: ['Svelte', 'SvelteKit', 'JavaScript/TypeScript', 'Python', 'C/C++']},
-	{title:'Devops', list: ['Git', 'Terraform', 'Ansible', 'Docker', 'Docker Compose', 'K8s']},
+	{title:'Langs', list: ['JavaScript/TypeScript', 'Python', 'a bit of C/C++', 'Bash', 'SQL', '...']},
+	{title:'Frontend', list: ['Svelte', 'SvelteKit']},
+	{title:'Devops', list: ['Git', 'Terraform', 'Ansible', 'Docker', 'Docker Compose', 'K8s', 'Grafana']},
+	{title:'CI/CD', list: ['GitHub Actions', 'Gitea Actors', 'Gitlab', 'SFTP', ]},
 	{title:'Linux', list: ['Debian', 'Ubuntu', 'Arch Linux', 'Alpine', 'Raspbian']},
 	{title:'SysAdmin', list: ['Systemd', 'nginx', 'User acc management', 'basic networking tools, ...']},
 	{title:'Databases', list: ['PostgreSQL', 'MariaDB', 'SQLite' ]},
-	{title:'Cloud', list: ['AWS', 'Azure', 'DigitalOcean', 'Vercel', 'Hetzner Cloud']},
+	{title:'Cloud', list: ['AWS', 'Azure', 'Cloudflare', 'DigitalOcean', 'Vercel', 'Hetzner Cloud']},
 	{title:'IoT', list: ['Raspberry Pi', 'Arduino', 'ESP32', 'ESP8266', '...sensors', 'MQTT', 'LoRa', 'BLE', 'NFC', 'WiFi', ]},
+	{title:'other tools', list: ['HC Vault / AWS Secrets Manager', 'AWS Lambda']},
 	{title:'Languages', list: ['English', 'Czech', 'French', 'German']},
-	{title:'other', list: ['Figma', 'UI/UX', 'Wireframing', 'Prototyping', 'Adobe InDesign, Illustrator, Inkscape, ...',]}
+	{title:'design', list: ['Figma', 'UI/UX', 'Wireframing', 'Prototyping', 'Adobe InDesign, Illustrator, Inkscape, ...',]}
 ];
 
 export default skills;
diff --git a/src/routes/projects/+layout.server.ts b/src/routes/projects/+page.server.ts
similarity index 75%
rename from src/routes/projects/+layout.server.ts
rename to src/routes/projects/+page.server.ts
index b29281a..8a5b4cb 100644
--- a/src/routes/projects/+layout.server.ts
+++ b/src/routes/projects/+page.server.ts
@@ -1,7 +1,7 @@
 import { listProjects } from '$content/projects';
 import type { LayoutServerLoad } from './$types';
 
-export const load: LayoutServerLoad = () => {
+export const load = () => {
 	return {
 		projects: listProjects()
 	};
diff --git a/src/routes/projects/+page.svelte b/src/routes/projects/+page.svelte
index b905094..6f4799f 100644
--- a/src/routes/projects/+page.svelte
+++ b/src/routes/projects/+page.svelte
@@ -1,11 +1,23 @@
 <script lang="ts">
 	import type { PageData } from './$types';
+	import PostPreview from '$lib/components/blog/PostPreview.svelte';
 
 	export let data: PageData;
 </script>
 
-<div class="projects-layout">
-	{data.projects}
+<div class="space-y-8">
+	<header class="flex flex-col justify-center items-center">
+		<h1 class="h1 m-4">Projects</h1>
+	</header>
+	<div
+		class="grid m-auto max-w-7xl w-full gap-6 grid-cols-none justify-center md:grid-cols-2 lg:grid-cols-3"
+	>
+		{#each data.projects as post}
+			<div class="flex justify-center min-w-[20rem] max-w-sm">
+				<PostPreview {post} type="blog" isMostRecent />
+			</div>
+		{/each}
+	</div>
 </div>
 
 <style lang="postcss">
diff --git a/src/routes/projects/[slug]/+layout.server.ts b/src/routes/projects/[slug]/+layout.server.ts
new file mode 100644
index 0000000..cf77940
--- /dev/null
+++ b/src/routes/projects/[slug]/+layout.server.ts
@@ -0,0 +1,27 @@
+import { listProjects } from '$content/projects';
+import { error } from '@sveltejs/kit';
+
+function shuffle<T>(array: T[]) {
+	for (let i = array.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1));
+		[array[i], array[j]] = [array[j], array[i]];
+	}
+}
+
+export async function load({ params }) {
+	const posts = listProjects();
+	const currentPost = posts.find((post) => post.slug == params.slug);
+
+	if (!currentPost) {
+		throw error(404, `Unable to find blog post "${params.slug}"`);
+	}
+
+	shuffle(posts);
+
+	return {
+		featuredPosts: posts
+			.filter((post) => post.slug != params.slug)
+			.filter((p) => p.tags?.some((t) => currentPost.tags?.includes(t)))
+			.slice(0, 3)
+	};
+}
diff --git a/src/routes/projects/[slug]/+page.svelte b/src/routes/projects/[slug]/+page.svelte
index 85d5c3d..1df7eb5 100644
--- a/src/routes/projects/[slug]/+page.svelte
+++ b/src/routes/projects/[slug]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import ProjectsContentLayout from '$lib/components/projects/projects-content-layout.svelte';
+	import ProjectsContentLayout from '$lib/components/projects/ProjectsContentLayout.svelte';
 	import type { PageData } from './$types';
 
 	export let data: PageData;
diff --git a/src/routes/sitemap.xml/+server.ts b/src/routes/sitemap.xml/+server.ts
index da7898d..00532ae 100644
--- a/src/routes/sitemap.xml/+server.ts
+++ b/src/routes/sitemap.xml/+server.ts
@@ -1,5 +1,4 @@
 import { removeTrailingSlash } from '$lib/utils/helpers';
-import type { RequestHandler } from './$types';
 import { listBlogPosts } from '$content/blog';
 
 // prettier-ignore
@@ -16,10 +15,10 @@ const sitemap = (pages: string[]) => `<?xml version="1.0" encoding="UTF-8" ?>
 	</urlset>
 `;
 
-export const GET: RequestHandler = async () => {
+export const GET = async () => {
 	const staticPages = Object.keys(
 		// For other static pages. Except content pages - changelogs, guides, blog posts, guides etc.
-		import.meta.glob('/src/routes/**/!(_)*.{svelte,md}'),
+		import.meta.glob('/src/routes/**/!(_)*.{svelte,md,svx}')
 	)
 		.filter((page) => {
 			const filters = [
@@ -28,14 +27,10 @@ export const GET: RequestHandler = async () => {
 				'404',
 				'slug]',
 				'title]',
-				'src/routes/docs/introduction/getting-started',
-				'extension-activation',
 				'unsubscribe',
 				'subscribe',
-				'stay-connected',
-				'extension-uninstall',
 				'+error',
-				'+layout',
+				'+layout'
 			];
 			return !filters.find((filter) => page.includes(filter));
 		})
@@ -49,18 +44,13 @@ export const GET: RequestHandler = async () => {
 				.replace('/+page', '');
 		});
 
-	const blogPosts = listBlogPosts().map(
-		(post) => `https://www.gitpod.io/blog/${post.slug}`,
-	);
-	const renderedSitemap = sitemap([
-		...staticPages,
-		...blogPosts,
-	]);
+	const blogPosts = listBlogPosts().map((post) => `https://www.mattmor.in/blog/${post.slug}`);
+	const renderedSitemap = sitemap([...staticPages, ...blogPosts]);
 
 	return new Response(renderedSitemap, {
 		headers: {
 			'Cache-Control': 'max-age=0, s-maxage=3600',
-			'Content-Type': 'application/xml',
-		},
+			'Content-Type': 'application/xml'
+		}
 	});
 };