From 514b0c6181cf4c77b21bddc72224483a758fff5f Mon Sep 17 00:00:00 2001
From: CodeKyana <169302941+anotherfrench@users.noreply.github.com>
Date: Mon, 5 Aug 2024 15:26:28 +0200
Subject: [PATCH] Update for Prerender

---
 package-lock.json                             |  4 +-
 package.json                                  | 14 +++---
 src/lib/components/Layouts/Footer.svelte      | 10 ++--
 src/lib/components/Layouts/MetaData.svelte    |  4 +-
 .../components/Pages/DiscordChannel.svelte    |  2 +-
 src/routes/+layout.server.ts                  |  2 +
 .../api/activate-revert-logo/+page.svelte     |  9 ++--
 src/routes/api/og-images/+page.server.ts      | 14 ------
 src/routes/api/redirect/+page.server.ts       | 46 -------------------
 src/routes/join/+page.svelte                  |  2 +-
 10 files changed, 26 insertions(+), 81 deletions(-)
 delete mode 100644 src/routes/api/og-images/+page.server.ts
 delete mode 100644 src/routes/api/redirect/+page.server.ts

diff --git a/package-lock.json b/package-lock.json
index 8befe38..e197bbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-	"name": "ninjin.sk",
+	"name": "dbninjin.svelte",
 	"version": "0.0.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
-			"name": "ninjin.sk",
+			"name": "dbninjin.svelte",
 			"version": "0.0.1",
 			"dependencies": {
 				"@popperjs/core": "^2.11.8",
diff --git a/package.json b/package.json
index d094921..83e3822 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,13 @@
 	"description": "New version of the Ninjin website now in version 2 with a new framework.",
 	"author": "AnotherFrench <https://anotherfrench.github.io>",
 	"bugs": {
-    	"url": "https://github.com/orgs/NinjinMC/discussions/categories/bugs"
-  	},
-  	"repository": {
-    	"type": "git",
-    	"url": "git+https://github.com/NinjinMC/Ninjin.Web.v2.git"
-  	},
-  	"homepage": "https://ninjin.eu.org",
+		"url": "https://github.com/orgs/NinjinMC/discussions/categories/bugs"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/NinjinMC/Ninjin.Web.v2.git"
+	},
+	"homepage": "https://ninjin.eu.org",
 	"licence": "GPL-3.0",
 	"version": "0.0.1",
 	"private": true,
diff --git a/src/lib/components/Layouts/Footer.svelte b/src/lib/components/Layouts/Footer.svelte
index 371c6fd..2a87bf7 100644
--- a/src/lib/components/Layouts/Footer.svelte
+++ b/src/lib/components/Layouts/Footer.svelte
@@ -7,17 +7,17 @@
 	const iconLinks = [
 		{
 			name: 'Rejoindre notre Discord',
-			url: '/api/redirect?to=discord',
+			url: 'https://discord.gg/JcbAENk',
 			icon: logoDiscord
 		},
 		{
 			name: 'Regarder nous sur YouTube',
-			url: '/api/redirect?to=youtube',
+			url: 'https://www.youtube.com/channel/UCRQcMWRLBLC-jj1XvyCv7yA',
 			icon: logoYoutube
 		},
 		{
 			name: 'Télécharger le Launcher',
-			url: '/api/redirect?to=download/launcher',
+			url: 'https://github.com/Hedaox/Ninjin/raw/master/download/NinjinLauncherBootstrap.jar',
 			icon: logoNinjin
 		}
 	];
@@ -31,7 +31,7 @@
 			<small>
 				{currentYears} ©
 				<a
-					href="/api/redirect?to=github-dev"
+					href="https://github.com/anotherfrench"
 					title="Voir le Profil GitHub"
 					target="_blank"
 					rel="noopener"
@@ -41,7 +41,7 @@
 				</a>
 				pour
 				<a
-					href="/api/redirect?to=github&repo=web-v2"
+					href="https://github.com/NinjinMC/Ninjin.Web.v2"
 					title="Voir le Repo GitHub"
 					target="_blank"
 					rel="noopener"
diff --git a/src/lib/components/Layouts/MetaData.svelte b/src/lib/components/Layouts/MetaData.svelte
index d663055..b694b64 100644
--- a/src/lib/components/Layouts/MetaData.svelte
+++ b/src/lib/components/Layouts/MetaData.svelte
@@ -16,12 +16,14 @@
 	 */
 	export let description;
 
+	var ogImage = 'https://dynamic-og-image-generator.vercel.app/api/generate';
+	var avatar = 'https://ninjin.eu.org/assets/images/ninjin_avatar.png';
 	/**
 	 * @type {any}
 	 * @default null
 	 * @optional
 	 */
-	export let image = `/api/og-images?title=${title.replaceAll(' ', '+')}&path=${$page.url.hostname}${$page.url.pathname == '/' ? '/' : $page.url.pathname}`;
+	export let image = `${ogImage}?title=${title}&author=Dragon+Ball+Ninjin&avatar=${avatar}&websiteUrl=${url}&theme=Default`;
 
 	/**
 	 * @type {any}
diff --git a/src/lib/components/Pages/DiscordChannel.svelte b/src/lib/components/Pages/DiscordChannel.svelte
index 9e7db95..7dce4e5 100644
--- a/src/lib/components/Pages/DiscordChannel.svelte
+++ b/src/lib/components/Pages/DiscordChannel.svelte
@@ -15,7 +15,7 @@
 	</span>
 {:else}
 	<a
-		href={`/api/redirect?to=discord&guild_id=${guild_id}&channel_id=${channel_id}`}
+		href={`https://discord.com/channels/${guild_id}/${channel_id}`}
 		title={`Voir le canal ${name} sur Discord`}
 		target="_blank"
 		rel="noopener"
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index ce57df4..7143afc 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -1,3 +1,5 @@
+export const prerender = true;
+
 export function load({ cookies }) {
 	return {
 		revertNinjinLogo: cookies.get('ninjin_af#eg@api/activate-revert-logo') || 'false'
diff --git a/src/routes/api/activate-revert-logo/+page.svelte b/src/routes/api/activate-revert-logo/+page.svelte
index be354d7..9e5b776 100644
--- a/src/routes/api/activate-revert-logo/+page.svelte
+++ b/src/routes/api/activate-revert-logo/+page.svelte
@@ -1,7 +1,8 @@
-<MetaData
-	title="'API' - Activate Revert Logo"
-	description="Sur cette page, bah rien..."
-/>
+<script>
+	import MetaData from '$lib/components/Layouts/MetaData.svelte';
+</script>
+
+<MetaData title="'API' - Activate Revert Logo" description="Sur cette page, bah rien..." />
 
 <div
 	class="flex min-h-[50dvh] flex-col items-center justify-center bg-background px-4 py-12 sm:px-6 lg:px-8"
diff --git a/src/routes/api/og-images/+page.server.ts b/src/routes/api/og-images/+page.server.ts
deleted file mode 100644
index 3cfea5f..0000000
--- a/src/routes/api/og-images/+page.server.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-
-/** @type {import('./$types').PageLoad} */
-export function load({ url }) {
-	let title = url.searchParams.get('title') || 'Undefined';
-	let pathName = url.searchParams.get('path') || '/';
-
-	var ogImage = 'https://dynamic-og-image-generator.vercel.app/api/generate';
-	var avatar = 'https://ninjin.eu.org/assets/images/ninjin_avatar.png';
-	redirect(
-		302,
-		`${ogImage}?title=${title}&author=Dragon+Ball+Ninjin&avatar=${avatar}&websiteUrl=${pathName}&theme=Default`
-	);
-}
diff --git a/src/routes/api/redirect/+page.server.ts b/src/routes/api/redirect/+page.server.ts
deleted file mode 100644
index 6fe1e16..0000000
--- a/src/routes/api/redirect/+page.server.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-
-/** @type {import('./$types').PageLoad} */
-export function load({ params, url }) {
-	let goTo = url.searchParams.get('to');
-	let repository = url.searchParams.get('repo');
-	let channelId = url.searchParams.get('channel_id');
-	let guildId = url.searchParams.get('guild_id');
-
-	switch (goTo) {
-		case 'discord':
-			if (!guildId || !channelId || (!guildId && !channelId)) {
-				redirect(302, `https://discord.gg/JcbAENk`);
-			}
-
-			switch (guildId && channelId) {
-				case guildId && channelId:
-					redirect(302, `https://discord.com/channels/${guildId}/${channelId}`);
-				default:
-					redirect(302, `https://discord.gg/JcbAENk`);
-			}
-		case 'youtube':
-			redirect(302, `https://www.youtube.com/channel/UCRQcMWRLBLC-jj1XvyCv7yA`);
-		case 'github-dev':
-			redirect(302, `https://github.com/anotherfrench`);
-		case 'github':
-			switch (repository) {
-				case 'web-v2':
-					redirect(302, `https://github.com/NinjinMC/Ninjin.Web.v2`);
-				default:
-					redirect(302, `https://github.com/NinjinMC`);
-			}
-		case 'download/java':
-			redirect(
-				302,
-				`https://javadl.oracle.com/webapps/download/AutoDL?BundleId=238729_478a62b7d4e34b78b671c754eaaf38ab`
-			);
-		case 'download/launcher':
-			redirect(
-				302,
-				`https://github.com/Hedaox/Ninjin/raw/master/download/NinjinLauncherBootstrap.jar`
-			);
-		default:
-			redirect(302, `/`);
-	}
-}
diff --git a/src/routes/join/+page.svelte b/src/routes/join/+page.svelte
index 3d560d0..d6179e9 100644
--- a/src/routes/join/+page.svelte
+++ b/src/routes/join/+page.svelte
@@ -36,7 +36,7 @@
 
 <p class="text-center text-lg mt-4">
 	En cas de crash, vérifiez que vous avez bien <a
-		href="/api/redirect?to=download/java"
+		href="https://javadl.oracle.com/webapps/download/AutoDL?BundleId=238729_478a62b7d4e34b78b671c754eaaf38ab"
 		title="Télécharger Java en 64 bit."
 		rel="noopener"
 		target="_self"><b>Java 64 bit</b></a