Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0b05cba25f | ||
| 14e001cae6 | |||
|
|
fc60234faf | ||
| b20ec0a363 |
10
CHANGELOG.md
@@ -78,3 +78,13 @@
|
|||||||
### Features
|
### 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))
|
* **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))
|
||||||
|
|||||||
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 |
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>
|
||||||
@@ -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 = {
|
||||||
|
|||||||
@@ -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("/lobby")
|
||||||
router.push({ name: 'mainmenu'});
|
}).catch(() => {
|
||||||
|
$q.notify({
|
||||||
|
message: `Lobby "${lobbyCode.value}" nicht gefunden`,
|
||||||
|
color: 'red-6',
|
||||||
|
icon: 'cancel',
|
||||||
|
position: 'top'
|
||||||
|
})
|
||||||
|
}).finally(() =>
|
||||||
|
isLoading.value = false
|
||||||
|
)
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=0
|
MAJOR=0
|
||||||
MINOR=7
|
MINOR=9
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||