Merge branch 'can-go-straight-to-sub-page'

This commit is contained in:
Yanick Champoux 2023-01-14 15:28:42 -05:00
commit e223d64864
4 changed files with 11 additions and 11 deletions

View File

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

View File

@ -5,7 +5,7 @@ version: '3'
vars:
GREETING: Hello, World!
FILES:
sh: git diff-ls --diff-filter=d main | perl -pe's/\n/ /'
sh: git diff-ls --diff-filter=d main
tasks:
build: vite build
@ -18,8 +18,8 @@ tasks:
silent: true
lint:fix:
cmds:
- npx prettier --write {{.CLI_ARGS | default .FILES }}
# - npx eslint --fix --quiet {{.CLI_ARGS | default .FILES }}
- npx prettier --write {{.CLI_ARGS | default .FILES | catLines }}
- npx eslint --fix --quiet {{.CLI_ARGS | default .FILES | without '.eslintignore' | catLines }}
integrate:
cmds:
- git is-clean

View File

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

View File

@ -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">
@ -103,7 +103,6 @@
<script>
import { getContext } from 'svelte';
import Stars from '@ernane/svelte-star-rating';
export let params;
@ -113,7 +112,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 +121,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);