diff --git a/express-server/public/javascripts/user.js b/express-server/public/javascripts/user.js
index d19ff5b8..728a5ccb 100644
--- a/express-server/public/javascripts/user.js
+++ b/express-server/public/javascripts/user.js
@@ -18,10 +18,11 @@ var msg = firebase.messaging();
var vue = new Vue({
el: '#vue-app',
prop: {
- name: '',
+
getpic: ''
},
data: {
+ name: '',
dataPic: '',
image: '',
idToken: '',
@@ -39,55 +40,45 @@ var vue = new Vue({
var currentUser = firebase.auth().currentUser;
var vm = this;
currentUser.getIdToken( /* forceRefresh */ true).then(function (idToken) {
- console.log("Vor Replace");
+
msg.requestPermission()
.then(function () {
-
return msg.getToken();
})
.then(token => {
- console.log("Zugriff auf msg", token, this.name, vm.dataPic);
vm.idToken = idToken;
vm.mid = token;
- console.log("IMAGE befor dbuserupdate: ", vm.image)
- vm.dbUserUpdate(vm.idToken, name, vm.image, vm.mid);
- vm.image = '';
- vm.startGetUser();
+ vm.dbUserUpdate(vm.idToken, vm.name, vm.image, vm.mid);
+ window.location.href = "/";
})
.catch(err => {
console.error("Msg Error: ", err);
vm.idToken = idToken;
vm.mid = "";
- console.log("IMAGE befor dbuserupdate: ", vm.image)
- vm.dbUserUpdate(vm.idToken, name, vm.image, vm.mid);
- vm.image = '';
- vm.startGetUser();
+ vm.dbUserUpdate(vm.idToken, vm.name, vm.image, vm.mid);
+
+ window.location.href = "/";
})
}).catch(function (error) {
console.error("Get id token client error: ", error)
});
}else{
- console.log("IMAGE befor dbuserupdate: ", this.image)
- this.dbUserUpdate(this.idToken, name, this.image, this.mid);
- this.image = '';
- this.startGetUser();
+ this.dbUserUpdate(this.idToken, this.name, this.image, this.mid);
+ window.location.href = "/";
}
},
updateUser() {
- console.log("updateuser")
var currentUser = firebase.auth().currentUser;
var vm = this;
currentUser.getIdToken( /* forceRefresh */ true).then(function (idToken) {
- console.log("Vor Replace");
msg.requestPermission()
.then(function () {
return msg.getToken();
})
.then(token => {
- console.log("Zugriff auf msg", token, this.name, vm.dataPic);
vm.idToken = idToken;
vm.mid = token;
})
@@ -104,38 +95,17 @@ var vue = new Vue({
this.showUploadButtons = '';
},
dbUserUpdate(token, name, pic, mid) {
- console.log("dbuserupdate: ", token, "\nname", name, "\npic: ", pic, "\nMId: ", mid)
var vm = this;
var user = firebase.auth().currentUser;
user.updateProfile({
displayName: name,
- photoURL: vm.image
+ photoURL: pic
}).then(async function () {
}).catch(function (error) {
console.error(error)
});
- console.log('Pic for upload: ', vm.image)
-
- // let req = {
- // url: '/userbearbeiten/'+vm.idToken+'/'+name+'/'+vm.dataPic+'/'+vm.mid,
- // method: 'POST',
- // }
- // axios(req).then(response => {
- // resolve(response.data.content)
- // console.log("POST result: ", response)
- // vm.startGetUser();
- // }, response => {
- // this.handleEditError(response)
- // })
-
-
- // axios.post('/userbearbeiten/'+vm.idToken+'/'+name+'/'+vm.dataPic+'/'+vm.mid).then(result => {
- // console.log("POST result: ", result.data)
- // vm.startGetUser();
- // }).catch(err => console.error("Axios error: ", err));
-
$.ajax({
type: "POST",
@@ -147,8 +117,7 @@ var vue = new Vue({
name: name
},
success(result) {
- console.log("POST result: ", result)
- vm.startGetUser();
+ //vm.startGetUser();
},
error(err) {
console.error("Error: " + err);
@@ -156,7 +125,6 @@ var vue = new Vue({
});
},
fotoChoose() {
- console.log("fotochoose")
var vm = this;
var currentUser = firebase.auth().currentUser;
var uid = currentUser.uid;
@@ -179,7 +147,7 @@ var vue = new Vue({
}
},
function (error) {
- console.log(error);
+ console.error(error);
},
function () {
// Upload completed successfully, now we can get the download URL
@@ -187,7 +155,6 @@ var vue = new Vue({
if (!downloadURL) {
downloadURL = 'https://firebasestorage.googleapis.com/v0/b/test-667ca.appspot.com/o/' + uid + '?alt=media&token=7e5f49c8-0e1f-4073-be30-5feaa691a770';
}
- console.log("download Url", downloadURL)
vm.image = downloadURL;
vm.updateUser();
});
@@ -197,9 +164,8 @@ var vue = new Vue({
},
getUser(uid) {
axios.get('/getUser/' + uid).then(result => {
- name = result.data[0].name;
+ this.name = result.data[0].name;
this.dataPic = result.data[0].picture + "";
- console.log("Created: ", this.dataPic, name)
}).catch(err => console.error(err));
},
onFileChange(e) {
@@ -255,7 +221,7 @@ var vue = new Vue({
//GetUser
this.getUser(user.uid);
} else {
- window.location("/");
+ window.location.href = "/";
}
});
},
diff --git a/express-server/views/user.ejs b/express-server/views/user.ejs
index 53744f3b..cbd8a166 100644
--- a/express-server/views/user.ejs
+++ b/express-server/views/user.ejs
@@ -27,7 +27,7 @@
zu SmartShopper