From 0544b91872a0b95b7554c131a023794a8d264fff Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Sat, 14 Jan 2023 15:18:49 -0500
Subject: [PATCH] don't assume the variables will be filled

---
 .eslintignore                    |  2 ++
 Taskfile.yaml                    |  2 +-
 src/lib/components/App.svelte    |  1 +
 src/lib/components/Battle.svelte | 12 +++++-------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 3897265..06ac5eb 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -11,3 +11,5 @@ node_modules
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
+Taskfile.yaml
+.eslintignore
diff --git a/Taskfile.yaml b/Taskfile.yaml
index 0b207fd..3717f9f 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -19,7 +19,7 @@ tasks:
     lint:fix:
         cmds:
             - npx prettier --write {{.CLI_ARGS | default .FILES }}
-        #            - npx eslint --fix --quiet {{.CLI_ARGS | default .FILES }}
+            - npx eslint --fix --quiet {{.CLI_ARGS | default .FILES }}
     integrate:
         cmds:
             - git is-clean
diff --git a/src/lib/components/App.svelte b/src/lib/components/App.svelte
index 0b630f0..3c72729 100644
--- a/src/lib/components/App.svelte
+++ b/src/lib/components/App.svelte
@@ -15,6 +15,7 @@
 	const api = genApi();
 
 	setContext('api', api);
+	console.log('api set, sucka');
 
 	const routes = {
 		// Exact path
diff --git a/src/lib/components/Battle.svelte b/src/lib/components/Battle.svelte
index f76371d..e7a6e9e 100644
--- a/src/lib/components/Battle.svelte
+++ b/src/lib/components/Battle.svelte
@@ -86,10 +86,10 @@
 					<i>arrow_backward</i>
 				</button>
 			</a>
-			{#if $activeCampaign.battles.length > battle.id}
+			{#if battles?.length > battle?.id}
 				<a
-					href={`#/campaign/${$activeCampaign._id}/battle/${
-						battle.id + 1
+					href={`#/campaign/${$activeCampaign?._id}/battle/${
+						battle?.id + 1
 					}`}
 				>
 					<button class="circle transparent">
@@ -113,7 +113,7 @@
 
 	event?.setActiveCampaign(params.campaignId);
 
-	$: battles = $activeCampaign?.battles;
+	$: battles = $activeCampaign?.battles ?? [];
 	$: battle = battles && battles[params.battleId - 1];
 	$: scenario = battle?.scenario;
 	$: status = battle?.status;
@@ -122,10 +122,8 @@
 	$: character = battle?.character;
 	$: city = battle?.city;
 
-	$: console.log(battle);
-
 	let chapter = 1 + parseInt(params.battleId / 2);
-	let chapterBattle =
+	$: chapterBattle =
 		params.battleId >= 7
 			? params.battleId - 6
 			: 1 + ((params.battleId - 1) % 2);