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>
|
</div>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- Name -->
|
<!-- Vorname -->
|
||||||
<div>
|
<div>
|
||||||
<label
|
<label
|
||||||
for="name"
|
for="firstName"
|
||||||
class="block text-sm font-medium text-gray-700 mb-2"
|
class="block text-sm font-medium text-gray-700 mb-2"
|
||||||
>
|
>
|
||||||
Vollständiger Name
|
Vorname
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
id="name"
|
id="firstName"
|
||||||
v-model="formData.name"
|
v-model="formData.firstName"
|
||||||
type="text"
|
type="text"
|
||||||
required
|
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"
|
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>
|
</div>
|
||||||
|
|
||||||
@@ -318,7 +336,8 @@ import { AlertCircle, Check, Loader2, Info } from 'lucide-vue-next'
|
|||||||
// console.log('[DEBUG] Component setup started')
|
// console.log('[DEBUG] Component setup started')
|
||||||
|
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
name: '',
|
firstName: '',
|
||||||
|
lastName: '',
|
||||||
email: '',
|
email: '',
|
||||||
phone: '',
|
phone: '',
|
||||||
password: '',
|
password: '',
|
||||||
@@ -400,7 +419,9 @@ const handleRegister = async () => {
|
|||||||
const response = await $fetch('/api/auth/register', {
|
const response = await $fetch('/api/auth/register', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: {
|
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,
|
email: formData.value.email,
|
||||||
phone: formData.value.phone,
|
phone: formData.value.phone,
|
||||||
password: formData.value.password
|
password: formData.value.password
|
||||||
@@ -412,7 +433,8 @@ const handleRegister = async () => {
|
|||||||
|
|
||||||
// Reset form
|
// Reset form
|
||||||
formData.value = {
|
formData.value = {
|
||||||
name: '',
|
firstName: '',
|
||||||
|
lastName: '',
|
||||||
email: '',
|
email: '',
|
||||||
phone: '',
|
phone: '',
|
||||||
password: '',
|
password: '',
|
||||||
|
|||||||
@@ -100,6 +100,14 @@ export default defineEventHandler(async (event) => {
|
|||||||
const normalizedEmail = user.email?.toLowerCase().trim() || ''
|
const normalizedEmail = user.email?.toLowerCase().trim() || ''
|
||||||
const normalizedName = user.name?.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
|
// Check if this user matches an existing manual member using O(1) lookup
|
||||||
let matchedManualIndex = -1
|
let matchedManualIndex = -1
|
||||||
|
|
||||||
@@ -135,6 +143,8 @@ export default defineEventHandler(async (event) => {
|
|||||||
// Merge with existing manual member
|
// Merge with existing manual member
|
||||||
const migratedUser = migrateUserRoles({ ...user })
|
const migratedUser = migrateUserRoles({ ...user })
|
||||||
const roles = Array.isArray(migratedUser.roles) ? migratedUser.roles : (migratedUser.role ? [migratedUser.role] : ['mitglied'])
|
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] = {
|
||||||
...mergedMembers[matchedManualIndex],
|
...mergedMembers[matchedManualIndex],
|
||||||
hasLogin: true,
|
hasLogin: true,
|
||||||
@@ -142,7 +152,10 @@ export default defineEventHandler(async (event) => {
|
|||||||
loginRoles: roles,
|
loginRoles: roles,
|
||||||
loginRole: roles[0] || 'mitglied', // Rückwärtskompatibilität
|
loginRole: roles[0] || 'mitglied', // Rückwärtskompatibilität
|
||||||
lastLogin: user.lastLogin,
|
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 the registered user has visibility preferences, apply them (coerce to booleans)
|
||||||
if (user.visibility && typeof user.visibility === 'object') {
|
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
|
// 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
|
// Use stored visibility from user if present, otherwise default to false
|
||||||
const userVis = user.visibility || {}
|
const userVis = user.visibility || {}
|
||||||
|
const { firstName, lastName } = extractNames(user.name)
|
||||||
mergedMembers.push({
|
mergedMembers.push({
|
||||||
id: user.id,
|
id: user.id,
|
||||||
name: user.name,
|
name: user.name,
|
||||||
|
firstName,
|
||||||
|
lastName,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
phone: user.phone || '',
|
phone: user.phone || '',
|
||||||
address: '',
|
address: '',
|
||||||
@@ -173,7 +189,7 @@ export default defineEventHandler(async (event) => {
|
|||||||
},
|
},
|
||||||
notes: `Rolle(n): ${roles.join(', ')}`,
|
notes: `Rolle(n): ${roles.join(', ')}`,
|
||||||
source: 'login',
|
source: 'login',
|
||||||
editable: false,
|
editable: true,
|
||||||
hasLogin: true,
|
hasLogin: true,
|
||||||
loginEmail: user.email,
|
loginEmail: user.email,
|
||||||
loginRoles: roles,
|
loginRoles: roles,
|
||||||
|
|||||||
Reference in New Issue
Block a user