Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4f04cf7dfe | ||
| adbe2be534 | |||
|
|
b2f56bcd6f | ||
| 458230622b | |||
| 946550f0ab | |||
|
|
3aceb48057 | ||
| eac315bea1 |
19
CHANGELOG.md
19
CHANGELOG.md
@@ -44,3 +44,22 @@
|
|||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* FRO-29 Websocket Communication ([#7](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/7)) ([64d528b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/64d528bf5c8b5d4f0d31274d600b3f05b8c47740))
|
* FRO-29 Websocket Communication ([#7](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/7)) ([64d528b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/64d528bf5c8b5d4f0d31274d600b3f05b8c47740))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.2.1...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* FRO-2 Implement Login Component ([#8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/8)) ([eac315b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/eac315bea1a2075858648bbc49c200b8020e1ff7))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.3.0...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* removed defaults ([#9](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/9)) ([946550f](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/946550f0ab141a8352f94b6c4ab5fa53cb81c53b))
|
||||||
|
|
||||||
|
### Reverts
|
||||||
|
|
||||||
|
* deleted MainMenuBoxes.vue ([#10](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/10)) ([4582306](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/458230622bcf0a5d6f5fe5cec028ab46651b6760))
|
||||||
|
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.3.1...0.0.0) (2025-12-10)
|
||||||
|
|
||||||
|
### 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))
|
||||||
|
|||||||
4
public/env.js
Normal file
4
public/env.js
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
window.__RUNTIME_CONFIG__ = {
|
||||||
|
API_URL: "http://localhost:9000"
|
||||||
|
};
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
globalThis.__RUNTIME_CONFIG__ = {
|
window.__RUNTIME_CONFIG__ = {
|
||||||
API_URL: "${API_URL}"
|
API_URL: "${API_URL}"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 276 B |
21
src/components/DefaultMenu.vue
Normal file
21
src/components/DefaultMenu.vue
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
import MainMenuBoxes from "@/components/MainMenuBoxes.vue";
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<header class="text-center q-mb-xl">
|
||||||
|
<p
|
||||||
|
class="text-h5 text-grey-4 q-mt-md"
|
||||||
|
style="max-width: 900px; margin-left: auto; margin-right: auto;"
|
||||||
|
>
|
||||||
|
Welcome to KnockOutWhist! In this game you have to "knock-out" your opponents until you are the last player standing.
|
||||||
|
Do you have what it takes to be crowned the champion?
|
||||||
|
</p>
|
||||||
|
</header>
|
||||||
|
<MainMenuBoxes />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
<script setup lang="ts">
|
|
||||||
defineProps<{
|
|
||||||
msg: string
|
|
||||||
}>()
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="greetings">
|
|
||||||
<h1 class="green">{{ msg }}</h1>
|
|
||||||
<h3>
|
|
||||||
You’ve successfully created a project with
|
|
||||||
<a href="https://vite.dev/" target="_blank" rel="noopener">Vite</a> +
|
|
||||||
<a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a>. What's next?
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
h1 {
|
|
||||||
font-weight: 500;
|
|
||||||
font-size: 2.6rem;
|
|
||||||
position: relative;
|
|
||||||
top: -10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.greetings h1,
|
|
||||||
.greetings h3 {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 1024px) {
|
|
||||||
.greetings h1,
|
|
||||||
.greetings h3 {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -23,6 +23,13 @@ const menuItems = [
|
|||||||
icon: 'settings',
|
icon: 'settings',
|
||||||
routeName: 'settings',
|
routeName: 'settings',
|
||||||
color: 'grey-8'
|
color: 'grey-8'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Rules',
|
||||||
|
description: 'Look at the rules to have a clear understanding for playing the game.',
|
||||||
|
icon: 'settings',
|
||||||
|
routeName: 'rules-Game',
|
||||||
|
color: 'grey-8'
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
107
src/components/Rules.vue
Normal file
107
src/components/Rules.vue
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="q-pa-md row justify-center">
|
||||||
|
<div style="width: 100%; max-width: 980px; min-width: 980px;">
|
||||||
|
|
||||||
|
<q-card class="rules-card bg-grey-10 text-white shadow-10">
|
||||||
|
|
||||||
|
<q-card-section class="text-center bg-grey-9 q-py-md">
|
||||||
|
<div class="text-h5 text-weight-bold rules-title">
|
||||||
|
<q-icon name="menu_book" class="q-mr-sm" /> Game Rules Overview
|
||||||
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
|
||||||
|
<q-card-section class="q-pa-none">
|
||||||
|
|
||||||
|
<q-list class="rules-list">
|
||||||
|
|
||||||
|
<QExpansionItem
|
||||||
|
icon="groups"
|
||||||
|
label="Players"
|
||||||
|
header-class="text-weight-bold bg-grey-8"
|
||||||
|
>
|
||||||
|
<q-card-section>
|
||||||
|
Two to seven players. The aim is to be the last player left in the game.
|
||||||
|
</q-card-section>
|
||||||
|
</QExpansionItem>
|
||||||
|
|
||||||
|
<QExpansionItem
|
||||||
|
icon="style"
|
||||||
|
label="Equipment & Card Ranks"
|
||||||
|
header-class="text-weight-bold bg-grey-8"
|
||||||
|
>
|
||||||
|
<q-card-section>
|
||||||
|
<p>A standard 52-card pack is used.</p>
|
||||||
|
<p>In each suit, cards rank from highest to lowest: **A K Q J 10 9 8 7 6 5 4 3 2**.</p>
|
||||||
|
</q-card-section>
|
||||||
|
</QExpansionItem>
|
||||||
|
|
||||||
|
<QExpansionItem
|
||||||
|
icon="casino"
|
||||||
|
label="Deal and Trumps"
|
||||||
|
header-class="text-weight-bold bg-grey-8"
|
||||||
|
>
|
||||||
|
<q-card-section>
|
||||||
|
<div class="text-subtitle1 text-primary q-mb-sm">First Hand (Deal)</div>
|
||||||
|
<p>The dealer deals seven cards to each player. One card is turned up to determine the trump suit for the round.</p>
|
||||||
|
<q-separator inset dark class="q-my-sm"/>
|
||||||
|
<div class="text-subtitle1 text-primary q-mb-sm">Subsequent Hands (Deal)</div>
|
||||||
|
<p>The deal rotates clockwise. The player who took the most tricks in the previous hand selects the trump suit. If there's a tie, players cut cards to decide who calls trumps. **One fewer card is dealt in each successive hand until the final hand consists of one card each.**</p>
|
||||||
|
</q-card-section>
|
||||||
|
</QExpansionItem>
|
||||||
|
|
||||||
|
<QExpansionItem
|
||||||
|
icon="play_circle_outline"
|
||||||
|
label="Play & Winning a Trick"
|
||||||
|
header-class="text-weight-bold bg-grey-8"
|
||||||
|
>
|
||||||
|
<q-card-section>
|
||||||
|
<div class="text-subtitle1 text-primary q-mb-sm">Play</div>
|
||||||
|
<p>The player to the dealer's left (eldest hand) leads the first trick. Any card can be led. Other players must follow suit if possible. A player with no cards of the suit led may play any card.</p>
|
||||||
|
|
||||||
|
<div class="text-subtitle1 text-primary q-my-sm">Winning a Trick</div>
|
||||||
|
<p>The highest card of the suit led wins, **unless** a trump is played, in which case the highest trump wins. The winner of the trick leads the next.</p>
|
||||||
|
|
||||||
|
<div class="text-subtitle1 text-primary q-my-sm">Leading Trumps</div>
|
||||||
|
<p>Some rules disallow leading trumps before the suit has been 'broken' (a trump has been played to the lead of another suit). Leading trumps is always permissible if a player holds only trumps.</p>
|
||||||
|
</q-card-section>
|
||||||
|
</QExpansionItem>
|
||||||
|
|
||||||
|
<QExpansionItem
|
||||||
|
icon="flare"
|
||||||
|
label="Knockout & Dog's Life (Special Rules)"
|
||||||
|
header-class="text-weight-bold bg-red-9"
|
||||||
|
>
|
||||||
|
<q-card-section>
|
||||||
|
<div class="text-subtitle1 text-red-4 q-mb-sm">Knockout</div>
|
||||||
|
<p>At the end of each hand, any player who took no tricks is knocked out and takes no further part in the game.</p>
|
||||||
|
|
||||||
|
<div class="text-subtitle1 text-red-4 q-my-sm">Winning the Game</div>
|
||||||
|
<p>The game is won when a player takes all the tricks in a round, as all other players are knocked out, leaving only one player remaining.</p>
|
||||||
|
|
||||||
|
<q-separator inset dark class="q-my-sm"/>
|
||||||
|
|
||||||
|
<div class="text-subtitle1 text-red-4 q-my-sm">Dog's Life (Optional)</div>
|
||||||
|
<p>The first player who takes no tricks is awarded a "dog's life". In the next hand, that player is dealt one card and can decide which trick to play it to. Each time a trick is played the dog may either play the card or knock on the table and wait to play it later. If the dog wins a trick, the player to the left leads the next and the dog re-enters the game properly in the next hand. If the dog fails, they are knocked out.</p>
|
||||||
|
</q-card-section>
|
||||||
|
</QExpansionItem>
|
||||||
|
|
||||||
|
</q-list>
|
||||||
|
</q-card-section>
|
||||||
|
</q-card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.rules-card {
|
||||||
|
width: 100%;
|
||||||
|
border: 2px solid #5a5a5a;
|
||||||
|
}
|
||||||
|
.rules-list .q-item {
|
||||||
|
border-bottom: 1px solid #333;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
<script setup lang="ts">
|
|
||||||
import WelcomeItem from './WelcomeItem.vue'
|
|
||||||
import DocumentationIcon from './icons/IconDocumentation.vue'
|
|
||||||
import ToolingIcon from './icons/IconTooling.vue'
|
|
||||||
import EcosystemIcon from './icons/IconEcosystem.vue'
|
|
||||||
import CommunityIcon from './icons/IconCommunity.vue'
|
|
||||||
import SupportIcon from './icons/IconSupport.vue'
|
|
||||||
|
|
||||||
const openReadmeInEditor = () => fetch('/__open-in-editor?file=README.md')
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<WelcomeItem>
|
|
||||||
<template #icon>
|
|
||||||
<DocumentationIcon />
|
|
||||||
</template>
|
|
||||||
<template #heading>Documentation</template>
|
|
||||||
|
|
||||||
Vue’s
|
|
||||||
<a href="https://vuejs.org/" target="_blank" rel="noopener">official documentation</a>
|
|
||||||
provides you with all information you need to get started.
|
|
||||||
</WelcomeItem>
|
|
||||||
|
|
||||||
<WelcomeItem>
|
|
||||||
<template #icon>
|
|
||||||
<ToolingIcon />
|
|
||||||
</template>
|
|
||||||
<template #heading>Tooling</template>
|
|
||||||
|
|
||||||
This project is served and bundled with
|
|
||||||
<a href="https://vite.dev/guide/features.html" target="_blank" rel="noopener">Vite</a>. The
|
|
||||||
recommended IDE setup is
|
|
||||||
<a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a>
|
|
||||||
+
|
|
||||||
<a href="https://github.com/vuejs/language-tools" target="_blank" rel="noopener"
|
|
||||||
>Vue - Official</a
|
|
||||||
>. If you need to test your components and web pages, check out
|
|
||||||
<a href="https://vitest.dev/" target="_blank" rel="noopener">Vitest</a>
|
|
||||||
and
|
|
||||||
<a href="https://www.cypress.io/" target="_blank" rel="noopener">Cypress</a>
|
|
||||||
/
|
|
||||||
<a href="https://playwright.dev/" target="_blank" rel="noopener">Playwright</a>.
|
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
More instructions are available in
|
|
||||||
<a href="javascript:void(0)" @click="openReadmeInEditor"><code>README.md</code></a
|
|
||||||
>.
|
|
||||||
</WelcomeItem>
|
|
||||||
|
|
||||||
<WelcomeItem>
|
|
||||||
<template #icon>
|
|
||||||
<EcosystemIcon />
|
|
||||||
</template>
|
|
||||||
<template #heading>Ecosystem</template>
|
|
||||||
|
|
||||||
Get official tools and libraries for your project:
|
|
||||||
<a href="https://pinia.vuejs.org/" target="_blank" rel="noopener">Pinia</a>,
|
|
||||||
<a href="https://router.vuejs.org/" target="_blank" rel="noopener">Vue Router</a>,
|
|
||||||
<a href="https://test-utils.vuejs.org/" target="_blank" rel="noopener">Vue Test Utils</a>, and
|
|
||||||
<a href="https://github.com/vuejs/devtools" target="_blank" rel="noopener">Vue Dev Tools</a>. If
|
|
||||||
you need more resources, we suggest paying
|
|
||||||
<a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">Awesome Vue</a>
|
|
||||||
a visit.
|
|
||||||
</WelcomeItem>
|
|
||||||
|
|
||||||
<WelcomeItem>
|
|
||||||
<template #icon>
|
|
||||||
<CommunityIcon />
|
|
||||||
</template>
|
|
||||||
<template #heading>Community</template>
|
|
||||||
|
|
||||||
Got stuck? Ask your question on
|
|
||||||
<a href="https://chat.vuejs.org" target="_blank" rel="noopener">Vue Land</a>
|
|
||||||
(our official Discord server), or
|
|
||||||
<a href="https://stackoverflow.com/questions/tagged/vue.js" target="_blank" rel="noopener"
|
|
||||||
>StackOverflow</a
|
|
||||||
>. You should also follow the official
|
|
||||||
<a href="https://bsky.app/profile/vuejs.org" target="_blank" rel="noopener">@vuejs.org</a>
|
|
||||||
Bluesky account or the
|
|
||||||
<a href="https://x.com/vuejs" target="_blank" rel="noopener">@vuejs</a>
|
|
||||||
X account for latest news in the Vue world.
|
|
||||||
</WelcomeItem>
|
|
||||||
|
|
||||||
<WelcomeItem>
|
|
||||||
<template #icon>
|
|
||||||
<SupportIcon />
|
|
||||||
</template>
|
|
||||||
<template #heading>Support Vue</template>
|
|
||||||
|
|
||||||
As an independent project, Vue relies on community backing for its sustainability. You can help
|
|
||||||
us by
|
|
||||||
<a href="https://vuejs.org/sponsor/" target="_blank" rel="noopener">becoming a sponsor</a>.
|
|
||||||
</WelcomeItem>
|
|
||||||
</template>
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="item">
|
|
||||||
<i>
|
|
||||||
<slot name="icon"></slot>
|
|
||||||
</i>
|
|
||||||
<div class="details">
|
|
||||||
<h3>
|
|
||||||
<slot name="heading"></slot>
|
|
||||||
</h3>
|
|
||||||
<slot></slot>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.item {
|
|
||||||
margin-top: 2rem;
|
|
||||||
display: flex;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.details {
|
|
||||||
flex: 1;
|
|
||||||
margin-left: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
i {
|
|
||||||
display: flex;
|
|
||||||
place-items: center;
|
|
||||||
place-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
|
|
||||||
color: var(--color-text);
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
font-weight: 500;
|
|
||||||
margin-bottom: 0.4rem;
|
|
||||||
color: var(--color-heading);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 1024px) {
|
|
||||||
.item {
|
|
||||||
margin-top: 0;
|
|
||||||
padding: 0.4rem 0 1rem calc(var(--section-gap) / 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
i {
|
|
||||||
top: calc(50% - 25px);
|
|
||||||
left: -26px;
|
|
||||||
position: absolute;
|
|
||||||
border: 1px solid var(--color-border);
|
|
||||||
background: var(--color-background);
|
|
||||||
border-radius: 8px;
|
|
||||||
width: 50px;
|
|
||||||
height: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.item:before {
|
|
||||||
content: ' ';
|
|
||||||
border-left: 1px solid var(--color-border);
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
bottom: calc(50% + 25px);
|
|
||||||
height: calc(50% - 25px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.item:after {
|
|
||||||
content: ' ';
|
|
||||||
border-left: 1px solid var(--color-border);
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
top: calc(50% + 25px);
|
|
||||||
height: calc(50% - 25px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.item:first-of-type:before {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.item:last-of-type:after {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<template>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
|
|
||||||
<path
|
|
||||||
d="M15 4a1 1 0 1 0 0 2V4zm0 11v-1a1 1 0 0 0-1 1h1zm0 4l-.707.707A1 1 0 0 0 16 19h-1zm-4-4l.707-.707A1 1 0 0 0 11 14v1zm-4.707-1.293a1 1 0 0 0-1.414 1.414l1.414-1.414zm-.707.707l-.707-.707.707.707zM9 11v-1a1 1 0 0 0-.707.293L9 11zm-4 0h1a1 1 0 0 0-1-1v1zm0 4H4a1 1 0 0 0 1.707.707L5 15zm10-9h2V4h-2v2zm2 0a1 1 0 0 1 1 1h2a3 3 0 0 0-3-3v2zm1 1v6h2V7h-2zm0 6a1 1 0 0 1-1 1v2a3 3 0 0 0 3-3h-2zm-1 1h-2v2h2v-2zm-3 1v4h2v-4h-2zm1.707 3.293l-4-4-1.414 1.414 4 4 1.414-1.414zM11 14H7v2h4v-2zm-4 0c-.276 0-.525-.111-.707-.293l-1.414 1.414C5.42 15.663 6.172 16 7 16v-2zm-.707 1.121l3.414-3.414-1.414-1.414-3.414 3.414 1.414 1.414zM9 12h4v-2H9v2zm4 0a3 3 0 0 0 3-3h-2a1 1 0 0 1-1 1v2zm3-3V3h-2v6h2zm0-6a3 3 0 0 0-3-3v2a1 1 0 0 1 1 1h2zm-3-3H3v2h10V0zM3 0a3 3 0 0 0-3 3h2a1 1 0 0 1 1-1V0zM0 3v6h2V3H0zm0 6a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1H0zm3 3h2v-2H3v2zm1-1v4h2v-4H4zm1.707 4.707l.586-.586-1.414-1.414-.586.586 1.414 1.414z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</template>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<template>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" fill="currentColor">
|
|
||||||
<path
|
|
||||||
d="M11 2.253a1 1 0 1 0-2 0h2zm-2 13a1 1 0 1 0 2 0H9zm.447-12.167a1 1 0 1 0 1.107-1.666L9.447 3.086zM1 2.253L.447 1.42A1 1 0 0 0 0 2.253h1zm0 13H0a1 1 0 0 0 1.553.833L1 15.253zm8.447.833a1 1 0 1 0 1.107-1.666l-1.107 1.666zm0-14.666a1 1 0 1 0 1.107 1.666L9.447 1.42zM19 2.253h1a1 1 0 0 0-.447-.833L19 2.253zm0 13l-.553.833A1 1 0 0 0 20 15.253h-1zm-9.553-.833a1 1 0 1 0 1.107 1.666L9.447 14.42zM9 2.253v13h2v-13H9zm1.553-.833C9.203.523 7.42 0 5.5 0v2c1.572 0 2.961.431 3.947 1.086l1.107-1.666zM5.5 0C3.58 0 1.797.523.447 1.42l1.107 1.666C2.539 2.431 3.928 2 5.5 2V0zM0 2.253v13h2v-13H0zm1.553 13.833C2.539 15.431 3.928 15 5.5 15v-2c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM5.5 15c1.572 0 2.961.431 3.947 1.086l1.107-1.666C9.203 13.523 7.42 13 5.5 13v2zm5.053-11.914C11.539 2.431 12.928 2 14.5 2V0c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM14.5 2c1.573 0 2.961.431 3.947 1.086l1.107-1.666C18.203.523 16.421 0 14.5 0v2zm3.5.253v13h2v-13h-2zm1.553 12.167C18.203 13.523 16.421 13 14.5 13v2c1.573 0 2.961.431 3.947 1.086l1.107-1.666zM14.5 13c-1.92 0-3.703.523-5.053 1.42l1.107 1.666C11.539 15.431 12.928 15 14.5 15v-2z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</template>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<template>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" fill="currentColor">
|
|
||||||
<path
|
|
||||||
d="M11.447 8.894a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm0 1.789a1 1 0 1 0 .894-1.789l-.894 1.789zM7.447 7.106a1 1 0 1 0-.894 1.789l.894-1.789zM10 9a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0H8zm9.447-5.606a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm2 .789a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zM18 5a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0h-2zm-5.447-4.606a1 1 0 1 0 .894-1.789l-.894 1.789zM9 1l.447-.894a1 1 0 0 0-.894 0L9 1zm-2.447.106a1 1 0 1 0 .894 1.789l-.894-1.789zm-6 3a1 1 0 1 0 .894 1.789L.553 4.106zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zm-2-.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 2.789a1 1 0 1 0 .894-1.789l-.894 1.789zM2 5a1 1 0 1 0-2 0h2zM0 7.5a1 1 0 1 0 2 0H0zm8.553 12.394a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 1a1 1 0 1 0 .894 1.789l-.894-1.789zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zM8 19a1 1 0 1 0 2 0H8zm2-2.5a1 1 0 1 0-2 0h2zm-7.447.394a1 1 0 1 0 .894-1.789l-.894 1.789zM1 15H0a1 1 0 0 0 .553.894L1 15zm1-2.5a1 1 0 1 0-2 0h2zm12.553 2.606a1 1 0 1 0 .894 1.789l-.894-1.789zM17 15l.447.894A1 1 0 0 0 18 15h-1zm1-2.5a1 1 0 1 0-2 0h2zm-7.447-5.394l-2 1 .894 1.789 2-1-.894-1.789zm-1.106 1l-2-1-.894 1.789 2 1 .894-1.789zM8 9v2.5h2V9H8zm8.553-4.894l-2 1 .894 1.789 2-1-.894-1.789zm.894 0l-2-1-.894 1.789 2 1 .894-1.789zM16 5v2.5h2V5h-2zm-4.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zm-2.894-1l-2 1 .894 1.789 2-1L8.553.106zM1.447 5.894l2-1-.894-1.789-2 1 .894 1.789zm-.894 0l2 1 .894-1.789-2-1-.894 1.789zM0 5v2.5h2V5H0zm9.447 13.106l-2-1-.894 1.789 2 1 .894-1.789zm0 1.789l2-1-.894-1.789-2 1 .894 1.789zM10 19v-2.5H8V19h2zm-6.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zM2 15v-2.5H0V15h2zm13.447 1.894l2-1-.894-1.789-2 1 .894 1.789zM18 15v-2.5h-2V15h2z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</template>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<template>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
|
|
||||||
<path
|
|
||||||
d="M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.666.105 5.5 5.5 0 0 0-.114 7.665L10 18.78l8.39-8.4a5.5 5.5 0 0 0-.114-7.665 5.5 5.5 0 0 0-7.666-.105l-.61.61z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</template>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<!-- This icon is from <https://github.com/Templarian/MaterialDesign>, distributed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) license-->
|
|
||||||
<template>
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
aria-hidden="true"
|
|
||||||
role="img"
|
|
||||||
class="iconify iconify--mdi"
|
|
||||||
width="24"
|
|
||||||
height="24"
|
|
||||||
preserveAspectRatio="xMidYMid meet"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M20 18v-4h-3v1h-2v-1H9v1H7v-1H4v4h16M6.33 8l-1.74 4H7v-1h2v1h6v-1h2v1h2.41l-1.74-4H6.33M9 5v1h6V5H9m12.84 7.61c.1.22.16.48.16.8V18c0 .53-.21 1-.6 1.41c-.4.4-.85.59-1.4.59H4c-.55 0-1-.19-1.4-.59C2.21 19 2 18.53 2 18v-4.59c0-.32.06-.58.16-.8L4.5 7.22C4.84 6.41 5.45 6 6.33 6H7V5c0-.55.18-1 .57-1.41C7.96 3.2 8.44 3 9 3h6c.56 0 1.04.2 1.43.59c.39.41.57.86.57 1.41v1h.67c.88 0 1.49.41 1.83 1.22l2.34 5.39z"
|
|
||||||
fill="currentColor"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</template>
|
|
||||||
19
src/composables/useUserInfo.ts
Normal file
19
src/composables/useUserInfo.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { defineStore } from 'pinia'
|
||||||
|
import {ref, type Ref} from 'vue'
|
||||||
|
|
||||||
|
export const useUserInfo = defineStore('userInfo', () => {
|
||||||
|
const username: Ref<string | null> = ref(null);
|
||||||
|
const userId: Ref<number | null> = ref(null);
|
||||||
|
|
||||||
|
function setUserInfo(name: string, id: number) {
|
||||||
|
username.value = name;
|
||||||
|
userId.value = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearUserInfo() {
|
||||||
|
username.value = null;
|
||||||
|
userId.value = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { username, userId, setUserInfo, clearUserInfo };
|
||||||
|
});
|
||||||
20
src/main.ts
20
src/main.ts
@@ -5,23 +5,27 @@ import App from './App.vue'
|
|||||||
import router from './router'
|
import router from './router'
|
||||||
import Particles from "@tsparticles/vue3";
|
import Particles from "@tsparticles/vue3";
|
||||||
import { loadFull } from "tsparticles";
|
import { loadFull } from "tsparticles";
|
||||||
import { Quasar, Notify } from 'quasar'
|
import { Quasar, Notify, QExpansionItem } from 'quasar'
|
||||||
import '@quasar/extras/material-icons/material-icons.css'
|
import '@quasar/extras/material-icons/material-icons.css'
|
||||||
import 'quasar/dist/quasar.css'
|
import 'quasar/dist/quasar.css'
|
||||||
import { createPinia } from 'pinia'
|
import { createPinia } from 'pinia'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import VueAxios from 'vue-axios'
|
import VueAxios from 'vue-axios'
|
||||||
|
import {useUserInfo} from "@/composables/useUserInfo.ts";
|
||||||
|
|
||||||
const app = createApp(App)
|
const app = createApp(App)
|
||||||
const pinia = createPinia()
|
const pinia = createPinia()
|
||||||
|
|
||||||
|
app.use(pinia)
|
||||||
app.use(router)
|
app.use(router)
|
||||||
app.use(Quasar, {
|
app.use(Quasar, {
|
||||||
plugins: {
|
plugins: {
|
||||||
Notify
|
Notify
|
||||||
},
|
},
|
||||||
|
components: {
|
||||||
|
QExpansionItem
|
||||||
|
}
|
||||||
})
|
})
|
||||||
app.use(pinia)
|
|
||||||
app.use(VueAxios, axios)
|
app.use(VueAxios, axios)
|
||||||
app.use(Particles, {
|
app.use(Particles, {
|
||||||
init: async engine => {
|
init: async engine => {
|
||||||
@@ -29,4 +33,16 @@ app.use(Particles, {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
axios.interceptors.response.use(
|
||||||
|
res => res,
|
||||||
|
err => {
|
||||||
|
if (err.response?.status === 401) {
|
||||||
|
const info = useUserInfo();
|
||||||
|
info.clearUserInfo();
|
||||||
|
router.replace({name: 'login'});
|
||||||
|
}
|
||||||
|
return Promise.reject(err);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
app.mount('#app')
|
app.mount('#app')
|
||||||
|
|||||||
@@ -1,49 +1,75 @@
|
|||||||
import { createRouter, createWebHistory } from 'vue-router'
|
import { createRouter, createWebHistory } from 'vue-router'
|
||||||
import HomeView from '../views/HomeView.vue'
|
|
||||||
import LoginView from '../views/LoginView.vue'
|
import LoginView from '../views/LoginView.vue'
|
||||||
import MainMenuView from '../views/MainMenuView.vue'
|
import MainMenuView from '../views/MainMenuView.vue'
|
||||||
import createGameView from '../views/CreateGame.vue'
|
import createGameView from '../views/CreateGame.vue'
|
||||||
import joinGameView from "@/views/JoinGameView.vue";
|
import joinGameView from "@/views/JoinGameView.vue";
|
||||||
|
import defaultMenu from "../components/DefaultMenu.vue"
|
||||||
|
import axios from "axios";
|
||||||
|
import { useUserInfo } from "@/composables/useUserInfo";
|
||||||
|
import rulesView from "../components/Rules.vue";
|
||||||
|
|
||||||
|
const api = window?.__RUNTIME_CONFIG__?.API_URL;
|
||||||
|
|
||||||
const router = createRouter({
|
const router = createRouter({
|
||||||
history: createWebHistory(import.meta.env.BASE_URL),
|
history: createWebHistory(import.meta.env.BASE_URL),
|
||||||
routes: [
|
routes: [
|
||||||
{
|
{
|
||||||
path: '/',
|
path: '/mainmenu/',
|
||||||
name: 'home',
|
component: MainMenuView,
|
||||||
component: HomeView,
|
meta: { requiresAuth: true },
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
name: 'mainmenu',
|
||||||
|
component: defaultMenu,
|
||||||
|
meta: { requiresAuth: true }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'create',
|
||||||
|
name: 'create-Game',
|
||||||
|
component: createGameView,
|
||||||
|
meta: {requiresAuth: true }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'join',
|
||||||
|
name: 'join-Game',
|
||||||
|
component: joinGameView,
|
||||||
|
meta: {requiresAuth: true }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'rules',
|
||||||
|
name: 'rules-Game',
|
||||||
|
component: rulesView,
|
||||||
|
meta: {requiresAuth: true }
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/login',
|
path: '/login',
|
||||||
name: 'login',
|
name: 'login',
|
||||||
component: LoginView,
|
component: LoginView,
|
||||||
|
meta: { requiresAuth: false }
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: '/about',
|
|
||||||
name: 'about',
|
|
||||||
// route level code-splitting
|
|
||||||
// this generates a separate chunk (About.[hash].js) for this route
|
|
||||||
// which is lazy-loaded when the route is visited.
|
|
||||||
component: () => import('../views/AboutView.vue'),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/mainmenu',
|
|
||||||
name: 'mainmenu',
|
|
||||||
component: MainMenuView
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/create',
|
|
||||||
name: 'create-Game',
|
|
||||||
component: createGameView
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/join',
|
|
||||||
name: 'join-Game',
|
|
||||||
component: joinGameView
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
|
|
||||||
|
router.beforeEach(async (to, from, next) => {
|
||||||
|
const info = useUserInfo();
|
||||||
|
if (!to.meta.requiresAuth) return next();
|
||||||
|
try {
|
||||||
|
await axios.get(`${api}/userInfo`, { withCredentials: true }).then(
|
||||||
|
res => {
|
||||||
|
info.setUserInfo(res.data.username, res.data.userId);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
next();
|
||||||
|
} catch (err) {
|
||||||
|
info.clearUserInfo();
|
||||||
|
next('/login');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
export default router
|
export default router
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
import {type credentials, type token, type user} from '@/types/authTypes'
|
|
||||||
import { defineStore } from 'pinia'
|
|
||||||
import {ref, computed, type Ref} from 'vue'
|
|
||||||
|
|
||||||
export const useAuthStore = defineStore('auth', () => {
|
|
||||||
const user: Ref<user | null> = ref(null)
|
|
||||||
const token = ref(localStorage.getItem('token') || null)
|
|
||||||
|
|
||||||
const isAuthenticated = computed(() => !!token.value)
|
|
||||||
|
|
||||||
async function login(credentials: credentials) {
|
|
||||||
const response = await fakeLoginApi(credentials)
|
|
||||||
|
|
||||||
token.value = response.token
|
|
||||||
user.value = response.user
|
|
||||||
|
|
||||||
localStorage.setItem('token', token.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
function setToken(newToken: string) {
|
|
||||||
token.value = newToken
|
|
||||||
localStorage.setItem('token', newToken)
|
|
||||||
}
|
|
||||||
|
|
||||||
function logout() {
|
|
||||||
token.value = null
|
|
||||||
user.value = null
|
|
||||||
localStorage.removeItem('token')
|
|
||||||
}
|
|
||||||
|
|
||||||
async function fetchUser() {
|
|
||||||
if (!token.value) return
|
|
||||||
|
|
||||||
const response = await fakeFetchUserApi(token.value)
|
|
||||||
user.value = response.user
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
user,
|
|
||||||
token,
|
|
||||||
isAuthenticated,
|
|
||||||
login,
|
|
||||||
setToken,
|
|
||||||
logout,
|
|
||||||
fetchUser,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
async function fakeLoginApi(credentials: credentials): Promise<token> {
|
|
||||||
return {
|
|
||||||
token: 'abc123',
|
|
||||||
user: { id: 1, name: 'John Doe' }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function fakeFetchUserApi(token: string): Promise<{ user: user }> {
|
|
||||||
return {
|
|
||||||
user: { id: 1, name: 'John Doe' }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -45,3 +45,5 @@ type WonInfo = {
|
|||||||
winner: PodiumPlayer | null
|
winner: PodiumPlayer | null
|
||||||
allPlayers: PodiumPlayer[]
|
allPlayers: PodiumPlayer[]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type { GameInfo, LobbyInfo, TieInfo, TrumpInfo, WonInfo }
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
|
|
||||||
type token = {
|
|
||||||
token: string
|
|
||||||
user: user
|
|
||||||
}
|
|
||||||
type user = {
|
|
||||||
id: number
|
|
||||||
name: string
|
|
||||||
}
|
|
||||||
type credentials = {
|
|
||||||
username: string
|
|
||||||
password: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export type { token, user, credentials }
|
|
||||||
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="about">
|
|
||||||
<h1>This is an about page</h1>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
@media (min-width: 1024px) {
|
|
||||||
.about {
|
|
||||||
min-height: 100vh;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -30,24 +30,16 @@ const createGameQuasar = async () => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<q-layout>
|
<header class="text-center q-mb-xl">
|
||||||
<q-page-container>
|
<p
|
||||||
<q-page class="flex justify-start items-center column ">
|
class="text-h5 text-grey-4 q-mt-md"
|
||||||
<header class="text-center q-mb-xl">
|
style="max-width: 900px; margin-left: auto; margin-right: auto;"
|
||||||
<h1 class="game-title text-white q-my-none">
|
>
|
||||||
KnockOutWhist
|
Are you ready to play? Please select a lobbyname of your choice, the amount of players you want
|
||||||
</h1>
|
to play with and you are ready to go!
|
||||||
<p
|
</p>
|
||||||
class="text-h5 text-grey-4 q-mt-md"
|
</header>
|
||||||
style="max-width: 900px; margin-left: auto; margin-right: auto;"
|
|
||||||
>
|
|
||||||
Are you ready to play? Please select a lobbyname of your choice, the amount of players you want
|
|
||||||
to play with and you are ready to go!
|
|
||||||
</p>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<div class="q-pa-md" style="width: 100%; max-width: 400px;">
|
<div class="q-pa-md" style="width: 100%; max-width: 400px;">
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<q-input
|
<q-input
|
||||||
v-model="lobbyName"
|
v-model="lobbyName"
|
||||||
@@ -108,9 +100,6 @@ const createGameQuasar = async () => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</q-page>
|
|
||||||
</q-page-container>
|
|
||||||
</q-layout>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
<script setup lang="ts">
|
|
||||||
import TheWelcome from '../components/TheWelcome.vue'
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<main>
|
|
||||||
<TheWelcome />
|
|
||||||
</main>
|
|
||||||
</template>
|
|
||||||
@@ -27,13 +27,7 @@ const startGameQuasar = async() => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<q-layout>
|
|
||||||
<q-page-container>
|
|
||||||
<q-page class="flex justify-start items-center column ">
|
|
||||||
<header class="text-center q-mb-xl">
|
<header class="text-center q-mb-xl">
|
||||||
<h1 class="game-title text-white q-my-none">
|
|
||||||
KnockOutWhist
|
|
||||||
</h1>
|
|
||||||
<p
|
<p
|
||||||
class="text-h5 text-grey-4 q-mt-md"
|
class="text-h5 text-grey-4 q-mt-md"
|
||||||
style="max-width: 900px; margin-left: auto; margin-right: auto;"
|
style="max-width: 900px; margin-left: auto; margin-right: auto;"
|
||||||
@@ -70,9 +64,6 @@ const startGameQuasar = async() => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</q-page>
|
|
||||||
</q-page-container>
|
|
||||||
</q-layout>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
filled
|
filled
|
||||||
dark
|
dark
|
||||||
|
type="password"
|
||||||
label-color="white"
|
label-color="white"
|
||||||
color="white"
|
color="white"
|
||||||
v-model="password"
|
v-model="password"
|
||||||
@@ -60,8 +61,8 @@
|
|||||||
import { useQuasar } from 'quasar'
|
import { useQuasar } from 'quasar'
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import {useAuthStore} from "@/stores/auth.ts";
|
|
||||||
import router from "@/router";
|
import router from "@/router";
|
||||||
|
import {useUserInfo} from "@/composables/useUserInfo.ts";
|
||||||
|
|
||||||
const api = window?.__RUNTIME_CONFIG__?.API_URL;
|
const api = window?.__RUNTIME_CONFIG__?.API_URL;
|
||||||
|
|
||||||
@@ -71,14 +72,14 @@ const username = ref(null)
|
|||||||
const password = ref(null)
|
const password = ref(null)
|
||||||
const inProgress = ref(false)
|
const inProgress = ref(false)
|
||||||
const loginError = ref('')
|
const loginError = ref('')
|
||||||
|
const uInfo = useUserInfo()
|
||||||
|
|
||||||
const onSubmit = () => {
|
const onSubmit = () => {
|
||||||
if (inProgress.value) return
|
if (inProgress.value) return
|
||||||
inProgress.value = true
|
inProgress.value = true
|
||||||
loginError.value = ''
|
loginError.value = ''
|
||||||
axios.post(`${api}/login`, {username: username.value, password: password.value}).then(response => {
|
axios.post(`${api}/login`, {username: username.value, password: password.value}, {withCredentials: true}).then((response) => {
|
||||||
const auth = useAuthStore()
|
uInfo.setUserInfo(response.data.user.username, response.data.user.id)
|
||||||
auth.setToken(response.data.token)
|
|
||||||
router.push("/")
|
router.push("/")
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
loginError.value = 'Invalid username or password'
|
loginError.value = 'Invalid username or password'
|
||||||
@@ -107,11 +108,6 @@ const options = {
|
|||||||
},
|
},
|
||||||
"polygon": {
|
"polygon": {
|
||||||
"sides": 5
|
"sides": 5
|
||||||
},
|
|
||||||
"image": {
|
|
||||||
"src": "img/github.svg",
|
|
||||||
"width": 100,
|
|
||||||
"height": 100
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"opacity": {
|
"opacity": {
|
||||||
|
|||||||
@@ -11,17 +11,8 @@ import MainMenuBoxes from "@/components/MainMenuBoxes.vue";
|
|||||||
<h1 class="game-title text-white q-my-none">
|
<h1 class="game-title text-white q-my-none">
|
||||||
KnockOutWhist
|
KnockOutWhist
|
||||||
</h1>
|
</h1>
|
||||||
<p
|
|
||||||
class="text-h5 text-grey-4 q-mt-md"
|
|
||||||
style="max-width: 900px; margin-left: auto; margin-right: auto;"
|
|
||||||
>
|
|
||||||
Welcome to KnockOutWhist! In this game you have to "knock-out" your opponents until you are the last player standing.
|
|
||||||
Do you have what it takes to be crowned the champion?
|
|
||||||
</p>
|
|
||||||
</header>
|
</header>
|
||||||
|
<router-view></router-view>
|
||||||
<MainMenuBoxes />
|
|
||||||
|
|
||||||
</q-page>
|
</q-page>
|
||||||
</q-page-container>
|
</q-page-container>
|
||||||
</q-layout>
|
</q-layout>
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=0
|
MAJOR=0
|
||||||
MINOR=2
|
MINOR=4
|
||||||
PATCH=1
|
PATCH=0
|
||||||
|
|||||||
Reference in New Issue
Block a user