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

Detailansicht verbessert

Browse Source
This commit is contained in:
Lukas Nowy
2019-02-13 00:36:21 +01:00
parent ff07d4ef0b
commit 87e7673513
1069 changed files with 105627 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ $(document).ready(function() {
eigeneEinkaufslisten();
geteilteEinkaufslisten();
$(".detailcardausgabe").hide();
$(".logout").click(function(){
@ -403,4 +404,4 @@ function groupdelete(){
});
});
};
};

1
express-server/public/javascripts/login.js
View File

@ -69,6 +69,7 @@ var vue = new Vue({
});
}
},
mounted() {
axios.post('/user', {

58
express-server/public/ocrscan/ocrscan.js
View File

@ -44,6 +44,8 @@ var config = {
firebase.initializeApp(config);
getAllShoppinglists();
//updateUser();
displayShoppinglist();
function movePurchases(text) {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
@ -186,3 +188,59 @@ var loading = false;
});
}
*/
function updateUser() {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
$.ajax({
type: "POST",
url: "/user",
data:{
idtoken: idtoken,
message_id: "msgtest"
},
success(){
console.log("USer updated");
},
error(err){
console.error("Error: " + err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}
function updateUser() {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
$.ajax({
type: "POST",
url: "/user",
data:{
idtoken: idtoken,
message_id: "msgtest"
},
success(){
console.log("USer updated");
},
error(err){
console.error("Error: " + err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}
function displayShoppinglist() {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
$.ajax({
type: "GET",
url: "/shoppinglist_json/4tezJYMK",
data:{
idtoken: idtoken
},
success(data){
console.log("Result: ", data.sl_id);
},
error(err){
console.error("Error: " + err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}

38
express-server/public/ocrscan/style.css
View File

@ -23,32 +23,16 @@
.r1 {
height: 100%;
max-height: 100%;
transform: translateY(100%);
margin-top: 100%;
}
.r2 {
height: 100%;
max-height: 100%;
transform: translateY(100%);
background-color: #242424;
}
.row {
margin-bottom: 0px !important;
margin-top: 0px !important;
}
.container {
margin-bottom: 0px !important;
margin-top: 0px !important;
}
html, body {
height: 100%;
margin: 0;
max-height: 100%;
overflow: hidden;
background-color: #242424;
background-color: #161616;
}
.ico {
@ -60,23 +44,5 @@ html, body {
.collection .collection-item.active {
/* background-color: #00c853; */
background-color: rgb(0, 195, 255);
color: rgb(24, 24, 24);
}
.collection-item {
/* background-color: #00c853; */
color: rgb(24, 24, 24) !important;
}
.btn-choose {
width: 100%;
}
.progress .indeterminate {
background-color: #f4511e;
}
.progress {
background-color: #f8cfc3;
}