don't assume the variables will be filled

This commit is contained in:
Yanick Champoux 2023-01-14 15:18:49 -05:00
parent 6e2bb0ddab
commit 0544b91872
4 changed files with 9 additions and 8 deletions

View File

@ -11,3 +11,5 @@ node_modules
pnpm-lock.yaml pnpm-lock.yaml
package-lock.json package-lock.json
yarn.lock yarn.lock
Taskfile.yaml
.eslintignore

View File

@ -19,7 +19,7 @@ tasks:
lint:fix: lint:fix:
cmds: cmds:
- npx prettier --write {{.CLI_ARGS | default .FILES }} - npx prettier --write {{.CLI_ARGS | default .FILES }}
# - npx eslint --fix --quiet {{.CLI_ARGS | default .FILES }} - npx eslint --fix --quiet {{.CLI_ARGS | default .FILES }}
integrate: integrate:
cmds: cmds:
- git is-clean - git is-clean

View File

@ -15,6 +15,7 @@
const api = genApi(); const api = genApi();
setContext('api', api); setContext('api', api);
console.log('api set, sucka');
const routes = { const routes = {
// Exact path // Exact path

View File

@ -86,10 +86,10 @@
<i>arrow_backward</i> <i>arrow_backward</i>
</button> </button>
</a> </a>
{#if $activeCampaign.battles.length > battle.id} {#if battles?.length > battle?.id}
<a <a
href={`#/campaign/${$activeCampaign._id}/battle/${ href={`#/campaign/${$activeCampaign?._id}/battle/${
battle.id + 1 battle?.id + 1
}`} }`}
> >
<button class="circle transparent"> <button class="circle transparent">
@ -113,7 +113,7 @@
event?.setActiveCampaign(params.campaignId); event?.setActiveCampaign(params.campaignId);
$: battles = $activeCampaign?.battles; $: battles = $activeCampaign?.battles ?? [];
$: battle = battles && battles[params.battleId - 1]; $: battle = battles && battles[params.battleId - 1];
$: scenario = battle?.scenario; $: scenario = battle?.scenario;
$: status = battle?.status; $: status = battle?.status;
@ -122,10 +122,8 @@
$: character = battle?.character; $: character = battle?.character;
$: city = battle?.city; $: city = battle?.city;
$: console.log(battle);
let chapter = 1 + parseInt(params.battleId / 2); let chapter = 1 + parseInt(params.battleId / 2);
let chapterBattle = $: chapterBattle =
params.battleId >= 7 params.battleId >= 7
? params.battleId - 6 ? params.battleId - 6
: 1 + ((params.battleId - 1) % 2); : 1 + ((params.battleId - 1) % 2);