fix: loading spinner now done properly

Tormak9970 · Apr 17, 2023 · b0a7f01 · b0a7f01
1 parent a333828
commit b0a7f01
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/Stores.ts b/src/Stores.ts
@@ -34,6 +34,7 @@ export const steamKey = sharedStore("", "steamKey");
 
 export const canSave = writable(false);
 export const isOnline = writable(false);
+export const loadingGames = writable(true);
 export const currentPlatform: Writable<Platforms> = writable(Platforms.STEAM);
 export const gridType: Writable<GridTypes> = writable(GridTypes.CAPSULE);
 

diff --git a/src/components/core/games/Games.svelte b/src/components/core/games/Games.svelte
@@ -2,7 +2,7 @@
   import { onDestroy, onMount } from "svelte";
   import { Pane } from "svelte-splitpanes";
   import type { Unsubscriber } from "svelte/store";
-  import { Platforms, currentPlatform, gridType, hiddenGameIds, nonSteamGames, selectedGameAppId, selectedGameName, selectedSteamGridGame, showHidden, steamGames } from "../../../Stores";
+  import { Platforms, currentPlatform, gridType, hiddenGameIds, loadingGames, nonSteamGames, selectedGameAppId, selectedGameName, selectedSteamGridGame, showHidden, steamGames } from "../../../Stores";
   import LoadingSpinner from "../../info/LoadingSpinner.svelte";
   import SearchBar from "../../interactables/SearchBar.svelte";
   import Toggle from "../../interactables/Toggle.svelte";
@@ -123,7 +123,7 @@
         <VerticalSpacer />
         <VerticalSpacer />
 
-        {#if isLoading || games.length == 0}
+        {#if isLoading || $loadingGames}
           <div class="loader-container">
             <LoadingSpinner />
           </div>

diff --git a/src/lib/controllers/AppController.ts b/src/lib/controllers/AppController.ts
@@ -20,7 +20,7 @@ import { ToastController } from "./ToastController";
 import { SettingsManager } from "../utils/SettingsManager";
 import { LogController } from "./LogController";
 import { get } from "svelte/store";
-import { GridTypes, Platforms, activeUserId, appLibraryCache, canSave, currentPlatform, gridType, hiddenGameIds, isOnline, needsSGDBAPIKey, needsSteamKey, nonSteamGames, originalAppLibraryCache, originalSteamShortcuts, selectedGameAppId, selectedGameName, steamGames, steamGridDBKey, steamKey, steamShortcuts, steamUsers } from "../../Stores";
+import { GridTypes, Platforms, activeUserId, appLibraryCache, canSave, currentPlatform, gridType, hiddenGameIds, isOnline, loadingGames, needsSGDBAPIKey, needsSteamKey, nonSteamGames, originalAppLibraryCache, originalSteamShortcuts, selectedGameAppId, selectedGameName, steamGames, steamGridDBKey, steamKey, steamShortcuts, steamUsers } from "../../Stores";
 import { CacheController } from "./CacheController";
 import { RustInterop } from "./RustInterop";
 import type { SGDBImage } from "../models/SGDB";
@@ -112,7 +112,10 @@ export class AppController {
     const appIsOnline = get(isOnline);
     LogController.log(`App loaded. IsOnline: ${appIsOnline}.`);
 
-    AppController.getUserApps();
+    loadingGames.set(true);
+    AppController.getUserApps().then(() => {
+      loadingGames.set(false);
+    });
 
     if (get(needsSGDBAPIKey)) {
       WindowController.openSettingsWindow();
@@ -583,10 +586,12 @@ export class AppController {
           });
         }
 
-        await AppController.getUserApps();
-
-        LogController.log(`Switched user to ${user.AccountName} id: ${userId}.`);
-        ToastController.showSuccessToast("Switched User!");
+        loadingGames.set(true);
+        AppController.getUserApps().then(() => {
+          loadingGames.set(false);
+          LogController.log(`Switched user to ${user.AccountName} id: ${userId}.`);
+          ToastController.showSuccessToast("Switched User!");
+        });
       } else {
         LogController.log(`Cancelled user switch to ${user.AccountName} id: ${userId}.`);
         ToastController.showGenericToast("Cancelled.");