Maxi/InfantrySkillCalculator
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Activity

Add input validation and error handling for clan+player modals.

Browse Source
This commit is contained in:
MaxJa4
2024-01-17 21:08:18 +01:00
parent 5af0f437b0
commit 331f725959
7 changed files with 361 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
templates/modals/add_clan.html
View File

@@ -1,5 +1,6 @@
{{ define "add_clan" }}
<div class="modal fade" id="addClanModal" tabindex="-1">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
@@ -9,17 +10,18 @@
</div>
<div class="modal-body">
<div class="form-floating mb-3">
<input type="text" class="form-control form-control-lg" id="clanName" placeholder="Clan-Name">
<input type="text" class="form-control form-control-lg" id="clanName" placeholder="Clan-Name" minlength="2" maxlength="30" required>
<label for="clanName">Clan-Name</label>
</div>
<div class="form-floating">
<input type="text" class="form-control form-control-lg" id="clanTag" placeholder="Clan-Tag">
<input type="text" class="form-control form-control-lg" id="clanTag" placeholder="Clan-Tag" minlength="2" maxlength="30" required>
<label for="clanTag">Clan-Tag</label>
</div>
<div class="form-check form-check-inline mt-3 fs-5">
<input class="form-check-input" type="checkbox" id="keepUpdated" value="keepUpdated">
<label class="form-check-label" for="keepUpdated">Immer aktuell halten</label>
</div>
<div class="error-message text-danger fs-5 badge" style="display: none;"></div>
</div>
<div class="modal-footer">
<button type="submit" name="submit" class="btn btn-lg btn-primary">Hinzufügen</button>
@@ -33,60 +35,111 @@
document.addEventListener('DOMContentLoaded', function() {
const addClanModal = document.getElementById('addClanModal');
const addClanModalBS = new bootstrap.Modal('#addClanModal');
if (addClanModal) {
addClanModal.addEventListener('shown.bs.modal', event => {
const submitButton = addClanModal.querySelector('button[name="submit"]');
submitButton.addEventListener('click', function () {
const [clanList, otherClanList] = getClanLists(event);
const submitButton = addClanModal.querySelector('button[name="submit"]');
let submitClanHandler = null;
const clanName = addClanModal.querySelector('#clanName');
const clanTag = addClanModal.querySelector('#clanTag');
const keepUpdated = addClanModal.querySelector('#keepUpdated');
const clanName = addClanModal.querySelector('#clanName');
const clanTag = addClanModal.querySelector('#clanTag');
const keepUpdated = addClanModal.querySelector('#keepUpdated');
const errorDiv = addClanModal.querySelector('.error-message');
fetch("/clan", {
method: "POST",
body: JSON.stringify({
name: clanName.value,
tag: clanTag.value,
keep_updated: keepUpdated.checked
}),
headers: {
"Content-type": "application/json; charset=UTF-8"
function validateInputs() {
if (clanName.value.length < 2 || clanName.value.length > 30) {
clanName.classList.add('is-invalid');
return false;
} else {
clanName.classList.remove('is-invalid');
}
if (clanTag.value.length < 2 || clanTag.value.length > 30) {
clanTag.classList.add('is-invalid');
return false;
} else {
clanTag.classList.remove('is-invalid');
}
return true;
}
function updateClanLists(clanList, otherClanList) {
fetch('/clans_html')
.then(response => {
if (!response.ok) {
console.error('Response was not ok');
}
return response.text();
})
.then(data => {
const lastIndex = otherClanList.selectedIndex;
clanList.innerHTML = data;
otherClanList.innerHTML = data;
clanList.selectedIndex = clanList.children.length - 1;
otherClanList.selectedIndex = lastIndex;
clanList.dispatchEvent(new Event('change'));
})
.catch((error) => {
alert('Fehler beim Aktualisieren der Clan-List: ' + error.message);
});
}
function createSubmitClanHandler(modalEvent) {
return function submitClanHandler(e) {
const [clanList, otherClanList] = getClanLists(modalEvent);
if (!validateInputs()) {
return;
}
fetch("/clan", {
method: "POST",
body: JSON.stringify({
name: clanName.value,
tag: clanTag.value,
keep_updated: keepUpdated.checked
}),
headers: {
"Content-type": "application/json; charset=UTF-8"
}
})
.then(response => {
if (!response.ok) {
if (response.status === 400) {
throw new Error('Clan oder Tag existiert bereits!');
}
throw new Error('Server error');
}
})
.then(() => {
const lastIndex = otherClanList.selectedIndex;
.then(() => {
updateClanLists(clanList, otherClanList);
fetch('/clans_html')
.then(response => {
if (!response.ok) {
throw new Error('Network response was not ok');
}
return response.text();
})
.then(data => {
clanList.innerHTML = data;
otherClanList.innerHTML = data;
addClanModalBS.hide();
})
.catch((error) => {
errorDiv.innerText = error.message;
errorDiv.style.display = 'block';
});
}
}
clanList.selectedIndex = clanList.children.length - 1;
otherClanList.selectedIndex = lastIndex;
if (addClanModal) {
addClanModal.addEventListener('shown.bs.modal', event => {
submitClanHandler = createSubmitClanHandler(event);
submitButton.addEventListener('click', submitClanHandler);
});
clanList.dispatchEvent(new Event('change'));
})
.catch(error => {
console.error('There has been a problem with your fetch operation:', error);
});
addClanModal.addEventListener('hidden.bs.modal', event => {
submitButton.removeEventListener('click', submitClanHandler);
addClanModalBS.hide();
clanName.value = "";
clanTag.value = "";
keepUpdated.checked = false;
})
.catch((error) => {
throw new Error(error)
});
}, { once: true });
clanName.value = "";
clanTag.value = "";
errorDiv.innerText = "";
errorDiv.style.display = 'none';
keepUpdated.checked = false;
clanName.classList.remove('is-invalid');
clanTag.classList.remove('is-invalid');
});
}
});