diff --git a/express-server/public/javascripts/user.js b/express-server/public/javascripts/user.js index f9c5ce7a..acc20fff 100644 --- a/express-server/public/javascripts/user.js +++ b/express-server/public/javascripts/user.js @@ -25,12 +25,15 @@ var vue = new Vue({ dataPic: '', image: '', idToken: '', - mid: '' + mid: '', + showUploadButtons: '' }, methods: { fertig(){ - this.dbUserUpdate(this.idToken, name, this.dataPic, this.mid); + this.dbUserUpdate(this.idToken, name, this.image, this.mid); + this.image = ''; + this.startGetUser(); }, updateUser(){ console.log("updateuser") @@ -47,20 +50,18 @@ var vue = new Vue({ console.log("Zugriff auf msg", token, this.name, vm.dataPic); vm.idToken = idToken; vm.mid = token; - vm.image = ''; }) .catch(err => { console.error("Msg Error: ", err); vm.idToken = idToken; vm.mid = ""; - vm.image = ''; }) }).catch(function (error) { console.error("Get id token client error: ", error) }); - + this.showUploadButtons = ''; }, dbUserUpdate(token, name, pic, mid){ console.log("dbuserupdate: ", token, "\nname", name,"\npic: ", pic, "\nMId: ", mid) @@ -119,6 +120,7 @@ var vue = new Vue({ var vm = this; var currentUser = firebase.auth().currentUser; var uid = currentUser.uid; + this.dataPic = this.image; var uploadTask = storage.ref('/').child(uid).putString(this.image, 'data_url', {contentType:'image/jpeg'}); uploadTask.on(firebase.storage.TaskEvent.STATE_CHANGED, // or 'state_changed' function(snapshot) { @@ -143,7 +145,6 @@ var vue = new Vue({ } console.log("download Url", downloadURL) vm.image = downloadURL; - vm.dataPic = downloadURL; vm.updateUser(); }); }, @@ -171,6 +172,7 @@ var vue = new Vue({ reader.onload = (e) => { vm.dataPic = e.target.result; vm.image = e.target.result; + this.showUploadButtons = 'true'; }; reader.readAsDataURL(file); }, diff --git a/express-server/views/user.ejs b/express-server/views/user.ejs index c249fb2a..eff887bd 100644 --- a/express-server/views/user.ejs +++ b/express-server/views/user.ejs @@ -18,6 +18,7 @@
+
@@ -25,8 +26,7 @@
-
-

Select an image

+