Compare commits

..

4 Commits

Author SHA1 Message Date
TeamCity
65591ad392 ci: bump version to v0.24.0 2026-01-20 18:31:14 +00:00
cd950e9521 feat: Update docker-entrypoint.sh and vite.config.ts for improved runtime handling and API navigation 2026-01-20 19:28:50 +01:00
TeamCity
c2dfa0e701 ci: bump version to v0.23.1 2026-01-20 11:31:51 +00:00
d3709ed852 feat/auth (#29)
Reviewed-on: #29
Co-authored-by: Janis <janis.e.20@gmx.de>
Co-committed-by: Janis <janis.e.20@gmx.de>
2026-01-20 12:28:20 +01:00
14 changed files with 1008 additions and 400 deletions

View File

@@ -165,3 +165,9 @@
### Features
* **ui:** Tie selection ([#26](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/26)) ([6c914b1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/6c914b1421030897d47449087dd1694068e84436))
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.23.0...0.0.0) (2026-01-20)
## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.23.1...0.0.0) (2026-01-20)
### Features
* Update docker-entrypoint.sh and vite.config.ts for improved runtime handling and API navigation ([cd950e9](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/cd950e952117cebe0ec46a18fc5b2cf90b247766))

View File

@@ -15,6 +15,5 @@ else
echo "No runtime template found at $TEMPLATE_PATH, skipping"
fi
# Start nginx in foreground
exec nginx -g 'daemon off;'

View File

@@ -3,10 +3,7 @@ import { RouterView } from 'vue-router'
import { onMounted, onUnmounted, watch } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { useUserInfo } from "@/composables/useUserInfo";
import { useIngame } from "@/composables/useIngame";
import { storeToRefs } from "pinia";
import { useWebSocket } from "@/composables/useWebsocket";
import { useQuasar } from "quasar";
import {Dark } from "quasar";
const route = useRoute();
const router = useRouter();
@@ -22,15 +19,26 @@ const handleOnlineStatusChange = () => {
let interval: number | null = null;
onMounted(() => {
onMounted(async () => {
window.addEventListener('online', handleOnlineStatusChange);
// Initialize dark mode based on browser preference
Dark.set('auto');
// Immediately check user state on app load
if (navigator.onLine) {
await info.requestState();
if (!info.username && route.meta.requiresAuth) {
router.push({ name: '/' });
}
}
// Continuously check user state every 10 seconds
interval = window.setInterval(async () => {
if (navigator.onLine && route.name !== 'login' && route.name !== 'offline') {
if (navigator.onLine) {
await info.requestState();
if (!info.username && route.name !== 'login') {
router.push({ name: 'login' });
if (!info.username && route.meta.requiresAuth) {
router.push({ name: '/' });
}
}
}, 10000);
@@ -48,55 +56,6 @@ watch(() => info.gameId, (newGameId) => {
router.push({ name: 'game' });
}
});
const ig = useIngame()
const { isWsConnected } = storeToRefs(ig)
const wb = useWebSocket()
const $q = useQuasar();
watch(isWsConnected, (connected) => {
if (!connected && info.gameId && route.name === 'game') {
showReconnectDialog();
}
});
function showReconnectDialog() {
$q.dialog({
title: 'Connection Lost',
message: 'The connection to the game server was lost. Would you like to reconnect?',
persistent: true,
ok: {
label: 'Reconnect',
color: 'positive'
},
cancel: {
label: 'Quit',
color: 'negative'
}
}).onOk(() => {
reconnect();
}).onCancel(() => {
router.replace("/");
});
}
async function reconnect() {
try {
await wb.connect();
$q.notify({
message: 'Reconnected successfully!',
color: 'positive',
icon: 'check'
});
} catch (err) {
$q.notify({
message: 'Failed to reconnect. Please try again.',
color: 'negative',
icon: 'error'
});
showReconnectDialog();
}
}
</script>
<template>

View File

@@ -1,40 +1,68 @@
<script setup lang="ts">
import { useRouter } from 'vue-router';
import { useUserInfo } from '@/composables/useUserInfo';
import { useQuasar } from 'quasar';
const router = useRouter();
const userInfo = useUserInfo();
const $q = useQuasar();
const menuItems = [
{
title: 'Create game',
description: 'Create a new game and invite your friends to play with you.',
icon: 'add_circle_outline',
routeName: 'create-Game',
color: 'green-9'
color: 'green-9',
requiresAuth: true
},
{
title: 'Spiel beitreten',
description: 'Join a game by typing in the game identifier.',
icon: 'login',
routeName: 'join-Game',
color: 'blue-9'
color: 'blue-9',
requiresAuth: true
},
{
title: 'Settings',
description: 'This area is currently under construction.',
icon: 'settings',
routeName: 'settings',
color: 'grey-8'
color: 'grey-8',
requiresAuth: false
},
{
title: 'Rules',
description: 'Look at the rules to have a clear understanding for playing the game.',
icon: 'settings',
routeName: 'rules-Game',
color: 'grey-8'
routeName: 'rule-Game',
color: 'grey-8',
requiresAuth: false
}
];
const navigateTo = (routeName: string) => {
router.push({ name: routeName });
const navigateTo = (item: any) => {
if (item.requiresAuth && !userInfo.username) {
$q.dialog({
title: 'Authentication Required',
message: 'You need to be logged in to create or join a game. Would you like to log in or sign up?',
ok: {
label: 'Login',
color: 'primary'
},
cancel: {
label: 'Sign Up',
color: 'secondary'
}
}).onOk(() => {
router.push({ name: 'login' });
}).onCancel(() => {
router.push({ name: 'register' });
});
} else {
router.push({ name: item.routeName });
}
};
</script>
@@ -57,7 +85,7 @@ const navigateTo = (routeName: string) => {
<q-card
class="menu-card bg-dark text-white q-pa-sm cursor-pointer"
v-ripple
@click="navigateTo(item.routeName)"
@click="navigateTo(item)"
>
<q-card-section class="row items-center no-wrap">
<q-avatar

View File

@@ -68,8 +68,21 @@ const handleLogoff = () => {
</q-menu>
</div>
<div v-else class="text-caption text-grey-4">
Not Logged In
<div v-else class="row items-center q-gutter-x-sm">
<q-btn
flat
color="white"
label="Login"
@click="router.push({ name: 'login' })"
size="sm"
/>
<q-btn
outline
color="white"
label="Sign Up"
@click="router.push({ name: 'register' })"
size="sm"
/>
</div>
</div>

View File

@@ -1,4 +1,4 @@
import { ref, onMounted, onBeforeUnmount } from "vue";
import { ref, onMounted, onBeforeUnmount, watch } from "vue";
import {
connectWebSocket,
disconnectWebSocket,
@@ -8,6 +8,7 @@ import {
isWebSocketConnected,
setDefaultHandler,
} from "@/services/ws";
import { useIngame } from "@/composables/useIngame";
function defaultEventHandler<T = any>(data: (data: T) => void) {
setDefaultHandler(data);
@@ -16,15 +17,28 @@ function defaultEventHandler<T = any>(data: (data: T) => void) {
export function useWebSocket() {
const isConnected = ref(isWebSocketConnected());
const lastMessage = ref<any>(null);
const lastError = ref<string | null>(null);
// Get ingame store to sync connection state
const ig = useIngame();
// Watch the ingame store's connection state and keep this composable in sync
watch(() => ig.isWsConnected, (connected) => {
isConnected.value = connected;
});
// Also update this composable's state when connecting/disconnecting
const updateConnectionState = (connected: boolean) => {
isConnected.value = connected;
};
async function safeConnect(url?: string) {
return connectWebSocket(url)
.then(() => {
isConnected.value = true;
updateConnectionState(true);
})
.catch((err) => {
updateConnectionState(false);
lastError.value = err?.message ?? "Unknown WS error";
throw err;
});

View File

@@ -5,8 +5,9 @@ import App from './App.vue'
import router from './router'
import Particles from "@tsparticles/vue3";
import { loadFull } from "tsparticles";
import { Quasar, Notify, QExpansionItem } from 'quasar'
import {Quasar, Notify, QExpansionItem, Dialog, Dark} from 'quasar'
import '@quasar/extras/material-icons/material-icons.css'
import '@quasar/extras/bootstrap-icons/bootstrap-icons.css'
import 'quasar/dist/quasar.css'
import { createPinia } from 'pinia'
import axios from 'axios'
@@ -25,10 +26,9 @@ initWebSocket(ui);
app.use(router)
app.use(Quasar, {
plugins: {
Notify
},
components: {
QExpansionItem
Notify,
Dialog,
Dark
}
})
app.use(VueAxios, axios)

View File

@@ -19,13 +19,13 @@ const router = createRouter({
{
path: '/',
component: MainMenuView,
meta: { requiresAuth: true },
meta: { requiresAuth: false },
children: [
{
path: '',
name: 'mainmenu',
component: defaultMenu,
meta: { requiresAuth: true }
meta: { requiresAuth: false }
},
{
path: 'create',
@@ -43,7 +43,7 @@ const router = createRouter({
path: 'rules',
name: 'rules-Game',
component: rulesView,
meta: {requiresAuth: true }
meta: {requiresAuth: false }
},
],
},
@@ -83,19 +83,16 @@ const router = createRouter({
router.beforeEach(async (to, from, next) => {
const info = useUserInfo();
const isOnline = navigator.onLine;
if (to.name === 'offline') {
if (isOnline) {
try {
await info.requestState();
if (!info.username) {
info.clearUserInfo();
return next('/login');
}
return next({ name: 'mainmenu' });
} catch (err) {
info.clearUserInfo();
return next('/login');
@@ -104,28 +101,27 @@ router.beforeEach(async (to, from, next) => {
return next();
}
}
if (!isOnline) {
return next({ name: 'offline' });
}
if (!to.meta.requiresAuth) return next();
try {
await info.requestState();
if (!info.username) {
info.clearUserInfo();
return next('/login');
}
if (info.gameId && to.name !== 'game') {
return next({ name: 'game' });
}
next();
} catch (err) {
console.error("Routing Error", err);
info.clearUserInfo();
next('/login');
}
});

View File

@@ -25,7 +25,16 @@ ui.requestState().then(() => {
router.replace("/")
} else {
ig.requestGame(ui.gameId).then(() => {
wb.connect()
// Attempt to connect to WebSocket
wb.connect().catch((err) => {
console.error('[Game] Initial WebSocket connection failed:', err);
$q.notify({
message: 'Failed to connect to game server. Please try reconnecting.',
color: 'negative',
icon: 'error',
timeout: 5000
});
});
})
}
})

View File

@@ -1,95 +1,111 @@
<template>
<div class="login-box q-col-gutter-sm">
<div class="text-h3 text-center row">
<img src="/logo.png" alt="Logo" style="height: 60px; margin-right: 10px;" />
<div class="login-container">
<div class="login-box">
<div class="logo-section">
<div class="logo-container">
<img src="/logo.png" alt="Logo" class="logo" />
<div class="logo-text">KnockOut Whist</div>
</div>
</div>
<q-form @submit.prevent="onSubmit"
class="q-gutter-md row justify-center"
style="width: 100%">
<div class="row q-col-gutter-sm" style="width: 100%">
<div class="content-section">
<h1 class="title">Welcome Back</h1>
<q-form @submit.prevent="onSubmit" class="form-section">
<q-input
style="width: 100%"
filled
dark
label-color="white"
color="white"
v-model="username"
label="Username *"
label="Username"
filled
color="primary"
label-color="grey-6"
:error="!!loginError"
:error-message="loginError"
class="form-input"
lazy-rules
:rules="[ val => val && val.length > 0 || 'Username is required']"
/>
</div>
>
<template v-slot:prepend>
<q-icon name="person" color="grey-6" />
</template>
</q-input>
<div class="row q-col-gutter-sm" style="width: 100%">
<q-input
style="width: 100%"
filled
dark
type="password"
label-color="white"
color="white"
v-model="password"
label="Password *"
label="Password"
filled
type="password"
color="primary"
label-color="grey-6"
:error="!!loginError"
:error-message="loginError"
class="form-input"
lazy-rules
:rules="[
val => !!val || 'Password is required'
]"
/>
</div>
>
<template v-slot:prepend>
<q-icon name="lock" color="grey-6" />
</template>
</q-input>
<div class="row justify-center">
<q-btn type="submit" label="Login" push color="dark" />
</div>
<div class="row justify-center q-mt-md">
<div class="text-center">
<p class="text-white text-caption">Or continue with:</p>
<div class="row q-gutter-sm justify-center">
<div class="action-buttons">
<q-btn
@click="loginWithProvider('discord')"
color="#5865F2"
text-color="white"
icon="mdi-discord"
label="Discord"
outline
size="sm"
/>
<q-btn
@click="loginWithProvider('keycloak')"
color="#0088CC"
text-color="white"
icon="mdi-key"
label="Keycloak"
outline
size="sm"
/>
</div>
</div>
</div>
<div class="row justify-center q-mt-md">
<q-btn
flat
color="white"
label="Don't have an account? Register"
@click="goToRegister"
size="sm"
type="submit"
label="Sign In"
color="primary"
class="submit-btn"
:loading="inProgress"
size="md"
rounded
/>
</div>
</q-form>
<div class="divider-section">
<div class="divider">
<span class="divider-text">Or continue with</span>
</div>
</div>
<div class="social-buttons">
<q-btn
@click="loginWithProvider('discord')"
class="social-btn discord-btn"
size="md"
rounded
icon="discord"
label="Discord"
/>
<q-btn
@click="loginWithProvider('keycloak')"
class="social-btn keycloak-btn"
size="md"
rounded
icon="emoji_people"
label="Keycloak"
/>
</div>
<div class="register-link">
<span class="register-text">Don't have an account?</span>
<q-btn
flat
color="primary"
label="Register"
@click="goToRegister"
class="register-btn"
size="md"
dense
/>
</div>
</div>
</div>
<vue-particles
id="particles-js"
:options='options'
/>
</div>
</template>
<script lang="ts" setup>
@@ -244,19 +260,213 @@ const options = {
</script>
<style scoped>
.login-box {
position: fixed;
.login-container {
position: relative;
display: flex;
align-items: center;
justify-content: center;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
display: flex;
overflow: hidden;
padding: 2rem;
box-sizing: border-box;
}
.login-box {
width: 100%;
max-width: 420px;
padding: 1rem;
height: 100%;
max-height: calc(100vh - 1rem);
background: var(--color-background-soft);
backdrop-filter: blur(20px);
border-radius: 24px;
overflow-y: auto;
overflow-x: hidden;
z-index: 2;
background-color: var(--color-background);
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
border: 1px solid var(--color-border);
box-sizing: border-box;
box-shadow: 0 10px 10px rgba(0, 0, 0, 0.5);
}
.logo-section {
background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
padding: 2rem;
text-align: center;
border-bottom: 1px solid var(--color-border);
}
.logo-container {
display: flex;
align-items: center;
justify-content: center;
gap: 1rem;
}
.logo {
height: 50px;
width: auto;
filter: brightness(0) invert(1);
}
.logo-text {
color: #ffffff;
font-size: 1.5rem;
font-weight: 700;
letter-spacing: 0.5px;
}
.content-section {
padding: 1.5rem;
}
.title {
color: var(--color-heading);
font-size: 1.8rem;
font-weight: 700;
text-align: center;
margin-bottom: 0.5rem;
}
.subtitle {
color: var(--color-text);
text-align: center;
margin-bottom: 2rem;
font-size: 0.95rem;
line-height: 1.5;
opacity: 0.8;
}
.form-section {
display: flex;
flex-direction: column;
gap: 1.5rem;
margin-bottom: 2rem;
}
.form-input {
border-radius: 12px;
}
.action-buttons {
display: flex;
flex-direction: column;
gap: 1rem;
margin-top: 1rem;
}
.submit-btn {
width: 100%;
height: 48px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
border: none;
}
.divider-section {
margin: 2rem 0;
}
.divider {
position: relative;
text-align: center;
}
.divider::before {
content: '';
position: absolute;
top: 50%;
left: 0;
right: 0;
height: 1px;
background: var(--color-border);
}
.divider-text {
background: var(--color-background-soft);
padding: 0 1rem;
color: var(--color-text);
font-size: 0.85rem;
position: relative;
opacity: 0.7;
}
.social-buttons {
display: flex;
gap: 1rem;
margin-bottom: 2rem;
}
.social-btn {
flex: 1;
height: 48px;
background: var(--color-background-mute);
border: 2px solid var(--color-border);
color: var(--color-heading);
font-weight: 500;
transition: all 0.3s ease;
}
.social-btn:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
}
.discord-btn:hover {
border-color: #5865F2;
background: rgba(88, 101, 242, 0.1);
}
.keycloak-btn:hover {
border-color: #0088CC;
background: rgba(0, 136, 204, 0.1);
}
.register-link {
text-align: center;
display: flex;
align-items: center;
justify-content: center;
gap: 0.5rem;
}
.register-text {
color: var(--color-text);
font-size: 0.9rem;
opacity: 0.7;
}
.register-btn {
font-weight: 600;
text-transform: none;
}
#particles-js {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1;
}
@media (max-width: 600px) {
.login-box {
max-width: 100%;
border-radius: 16px;
max-height: calc(100vh - 1rem);
}
.content-section {
padding: 1rem;
}
.title {
font-size: 1.5rem;
}
.social-buttons {
flex-direction: column;
}
}
</style>

View File

@@ -1,27 +1,27 @@
<template>
<div class="register-box q-col-gutter-sm">
<div class="text-h3 text-center row">
<img src="/logo.png" alt="Logo" style="height: 60px; margin-right: 10px;" />
<div class="register-container">
<div class="register-box">
<div class="logo-section">
<div class="logo-container">
<img src="/logo.png" alt="Logo" class="logo" />
<div class="logo-text">KnockOut Whist</div>
</div>
</div>
<h1 class="text-h5 text-center text-white q-mb-md">Create Account</h1>
<div class="content-section">
<h1 class="title">Create Account</h1>
<p class="subtitle">Join the ultimate card game experience</p>
<q-form @submit.prevent="onSubmit"
class="q-gutter-md row justify-center"
style="width: 100%">
<div class="row q-col-gutter-sm" style="width: 100%">
<q-form @submit.prevent="onSubmit" class="form-section">
<q-input
style="width: 100%"
filled
dark
label-color="white"
color="white"
v-model="username"
label="Username *"
label="Username"
filled
color="primary"
label-color="grey-6"
:error="!!errorMessage"
:error-message="errorMessage"
class="form-input"
lazy-rules
:rules="[
val => !!val && val.trim().length > 0 || 'Username is required',
@@ -29,96 +29,111 @@
val => val && val.trim().length <= 30 || 'Username must be less than 30 characters',
val => /^[a-zA-Z0-9_-]+$/.test(val) || 'Username can only contain letters, numbers, underscores, and hyphens'
]"
/>
</div>
>
<template v-slot:prepend>
<q-icon name="person" color="grey-6" />
</template>
</q-input>
<div class="row q-col-gutter-sm" style="width: 100%">
<q-input
style="width: 100%"
filled
dark
type="password"
label-color="white"
color="white"
v-model="password"
label="Password *"
label="Password"
filled
type="password"
color="primary"
label-color="grey-6"
:error="!!errorMessage"
:error-message="errorMessage"
class="form-input"
lazy-rules
:rules="[
val => !!val || 'Password is required',
val => val && val.length >= 6 || 'Password must be at least 6 characters'
]"
/>
</div>
>
<template v-slot:prepend>
<q-icon name="lock" color="grey-6" />
</template>
</q-input>
<div class="row q-col-gutter-sm" style="width: 100%">
<q-input
style="width: 100%"
filled
dark
type="password"
label-color="white"
color="white"
v-model="confirmPassword"
label="Confirm Password *"
label="Confirm Password"
filled
type="password"
color="primary"
label-color="grey-6"
:error="!!errorMessage"
:error-message="errorMessage"
class="form-input"
lazy-rules
:rules="[
val => !!val || 'Password confirmation is required',
val => val === password || 'Passwords do not match'
]"
/>
</div>
>
<template v-slot:prepend>
<q-icon name="lock_outline" color="grey-6" />
</template>
</q-input>
<div class="row justify-center">
<q-btn type="submit" label="Register" push color="dark" :loading="inProgress" />
</div>
<div class="row justify-center q-mt-md">
<div class="text-center">
<p class="text-white text-caption">Or register with:</p>
<div class="row q-gutter-sm justify-center">
<div class="action-buttons">
<q-btn
@click="loginWithProvider('discord')"
color="#5865F2"
text-color="white"
icon="mdi-discord"
label="Discord"
outline
size="sm"
/>
<q-btn
@click="loginWithProvider('keycloak')"
color="#0088CC"
text-color="white"
icon="mdi-key"
label="Keycloak"
outline
size="sm"
/>
</div>
</div>
</div>
<div class="row justify-center">
<q-btn
flat
color="white"
label="Already have an account? Login"
@click="goToLogin"
size="sm"
type="submit"
label="Create Account"
color="primary"
class="submit-btn"
:loading="inProgress"
size="md"
rounded
/>
</div>
</q-form>
<div class="divider-section">
<div class="divider">
<span class="divider-text">Or register with</span>
</div>
</div>
<div class="social-buttons">
<q-btn
@click="loginWithProvider('discord')"
class="social-btn discord-btn"
size="md"
rounded
icon="discord"
label="Discord"
/>
<q-btn
@click="loginWithProvider('keycloak')"
class="social-btn keycloak-btn"
size="md"
rounded
icon="emoji_people"
label="Keycloak"
/>
</div>
<div class="login-link">
<span class="login-text">Already have an account?</span>
<q-btn
flat
color="primary"
label="Login"
@click="goToLogin"
class="login-btn"
size="md"
dense
/>
</div>
</div>
</div>
<vue-particles
id="particles-js"
:options='options'
/>
</div>
</template>
<script lang="ts" setup>
@@ -288,19 +303,214 @@ const options = {
</script>
<style scoped>
.register-box {
position: fixed;
.register-container {
position: relative;
display: flex;
align-items: center;
justify-content: center;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
display: flex;
overflow: hidden;
padding: 1rem;
box-sizing: border-box;
}
.register-box {
width: 100%;
max-width: 420px;
padding: 1rem;
max-height: calc(100vh - 1rem);
background: var(--color-background-soft);
backdrop-filter: blur(20px);
border-radius: 24px;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
overflow-y: auto;
overflow-x: hidden;
z-index: 2;
background-color: var(--color-background);
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
border: 1px solid var(--color-border);
box-sizing: border-box;
}
.logo-section {
background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
padding: 2rem;
text-align: center;
border-bottom: 1px solid var(--color-border);
}
.logo-container {
display: flex;
align-items: center;
justify-content: center;
gap: 1rem;
}
.logo {
height: 50px;
width: auto;
filter: brightness(0) invert(1);
}
.logo-text {
color: #ffffff;
font-size: 1.5rem;
font-weight: 700;
letter-spacing: 0.5px;
}
.content-section {
padding: 1.5rem;
}
.title {
color: var(--color-heading);
font-size: 1.8rem;
font-weight: 700;
text-align: center;
margin-bottom: 0.5rem;
}
.subtitle {
color: var(--color-text);
text-align: center;
margin-bottom: 2rem;
font-size: 0.95rem;
line-height: 1.5;
opacity: 0.8;
}
.form-section {
display: flex;
flex-direction: column;
margin-bottom: 2rem;
}
.form-input {
border-radius: 12px;
}
.action-buttons {
display: flex;
flex-direction: column;
gap: 1rem;
margin-top: 1rem;
}
.submit-btn {
width: 100%;
height: 48px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
border: none;
color: white;
}
.divider-section {
margin: 2rem 0;
}
.divider {
position: relative;
text-align: center;
}
.divider::before {
content: '';
position: absolute;
top: 50%;
left: 0;
right: 0;
height: 1px;
background: var(--color-border);
}
.divider-text {
background: var(--color-background-soft);
padding: 0 1rem;
color: var(--color-text);
font-size: 0.85rem;
position: relative;
opacity: 0.7;
}
.social-buttons {
display: flex;
gap: 1rem;
margin-bottom: 2rem;
}
.social-btn {
flex: 1;
height: 48px;
background: var(--color-background-mute);
border: 2px solid var(--color-border);
color: var(--color-heading);
font-weight: 500;
transition: all 0.3s ease;
}
.social-btn:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
}
.discord-btn:hover {
border-color: #5865F2;
background: rgba(88, 101, 242, 0.1);
}
.keycloak-btn:hover {
border-color: #0088CC;
background: rgba(0, 136, 204, 0.1);
}
.social-icon {
margin-right: 0.5rem;
}
.social-text {
font-weight: 500;
}
.login-link {
text-align: center;
display: flex;
align-items: center;
justify-content: center;
gap: 0.5rem;
}
.login-text {
color: var(--color-text);
font-size: 0.9rem;
opacity: 0.7;
}
#particles-js {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1;
}
@media (max-width: 600px) {
.register-box {
max-width: 100%;
border-radius: 16px;
max-height: calc(100vh - 1rem);
}
.content-section {
padding: 1rem;
}
.title {
font-size: 1.5rem;
}
.social-buttons {
flex-direction: column;
}
}
</style>

View File

@@ -1,41 +1,42 @@
<template>
<div class="username-selection-box q-col-gutter-sm">
<div class="text-h3 text-center row">
<img src="/logo.png" alt="Logo" style="height: 60px; margin-right: 10px;" />
<div class="username-selection-container">
<div class="username-selection-box">
<div class="logo-section">
<div class="logo-container">
<img src="/logo.png" alt="Logo" class="logo" />
<div class="logo-text">KnockOut Whist</div>
</div>
</div>
<h1 class="text-h5 text-center text-white q-mb-md">Choose Your Username</h1>
<p class="text-center text-white text-caption q-mb-lg">
You're signed in with {{ userInfo.provider }}. Please choose a username for your account.
<div class="content-section">
<h1 class="title">Choose Your Username</h1>
<p class="subtitle">
You're signed in with <span class="provider-badge">{{ userInfo.providerName }}</span>. Please choose a username for your account.
</p>
<div class="user-info q-mb-lg">
<div class="row items-center q-gutter-md">
<div class="user-info-card">
<div class="user-avatar">
<img v-if="userInfo.picture" :src="userInfo.picture" alt="Profile" class="avatar-img" />
<div v-else class="avatar-text">{{ userInfo.name?.charAt(0)?.toUpperCase() || 'U' }}</div>
</div>
<div class="user-details">
<div class="text-white text-weight-medium">{{ userInfo.name || 'Unknown User' }}</div>
<div class="text-white text-caption">Signed in with {{ userInfo.provider }}</div>
</div>
<div class="user-name">{{ userInfo.name || 'Unknown User' }}</div>
<div class="user-provider">Signed in with {{ userInfo.providerName }}</div>
</div>
</div>
<q-form @submit.prevent="onSubmit" class="q-gutter-md">
<div class="row q-col-gutter-sm">
<q-form @submit.prevent="onSubmit" class="form-section">
<q-input
style="width: 100%"
v-model="username"
label="Username"
filled
dark
label-color="white"
color="white"
v-model="username"
label="Username *"
color="primary"
label-color="grey-6"
:error="!!errorMessage"
:error-message="errorMessage"
:loading="inProgress"
class="username-input"
lazy-rules
:rules="[
val => !!val && val.trim().length > 0 || 'Username is required',
@@ -43,28 +44,39 @@
val => val && val.trim().length <= 30 || 'Username must be less than 30 characters',
val => /^[a-zA-Z0-9_-]+$/.test(val) || 'Username can only contain letters, numbers, underscores, and hyphens'
]"
>
<template v-slot:prepend>
<q-icon name="person" color="grey-6" />
</template>
</q-input>
<div class="action-buttons">
<q-btn
type="submit"
label="Complete Registration"
color="primary"
class="submit-btn"
:loading="inProgress"
size="md"
rounded
/>
</div>
<div class="row justify-center">
<q-btn type="submit" label="Complete Registration" push color="primary" :loading="inProgress" />
</div>
<div class="row justify-center">
<q-btn
flat
color="white"
color="grey-6"
label="Cancel"
@click="goToLogin"
size="sm"
class="cancel-btn"
size="md"
/>
</div>
</q-form>
</div>
</div>
<vue-particles
id="particles-js"
:options='options'
/>
</div>
</template>
<script lang="ts" setup>
@@ -86,7 +98,8 @@ const userInfo = ref({
email: '',
name: '',
picture: '',
provider: ''
provider: '',
providerName: ''
})
onMounted(async () => {
@@ -244,38 +257,109 @@ const options = {
</script>
<style scoped>
.username-selection-box {
position: fixed;
.username-selection-container {
position: relative;
display: flex;
align-items: center;
justify-content: center;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
display: flex;
width: 100%;
max-width: 420px;
padding: 1rem;
z-index: 2;
background-color: var(--color-background);
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
overflow: hidden;
padding: 3rem;
box-sizing: border-box;
}
.user-info {
background: rgba(255, 255, 255, 0.1);
.username-selection-box {
width: 100%;
max-width: 420px;
height: 100%;
max-height: calc(100vh - 1rem);
background: var(--color-background-soft);
backdrop-filter: blur(20px);
border-radius: 24px;
box-shadow: 0 10px 10px rgba(0, 0, 0, 0.5);
overflow-y: auto;
overflow-x: hidden;
z-index: 2;
border: 1px solid var(--color-border);
box-sizing: border-box;
}
.logo-section {
background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
padding: 2rem;
text-align: center;
border-bottom: 1px solid var(--color-border);
}
.logo-container {
display: flex;
align-items: center;
justify-content: center;
gap: 1rem;
}
.logo {
height: 50px;
width: auto;
filter: brightness(0) invert(1);
}
.logo-text {
color: #ffffff;
font-size: 1.5rem;
font-weight: 700;
letter-spacing: 0.5px;
}
.content-section {
padding: 1.5rem;
}
.title {
color: var(--color-heading);
font-size: 1.8rem;
font-weight: 700;
text-align: center;
margin-bottom: 0.5rem;
}
.subtitle {
color: var(--color-text);
text-align: center;
margin-bottom: 2rem;
font-size: 0.95rem;
line-height: 1.5;
opacity: 0.8;
}
.provider-badge {
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
padding: 0.2rem 0.6rem;
border-radius: 12px;
padding: 1rem;
backdrop-filter: blur(10px);
font-size: 0.85rem;
font-weight: 600;
}
.user-info-card {
background: var(--color-background-mute);
border-radius: 16px;
padding: 1.5rem;
margin-bottom: 2rem;
display: flex;
align-items: center;
gap: 1rem;
border: 1px solid var(--color-border);
}
.user-avatar {
min-width: 50px;
height: 50px;
width: 60px;
height: 60px;
border-radius: 50%;
overflow: hidden;
display: flex;
align-items: center;
justify-content: center;
background: rgba(255, 255, 255, 0.2);
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
flex-shrink: 0;
}
.avatar-img {
@@ -286,11 +370,88 @@ const options = {
.avatar-text {
color: white;
font-weight: 600;
font-size: 1.2rem;
font-weight: 700;
font-size: 1.4rem;
}
.user-details {
flex: 1;
}
.user-name {
color: var(--color-heading);
font-weight: 600;
font-size: 1.1rem;
margin-bottom: 0.25rem;
}
.user-provider {
color: var(--color-text);
font-size: 0.9rem;
opacity: 0.7;
}
.form-section {
display: flex;
flex-direction: column;
gap: 1.5rem;
}
.username-input {
border-radius: 12px;
}
.action-buttons {
display: flex;
flex-direction: column;
gap: 1rem;
margin-top: 1rem;
}
.submit-btn {
width: 100%;
height: 48px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
border: none;
}
.cancel-btn {
width: 100%;
height: 48px;
font-weight: 500;
color: var(--color-text);
opacity: 0.7;
}
.cancel-btn:hover {
opacity: 1;
}
#particles-js {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1;
}
@media (max-width: 600px) {
.username-selection-box {
max-width: 100%;
border-radius: 16px;
max-height: calc(100vh - 1rem);
}
.content-section {
padding: 1rem;
}
.title {
font-size: 1.5rem;
}
}
</style>

View File

@@ -1,3 +1,3 @@
MAJOR=0
MINOR=23
MINOR=24
PATCH=0

View File

@@ -22,6 +22,9 @@ export default defineConfig({
globPatterns: [
'**/*.{js,css,html,ico,png,svg,webmanifest}',
],
navigateFallbackDenylist: [
/^\/api/,
],
},
manifest: {