Add redirect URL when logging in, fix choices for characters not being saved

This commit is contained in:
Clément Pons
2026-01-05 17:34:42 +01:00
parent 04534b2530
commit 7021264c11
15 changed files with 50 additions and 49 deletions

View File

@@ -3,7 +3,7 @@ import { unifySlug } from '#shared/general.util';
import { CampaignSheet } from '#shared/campaign.util';
definePageMeta({
guestsGoesTo: '/user/login',
requiresAuth: true,
});
const id = unifySlug(useRoute().params.id ?? '');

View File

@@ -2,7 +2,7 @@
import { Toaster } from '#shared/components.util';
definePageMeta({
guestsGoesTo: '/user/login',
requiresAuth: true,
});
const { user, loggedIn } = useUserSession();

View File

@@ -3,7 +3,7 @@ import { CharacterBuilder } from '#shared/character.util';
import { unifySlug } from '#shared/general.util';
definePageMeta({
guestsGoesTo: '/user/login',
requiresAuth: true,
validState: true,
});
const id = unifySlug(useRouter().currentRoute.value.params.id ?? "new");

View File

@@ -4,7 +4,7 @@ import { Toaster } from '#shared/components.util';
import type { CharacterConfig } from '~/types/character';
definePageMeta({
guestsGoesTo: '/user/login',
requiresAuth: true,
})
const { data: characters, error, status } = await useFetch(`/api/character`);
const config = characterConfig as CharacterConfig;

View File

@@ -3,7 +3,7 @@ import { HomebrewBuilder } from '#shared/feature.util';
definePageMeta({
guestsGoesTo: '/user/login',
requiresAuth: true,
});
const container = useTemplateRef('container');

View File

@@ -30,7 +30,7 @@ import { Toaster } from '#shared/components.util';
definePageMeta({
layout: 'login',
guestsGoesTo: '/user/login',
requiresAuth: true,
});
const { user } = useUserSession();

View File

@@ -7,7 +7,7 @@
<span class="border border-transparent hover:border-light-35 dark:hover:border-dark-35 p-1 cursor-pointer" @click="() => $router.go(-1)"><Icon icon="radix-icons:arrow-left" class="text-light-50 dark:text-dark-50 w-6 h-6"/></span>
<h4 class="text-xl font-bold">Connexion</h4>
</div>
<form @submit.prevent="() => submit()" class="flex flex-1 flex-col justify-center items-stretch">
<form @submit.prevent="submit" class="flex flex-1 flex-col justify-center items-stretch">
<TextInput type="text" label="Utilisateur ou email" name="username" autocomplete="username email" v-model="state.usernameOrEmail"/>
<TextInput type="password" label="Mot de passe" name="password" autocomplete="current-password" v-model="state.password"/>
<Button type="submit" class="border border-light-35 dark:border-dark-35 self-center" :loading="status === 'pending'">Se connecter</Button>
@@ -63,7 +63,10 @@ async function submit()
{
Toaster.clear();
Toaster.add({ duration: 10000, content: 'Vous êtes maintenant connecté', timer: true, type: 'success' });
useRouter().push({ name: 'user-profile' });
const router = useRouter();
const target = router.currentRoute.value.query?.t as string | undefined;
router.push(target ? decodeURIComponent(target) : { name: 'user-profile' });
}
}
else

View File

@@ -3,7 +3,7 @@ import { hasPermissions } from "#shared/auth.util";
import { Toaster } from '#shared/components.util';
definePageMeta({
guestsGoesTo: '/user/login',
requiresAuth: true,
})
const { user, clear } = useUserSession();
const loading = ref<boolean>(false);