From 9635a48051d2bdaa1ec4debad41e91d432425984 Mon Sep 17 00:00:00 2001
From: Akis <mavrommatisakis@gmail.com>
Date: Sun, 1 Jan 2023 14:27:24 +0200
Subject: [PATCH] fix some props and make donate content better

---
 src/lib/Card/CardInner.svelte   | 10 ++++-----
 src/lib/Card/Link.svelte        |  2 +-
 src/lib/Form/Captcha.svelte     |  2 +-
 src/lib/Form/Form.svelte        |  6 +++---
 src/lib/Form/Meta.svelte        |  6 +++---
 src/lib/Form/Note.svelte        |  4 ++--
 src/lib/Form/TextArea.svelte    |  6 +++---
 src/lib/Hero.svelte             |  6 +++---
 src/lib/LinkButton.svelte       | 12 +++++------
 src/lib/MDsvexLayout.svelte     | 38 ---------------------------------
 src/lib/Team.json               | 14 ++++++------
 src/routes/contact/+page.svelte | 14 ++++++------
 src/routes/donate/+page.md      | 17 ++++++++-------
 svelte.config.js                |  3 +--
 14 files changed, 52 insertions(+), 88 deletions(-)
 delete mode 100644 src/lib/MDsvexLayout.svelte

diff --git a/src/lib/Card/CardInner.svelte b/src/lib/Card/CardInner.svelte
index 63e4909..17f4491 100644
--- a/src/lib/Card/CardInner.svelte
+++ b/src/lib/Card/CardInner.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	export let title: any;
-	export let position: any;
-	export let description: any;
-	export let icon: any;
-	export let positionStyles: any;
+	export let title: string = "";
+	export let position: string = "";
+	export let description: string = "";
+	export let icon: string = "";
+	export let positionStyles: string = "";
 </script>
 
 <div class="bg-secondary rounded-2 p-4 w-[18rem] sm:w-md flex flex-col">
diff --git a/src/lib/Card/Link.svelte b/src/lib/Card/Link.svelte
index 605aaf1..66e4364 100644
--- a/src/lib/Card/Link.svelte
+++ b/src/lib/Card/Link.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	export let url: any;
+	export let url: string = "";
 	let classes: string = "";
 	export { classes as class };
 </script>
diff --git a/src/lib/Form/Captcha.svelte b/src/lib/Form/Captcha.svelte
index e2ea033..80b1253 100644
--- a/src/lib/Form/Captcha.svelte
+++ b/src/lib/Form/Captcha.svelte
@@ -8,7 +8,7 @@
 		submit = !submit;
 	};
 
-	export let sitekey: string;
+	export let sitekey: string = "";
 </script>
 
 <Note
diff --git a/src/lib/Form/Form.svelte b/src/lib/Form/Form.svelte
index 23336d2..06cc89f 100644
--- a/src/lib/Form/Form.svelte
+++ b/src/lib/Form/Form.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	export let action: string;
-	export let method: string;
-	export let id: string;
+	export let action: string = "";
+	export let method: string = "";
+	export let id: string = "";
 </script>
 
 <form
diff --git a/src/lib/Form/Meta.svelte b/src/lib/Form/Meta.svelte
index 43546cc..761f124 100644
--- a/src/lib/Form/Meta.svelte
+++ b/src/lib/Form/Meta.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	export let inputType: string;
-	export let inputPlaceholder: string;
-	export let selectType: string;
+	export let inputType: string = "";
+	export let inputPlaceholder: string = "";
+	export let selectType: string = "";
 </script>
 
 <div
diff --git a/src/lib/Form/Note.svelte b/src/lib/Form/Note.svelte
index 31432c8..356b83d 100644
--- a/src/lib/Form/Note.svelte
+++ b/src/lib/Form/Note.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	export let content: string;
-	export let icon: string;
+	export let content: string = "";
+	export let icon: string = "";
 </script>
 
 <div class="flex items-center gap-2">
diff --git a/src/lib/Form/TextArea.svelte b/src/lib/Form/TextArea.svelte
index 7b6de13..48f9741 100644
--- a/src/lib/Form/TextArea.svelte
+++ b/src/lib/Form/TextArea.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	export let id: string;
-	export let name: string;
-	export let placeholder: string;
+	export let id: string = "";
+	export let name: string = "";
+	export let placeholder: string = "";
 </script>
 
 <textarea
diff --git a/src/lib/Hero.svelte b/src/lib/Hero.svelte
index e5a2341..a838837 100644
--- a/src/lib/Hero.svelte
+++ b/src/lib/Hero.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	export let title: string;
-	export let description: string;
-	export let marginTop: string;
+	export let title: string = "";
+	export let description: string = "";
+	export let marginTop: string = "";
 	let styles: string = "";
 	export { styles as style };
 </script>
diff --git a/src/lib/LinkButton.svelte b/src/lib/LinkButton.svelte
index 1bfc8f9..d3dcb64 100644
--- a/src/lib/LinkButton.svelte
+++ b/src/lib/LinkButton.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-	export let url: string;
-	export let icon: string;
-	export let title: string;
-	export let bg: string;
-	export let color: string;
-	export let styles: string;
+	export let url: string = "";
+	export let icon: string = "";
+	export let title: string = "";
+	export let bg: string = "";
+	export let color: string = "";
+	export let styles: string = "";
 </script>
 
 <a
diff --git a/src/lib/MDsvexLayout.svelte b/src/lib/MDsvexLayout.svelte
deleted file mode 100644
index 4230469..0000000
--- a/src/lib/MDsvexLayout.svelte
+++ /dev/null
@@ -1,38 +0,0 @@
-<script>
-	//@ts-ignoreS
-	export let title;
-	export let description;
-	export let separator;
-	import SvelteSeo from "svelte-seo";
-	// Enjoy the jank.
-	if (title === "Project Segfault") {
-		title = "";
-		separator = "";
-	} else {
-		separator = "|";
-	}
-</script>
-
-<SvelteSeo
-	openGraph={{
-		title: title,
-		description: description,
-		type: "website",
-		images: [
-			{
-				url: "https://projectsegfau.lt:8448/_matrix/media/r0/download/projectsegfau.lt/HBgjhWUExhKPzbpkpIqQfUkF",
-				width: 850,
-				height: 650,
-				alt: "Image"
-			}
-		]
-	}}
-/>
-
-<svelte:head>
-	<title>{title} {separator} Project Segfault</title>
-</svelte:head>
-
-<div class="mdsvex_content">
-	<slot />
-</div>
diff --git a/src/lib/Team.json b/src/lib/Team.json
index be44678..7c6804e 100644
--- a/src/lib/Team.json
+++ b/src/lib/Team.json
@@ -15,6 +15,13 @@
 		"email": "arya@projectsegfau.lt",
 		"pgp": "https://keys.openpgp.org/vks/v1/by-fingerprint/9D56914428A62CF1B6A32175842D12BDA50DF120"
 	},
+	{
+		"name": "Devrand",
+		"matrix": "https://matrix.to/#/@openssl_rand:projectsegfau.lt/",
+		"position": "Sysadmin",
+		"description": "High schooler who is interested in internet freedom, programming, and open source software. (Previously openssl_rand)",
+		"email": "mailto:openssl_rand@projectsegfau.lt"
+	},
 	{
 		"name": "Midou",
 		"description": "A random person with an obsession to online cat pics, also happens to be the sysadmin of the project",
@@ -31,12 +38,5 @@
 		"matrix": "https://matrix.to/#/@mrlerien:projectsegfau.lt/",
 		"position": "France server owner",
 		"description": "using windows server for soleil levant was a mistake"
-	},
-	{
-		"name": "Devrand",
-		"matrix": "https://matrix.to/#/@openssl_rand:projectsegfau.lt/",
-		"position": "Sysadmin",
-		"description": "High schooler who is interested in internet freedom, programming, and open source software. (Previously openssl_rand)",
-		"email": "mailto:openssl_rand@projectsegfau.lt"
 	}
 ]
diff --git a/src/routes/contact/+page.svelte b/src/routes/contact/+page.svelte
index a9cc7b4..eadb2da 100644
--- a/src/routes/contact/+page.svelte
+++ b/src/routes/contact/+page.svelte
@@ -79,13 +79,15 @@
 
 <h2>Our Email</h2>
 
-<a href="mailto:contact@projectsegfau.lt">contact@projectsegfau.lt</a>
+<div class="flex flex-col gap-4">
+	<a href="mailto:contact@projectsegfau.lt">contact@projectsegfau.lt</a>
 
-<span class="italic">
-	Please be aware that Microsoft often blocks non-popular emails, if you do
-	contact us through there, make sure to check your spam and mark it as
-	not-spam!
-</span>
+	<span class="italic">
+		Please be aware that Microsoft and other email providers often block non-popular emails, if you do
+		contact us through there, make sure to check your spam and mark it as
+		not-spam!
+	</span>
+</div>
 
 <h2>People</h2>
 
diff --git a/src/routes/donate/+page.md b/src/routes/donate/+page.md
index 9faefbf..d6f2166 100644
--- a/src/routes/donate/+page.md
+++ b/src/routes/donate/+page.md
@@ -1,21 +1,22 @@
 ---
-title: Donate to Project Segfault
-description: The ways you can donate to us and more.
+title: Donate
 ---
 
 <script>
 	import LinkButton from "$lib/LinkButton.svelte";
 </script>
 
+<svelte:head>
+	<title>{title} | Project Segfault</title>
+</svelte:head>
+
 # { title }
 
-{ description }
-
-## Reasons to donate to our project.
-
-If you donate, we will be more motivated to work on the server and host more stuff and maybe even get more hardware. As well as that, we may donate PayPal funds to project we heavily rely on. Thanks!
+## What we do with donations
+These donations primarily help us pay for our VPSes, domain names and other expenses related to crucial infrastructure we have to maintain. We also sometimes donate to developers who maintain software we rely heavily on such as our authentication provider.
 
 ## Donation methods
+You can currently donate by credit card through [Liberapay](https://liberaypay.com) and cryptocurrencies.
 
 ### Credit card
 
@@ -23,7 +24,7 @@ If you donate, we will be more motivated to work on the server and host more stu
 
 ### Cryptocurrency
 
-You can use our [domain name](https://projectsegfau.lt) as a crypto wallet address in supported OpenAlias clients such as [MyMonero](https://mymonero.com/), [Electrum](https://electrum.org/) and [Electrum-LTC](https://electrum-ltc.org/).
+You can use [projectsegfau.lt](https://projectsegfau.lt) as a crypto wallet address in supported OpenAlias clients such as [MyMonero](https://mymonero.com/), [Electrum](https://electrum.org/) and [Electrum-LTC](https://electrum-ltc.org/).
 
 #### Monero
 
diff --git a/svelte.config.js b/svelte.config.js
index 1ffe2db..744c920 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -11,8 +11,7 @@ const config = {
 	preprocess: [
 		preprocess(),
 		mdsvex({
-			extensions: [".md"],
-			layout: "./src/lib/MDsvexLayout.svelte"
+			extensions: [".md"]
 		})
 	],