Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
97b7df2a75 | ||
| 06f27d6813 | |||
|
|
7c8cf6503b | ||
| f05f10ea56 | |||
|
|
43920b25f3 | ||
| 21db939d34 | |||
|
|
0b05cba25f | ||
| 14e001cae6 | |||
|
|
fc60234faf | ||
| b20ec0a363 | |||
|
|
027095f874 | ||
| df61db2730 | |||
|
|
8758f95fcd | ||
| ecb38510de | |||
|
|
e2f8dc23ab | ||
| 97a9f85758 |
40
CHANGELOG.md
@@ -63,3 +63,43 @@
|
|||||||
### Features
|
### Features
|
||||||
|
|
||||||
* FRO-17 Added Rule Component and changed Mainmenu structure ([#11](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/11)) ([adbe2be](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/adbe2be5345b95cd3bcd9deba936614b489268fd))
|
* FRO-17 Added Rule Component and changed Mainmenu structure ([#11](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/11)) ([adbe2be](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/adbe2be5345b95cd3bcd9deba936614b489268fd))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.4.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* FRO-20 Create scoreboard component ([#12](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/12)) ([97a9f85](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/97a9f857586eb41feb056d7af0a5d8553d2bcf80))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.5.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* FRO-21 Create Turn Component ([#13](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/13)) ([ecb3851](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/ecb38510de53b811eaaee2a39fc1ae423aed71c6))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.6.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **api:** FRO-14 Create Game ([#14](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/14)) ([df61db2](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/df61db2730b5e6b2796cbe58d1d224f1d5d6f085))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.7.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* FRO-23 Create Player Hand Component ([#15](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/15)) ([b20ec0a](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/b20ec0a3638649155f2f9c5984014d75eb2ba618))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.8.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **api:** FRO-15 Join Game ([#16](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/16)) ([14e001c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/14e001cae67592c5ea15786905aa3574df9a9e6c))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.9.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* FRO-24 Create Played Cards Component ([#17](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/17)) ([21db939](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/21db939d342c72f5ad5fad3b4f873e902d1e5a0f))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.10.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **ui:** FRO-13 User Component ([#18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/18)) ([f05f10e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/f05f10ea56b21f15cefbc76277ead5806eb1cf18))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.11.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* FRO-25 Create Game Info Component ([#19](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/19)) ([06f27d6](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/06f27d6813f625af25e734de3dcbcf07b10f3a1a))
|
||||||
|
|||||||
BIN
public/images/cards/1B.png
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
public/images/cards/1J.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
public/images/cards/2B.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
BIN
public/images/cards/2C.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
public/images/cards/2D.png
Normal file
|
After Width: | Height: | Size: 6.2 KiB |
BIN
public/images/cards/2H.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
BIN
public/images/cards/2J.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
public/images/cards/2S.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
public/images/cards/3C.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
public/images/cards/3D.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
public/images/cards/3H.png
Normal file
|
After Width: | Height: | Size: 7.6 KiB |
BIN
public/images/cards/3S.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
public/images/cards/4C.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
public/images/cards/4D.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
public/images/cards/4H.png
Normal file
|
After Width: | Height: | Size: 7.0 KiB |
BIN
public/images/cards/4S.png
Normal file
|
After Width: | Height: | Size: 8.6 KiB |
BIN
public/images/cards/5C.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
public/images/cards/5D.png
Normal file
|
After Width: | Height: | Size: 7.9 KiB |
BIN
public/images/cards/5H.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
public/images/cards/5S.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
public/images/cards/6C.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
public/images/cards/6D.png
Normal file
|
After Width: | Height: | Size: 8.6 KiB |
BIN
public/images/cards/6H.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
BIN
public/images/cards/6S.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
public/images/cards/7C.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
public/images/cards/7D.png
Normal file
|
After Width: | Height: | Size: 9.0 KiB |
BIN
public/images/cards/7H.png
Normal file
|
After Width: | Height: | Size: 9.6 KiB |
BIN
public/images/cards/7S.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
public/images/cards/8C.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
public/images/cards/8D.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
public/images/cards/8H.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
public/images/cards/8S.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
public/images/cards/9C.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
public/images/cards/9D.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
public/images/cards/9H.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
public/images/cards/9S.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
public/images/cards/AC.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
public/images/cards/ACB.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
public/images/cards/AD.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
BIN
public/images/cards/ADB.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
public/images/cards/AH.png
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
public/images/cards/AHB.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
public/images/cards/AS.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
public/images/cards/ASB.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
public/images/cards/JC.png
Normal file
|
After Width: | Height: | Size: 68 KiB |
BIN
public/images/cards/JD.png
Normal file
|
After Width: | Height: | Size: 72 KiB |
BIN
public/images/cards/JH.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
BIN
public/images/cards/JS.png
Normal file
|
After Width: | Height: | Size: 67 KiB |
BIN
public/images/cards/KC.png
Normal file
|
After Width: | Height: | Size: 60 KiB |
BIN
public/images/cards/KD.png
Normal file
|
After Width: | Height: | Size: 61 KiB |
BIN
public/images/cards/KH.png
Normal file
|
After Width: | Height: | Size: 68 KiB |
BIN
public/images/cards/KS.png
Normal file
|
After Width: | Height: | Size: 68 KiB |
BIN
public/images/cards/QC.png
Normal file
|
After Width: | Height: | Size: 64 KiB |
BIN
public/images/cards/QD.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
public/images/cards/QH.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
public/images/cards/QS.png
Normal file
|
After Width: | Height: | Size: 72 KiB |
BIN
public/images/cards/TC.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
public/images/cards/TD.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
public/images/cards/TH.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
public/images/cards/TS.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
81
src/components/User.vue
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { useUserInfo } from "@/composables/useUserInfo.ts";
|
||||||
|
import { useRouter } from 'vue-router';
|
||||||
|
import {useQuasar} from "quasar";
|
||||||
|
import axios from "axios";
|
||||||
|
|
||||||
|
const api = window?.__RUNTIME_CONFIG__?.API_URL;
|
||||||
|
const $q = useQuasar()
|
||||||
|
let userinfo = useUserInfo();
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
const handleLogoff = () => {
|
||||||
|
|
||||||
|
axios.post(`${api}/logout`, {}, {withCredentials: true}).then((response) => {
|
||||||
|
const responseData = response.data
|
||||||
|
console.log("Response" + responseData.status)
|
||||||
|
$q.notify({
|
||||||
|
message: `You successfully logged out!`,
|
||||||
|
color: 'green-6',
|
||||||
|
icon: 'check_circle',
|
||||||
|
position: 'top'
|
||||||
|
});
|
||||||
|
router.push({ name: 'login' });
|
||||||
|
}).catch((err) => {
|
||||||
|
console.log("ERROR:" + err)
|
||||||
|
$q.notify({
|
||||||
|
message: `Something went wrong`,
|
||||||
|
color: 'red-6',
|
||||||
|
icon: 'cancel',
|
||||||
|
position: 'top'
|
||||||
|
});
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="row items-center q-gutter-x-md">
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="userinfo.username"
|
||||||
|
class="text-body1 text-weight-medium row items-center q-gutter-x-sm cursor-pointer relative-position"
|
||||||
|
>
|
||||||
|
<div id="user-menu-target" class="row items-center q-gutter-x-sm" style="min-width: 150px">
|
||||||
|
<q-icon name="account_circle" size="md" />
|
||||||
|
<span>{{ userinfo.username }}</span>
|
||||||
|
<q-icon name="arrow_drop_down" size="sm" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<q-menu
|
||||||
|
target="#user-menu-target"
|
||||||
|
anchor="bottom right"
|
||||||
|
self="top right"
|
||||||
|
>
|
||||||
|
<q-list style="max-width: 150px" class="bg-dark">
|
||||||
|
<q-item
|
||||||
|
clickable
|
||||||
|
v-close-popup
|
||||||
|
@click="handleLogoff"
|
||||||
|
class="text-negative"
|
||||||
|
>
|
||||||
|
<q-item-section avatar>
|
||||||
|
<q-icon name="logout" color="negative" />
|
||||||
|
</q-item-section>
|
||||||
|
<q-item-section>Log Off</q-item-section>
|
||||||
|
</q-item>
|
||||||
|
</q-list>
|
||||||
|
</q-menu>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else class="text-caption text-grey-4">
|
||||||
|
Not Logged In
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<style scoped>
|
||||||
|
#user-menu-target:hover {
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
57
src/components/ingame/GameInfo.vue
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
<script lang="ts" setup>
|
||||||
|
import type {Card} from "@/types/GameSubTypes.ts";
|
||||||
|
import {computed, toRefs} from "vue";
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
trumpsuit: Card
|
||||||
|
firstCard: Card | null
|
||||||
|
}>()
|
||||||
|
const {trumpsuit, firstCard} = toRefs(props)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const trumpName = computed(() => {
|
||||||
|
switch (trumpsuit.value.path.charAt(trumpsuit.value.path.length - 1)) {
|
||||||
|
case 'S':
|
||||||
|
return 'Spades'
|
||||||
|
case 'H':
|
||||||
|
return 'Hearts'
|
||||||
|
case 'D':
|
||||||
|
return 'Diamonds'
|
||||||
|
case 'C':
|
||||||
|
return 'Clubs'
|
||||||
|
default:
|
||||||
|
return 'Unknown'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<div class="q-mb-sm">
|
||||||
|
<div class="text-h6 q-mb-xs q-font-medium">Trumpsuit</div>
|
||||||
|
<div id="trumpsuit" class="text-h5 text-primary">{{ trumpName }}</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="q-mt-md">
|
||||||
|
<div class="text-subtitle1 q-mb-xs q-font-medium">First Card</div>
|
||||||
|
<div id="first-card-container" class="q-pa-sm bg-grey-2 rounded shadow-2"
|
||||||
|
style="display:inline-block;">
|
||||||
|
<q-img v-if="firstCard" :src="firstCard.path" alt="First Card" class="firstbox"
|
||||||
|
style="width: 80px; border-radius: 6px;"/>
|
||||||
|
<div v-else class="q-pa-sm"
|
||||||
|
style="width: 80px; height: 120px; display:flex; align-items:center; justify-content:center; border-radius:6px; background: #ffffff; color: #666;">
|
||||||
|
No image
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.firstbox {
|
||||||
|
width: 80px;
|
||||||
|
border-radius: 6px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
110
src/components/ingame/Hand.vue
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
<script lang="ts" setup>
|
||||||
|
import {toRefs} from 'vue'
|
||||||
|
import type {Hand, Player} from "@/types/GameSubTypes.ts";
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
hand: Hand
|
||||||
|
isHandInactive?: boolean
|
||||||
|
self: Player | null
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'play-card', idx: number): void
|
||||||
|
(e: 'skip-dog'): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { hand, isHandInactive, self } = toRefs(props)
|
||||||
|
|
||||||
|
function handlePlayCard(idx: number | null) {
|
||||||
|
if (idx === null) return
|
||||||
|
if (isHandInactive?.value) return
|
||||||
|
emit('play-card', idx)
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSkipDogLife() {
|
||||||
|
emit('skip-dog')
|
||||||
|
}
|
||||||
|
|
||||||
|
function getCardImagePath(cardPath: string) {
|
||||||
|
if (!cardPath) return ''
|
||||||
|
if (cardPath.includes('://') || cardPath.startsWith('/')) return cardPath
|
||||||
|
return `/${cardPath}`
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="bottom-div hand-container">
|
||||||
|
<div id="card-slide" :class="'ingame-cards-slide ' + (isHandInactive ? 'inactive' : '' )">
|
||||||
|
<div class="cards-row">
|
||||||
|
<div v-for="card in hand.cards" :key="card.identifier" class="handcard">
|
||||||
|
<div class="card-btn" @click="handlePlayCard(card.idx)" aria-label="Play card">
|
||||||
|
<q-img :src="getCardImagePath(card.path)" :alt="card.identifier" class="card" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="self?.dogLife" class="dog-actions">
|
||||||
|
<q-btn color="negative" label="Skip Turn" @click="handleSkipDogLife" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.bottom-div {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
max-width: 1400px;
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
text-align: center;
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
.hand-container {
|
||||||
|
margin-left: 0;
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
.ingame-cards-slide {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
.cards-row {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
gap: 8px;
|
||||||
|
align-items: flex-end;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.handcard {
|
||||||
|
border-radius: 6px;
|
||||||
|
}
|
||||||
|
.card-btn {
|
||||||
|
padding: 0;
|
||||||
|
min-width: 0;
|
||||||
|
border-radius: 6px;
|
||||||
|
}
|
||||||
|
.inactive {
|
||||||
|
opacity: 0.6;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
.dog-actions {
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
.handcard :hover {
|
||||||
|
box-shadow: 3px 3px 3px #000000;
|
||||||
|
}
|
||||||
|
.card {
|
||||||
|
width:120px;
|
||||||
|
border-radius:6px
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-height: 500px) {
|
||||||
|
.card {
|
||||||
|
width: 80px;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
43
src/components/ingame/PlayedCards.vue
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
<script lang="ts" setup>
|
||||||
|
import {computed, defineProps, toRefs} from 'vue'
|
||||||
|
import type {Trick} from "@/types/GameSubTypes.ts";
|
||||||
|
const props = defineProps<{ trick: Trick }>()
|
||||||
|
|
||||||
|
const {trick } = toRefs(props)
|
||||||
|
|
||||||
|
const playedCards = computed(() => {
|
||||||
|
return [...trick.value.cards].map(card => {
|
||||||
|
return {
|
||||||
|
cardId: card[1].path,
|
||||||
|
player: card[0].name
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
function getCardImagePath(cardPath: string) {
|
||||||
|
if (!cardPath) return ''
|
||||||
|
if (cardPath.includes('://') || cardPath.startsWith('/')) return cardPath
|
||||||
|
return `/${cardPath}`
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="row items-center justify-center q-gutter-sm" id="trick-cards-content">
|
||||||
|
<div v-for="(play, index) in playedCards" :key="index" class="col-auto">
|
||||||
|
<q-card flat class="bg-transparent trick-card" style="width: 7rem; backdrop-filter: blur(4px);">
|
||||||
|
<q-card-section class="q-pa-sm q-pb-xs">
|
||||||
|
<q-img :src="getCardImagePath(play.cardId)" alt="card" style="border-radius: 6px; width:100%" />
|
||||||
|
</q-card-section>
|
||||||
|
<q-card-section class="q-pa-sm q-pt-xs text-center bg-transparent">
|
||||||
|
<div class="text-subtitle2 text-grey-7">{{ play.player }}</div>
|
||||||
|
</q-card-section>
|
||||||
|
</q-card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.trick-card {
|
||||||
|
box-shadow: 0 1px 6px rgba(0,0,0,0.08);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
69
src/components/ingame/Scoreboard.vue
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import type {Round} from "@/types/GameSubTypes.ts";
|
||||||
|
|
||||||
|
interface PlayerScore { name: string; tricks: number }
|
||||||
|
const props = defineProps<{ currentRound: Round }>()
|
||||||
|
const playerScores: PlayerScore[] = props.currentRound.playersIn.map(player => {
|
||||||
|
return {
|
||||||
|
name: player.name,
|
||||||
|
tricks: props.currentRound.trickList.filter(trick => {
|
||||||
|
return trick.winner?.id === player.id
|
||||||
|
}).length
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<q-card class="score-card q-mt-md" id="score-table-container">
|
||||||
|
<q-card-section class="row items-center q-px-md q-pt-md">
|
||||||
|
<div class="col">
|
||||||
|
<div class="text-h6 fw-bold">Tricks Won</div>
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
|
||||||
|
<q-separator />
|
||||||
|
|
||||||
|
<q-list dense class="q-pa-sm">
|
||||||
|
<q-item class="score-header">
|
||||||
|
<q-item-section style="width:50%">PLAYER</q-item-section>
|
||||||
|
<q-item-section side style="width:50%" class="text-right">TRICKS</q-item-section>
|
||||||
|
</q-item>
|
||||||
|
|
||||||
|
<q-separator inset />
|
||||||
|
|
||||||
|
<div v-if="playerScores.length">
|
||||||
|
<q-item v-for="player in playerScores" :key="player.name" class="score-row">
|
||||||
|
<q-item-section style="width:50%" class="text-truncate">{{ player.name }}</q-item-section>
|
||||||
|
<q-item-section side style="width:50%" class="text-right">{{ player.tricks }}</q-item-section>
|
||||||
|
</q-item>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else>
|
||||||
|
<q-item>
|
||||||
|
<q-item-section class="text-grey">No scores yet</q-item-section>
|
||||||
|
</q-item>
|
||||||
|
</div>
|
||||||
|
</q-list>
|
||||||
|
</q-card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.score-card {
|
||||||
|
background-color: rgba(255, 255, 255, 0.08);
|
||||||
|
border-radius: 8px;
|
||||||
|
backdrop-filter: blur(8px);
|
||||||
|
box-shadow: 0 4px 6px rgba(0,0,0,0.08);
|
||||||
|
}
|
||||||
|
|
||||||
|
.score-header {
|
||||||
|
font-weight: 700;
|
||||||
|
color: #000000;
|
||||||
|
border-bottom: 1px solid rgba(255,255,255,0.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
.score-row {
|
||||||
|
color: #000000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.text-right { text-align: right; }
|
||||||
|
</style>
|
||||||
38
src/components/ingame/Turn.vue
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
import type {PlayerQueue} from "@/types/GameSubTypes.ts";
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
queue: PlayerQueue
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const safeNextPlayers = computed(() => props.queue.players ?? [])
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<q-card flat class="turn-tracker-container q-pa-md">
|
||||||
|
<q-card-section>
|
||||||
|
<div class="text-subtitle2 q-mb-xs">Current Player</div>
|
||||||
|
<div id="current-player-name" class="text-h6 text-weight-bold text-positive">{{
|
||||||
|
props.queue.currentPlayer?.name
|
||||||
|
}}</div>
|
||||||
|
|
||||||
|
<div v-if="safeNextPlayers.length > 0" class="q-mt-md">
|
||||||
|
<div id="next-players-text" class="text-subtitle2 q-mb-xs">Next Players</div>
|
||||||
|
<q-list id="next-players-container" dense>
|
||||||
|
<q-item v-for="player in safeNextPlayers" :key="player.id">
|
||||||
|
<q-item-section>
|
||||||
|
<div class="text-body1 text-primary">{{ player.name }}</div>
|
||||||
|
</q-item-section>
|
||||||
|
</q-item>
|
||||||
|
</q-list>
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
</q-card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.turn-tracker-container {
|
||||||
|
max-width: 320px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -11,7 +11,7 @@ type Hand = {
|
|||||||
type Player = {
|
type Player = {
|
||||||
id: string
|
id: string
|
||||||
name: string
|
name: string
|
||||||
dogLife: string
|
dogLife: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
type PlayerQueue = {
|
type PlayerQueue = {
|
||||||
@@ -28,12 +28,13 @@ type PodiumPlayer = {
|
|||||||
|
|
||||||
type Round = {
|
type Round = {
|
||||||
trumpSuit: Card
|
trumpSuit: Card
|
||||||
|
playersIn: Player[]
|
||||||
firstRound: boolean
|
firstRound: boolean
|
||||||
trickList: Trick[]
|
trickList: Trick[]
|
||||||
}
|
}
|
||||||
|
|
||||||
type Trick = {
|
type Trick = {
|
||||||
cards: { [player: string]: Card }
|
cards: Map<Player, Card>
|
||||||
firstCard: Card | null
|
firstCard: Card | null
|
||||||
winner: Player | null
|
winner: Player | null
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,9 @@
|
|||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
|
import axios from "axios";
|
||||||
|
|
||||||
|
const api = window?.__RUNTIME_CONFIG__?.API_URL;
|
||||||
const lobbyName = ref('');
|
const lobbyName = ref('');
|
||||||
const isPublic = ref(false);
|
const isPublic = ref(false);
|
||||||
const playerAmount = ref(2);
|
const playerAmount = ref(2);
|
||||||
@@ -16,16 +18,21 @@ const createGameQuasar = async () => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
//TODO: Implement Logic to Create the Game and Redirect to Lobby
|
axios.post(`${api}/createGame`, {lobbyname: lobbyName.value, playeramount: playerAmount.value.toString()}, {withCredentials: true}).then((response) => {
|
||||||
await delay(3000)
|
const responseData = response.data
|
||||||
isLoading.value = false;
|
console.log("Response" + responseData.status)
|
||||||
$q.notify({
|
$q.notify({
|
||||||
message: `Lobby "${lobbyName.value}" erfolgreich erstellt!`,
|
message: `Lobby "${lobbyName.value}" erfolgreich erstellt mit gameId ${responseData.gameId}!`,
|
||||||
color: 'green-6',
|
color: 'green-6',
|
||||||
icon: 'check_circle',
|
icon: 'check_circle',
|
||||||
position: 'top'
|
position: 'top'
|
||||||
});
|
});
|
||||||
router.push({ name: 'mainmenu'});
|
router.push("/lobby")
|
||||||
|
}).catch((err) => {
|
||||||
|
console.log("ERROR:" + err)
|
||||||
|
}).finally(() =>
|
||||||
|
isLoading.value = false
|
||||||
|
)
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -2,27 +2,37 @@
|
|||||||
import {ref} from "vue";
|
import {ref} from "vue";
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import {useQuasar} from "quasar";
|
import {useQuasar} from "quasar";
|
||||||
|
import axios from "axios";
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const lobbyCode = ref('');
|
const lobbyCode = ref('');
|
||||||
const isLoading = ref(false);
|
const isLoading = ref(false);
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
|
const api = window?.__RUNTIME_CONFIG__?.API_URL;
|
||||||
const startGameQuasar = async() => {
|
const startGameQuasar = async() => {
|
||||||
if (!lobbyCode.value) {
|
if (!lobbyCode.value) {
|
||||||
$q.notify({ message: 'Lobby-Name wird benötigt', color: 'red', position: 'top', icon: 'cancel' });
|
$q.notify({ message: 'Lobby-Name wird benötigt', color: 'red', position: 'top', icon: 'cancel' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
//TODO: Implement Logic to Start the Game and Redirect to Ingame
|
axios.post(`${api}/joinGame`, {gameId: lobbyCode.value.toString()}, {withCredentials: true}).then(response => {
|
||||||
await delay(3000)
|
const responseData = response.data
|
||||||
isLoading.value = false;
|
|
||||||
$q.notify({
|
$q.notify({
|
||||||
message: `Lobby "${lobbyCode.value}" erfolgreich gefunden`,
|
message: `Lobby "${lobbyCode.value}" erfolgreich gefunden`,
|
||||||
color: 'green-6',
|
color: 'green-6',
|
||||||
icon: 'check_circle',
|
icon: 'check_circle',
|
||||||
position: 'top'
|
position: 'top'
|
||||||
});
|
});
|
||||||
router.push({ name: 'mainmenu'});
|
router.push("/lobby")
|
||||||
|
}).catch(() => {
|
||||||
|
$q.notify({
|
||||||
|
message: `Lobby "${lobbyCode.value}" nicht gefunden`,
|
||||||
|
color: 'red-6',
|
||||||
|
icon: 'cancel',
|
||||||
|
position: 'top'
|
||||||
|
})
|
||||||
|
}).finally(() =>
|
||||||
|
isLoading.value = false
|
||||||
|
)
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ const onSubmit = () => {
|
|||||||
loginError.value = ''
|
loginError.value = ''
|
||||||
axios.post(`${api}/login`, {username: username.value, password: password.value}, {withCredentials: true}).then((response) => {
|
axios.post(`${api}/login`, {username: username.value, password: password.value}, {withCredentials: true}).then((response) => {
|
||||||
uInfo.setUserInfo(response.data.user.username, response.data.user.id)
|
uInfo.setUserInfo(response.data.user.username, response.data.user.id)
|
||||||
router.push("/")
|
router.push("/mainmenu")
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
loginError.value = 'Invalid username or password'
|
loginError.value = 'Invalid username or password'
|
||||||
}).finally(() =>
|
}).finally(() =>
|
||||||
|
|||||||
@@ -1,14 +1,20 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import MainMenuBoxes from "@/components/MainMenuBoxes.vue";
|
import UserStatusArea from '../components/User.vue'
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<q-layout view="hHh lpR fFf" class="font-roboto">
|
<q-layout view="hHh lpR fFf" class="font-roboto">
|
||||||
<q-page-container>
|
<q-header elevated class="bg-dark text-white">
|
||||||
<q-page class="flex justify-start items-center column">
|
<q-toolbar>
|
||||||
|
<q-toolbar-title class="q-ml-md">
|
||||||
|
</q-toolbar-title>
|
||||||
|
|
||||||
<header class="text-center q-mb-xl">
|
<UserStatusArea />
|
||||||
<h1 class="game-title text-white q-my-none">
|
</q-toolbar>
|
||||||
|
</q-header>
|
||||||
|
|
||||||
|
<q-page-container>
|
||||||
|
<q-page class="flex justify-start items-center column q-pa-md"> <header class="text-center q-mb-xl q-mt-md"> <h1 class="game-title text-white q-my-none">
|
||||||
KnockOutWhist
|
KnockOutWhist
|
||||||
</h1>
|
</h1>
|
||||||
</header>
|
</header>
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=0
|
MAJOR=0
|
||||||
MINOR=4
|
MINOR=12
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||