diff --git a/express-server/package.json b/express-server/package.json index cc02876d..2d084ed4 100644 --- a/express-server/package.json +++ b/express-server/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "node ./bin/www" + "start": "nodemon ./bin/www" }, "dependencies": { "axios": "^0.18.0", diff --git a/express-server/public/javascripts/ajax.js b/express-server/public/javascripts/ajax.js index e759e10c..3e99fcd3 100644 --- a/express-server/public/javascripts/ajax.js +++ b/express-server/public/javascripts/ajax.js @@ -229,6 +229,7 @@ function Detail(){ idtoken: idtoken }, success(res){ + console.log(res.groups) console.log("/myshoppinglists inside idtoken: ", idtoken) $.ajax({ type: "GET", @@ -255,31 +256,22 @@ function Detail(){ //ITEM ADD // von Card Header Kopiert - // - // - // - - $(".card-header").append(` + $(".card-header").append(`
- - - +

${neu[0].name} -

- - - +
`); - for (let i = 0; i < res.length; i++) { - const el = res[i]; - $(".card-text").append(`
-
+ for (let i = 0; i < res.groups.length; i++) { + const el = res.groups[i]; + $(".card-body").append(`
${el.name}
-
-
`); + `); } ItemAdden() }, @@ -303,6 +295,42 @@ function Detail(){ function ItemAdden(){ $(".itemadd").click(function(){ - alert("aleert"); + + let getid = $(this).closest('.shoplistid'); + let id = getid.attr('id'); + console.log(id); + + $('.GroupItemAdd').modal('show'); + + firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) { + $.ajax({ + type: "GET", + url: "/shoppinglist_json/" + id, + data: { + idtoken: idtoken + }, + success(result){ + + console.log(result); + + for (let i = 0; i < result.groups.length; i++) { + const el = result.groups[i]; + $(".custom-select").append(` + + `); + } + + }, + error(err){ + console.log(err); + } + }); + }).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}}); }); -} \ No newline at end of file +} + +$(".itemhinzu").click(function(){ + + + +}); \ No newline at end of file diff --git a/express-server/public/stylesheets/style.css b/express-server/public/stylesheets/style.css index f9439c80..f418d6cf 100644 --- a/express-server/public/stylesheets/style.css +++ b/express-server/public/stylesheets/style.css @@ -48,5 +48,5 @@ background: transparent; position: absolute; right:5px; - margin-top: -50px; + border: 0px; } \ No newline at end of file diff --git a/express-server/views/dash.ejs b/express-server/views/dash.ejs index f187b070..9a454bd8 100644 --- a/express-server/views/dash.ejs +++ b/express-server/views/dash.ejs @@ -2,6 +2,7 @@ + @@ -43,7 +44,7 @@
-
+
@@ -75,6 +76,42 @@ + + + +