dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
InesSuess
2019-01-29 19:46:51 +01:00
parent 9141c17e4d
commit 05568120bf
3 changed files with 94 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
express-server/public/javascripts/ajax.js
View File

@ -47,6 +47,7 @@ $(document).ready(function() {
data: {
name: $("#einkaufslistenname").val(),
description: $("#einkaufslistenbeschreibung").val(),
color: $( "input:checked" ).val(),
idtoken: idtoken
},
success(res){
@ -126,14 +127,14 @@ function eigeneEinkaufslisten(){
const el = res[i];
$(".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" style="background-color: #b3b3b3;">
<div class="card border-light mb-3 shadow-sm" style="max-width: 18rem;" id="${el.sl_id}">
<div class="card-header" style="background-color: #${el.color};">
<span>
<img src="${picture}" alt="Avatar" style="width:10%; border-radius: 50%;">
${userinfo}</span>
<button class="btn edit"><i class="fas fa-pencil-alt "></i></button>
<button class="btn trash"><i class="far fa-trash-alt"></i></button>
<button class="btn groupadd" data-toggle="modal" data-target=".ListenDetailAdd"><i class="fas fa-ellipsis-v"></i></button>
<button class="btn groupadd" data-toggle="modal" data-target=".ListenDetailAdd"><i class="fas fa-plus"></i></button>
</div>
<div class="card-body">
@ -255,12 +256,12 @@ function Detail(){
var link = "/dash/"+idtoken;
$(".card-header").append(`<div class="shoplistid" id="${id}" style="background-color:#b3b3b3">
$(".card-header").append(`<div class="shoplistid" id="${id}">
<a href="${link}" style="left: 5px; margin-top: -50px">
<i class="fas fa-caret-left"></i>
</a>
<button class="itemadd">
<i class="fas fa-ellipsis-v"></i>
<i class="fas fa-plus"></i>
</button>
<h1 class="text-center">
${neu[0].name}
@ -280,9 +281,7 @@ function Detail(){
`);
for(let x = 0; x < el.content.length; x++){
const el2 = el.content[x]
$(`.${el.name}`).append(`<div class="collapse" id="${el.name}"><ul><li>${el2.name}</li></ul></div>
`);
$(`.${el.name}`).append(`<div class="collapse" id="${el.name}"><ul><li>${el2.count}x ${el2.name}</li></ul></div>`);
}
}
ItemAdden();

24
express-server/public/stylesheets/style.css
View File

@ -71,4 +71,26 @@
position: absolute;
right:23px;
margin-top:-40px;
}
}
/* button.change {
border: none;
}
button.change:hover{
cursor:pointer;
}
button:active{
outline: none;
border: none;
} */
/*
button:focus{
outline: none;
} */
.btn:focus, .btn:active {
outline: none !important;
box-shadow: none !important;
}