From eb9a230d69a4df53eef8220a13cfd19ad3763f55 Mon Sep 17 00:00:00 2001
From: InesSuess <suess936i@htl-ottakring.ac.at>
Date: Thu, 24 Jan 2019 23:10:35 +0100
Subject: [PATCH] =?UTF-8?q?colorpicker=20fertig=20und=20gruppen=20l=C3=B6s?=
 =?UTF-8?q?chbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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, 103 insertions(+), 44 deletions(-)

diff --git a/express-server/public/javascripts/ajax.js b/express-server/public/javascripts/ajax.js
index 3abdd961..631a5654 100644
--- a/express-server/public/javascripts/ajax.js
+++ b/express-server/public/javascripts/ajax.js
@@ -68,6 +68,7 @@ $(document).ready(function() {
 
         // let name = $("#groupname").val();
         // let color = $("#groupfarbe").val();
+        $("#ListenDetailAdd").modal("hide");
         
         $.ajax({
             type: "POST",
@@ -79,7 +80,7 @@ $(document).ready(function() {
             },
             success(res){
                 console.log("groupadd funktioniert");
-                $("#mySmallModalLabel").modal("hide");
+                
             },
             error(err){
                 console.log("error");
@@ -126,7 +127,7 @@ function eigeneEinkaufslisten(){
                 
                                 $(".listen-ausgabe").append(`<div class="col-md-12 karten">
                                 <div class="card border-light mb-3" style="max-width: 18rem;" id="${el.sl_id}">
-                                    <div class="card-header">
+                                    <div class="card-header" style="background-color: #b3b3b3;">
                                     <span>
                                     <img src="${picture}" alt="Avatar" style="width:10%; border-radius: 50%;">
                                         ${userinfo}</span>
@@ -210,6 +211,7 @@ function lala(){
         let card = $(this).closest(".card");
         let id = card.attr("id");
         globaleAddZwischenID = id;
+        $("#groupname").val("");
     });
 }
 
@@ -253,10 +255,7 @@ function Detail(){
 
                                     var link = "/dash/"+idtoken;
 
-                                    //ITEM ADD
-                                    // von Card Header Kopiert
-
-                                    $(".card-header").append(`<div class="shoplistid" id="${id}">
+                                    $(".card-header").append(`<div class="shoplistid" id="${id}" style="background-color:#b3b3b3">
                                         <a href="${link}" style="left: 5px; margin-top: -50px">
                                             <i class="fas fa-caret-left"></i>
                                         </a>
@@ -269,12 +268,15 @@ function Detail(){
                                     `);
                                     for (let i = 0; i < res.groups.length; i++) {
                                         const el = res.groups[i];
-                                        $(".gruppeninhalt").append(`<div class="card mb-3" style="max-width: 18rem;background-color:#${el.color};">
-                                        <div class="card-header"><h5 class="card-title">${el.name}</h5><button class="btn seemore" type="button" data-toggle="collapse" data-target="#${el.name}" aria-expanded="false" aria-controls="${el.name}"><i class="fas fa-caret-down"></i></button>
-                                        <div class="${el.name}">
-                                        </div>
-                                        </div>
-                                      </div>
+                                        $(".gruppeninhalt").append(`<div class="col-md-6 col-lg-4 shoplisteid" id="${res.sl_id}">
+                                        <div class="card mb-3 groupid ${el.group_id}" id="${el.group_id}" style="max-width: 18rem;background-color:#${el.color};">
+
+                                            <div class="card-header"><h5 class="card-title">${el.name}</h5><button class="btn trashgroup"><i class="far fa-trash-alt"></i></button><button class="btn seemore" type="button" data-toggle="collapse" data-target="#${el.name}" aria-expanded="false" aria-controls="${el.name}"><i class="fas fa-caret-down"></i></button>
+                                                <div class="${el.name}">
+                                                </div>
+                                            </div>
+
+                                        </div></div>
                                         `);
                                         for(let x = 0; x < el.content.length; x++){
                                             const el2 = el.content[x]
@@ -283,7 +285,8 @@ function Detail(){
                                         `);
                                     }
                                     }
-                                    ItemAdden()
+                                    ItemAdden();
+                                    groupdelete();
                                 },
                                 error(err){
                                     console.log("Detail error userinfo_json: ", err);
@@ -368,4 +371,33 @@ $(".itemhinzu").click(function(){
 
     Detail();
 
-});
\ No newline at end of file
+});
+
+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
diff --git a/express-server/public/stylesheets/colorpicker-style.css b/express-server/public/stylesheets/colorpicker-style.css
index 050ab98e..6dc42c32 100644
--- a/express-server/public/stylesheets/colorpicker-style.css
+++ b/express-server/public/stylesheets/colorpicker-style.css
@@ -38,13 +38,19 @@ input[type="radio"] {
   input[type="radio"]:checked + label .farbe7 {
     border: 1px solid black;
   }
-  input[type="radio"]:checked + label .violet {
+  input[type="radio"]:checked + label .farbe8 {
     border: 1px solid black;
   }
-  input[type="radio"]:checked + label .purple {
+  input[type="radio"]:checked + label .farbe9 {
     border: 1px solid black;
   }
-  input[type="radio"]:checked + label .pink {
+  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 {
     border: 1px solid black;
   }
   label {
@@ -81,15 +87,21 @@ input[type="radio"] {
   label span.farbe6 {
     background: #2196F3;
   }
-  label span.blue {
-    background: #03A9F4;
+  label span.farbe7 {
+    background: #03a9f4;
   }
-  label span.violet {
-    background: #00BCD4;
+  label span.farbe8 {
+    background: #00bcd4;
   }
-  label span.purple {
+  label span.farbe9 {
     background: #009688;
   }
-  label span.pink {
-    background: #4CAF50;
+  label span.farbe10 {
+    background: #4caf50;
+  }
+  label span.farbe11 {
+    background: #8bc34a;
+  }
+  label span.farbe12 {
+    background: #cddc39;
   }
\ No newline at end of file
diff --git a/express-server/public/stylesheets/style.css b/express-server/public/stylesheets/style.css
index 169545a7..49d566e8 100644
--- a/express-server/public/stylesheets/style.css
+++ b/express-server/public/stylesheets/style.css
@@ -60,4 +60,15 @@
 
 .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 91cc5c1a..415a3b14 100644
--- a/express-server/views/dash.ejs
+++ b/express-server/views/dash.ejs
@@ -13,7 +13,7 @@
   <body id="vue-app">
 
     <!-- Navbar -->
-    <nav class="navbar sticky-top navbar-light bg-light" style="background-color:rgb(200, 200, 201)">
+    <nav class="navbar sticky-top navbar-light spez-farbe" style="background-color:rgb(200, 200, 201)">
         <a class="navbar-brand" id="dashurl">
             <div class="logo-image">
                 <img src="/images/Logo.png" class="img-fluid">
@@ -33,7 +33,7 @@
     <br>
 
     <!-- alle cards-->
-    <div class="container justify-content-center cardausgabe">
+    <div class="row justify-content-center cardausgabe">
         <div class="card-columns">
             <div class="listen-ausgabe">
             </div>
@@ -43,16 +43,20 @@
     <!-- detail card -->
     <div class="row justify-content-center ">
         <div class="card border-light mb-3 detailcardausgabe" style="width: 50rem;">
-            <div class="card-header"></div>
+            <div class="card-header" style="background-color: #b3b3b3;"></div>
 
-            <div class="card-body text-dark gruppeninhalt"></div>
+            <div class="card-body text-dark">
+                <div class="row justify-content-center gruppeninhalt">
+                    
+                </div>
+            </div>
                 
         </div>
     </div>
 
 
     <!-- Modal Group Hinzufügen -->
-    <div class="modal fade bd-example-modal-sm ListenDetailAdd" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
+    <div class="modal fade bd-example-modal-sm ListenDetailAdd" tabindex="-1" role="dialog" aria-labelledby="ListenDetailAdd" aria-hidden="true">
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
                 <div>
@@ -68,7 +72,7 @@
                       <div class="farbeeen">
                             
                         <input type="radio" name="color" id="farbe1" value="F44336" />
-                        <label for="farbe1"><span class="farbe1 border"></span></label>
+                        <label for="farbe1"><span class="farbe1"></span></label>
     
                         <input type="radio" name="color" id="farbe2" value="e91e63" />
                         <label for="farbe2"><span class="farbe2"></span></label>
@@ -85,25 +89,25 @@
                         <input type="radio" name="color" id="farbe6" value="2196F3" />
                         <label for="farbe6"><span class="farbe6"></span></label>
 
-                        <!-- <br> 
+                        <br> 
     
-                        <input type="radio" name="color" id="violet" value="violet" />
-                        <label for="violet"><span class="violet"></span></label>
+                        <input type="radio" name="color" id="farbe7" value="03a9f4" />
+                        <label for="farbe7"><span class="farbe7"></span></label>
     
-                        <input type="radio" name="color" id="purple" value="purple" />
-                        <label for="purple"><span class="purple"></span></label>
+                        <input type="radio" name="color" id="farbe8" value="00bcd4" />
+                        <label for="farbe8"><span class="farbe8"></span></label>
     
-                        <input type="radio" name="color" id="pink" value="pink" />
-                        <label for="pink"><span class="pink"></span></label>
+                        <input type="radio" name="color" id="farbe9" value="009688" />
+                        <label for="farbe9"><span class="farbe9"></span></label>
 
-                        <input type="radio" name="color" id="blue" value="blue" />
-                        <label for="blue"><span class="blue"></span></label>
+                        <input type="radio" name="color" id="farbe10" value="4caf50" />
+                        <label for="farbe10"><span class="farbe10"></span></label>
     
-                        <input type="radio" name="color" id="violet" value="violet" />
-                        <label for="violet"><span class="violet"></span></label>
+                        <input type="radio" name="color" id="farbe11" value="8bc34a" />
+                        <label for="farbe11"><span class="farbe11"></span></label>
     
-                        <input type="radio" name="color" id="purple" value="purple" />
-                        <label for="purple"><span class="purple"></span></label> -->
+                        <input type="radio" name="color" id="farbe12" value="cddc39" />
+                        <label for="farbe12"><span class="farbe12"></span></label>
 
                         </div>
                     </div>
@@ -118,7 +122,7 @@
 
 
     <!-- Modal Item Hinzufügen -->
-    <div class="modal fade bd-example-modal-sm GroupItemAdd" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
+    <div class="modal fade bd-example-modal-sm GroupItemAdd" tabindex="-1" role="dialog" aria-labelledby="GroupItemAdd" aria-hidden="true">
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
                 <div class="inhalt">