Implement account deletion handling and improve user feedback
Some checks failed
Chore App Build and Push Docker Images / build-and-push (push) Has been cancelled
Some checks failed
Chore App Build and Push Docker Images / build-and-push (push) Has been cancelled
- Added checks for accounts marked for deletion in signup, verification, and password reset processes. - Updated reward and task listing to sort user-created items first. - Enhanced user API to clear verification and reset tokens when marking accounts for deletion. - Introduced tests for marked accounts to ensure proper handling in various scenarios. - Updated profile and reward edit components to reflect changes in validation and data handling.
This commit is contained in:
@@ -39,7 +39,7 @@
|
||||
<button type="button" class="btn btn-secondary" @click="onCancel" :disabled="loading">
|
||||
Cancel
|
||||
</button>
|
||||
<button type="submit" class="btn btn-primary" :disabled="loading || !isDirty">
|
||||
<button type="submit" class="btn btn-primary" :disabled="loading || !isDirty || !isValid">
|
||||
{{ isEdit ? 'Save' : 'Create' }}
|
||||
</button>
|
||||
</div>
|
||||
@@ -47,7 +47,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, nextTick, watch } from 'vue'
|
||||
import { ref, onMounted, nextTick, watch, computed } from 'vue'
|
||||
import ImagePicker from '@/components/utils/ImagePicker.vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import '@/assets/styles.css'
|
||||
@@ -120,9 +120,33 @@ function checkDirty() {
|
||||
})
|
||||
}
|
||||
|
||||
// Validation logic
|
||||
const isValid = computed(() => {
|
||||
return props.fields.every((field) => {
|
||||
if (!field.required) return true
|
||||
const value = formData.value[field.name]
|
||||
|
||||
if (field.type === 'text') {
|
||||
return typeof value === 'string' && value.trim().length > 0
|
||||
}
|
||||
|
||||
if (field.type === 'number') {
|
||||
const numValue = Number(value)
|
||||
if (isNaN(numValue)) return false
|
||||
if (field.min !== undefined && numValue < field.min) return false
|
||||
if (field.max !== undefined && numValue > field.max) return false
|
||||
return true
|
||||
}
|
||||
|
||||
// For other types, just check it's not null/undefined
|
||||
return value != null
|
||||
})
|
||||
})
|
||||
|
||||
watch(
|
||||
() => ({ ...formData.value }),
|
||||
() => {
|
||||
(newVal) => {
|
||||
console.log('formData changed:', newVal)
|
||||
checkDirty()
|
||||
},
|
||||
{ deep: true },
|
||||
|
||||
Reference in New Issue
Block a user