From e39632dc2e21249d48fc62f18412bb7a9db305e8 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Fri, 15 Sep 2023 17:19:44 +0200
Subject: [PATCH] fix: Move JSON-LD scripts to `head` nodes

---
 src/lib/components/Meta.svelte       | 24 +++++++++++------
 src/routes/+error.svelte             |  1 -
 src/routes/+page.svelte              |  5 +---
 src/routes/contributors/+page.svelte |  5 ++--
 src/routes/donate/+page.svelte       | 40 +++++++++++++++++++++++-----
 src/routes/download/+page.svelte     |  5 ++--
 src/routes/patches/+page.svelte      |  4 +--
 7 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/lib/components/Meta.svelte b/src/lib/components/Meta.svelte
index 9e5b2a8..2d3d170 100644
--- a/src/lib/components/Meta.svelte
+++ b/src/lib/components/Meta.svelte
@@ -1,26 +1,34 @@
 <script lang="ts">
-let _title: string = "";
-$: title = _title === "" ? "ReVanced" : `ReVanced · ${_title}`;
+	import { JsonLd } from 'svelte-meta-tags';
 
-export { _title as title };
+	let _title: string = '';
+	$: title = _title === '' ? 'ReVanced' : `ReVanced · ${_title}`;
 
-export let description: string = "Continuing the legacy of Vanced.";
+	export { _title as title };
+
+	export let description: string = 'Continuing the legacy of Vanced.';
+
+	export let schema: any | undefined;
 </script>
 
 <svelte:head>
-  <title>{title}</title>
-  <meta name="description" content={description} />
+	<title>{title}</title>
+	<meta name="description" content={description} />
 	<meta name="theme-color" content="#9FD5FF" />
 
-  <!-- OpenGraph -->
+	<!-- OpenGraph -->
 	<meta property="og:title" content={title} />
 	<meta property="og:description" content={description} />
 	<meta property="og:type" content="website" />
 	<meta property="og:image" content="/embed.png" />
 
-  <!-- Twitter -->
+	<!-- Twitter -->
 	<meta name="twitter:title" content={title} />
 	<meta name="twitter:description" content={description} />
 	<meta name="twitter:image" itemprop="image" content="/embed.png" />
 	<meta name="twitter:card" content="summary" />
+
+	{#if schema}
+		<JsonLd {schema} />
+	{/if}
 </svelte:head>
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index 51f3a29..7120a66 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import Meta from '$lib/components/Meta.svelte';
-	import Navigation from '$layout/Navbar/NavButton.svelte';
 	import { page } from '$app/stores';
 	import Button from '$lib/components/Button.svelte';
 
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index b322198..630e6fa 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -4,12 +4,9 @@
 	import SocialHost from '$layout/Hero/SocialHost.svelte';
 	import Wave from '$lib/components/Wave.svelte';
 	import Meta from '$lib/components/Meta.svelte';
-	import { JsonLd } from 'svelte-meta-tags';
 </script>
 
-<Meta />
-
-<JsonLd
+<Meta
 	schema={{
 		'@context': 'https://schema.org',
 		'@type': 'WebPage',
diff --git a/src/routes/contributors/+page.svelte b/src/routes/contributors/+page.svelte
index 5c08559..b421140 100644
--- a/src/routes/contributors/+page.svelte
+++ b/src/routes/contributors/+page.svelte
@@ -5,7 +5,6 @@
 	import ContributorHost from './ContributorSection.svelte';
 	import Footer from '$layout/Footer/FooterHost.svelte';
 	import Meta from '$lib/components/Meta.svelte';
-	import { JsonLd } from 'svelte-meta-tags';
 	import Query from '$lib/components/Query.svelte';
 
 	import { queries } from '$data/api';
@@ -14,8 +13,8 @@
 	const query = createQuery(['repositories'], queries.repositories);
 </script>
 
-<Meta title="Contributors" />
-<JsonLd
+<Meta
+	title="Contributors"
 	schema={{
 		'@context': 'https://schema.org',
 		'@type': 'WebPage',
diff --git a/src/routes/donate/+page.svelte b/src/routes/donate/+page.svelte
index 0fc5ed1..175eff6 100644
--- a/src/routes/donate/+page.svelte
+++ b/src/routes/donate/+page.svelte
@@ -39,7 +39,33 @@
 	}
 </script>
 
-<Meta title="Donate" />
+<Meta
+	title="Donate"
+	schema={{
+		'@context': 'https://schema.org',
+		'@type': 'WebPage',
+		name: 'ReVanced Donation',
+		abstract: 'Various ways to support ReVanced',
+		breadcrumb: 'Home > Donate',
+		publisher: {
+			'@type': 'Organization',
+			name: 'ReVanced',
+			url: 'https://revanced.app/',
+			logo: {
+				'@type': 'ImageObject',
+				url: 'https://revanced.app/embed.png'
+			},
+			sameAs: [
+				'https://github.com/revanced',
+				'https://twitter.com/revancedapp',
+				'https://revanced.app/discord',
+				'https://www.reddit.com/r/revancedapp',
+				'https://t.me/app_revanced',
+				'https://www.youtube.com/@ReVanced'
+			]
+		}
+	}}
+/>
 
 <main class="wrapper" in:fly={{ y: 10, easing: quintOut, duration: 750 }}>
 	<section>
@@ -67,11 +93,12 @@
 					<a class="donate-card" target="_blank" rel="noreferrer" href={platform.url}>
 						<!-- not using <img/> because we want the image height to always be 200px -->
 						<div
-							style="background-image: url('/donate/card-images/{platform.name}.{supportsWebP() ? 'webp' : 'png'}'), url('/donate/card-images/fallback.svg');"
+							style="background-image: url('/donate/card-images/{platform.name}.{supportsWebP()
+								? 'webp'
+								: 'png'}'), url('/donate/card-images/fallback.svg');"
 							role="img"
 							aria-label="{platform.name} preview image"
-							>
-						  </div>
+						/>
 						<span>{platform.name}</span>
 					</a>
 				{/each}
@@ -79,7 +106,9 @@
 			{#if data.wallets}
 				<button class="donate-card" on:click={() => (cryptoDialogue = !cryptoDialogue)}>
 					<div
-						style="background-image: url('/donate/card-images/Cryptocurrencies.{supportsWebP() ? 'webp' : 'png'}'), url('/donate/card-images/fallback.svg');"
+						style="background-image: url('/donate/card-images/Cryptocurrencies.{supportsWebP()
+							? 'webp'
+							: 'png'}'), url('/donate/card-images/fallback.svg');"
 						role="img"
 						aria-label="Cryptocurrencies preview image"
 					/>
@@ -209,7 +238,6 @@
 		}
 	}
 
-
 	// COPEEEE
 	@media screen and (max-width: 768px) {
 		#heart {
diff --git a/src/routes/download/+page.svelte b/src/routes/download/+page.svelte
index 0dbefcf..f8bb67e 100644
--- a/src/routes/download/+page.svelte
+++ b/src/routes/download/+page.svelte
@@ -8,7 +8,6 @@
 	import manager_screenshot from '$images/manager.png?format=avif;webp;png&picture';
 
 	import Meta from '$lib/components/Meta.svelte';
-	import { JsonLd } from 'svelte-meta-tags';
 	import Query from '$lib/components/Query.svelte';
 	import Button from '$lib/components/Button.svelte';
 	import Footer from '$layout/Footer/FooterHost.svelte';
@@ -44,8 +43,8 @@
 	}
 </script>
 
-<Meta title="Download" />
-<JsonLd
+<Meta
+	title="Download"
 	schema={{
 		'@type': 'MobileApplication',
 		name: 'ReVanced Manager',
diff --git a/src/routes/patches/+page.svelte b/src/routes/patches/+page.svelte
index eb48e0e..639d5c3 100644
--- a/src/routes/patches/+page.svelte
+++ b/src/routes/patches/+page.svelte
@@ -107,8 +107,8 @@
 	};
 </script>
 
-<Meta title="Patches" />
-<JsonLd
+<Meta
+	title="Patches"
 	schema={{
 		'@context': 'https://schema.org',
 		'@type': 'WebPage',