From 27a3396b29a7a217f2649e68b725f8287263ab05 Mon Sep 17 00:00:00 2001
From: Ludovic <ludovicmalot@icloud.com>
Date: Sat, 20 Jul 2024 09:03:11 +0800
Subject: [PATCH] fix: microsoft removal here too

---
 src/routes/login/+page.svelte | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 888d504f..c8268334 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import DefaultLayout from '$lib/components/layout/DefaultLayout.svelte';
 	import BackendService from '$lib/services/backend';
-	import { mdiAccount, mdiAlert, mdiDevices, mdiServer } from '@mdi/js';
-	import { siDiscord, siGoogle, siMicrosoft, siGithub } from 'simple-icons';
+	import { mdiAccount, mdiAlert, mdiDevices, mdiServer, mdiMicrosoft } from '@mdi/js';
+	import { siDiscord, siGoogle, siGithub, type SimpleIcon } from 'simple-icons';
 	import Icon from '$lib/components/ui/icon/icon.svelte';
 	import i18n from '$lib/services/i18n';
 	import { Alert, AlertDescription, AlertTitle } from '$lib/components/ui/alert';
@@ -19,12 +19,16 @@
 		{ name: 'Discord', icon: siDiscord, action: () => nav(backend.auth.login('discord')) },
 		{
 			name: 'Microsoft',
-			icon: siMicrosoft,
+			icon: mdiMicrosoft,
 			action: () => nav(backend.auth.login('microsoft'))
 		},
 		{ name: 'Github', icon: siGithub, action: () => nav(backend.auth.login('github')) }
 	];
 
+	const isSimpleIcon = (icon: string | SimpleIcon): icon is SimpleIcon => {
+		return typeof icon === 'object' && 'path' in icon;
+	};
+
 	const perks = [
 		{
 			icon: mdiDevices,
@@ -65,7 +69,10 @@
 			</Alert>
 			{#each loginOptions as option}
 				<Button variant="outline" class="w-full justify-center" on:click={option.action}>
-					<Icon path={option.icon.path} class="mr-2" />
+					<Icon
+						path={isSimpleIcon(option.icon) ? option.icon.path : option.icon}
+						class="mr-2"
+					/>
 					{option.name}
 				</Button>
 			{/each}