From a2bb9f25d3e7ef1fe2cb5e1382531406b36ced39 Mon Sep 17 00:00:00 2001 From: InesSuess Date: Mon, 3 Dec 2018 21:06:36 +0100 Subject: [PATCH] noch nicht alles ausgegeben style fehlt teils So ziemlich alle routes bis auf item add und noch nicht alle detail ausgaben .... --- express-server/public/javascripts/ajax.js | 184 ++++++++++++++++---- express-server/public/stylesheets/style.css | 27 ++- express-server/views/index.ejs | 80 +++++++-- 3 files changed, 241 insertions(+), 50 deletions(-) diff --git a/express-server/public/javascripts/ajax.js b/express-server/public/javascripts/ajax.js index 540c5b98..093a8190 100644 --- a/express-server/public/javascripts/ajax.js +++ b/express-server/public/javascripts/ajax.js @@ -1,7 +1,36 @@ $(document).ready(function() { - bekommen(); - // loeschen(); + eigeneEinkaufslisten(); + geteilteEinkaufslisten(); + $(".detailcardausgabe").hide(); + + $(".gruppenadd").click(function(){ + + // let name = $("#groupname").val(); + // let color = $("#groupfarbe").val(); + + $.ajax({ + type: "POST", + url: "/group", + data: { + sl_id: globaleAddZwischenID, + name: $("#groupname").val(), + color: $("#groupfarbe").val() + }, + success(res){ + console.log("groupadd funktioniert"); + $("#mySmallModalLabel").modal("hide"); + }, + error(err){ + console.log("error"); + } + }); + }); + + $(".sl_add").click(function(){ + $('#EigeneListeAdd').modal('show'); + }); + $(".add").click(function(){ @@ -17,16 +46,7 @@ $(document).ready(function() { }, success(res){ console.log("add funktioniert"); - $("#mySmallModalLabel").modal("hide"); - // $(".listen-ausgabe").append(`
- //
- //
Username...
- //
- //
`+ $("#einkaufslistenname").val() +`
- //

`+ $("#einkaufslistenbeschreibung").val() +`

- //
- //
` - // ) + $("#normalAdd").modal("hide"); }, error(err){ console.log("error"); @@ -37,33 +57,68 @@ $(document).ready(function() { }); -function bekommen(){ +var globaleAddZwischenID = ""; +// var globaleGetZwischenID = ""; + +function eigeneEinkaufslisten(){ $.ajax({ type: "GET", url: "/myshoppinglists", - success(data){ - console.log("get funktioniert"); - for(let i = 0; i < data.length; i++){ - const el = data[i]; + success(res){ - $(".listen-ausgabe").append(`
-
-
Username...
-
-
${el.name}
-

${el.description}

-
-
` - ) - } - loeschen(); + $.ajax({ + type: "GET", + url: "/userinfo_json", + success(data){ + let userinfo = data.profile.displayName + console.log(userinfo); + + for(let i = 0; i < res.length; i++){ + const el = res[i]; + + $(".listen-ausgabe").append(`
+
+
+ ${userinfo} + + + +
+ +
+
${el.name}
+

${el.description}

+
+
` + ) + } + console.log("Eigene Einkaufslisten"); + loeschen(); + lala(); + Detail(); + // groupHinzufügen() + } + }) }, error(err){ console.log("error"); } }); -} +}; + +function geteilteEinkaufslisten(){ + $.ajax({ + data: "GET", + url: "/sharedshoppinglists", + success(res){ + console.log("Geteilte Einkaufslisten"); + }, + error(err){ + console.log("error"); + } + }); +}; function loeschen(){ $(".trash").click(function(){ @@ -80,13 +135,80 @@ function loeschen(){ sl_id: id}, success(res){ console.log("card gelöscht"); - // bekommen(); card.remove(); }, error(err){ - + console.log("error"); } }); }); +}; + +function lala(){ + $(".groupadd").click(function(){ + let card = $(this).closest(".card"); + let id = card.attr("id"); + globaleAddZwischenID = id; + }); +} + +function Detail(){ + $(".edit").click(function(){ + + $(".cardausgabe").hide(); + $(".detailcardausgabe").show(); + + let card = $(this).closest(".card"); + let id = card.attr("id"); + + $.ajax({ + data: "GET", + url: "/shoppinglist_json/" + id, + success(res){ + + $.ajax({ + type: "GET", + url: "/myshoppinglists", + success(result){ + + $.ajax({ + type: "GET", + url: "/userinfo_json", + success(data){ + let userinfo = data.profile.displayName + console.log(userinfo); + + const neu = result.filter(obj => obj.sl_id === id); + + $(".card-header").append(`

${neu[0].name}

+ `); + for (let i = 0; i < res.length; i++) { + const el = res[i]; + $(".card-text").append(`
+
+
${el.name}
+
+
`); + } + ItemAdden() + } + }) + }, + error(err){ + console.log("error"); + } + }); + }, + error(err){ + console.log("error"); + } + }); + }); +}; + +function ItemAdden(){ + $(".itemadd").click(function(){ + alert("aleert"); + }); } \ No newline at end of file diff --git a/express-server/public/stylesheets/style.css b/express-server/public/stylesheets/style.css index e5481ebc..f9439c80 100644 --- a/express-server/public/stylesheets/style.css +++ b/express-server/public/stylesheets/style.css @@ -22,6 +22,31 @@ .trash{ background: transparent; position:absolute; - right:5px; + right: 29px; margin-top:-7px; +} + +.edit{ + background: transparent; + position: absolute; + right: 60px; + margin-top:-7px; +} + +.groupadd{ + background: transparent; + position: absolute; + right:5px; + margin-top: -7px; +} + +.ueberschrift{ + font-size: 25px; +} + +.itemadd{ + background: transparent; + position: absolute; + right:5px; + margin-top: -50px; } \ No newline at end of file diff --git a/express-server/views/index.ejs b/express-server/views/index.ejs index a8b23d47..27598f93 100644 --- a/express-server/views/index.ejs +++ b/express-server/views/index.ejs @@ -5,6 +5,7 @@ + @@ -18,42 +19,84 @@

- -
+ +
-
+
+ +
+
+
- - + + + + + + + + +