Füge Vorname und Nachname in das Registrierungsformular und die Mitgliederverwaltung ein
Some checks failed
Code Analysis (JS/Vue) / analyze (push) Failing after 50s
Some checks failed
Code Analysis (JS/Vue) / analyze (push) Failing after 50s
This commit is contained in:
@@ -32,22 +32,40 @@
|
||||
</div>
|
||||
-->
|
||||
|
||||
<!-- Name -->
|
||||
<!-- Vorname -->
|
||||
<div>
|
||||
<label
|
||||
for="name"
|
||||
for="firstName"
|
||||
class="block text-sm font-medium text-gray-700 mb-2"
|
||||
>
|
||||
Vollständiger Name
|
||||
Vorname
|
||||
</label>
|
||||
<input
|
||||
id="name"
|
||||
v-model="formData.name"
|
||||
id="firstName"
|
||||
v-model="formData.firstName"
|
||||
type="text"
|
||||
required
|
||||
autocomplete="name"
|
||||
autocomplete="given-name"
|
||||
class="w-full px-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary-600 focus:border-transparent transition-all"
|
||||
placeholder="Max Mustermann"
|
||||
placeholder="Max"
|
||||
>
|
||||
</div>
|
||||
<!-- Nachname -->
|
||||
<div>
|
||||
<label
|
||||
for="lastName"
|
||||
class="block text-sm font-medium text-gray-700 mb-2"
|
||||
>
|
||||
Nachname
|
||||
</label>
|
||||
<input
|
||||
id="lastName"
|
||||
v-model="formData.lastName"
|
||||
type="text"
|
||||
required
|
||||
autocomplete="family-name"
|
||||
class="w-full px-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary-600 focus:border-transparent transition-all"
|
||||
placeholder="Mustermann"
|
||||
>
|
||||
</div>
|
||||
|
||||
@@ -318,7 +336,8 @@ import { AlertCircle, Check, Loader2, Info } from 'lucide-vue-next'
|
||||
// console.log('[DEBUG] Component setup started')
|
||||
|
||||
const formData = ref({
|
||||
name: '',
|
||||
firstName: '',
|
||||
lastName: '',
|
||||
email: '',
|
||||
phone: '',
|
||||
password: '',
|
||||
@@ -400,7 +419,9 @@ const handleRegister = async () => {
|
||||
const response = await $fetch('/api/auth/register', {
|
||||
method: 'POST',
|
||||
body: {
|
||||
name: formData.value.name,
|
||||
firstName: formData.value.firstName,
|
||||
lastName: formData.value.lastName,
|
||||
name: `${formData.value.firstName} ${formData.value.lastName}`.trim(),
|
||||
email: formData.value.email,
|
||||
phone: formData.value.phone,
|
||||
password: formData.value.password
|
||||
@@ -412,7 +433,8 @@ const handleRegister = async () => {
|
||||
|
||||
// Reset form
|
||||
formData.value = {
|
||||
name: '',
|
||||
firstName: '',
|
||||
lastName: '',
|
||||
email: '',
|
||||
phone: '',
|
||||
password: '',
|
||||
|
||||
@@ -100,6 +100,14 @@ export default defineEventHandler(async (event) => {
|
||||
const normalizedEmail = user.email?.toLowerCase().trim() || ''
|
||||
const normalizedName = user.name?.toLowerCase().trim() || ''
|
||||
|
||||
// Hilfsfunktion: Extrahiere Vorname/Nachname aus user.name
|
||||
function extractNames(name) {
|
||||
if (!name || typeof name !== 'string') return { firstName: '', lastName: '' }
|
||||
const parts = name.trim().split(/\s+/)
|
||||
if (parts.length === 1) return { firstName: parts[0], lastName: '' }
|
||||
return { firstName: parts[0], lastName: parts.slice(1).join(' ') }
|
||||
}
|
||||
|
||||
// Check if this user matches an existing manual member using O(1) lookup
|
||||
let matchedManualIndex = -1
|
||||
|
||||
@@ -135,6 +143,8 @@ export default defineEventHandler(async (event) => {
|
||||
// Merge with existing manual member
|
||||
const migratedUser = migrateUserRoles({ ...user })
|
||||
const roles = Array.isArray(migratedUser.roles) ? migratedUser.roles : (migratedUser.role ? [migratedUser.role] : ['mitglied'])
|
||||
// Extrahiere Namen nur, wenn Felder leer sind
|
||||
const { firstName, lastName } = extractNames(user.name)
|
||||
mergedMembers[matchedManualIndex] = {
|
||||
...mergedMembers[matchedManualIndex],
|
||||
hasLogin: true,
|
||||
@@ -142,7 +152,10 @@ export default defineEventHandler(async (event) => {
|
||||
loginRoles: roles,
|
||||
loginRole: roles[0] || 'mitglied', // Rückwärtskompatibilität
|
||||
lastLogin: user.lastLogin,
|
||||
isMannschaftsspieler: user.isMannschaftsspieler === true || mergedMembers[matchedManualIndex].isMannschaftsspieler === true
|
||||
isMannschaftsspieler: user.isMannschaftsspieler === true || mergedMembers[matchedManualIndex].isMannschaftsspieler === true,
|
||||
firstName: mergedMembers[matchedManualIndex].firstName || firstName,
|
||||
lastName: mergedMembers[matchedManualIndex].lastName || lastName,
|
||||
editable: true
|
||||
}
|
||||
// If the registered user has visibility preferences, apply them (coerce to booleans)
|
||||
if (user.visibility && typeof user.visibility === 'object') {
|
||||
@@ -160,9 +173,12 @@ export default defineEventHandler(async (event) => {
|
||||
// Registered-only user: default to privacy-preserving visibility (hidden) unless user explicitly set visibility elsewhere
|
||||
// Use stored visibility from user if present, otherwise default to false
|
||||
const userVis = user.visibility || {}
|
||||
const { firstName, lastName } = extractNames(user.name)
|
||||
mergedMembers.push({
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
firstName,
|
||||
lastName,
|
||||
email: user.email,
|
||||
phone: user.phone || '',
|
||||
address: '',
|
||||
@@ -173,7 +189,7 @@ export default defineEventHandler(async (event) => {
|
||||
},
|
||||
notes: `Rolle(n): ${roles.join(', ')}`,
|
||||
source: 'login',
|
||||
editable: false,
|
||||
editable: true,
|
||||
hasLogin: true,
|
||||
loginEmail: user.email,
|
||||
loginRoles: roles,
|
||||
|
||||
Reference in New Issue
Block a user