feat: store game state in Pinia

This commit is contained in:
Settel 2022-08-06 13:06:51 +02:00
parent cc136c4c2c
commit fd6cfbc910
5 changed files with 84 additions and 16 deletions

View File

@ -1,11 +1,19 @@
<template> <template>
<div v-if="userInfo" class="topbar__container"> <div v-if="user.name" class="topbar__container">
<div class="topbar__username"> <div class="topbar__username">
{{ userInfo.name }} {{ user.name }}
</div> </div>
<div class="topbar__separator" /> <div class="topbar__separator" />
<div class="topbar__actionbar"> <div class="topbar__actionbar">
{{ userInfo.role }} <div v-if="user.isAdmin" class="topbar__actionbar__admin">
Admin
</div>
<div v-if="user.isGamemaster" class="topbar__actionbar__gamemaster">
Collect Quotes | Start | Continue | Idle | Finish
</div>
<div v-else class="topbar__actionbar__user">
{{ game.name }}
</div>
</div> </div>
<div class="topbar__separator" /> <div class="topbar__separator" />
<div class="topbar__logout-button-container"> <div class="topbar__logout-button-container">
@ -18,8 +26,10 @@
import { useRouter } from '#app' import { useRouter } from '#app'
import useAuth from '@/composables/useAuth'; import useAuth from '@/composables/useAuth';
import { useUserinfoStore } from "@/stores/UserinfoStore" import { useUserinfoStore } from "@/stores/UserinfoStore"
import { useGameinfoStore } from "@/stores/GameinfoStore"
const { userInfo } = useUserinfoStore() const user = useUserinfoStore()
const game = useGameinfoStore()
const actionLogout = async () => { const actionLogout = async () => {
await useAuth().logout() await useAuth().logout()

View File

@ -1,4 +1,5 @@
import { useUserinfoStore } from "@/stores/UserinfoStore" import { useUserinfoStore } from "@/stores/UserinfoStore"
import { useGameinfoStore } from "@/stores/GameinfoStore"
export async function fetchUpdate() { export async function fetchUpdate() {
if (this.shouldStop || !this.isActive) { if (this.shouldStop || !this.isActive) {
@ -21,10 +22,12 @@ export async function fetchUpdate() {
throw Error('unexpected response from /api/sync') throw Error('unexpected response from /api/sync')
} }
// TODO: parse answer
this.version = parseInt(response.version) this.version = parseInt(response.version)
this.isConnected.value = true this.isConnected.value = true
this.retry.value = 0 this.retry.value = 0
const gameInfoStore = useGameinfoStore()
gameInfoStore.setGameinfo(response.game)
// apply rate limit // apply rate limit
const now = new Date() const now = new Date()

View File

@ -5,7 +5,13 @@
connection to server broken connection to server broken
<div v-if="retry >= 0">retrying {{'...'.slice(0, retry % 4)}}</div> <div v-if="retry >= 0">retrying {{'...'.slice(0, retry % 4)}}</div>
</AlertBox> </AlertBox>
wohoo! <p>wohoo!</p>
<p>
{{game.id}}<br />
{{game.name}}<br />
{{game.state}}<br />
{{game.phase}}<br />
</p>
</div> </div>
</template> </template>
@ -14,7 +20,9 @@ import { navigateTo } from '#app'
import useAuth from '@/composables/useAuth'; import useAuth from '@/composables/useAuth';
import useEngine from '@/composables/useEngine'; import useEngine from '@/composables/useEngine';
import { onMounted, onBeforeUnmount } from 'vue'; import { onMounted, onBeforeUnmount } from 'vue';
import { useGameinfoStore } from "@/stores/GameinfoStore"
// ensure user is authenticated
const { authenticateAndLoadUserInfo } = useAuth() const { authenticateAndLoadUserInfo } = useAuth()
try { try {
await authenticateAndLoadUserInfo() await authenticateAndLoadUserInfo()
@ -25,6 +33,8 @@ try {
const { start: startEngine, stop: stopEngine, isConnected, retry } = useEngine() const { start: startEngine, stop: stopEngine, isConnected, retry } = useEngine()
onMounted(() => startEngine()) onMounted(() => startEngine())
onBeforeUnmount(() => stopEngine()) onBeforeUnmount(() => stopEngine())
const game = useGameinfoStore()
</script> </script>
<style lang="scss"> <style lang="scss">

View File

@ -0,0 +1,32 @@
import { defineStore } from 'pinia'
export type Gameinfo = {
id: string
name: string
state: string
phase: string
}
export const useGameinfoStore = defineStore('GameinfoStore', {
state: () => {
return {
gameInfo: {
id: '',
name: '',
state: '',
phase: '',
} as Gameinfo,
}
},
getters: {
id: (state): string => state.gameInfo.id,
name: (state): string => state.gameInfo.name,
state: (state): string => state.gameInfo.state,
phase: (state): string => state.gameInfo.phase,
},
actions: {
setGameinfo(gameInfo: unknown): void {
this.gameInfo = gameInfo
},
},
})

View File

@ -1,21 +1,34 @@
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
export type Userinfo = {
id: string
name: string
role: '' | 'player' | 'gamemaster' | 'admin'
game: string
lang: 'de' | 'en'
isCameo: string
}
export const useUserinfoStore = defineStore('UserinfoStore', { export const useUserinfoStore = defineStore('UserinfoStore', {
state: () => { state: () => {
return { return {
userInfo: null, userInfo: {
id: '',
name: '',
role: '',
game: '',
lang: 'en',
isCameo: '',
} as Userinfo,
} }
}, },
getters: { getters: {
isAdmin(): boolean { id: (state): string => state.userInfo.id,
return this.userInfo && this.userInfo.role === 'admin' name: (state): string => state.userInfo.name,
}, lang: (state): string => state.userInfo.lang,
isGamemaster(): boolean { isAdmin: (state): boolean => state.userInfo.role === 'admin',
return this.userInfo && ( this.userInfo.role === 'gamemaster' || this.userInfo.role === 'admin' ) isGamemaster: (state): boolean => state.userInfo.role === 'gamemaster',
}, gameId: (state): string => state.userInfo.game,
gameId(): string | null {
return this.userInfo?.game
},
}, },
actions: { actions: {
setUserInfo(userInfo: unknown): void { setUserInfo(userInfo: unknown): void {