use debug-info in infobar

codam-coding-college · Nov 21, 2023 · 84acf54 · 84acf54
1 parent 120b127
commit 84acf54
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git a/scripts/auth.ts b/scripts/auth.ts
@@ -67,6 +67,9 @@ export class Authenticator {
 			}
 			catch (err) {
 				console.error(err);
+				if (this._authEvents) {
+					this._authEvents.errorMessage(String(err));
+				}
 			}
 		});
 
@@ -93,6 +96,9 @@ export class Authenticator {
 			}
 			catch (err) {
 				console.error(err);
+				if (this._authEvents) {
+					this._authEvents.errorMessage(String(err));
+				}
 			}
 		});
 
@@ -180,6 +186,9 @@ export class Authenticator {
 		}
 		catch (err) {
 			console.error(err);
+			if (this._authEvents) {
+				this._authEvents.errorMessage(String(err));
+			}
 		}
 	}
 

diff --git a/scripts/data.ts b/scripts/data.ts
@@ -19,6 +19,7 @@ export class Wallpaper {
 		this._exists = (dirFiles !== undefined && dirFiles.includes(this._path));
 		if (!this._exists) {
 			console.warn('Wallpaper file does not exist: ' + this._path);
+			window.ui.setDebugInfo(`Wallpaper file does not exist: ${this._path}`);
 		}
 	}
 
@@ -159,6 +160,11 @@ export class Data {
 			.then(response => response.json())
 			.then(data => {
 				console.log("Fetched data.json", data);
+				if ("error" in data) {
+					console.warn("data.json response contains an error", data);
+					window.ui.setDebugInfo(`data.json response contains an error: ${data.error}`);
+					return;
+				}
 				this._dataJson = data;
 				// Emit data change event to all listeners
 				for (const listener of this._dataChangeListeners) {
@@ -167,6 +173,7 @@ export class Data {
 			})
 			.catch(error => {
 				console.error("Failed to fetch data.json", error);
+				window.ui.setDebugInfo(`Error fetching data.json: ${error}`);
 			});
 	}
 }
diff --git a/scripts/ui/infobars.ts b/scripts/ui/infobars.ts
@@ -23,6 +23,11 @@ export class InfoBarsUI {
 		this._populateInfoElements();
 	}
 
+	public setDebugInfo(info: string): void {
+		this._infoElements.debug.innerText = info;
+		console.debug("Changed text in debug info: ", info);
+	}
+
 	private _populateInfoElements(): void {
 		// Populate debug info
 		this._infoElements.debug.innerText = '';

diff --git a/scripts/ui/lockscreen.ts b/scripts/ui/lockscreen.ts
@@ -20,6 +20,7 @@ export class LockScreenUI extends UIScreen {
 			},
 			errorMessage: (message: string) => {
 				alert(message);
+				window.ui.setDebugInfo(message);
 			},
 			infoMessage: (message: string) => {
 				alert(message);

diff --git a/scripts/ui/loginscreen.ts b/scripts/ui/loginscreen.ts
@@ -18,6 +18,7 @@ export class LoginScreenUI extends UIScreen {
 			},
 			errorMessage: (message: string) => {
 				alert(message);
+				window.ui.setDebugInfo(message);
 			},
 			infoMessage: (message: string) => {
 				alert(message);

diff --git a/scripts/ui/ui.ts b/scripts/ui/ui.ts
@@ -38,4 +38,8 @@ export class UI {
 	public get isLockScreen(): boolean {
 		return this._isLockScreen;
 	}
+
+	public setDebugInfo(info: string): void {
+		this._infoBars.setDebugInfo(info);
+	}
 }