diff --git a/express-server/public/javascripts/ajax.js b/express-server/public/javascripts/ajax.js index f776a30c..e1d83ef0 100644 --- a/express-server/public/javascripts/ajax.js +++ b/express-server/public/javascripts/ajax.js @@ -78,37 +78,10 @@ $(document).ready(function () { }); - $(".gruppenadd").click(function () { - - // let name = $("#groupname").val(); - // let color = $("#groupfarbe").val(); - $("#ListenDetailAdd").modal("hide"); - - $.ajax({ - type: "POST", - url: "/group", - data: { - sl_id: globaleAddZwischenID, - name: $("#groupname").val(), - color: $("input:checked").val() - }, - success(res) { - console.log("groupadd funktioniert"); - - }, - error(err) { - console.log("error"); - } - }); - }); - $(".sl_add").click(function () { $('#EigeneListeAdd').modal('show'); }); - - - }); var globaleAddZwischenID = ""; @@ -151,7 +124,6 @@ function eigeneEinkaufslisten() { ${userinfo} -
@@ -162,7 +134,6 @@ function eigeneEinkaufslisten() { } console.log("Eigene Einkaufslisten"); loeschen(); - lala(); Detail(); // groupHinzufügen() }, @@ -240,10 +211,58 @@ function loeschen() { function lala() { $(".groupadd").click(function () { - let card = $(this).closest(".card"); - let id = card.attr("id"); - globaleAddZwischenID = id; - $("#groupname").val(""); + let getid = $(this).closest('.shoplistid'); + let id = getid.attr('id'); + console.log(id); + globaleAddZwischenID = id; + }); +} + +function gruppenhinzu() { + $(".gruppenadd").click(function () { + + let name = $("#groupname").val(); + let color = $("input:checked").val(); + $("#ListenDetailAdd").modal("hide"); + console.log(globaleAddZwischenID); + + firebase.auth().onAuthStateChanged(async function (user) { + if (user) { + firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) { + + $.ajax({ + type: "POST", + url: "/group", + data: { + idtoken:idtoken, + sl_id: globaleAddZwischenID, + name: $("#groupname").val(), + color: $("input:checked").val(), + hidden: false + }, + success(res) { + $(".gruppeninhalt").append(`
+
+ +
${name}
+
+
+
+ +
+ `); + + }, + error(err) { + console.log("error"); + } + }); + + }).catch((error) => console.error("Get id token client error: ", error)); + } else { + console.log("Check Auth error", user) + } + }); }); } @@ -297,9 +316,7 @@ function Detail() { - +

${neu[0].name}

@@ -321,6 +338,8 @@ function Detail() { $(`.${el.name}`).append(`
`); } } + lala(); + gruppenhinzu(); ItemAdden(); groupdelete(); }, @@ -351,6 +370,7 @@ function ItemAdden() { let getid = $(this).closest('.shoplistid'); let id = getid.attr('id'); + console.log(id); globaleAddZwischenID = id; console.log(id); $('.select').remove(); @@ -399,20 +419,29 @@ $(".itemhinzu").click(function () { console.log(zahl); console.log(gruppe); - $.ajax({ - type: "POST", - url: "/item", - data: { - group_id: $('#inputGroupSelect02').val(), - sl_id: globaleAddZwischenID, - name: $('#itemname').val(), - count: $('#inputGroupSelect01').val() - }, - success(result) { - console.log("post item"); - }, - error(err) { + firebase.auth().onAuthStateChanged(async function (user) { + if (user) { + firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) { + $.ajax({ + type: "POST", + url: "/item", + data: { + group_id: $('#inputGroupSelect02').val(), + sl_id: globaleAddZwischenID, + name: $('#itemname').val(), + count: $('#inputGroupSelect01').val() + }, + success(result) { + console.log("post item"); + }, + error(err) { + + } + }); + }).catch((error) => console.error("Get id token client error: ", error)); + } else { + console.log("Check Auth error", user) } });