fix: load gapi beforehand

bkalendar · Sep 1, 2023 · 4e9dec8 · 4e9dec8
1 parent c990164
commit 4e9dec8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 30 deletions.
diff --git a/src/lib/google.ts b/src/lib/google.ts
@@ -6,37 +6,14 @@ const API_KEY: string = 'AIzaSyBB2fk24uJrAXx_Q7DVPD0XdzUZ6xaFbRI';
 const CLIENT_ID: string =
 	'1003739652458-kgklao4co5lrtffceqeq8ng2m7m1pde6.apps.googleusercontent.com';
 
-await Promise.all([initGapi(), initGsi()]);
+await initGapi();
 
-function initGapi() {
-	return new Promise<void>((resolve) => {
-		const script = document.createElement('script');
-		script.src = 'https://apis.google.com/js/api.js';
-		script.defer = true;
-		script.onload = () => {
-			gapi.load('client', async () => {
-				await gapi.client.init({
-					apiKey: API_KEY,
-					discoveryDocs: ['https://www.googleapis.com/discovery/v1/apis/calendar/v3/rest']
-				});
-				script.onload = function () {};
-				resolve();
-			});
-		};
-		document.head.appendChild(script);
-	});
-}
-
-function initGsi() {
-	return new Promise<void>((resolve) => {
-		const script = document.createElement('script');
-		script.src = 'https://accounts.google.com/gsi/client';
-		script.defer = true;
-		script.onload = () => {
-			script.onload = function () {};
-			resolve();
-		};
-		document.head.appendChild(script);
+async function initGapi() {
+	gapi.load('client', async () => {
+		await gapi.client.init({
+			apiKey: API_KEY,
+			discoveryDocs: ['https://www.googleapis.com/discovery/v1/apis/calendar/v3/rest']
+		});
 	});
 }
 

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -3,6 +3,11 @@
 	import '@fontsource/arimo';
 </script>
 
+<svelte:head>
+	<script src="https://apis.google.com/js/api.js" defer></script>
+	<script src="https://accounts.google.com/gsi/client" defer></script>
+</svelte:head>
+
 <div class="mx-auto max-w-xs py-20 font-body">
 	<slot />
 </div>