From d9c3d422d77f2fb3b42157b022995b8bd59ce59d Mon Sep 17 00:00:00 2001 From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com> Date: Sat, 26 Jan 2019 21:08:38 +0100 Subject: [PATCH 1/7] =?UTF-8?q?Revert=20"colorpicker=20fertig=20und=20grup?= =?UTF-8?q?pen=20l=C3=B6schbar"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit eb9a230d69a4df53eef8220a13cfd19ad3763f55. --- express-server/public/javascripts/ajax.js | 60 +++++-------------- .../public/stylesheets/colorpicker-style.css | 32 ++++------ express-server/public/stylesheets/style.css | 11 ---- express-server/views/dash.ejs | 44 +++++++------- 4 files changed, 44 insertions(+), 103 deletions(-) diff --git a/express-server/public/javascripts/ajax.js b/express-server/public/javascripts/ajax.js index 631a5654..3abdd961 100644 --- a/express-server/public/javascripts/ajax.js +++ b/express-server/public/javascripts/ajax.js @@ -68,7 +68,6 @@ $(document).ready(function() { // let name = $("#groupname").val(); // let color = $("#groupfarbe").val(); - $("#ListenDetailAdd").modal("hide"); $.ajax({ type: "POST", @@ -80,7 +79,7 @@ $(document).ready(function() { }, success(res){ console.log("groupadd funktioniert"); - + $("#mySmallModalLabel").modal("hide"); }, error(err){ console.log("error"); @@ -127,7 +126,7 @@ function eigeneEinkaufslisten(){ $(".listen-ausgabe").append(`
-
+
Avatar ${userinfo} @@ -211,7 +210,6 @@ function lala(){ let card = $(this).closest(".card"); let id = card.attr("id"); globaleAddZwischenID = id; - $("#groupname").val(""); }); } @@ -255,7 +253,10 @@ function Detail(){ var link = "/dash/"+idtoken; - $(".card-header").append(`
+ //ITEM ADD + // von Card Header Kopiert + + $(".card-header").append(`
@@ -268,15 +269,12 @@ function Detail(){ `); for (let i = 0; i < res.groups.length; i++) { const el = res.groups[i]; - $(".gruppeninhalt").append(`
-
- -
${el.name}
-
-
-
- -
+ $(".gruppeninhalt").append(`
+
${el.name}
+
+
+
+
`); for(let x = 0; x < el.content.length; x++){ const el2 = el.content[x] @@ -285,8 +283,7 @@ function Detail(){ `); } } - ItemAdden(); - groupdelete(); + ItemAdden() }, error(err){ console.log("Detail error userinfo_json: ", err); @@ -371,33 +368,4 @@ $(".itemhinzu").click(function(){ Detail(); -}); - -function groupdelete(){ - $('.trashgroup').click(function(){ - - let getid = $(this).closest('.shoplisteid'); - let shoplistid = getid.attr('id'); - let getid2 = $(this).closest('.groupid'); - let groupid = getid2.attr('id'); - - console.log(shoplistid); - console.log(groupid); - - $.ajax({ - type: "DELETE", - url: "/group", - data: { - sl_id: shoplistid, - group_id: groupid}, - success(res){ - console.log("card gelöscht"); - $(`.${groupid}`).remove(); - }, - error(err){ - console.log("error"); - } - }); - - }); -}; \ No newline at end of file +}); \ No newline at end of file diff --git a/express-server/public/stylesheets/colorpicker-style.css b/express-server/public/stylesheets/colorpicker-style.css index 6dc42c32..050ab98e 100644 --- a/express-server/public/stylesheets/colorpicker-style.css +++ b/express-server/public/stylesheets/colorpicker-style.css @@ -38,19 +38,13 @@ input[type="radio"] { input[type="radio"]:checked + label .farbe7 { border: 1px solid black; } - input[type="radio"]:checked + label .farbe8 { + input[type="radio"]:checked + label .violet { border: 1px solid black; } - input[type="radio"]:checked + label .farbe9 { + input[type="radio"]:checked + label .purple { border: 1px solid black; } - input[type="radio"]:checked + label .farbe10 { - border: 1px solid black; - } - input[type="radio"]:checked + label .farbe11 { - border: 1px solid black; - } - input[type="radio"]:checked + label .farbe12 { + input[type="radio"]:checked + label .pink { border: 1px solid black; } label { @@ -87,21 +81,15 @@ input[type="radio"] { label span.farbe6 { background: #2196F3; } - label span.farbe7 { - background: #03a9f4; + label span.blue { + background: #03A9F4; } - label span.farbe8 { - background: #00bcd4; + label span.violet { + background: #00BCD4; } - label span.farbe9 { + label span.purple { background: #009688; } - label span.farbe10 { - background: #4caf50; - } - label span.farbe11 { - background: #8bc34a; - } - label span.farbe12 { - background: #cddc39; + label span.pink { + background: #4CAF50; } \ No newline at end of file diff --git a/express-server/public/stylesheets/style.css b/express-server/public/stylesheets/style.css index 49d566e8..169545a7 100644 --- a/express-server/public/stylesheets/style.css +++ b/express-server/public/stylesheets/style.css @@ -60,15 +60,4 @@ .farbeeen{ margin-left: 19px; -} - -.spez-farbe{ - background-color: #b3b3b3; -} - -.trashgroup{ - background: transparent; - position: absolute; - right:23px; - margin-top:-40px; } \ No newline at end of file diff --git a/express-server/views/dash.ejs b/express-server/views/dash.ejs index 415a3b14..91cc5c1a 100644 --- a/express-server/views/dash.ejs +++ b/express-server/views/dash.ejs @@ -13,7 +13,7 @@ -