diff --git a/express-server/public/javascripts/ajax.js b/express-server/public/javascripts/ajax.js index 6d20e964..ecb90118 100644 --- a/express-server/public/javascripts/ajax.js +++ b/express-server/public/javascripts/ajax.js @@ -111,6 +111,9 @@ function eigeneEinkaufslisten(){ success(res){ firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) { console.log("/userinfo_json idtoken: ",idtoken) + // user = firebase.auth().currentUser; + var userinfo = user.displayName; + console.log(userinfo); $.ajax({ type: "GET", url: "/userinfo_json", @@ -118,8 +121,7 @@ function eigeneEinkaufslisten(){ idtoken: idtoken }, success(data){ - let userinfo = "jhsbdjhf"; - // console.log(userinfo); + for(let i = 0; i < res.length; i++){ const el = res[i]; diff --git a/express-server/routes/index.js b/express-server/routes/index.js index 0ca9d392..6f6e10c8 100644 --- a/express-server/routes/index.js +++ b/express-server/routes/index.js @@ -82,11 +82,6 @@ router.get('/dash/:idtoken', function(req, res, next) { res.render('dash'); }); -router.get('/logout', (req, res, next) => { - - -}); - // SmartShopper @@ -192,6 +187,7 @@ router.get("/shoppinglist_json/:sl_id", async (req, res) => { router.delete("/shoppinglist", async (req, res) => { try { res.status(200).send(await postgres.deleteShoppinglist(req.body.sl_id)); + sendPush("enG4tJ6LyyU:APA91bEYjUEs7Sdzvu2ivgfqtpzlg42BZLlujDSRg0WLBvfZ_oD4V7cTx2o6MVr4oAdeHaK0wttPMQ85GMMOkgM7xvbHFcwXUG4MCr8JXX16S-OV2CS4ikQ286DOHPtBotbM7pqFTvIM", "Die Einkaufsliste " + req.body.sl_id + " wurde gelöscht!", "Einkaufsliste wurde geändert") } catch(err) {