From 8b9d84c1b0af3737c7b4c858e4d13e0684d79bd9 Mon Sep 17 00:00:00 2001 From: sam cross Date: Sat, 27 Apr 2024 23:46:56 +0100 Subject: [PATCH 1/5] fix zoom test --- index.html | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index bacb3a9..5252842 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + tracker diff --git a/package.json b/package.json index 2975ce8..3eae70b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "vite", "build": "vue-tsc && vite build", - "preview": "vite preview" + "preview": "vite preview --host 0.0.0.0" }, "dependencies": { "@supabase/supabase-js": "^2.42.7", From 5775811ea04fc4efb76d1389254bfff5cbd81be4 Mon Sep 17 00:00:00 2001 From: sam cross Date: Sun, 28 Apr 2024 09:23:00 +0100 Subject: [PATCH 2/5] fix attack not loading if next player pressed --- src/components/Attack.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Attack.vue b/src/components/Attack.vue index dbf6e06..3c1d4b8 100644 --- a/src/components/Attack.vue +++ b/src/components/Attack.vue @@ -30,7 +30,7 @@ import { ref } from 'vue'; import { usePlayersStore } from '../stores/playersStore'; import Selector from './Selector.vue'; const playersStore = usePlayersStore(); -const activePlayer = playersStore.getActivePlayer(); + type PlayerAttack = { value: number, name: string, @@ -41,6 +41,8 @@ const combat = ref(0); const attack = ref<{[key:string]:PlayerAttack}>({}); const setup = () => { + const activePlayer = playersStore.getActivePlayer(); + Object.keys(playersStore.players).forEach(player => { if(player == activePlayer?.id) return; attack.value[player] = { @@ -52,6 +54,7 @@ const setup = () => { }); if(!activePlayer) return console.log('no active player'); + combat.value = activePlayer.combat; //@ts-ignore window.attackModal.showModal(); From adcf547d2bf8f6b050e14f84fe82017c52778475 Mon Sep 17 00:00:00 2001 From: sam cross Date: Sun, 28 Apr 2024 09:50:48 +0100 Subject: [PATCH 3/5] clean up maiage user screen --- src/components/addPlayer.vue | 115 ++++++++++++++++++++++++----------- 1 file changed, 78 insertions(+), 37 deletions(-) diff --git a/src/components/addPlayer.vue b/src/components/addPlayer.vue index 252ea2b..463d897 100644 --- a/src/components/addPlayer.vue +++ b/src/components/addPlayer.vue @@ -1,52 +1,93 @@ - - - From bc59ab7818a239c200b9c1fd8967c838857537ff Mon Sep 17 00:00:00 2001 From: sam cross Date: Sun, 28 Apr 2024 09:58:21 +0100 Subject: [PATCH 4/5] fix url render --- src/components/GameSettings.vue | 6 +++--- src/supabase.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/GameSettings.vue b/src/components/GameSettings.vue index 3969f85..f77be71 100644 --- a/src/components/GameSettings.vue +++ b/src/components/GameSettings.vue @@ -4,8 +4,8 @@

Scan the QR code to join the game

- -

{{value}}

+ +

{{value}}

@@ -20,5 +20,5 @@ diff --git a/src/supabase.ts b/src/supabase.ts index aeb683b..7a337c7 100644 --- a/src/supabase.ts +++ b/src/supabase.ts @@ -5,7 +5,7 @@ const supabaseKey = import.meta.env.VITE_SUPABASE_KEY export const supabase = createClient(supabaseUrl, supabaseKey) if(!window.location.hash) { - window.location.hash = Math.random().toString(36).substr(2, 9) + window.location.hash = Math.random().toString(36).substr(2, 8) } export const roomid = window.location.hash.substr(1); From eeae06196190c18e567c707530f91717f90f18cc Mon Sep 17 00:00:00 2001 From: sam cross Date: Sun, 28 Apr 2024 10:22:49 +0100 Subject: [PATCH 5/5] fix add player --- src/components/Attack.vue | 4 +++ src/components/GameSettings.vue | 2 +- src/components/Selector.vue | 8 +++++- src/components/addPlayer.vue | 45 ++++++++++----------------------- 4 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/components/Attack.vue b/src/components/Attack.vue index 3c1d4b8..187c81a 100644 --- a/src/components/Attack.vue +++ b/src/components/Attack.vue @@ -62,6 +62,7 @@ const setup = () => { } const decrement = (player:{value:number}) => { + const activePlayer = playersStore.getActivePlayer(); if(!activePlayer) return console.log('no active player'); if(combat.value == 0) return console.log('no more points'); if(player.value == 0) return console.log('not enough points'); @@ -69,6 +70,7 @@ const decrement = (player:{value:number}) => { combat.value -= 1; } const increment = (player:{value:number,start:number}) => { + const activePlayer = playersStore.getActivePlayer(); if(!activePlayer) return console.log('no active player'); if(combat.value+1 > activePlayer.combat) return console.log('not enough points'); if(player.value+1 > player.start) return console.log('not enough points'); @@ -77,6 +79,8 @@ const increment = (player:{value:number,start:number}) => { } const makeAttack = () => { + const activePlayer = playersStore.getActivePlayer(); + if(!activePlayer) return console.log('no active player'); Object.keys(attack.value).forEach(player => { playersStore.updatePlayer(player, 'authority', attack.value[player].value) diff --git a/src/components/GameSettings.vue b/src/components/GameSettings.vue index f77be71..97746d2 100644 --- a/src/components/GameSettings.vue +++ b/src/components/GameSettings.vue @@ -4,7 +4,7 @@

Scan the QR code to join the game

- +

{{value}}

diff --git a/src/components/Selector.vue b/src/components/Selector.vue index de2f79b..66fecce 100644 --- a/src/components/Selector.vue +++ b/src/components/Selector.vue @@ -1,7 +1,7 @@ @@ -13,6 +13,7 @@ const props = defineProps<{ value: number; color: string; + size?: string; increment: () => void; decrement: () => void; }>(); @@ -22,4 +23,9 @@ btnClass['btn-primary'] = props.color === 'primary'; btnClass['btn-error'] = props.color === 'error'; btnClass['btn-warning'] = props.color === 'warning'; + + btnClass['btn-xs'] = props.size === 'xs'; + btnClass['btn-sm'] = props.size === 'sm'; + btnClass['btn-lg'] = props.size === 'lg'; + diff --git a/src/components/addPlayer.vue b/src/components/addPlayer.vue index 463d897..43aaafa 100644 --- a/src/components/addPlayer.vue +++ b/src/components/addPlayer.vue @@ -6,40 +6,21 @@

Manage Players

- - - - - - - - - - - - + - @@ -52,7 +33,7 @@ v-model="name" type="text" placeholder="Name" - class="input input-bordered" + class="input input-bordered w-40" @keyup.enter="addPlayer" />
NameAuthorityCombatTradeActions
{{ player.name }} - - - + {{ player.name }} + - - - +