ocr design fix

This commit is contained in:
LukasNowy 2019-02-18 09:26:12 +01:00
parent 4464697a73
commit e97fb4ce2e
3 changed files with 46 additions and 44 deletions

View File

@ -44,8 +44,6 @@ var config = {
firebase.initializeApp(config); firebase.initializeApp(config);
getAllShoppinglists(); getAllShoppinglists();
//updateUser();
displayShoppinglist();
function movePurchases(text) { function movePurchases(text) {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) { firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
@ -189,41 +187,3 @@ 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 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)}});
}

View File

@ -10,29 +10,46 @@
} }
.opt2 { .opt2 {
background-color: #039be5 ; background-color: #039be5 !important;
height: 100%; height: 100%;
max-height: 100%; max-height: 100%;
transition: 1s; transition: 1s;
} }
.opt2:hover { .opt2:hover {
background-color: #4fc3f7; background-color: #4fc3f7 !important;
} }
.r1 { .r1 {
height: 100%; height: 100%;
max-height: 100%; max-height: 100%;
margin-top: 100%; margin-top: 100%;
transform: translateY(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 { html, body {
height: 100%; height: 100%;
margin: 0; margin: 0;
max-height: 100%; max-height: 100%;
overflow: hidden; overflow: hidden;
background-color: #161616; background-color: #242424;
} }
.ico { .ico {
@ -44,5 +61,30 @@ html, body {
.collection .collection-item.active { .collection .collection-item.active {
/* background-color: #00c853; */ /* background-color: #00c853; */
background-color: rgb(0, 195, 255);
color: rgb(24, 24, 24);
} }
.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;
}

View File

@ -94,7 +94,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="modal-close waves-effect waves-red btn-flat btndash">Return to Dashboard</a> <a class="modal-close waves-effect waves-red btn-flat btndash">Return to Dashboard</a>
<a href="#!" class="modal-close waves-effect waves-green btn-flat btncont">Continue</a> <a class="modal-close waves-effect waves-green btn-flat btncont">Continue</a>
</div> </div>
</div> </div>