=================================================================== RCS file: /cvs/cvs/draft/form.min.js,v retrieving revision 1.59 retrieving revision 1.69 diff -u -p -r1.59 -r1.69 --- draft/form.min.js 2024/03/29 21:19:59 1.59 +++ draft/form.min.js 2024/03/30 18:02:07 1.69 @@ -26,7 +26,7 @@ async function sendData() { ii.textContent="One or more fields have an error. Please check and try again."; } else { var fc = document.querySelectorAll(".wpcf7-form-control"); - ii.textContent="All good."; + ii.textContent="Checking..."; fc.forEach((f) => { f.disabled=true; l=f; @@ -42,50 +42,24 @@ async function sendData() { turnstile.remove(); }, callback: function(token) { - ii.textContent="Sent"; - console.log(`Challenge Success ${token}`); -/* --------------------- */ -//const ob = {mail: em, sub: su, msg: ms, id: token }; -//var data="", -// status="", -// feed=JSON.stringify(ob); -//$.post("/feedbk/", feed, function(data, status){ -// console.log("Data: " + data + "\nStatus: " + status); -// console.log(data); -// console.log("JSON: " + JSON.parse(data) ); -// -//}); -/* --------------------- */ -//ovar re=""; -const dataToSend = JSON.stringify({"email": "hey@mail.com", "password": "101010"}); -let dataReceived = ""; + const dataToSend = JSON.stringify({"add": em, "sub": su, "msg": ms, "tok": token}); + console.log(`JSON: ${dataToSend}`); + ii.textContent="Sending..."; + + + fetch("/feedbk/", { - credentials: "same-origin", - mode: "same-origin", - method: "post", - headers: { "Content-Type": "application/json" }, - body: dataToSend + credentials: "same-origin", + mode: "same-origin", + method: "post", + headers: { "Content-Type": "application/json" }, + body: dataToSend }) - .then(resp => { - if (resp.status === 200) { - return resp.json() - } else { - console.log("Status: " + resp.status) - return Promise.reject("server") - } - }) - .then(dataJson => { - dataReceived = JSON.parse(dataJson); - }) - .catch(err => { - if (err === "server") return - console.log(err) - }) -console.log(`Received: ${dataReceived}`) - -//fetch('https://draft.hgk.global/feedbk/') -// .then(response => response.json()) -// .then(json => console.log(json)) + .then(response => response.json()) + .then(json => console.log(json)) + + + ii.textContent=json['msg'];