From 3aacc7fcc196d3467ec163b59250955e0526ea24 Mon Sep 17 00:00:00 2001 From: brunosimon Date: Mon, 14 Aug 2017 23:02:02 +0200 Subject: [PATCH] :sparkles: Site > Chat > Add messages sending --- site/src/components/chat/script.js | 18 ++++++++++++++++-- site/src/components/chat/template.html | 3 +++ site/src/components/connexion/script.js | 16 +++++++++++++++- site/src/store/modules/chat.js | 7 ++++++- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/site/src/components/chat/script.js b/site/src/components/chat/script.js index 7686108..b532fd5 100644 --- a/site/src/components/chat/script.js +++ b/site/src/components/chat/script.js @@ -5,7 +5,8 @@ export default data() { return { - userName: '' + userName: '', + messageText: '' } }, @@ -38,7 +39,7 @@ export default { onUserNameChange() { - this.$store.commit('askUpdateUser', { name: this.userName }) + this.$store.commit('setPendingUser', { name: this.userName }) }, onUserNameKeyDown(event) @@ -48,6 +49,19 @@ export default { event.target.blur() } + }, + + onMessageTextKeyDown(event) + { + // Blur if enter pressed + if(event.keyCode === 13) + { + event.preventDefault() + event.target.blur() + + this.$store.commit('setPendingMessage', { text: this.messageText }) + this.messageText = '' + } } } } \ No newline at end of file diff --git a/site/src/components/chat/template.html b/site/src/components/chat/template.html index f2a0edc..af3e200 100644 --- a/site/src/components/chat/template.html +++ b/site/src/components/chat/template.html @@ -18,4 +18,7 @@
Your nickname is
+
+ +
\ No newline at end of file diff --git a/site/src/components/connexion/script.js b/site/src/components/connexion/script.js index aca7e55..03baea8 100644 --- a/site/src/components/connexion/script.js +++ b/site/src/components/connexion/script.js @@ -14,13 +14,19 @@ export default pendingUser() { return this.$store.state.chat.pendingUser + }, + + pendingMessage() + { + return this.$store.state.chat.pendingMessage } }, watch: { project: 'onProjectChange', - pendingUser: 'onPendingUser' + pendingUser: 'onPendingUser', + pendingMessage: 'onPendingMessage' }, created() @@ -105,6 +111,14 @@ export default { this.chatSocket.emit('update_user', value) } + }, + + onPendingMessage(value) + { + if(value) + { + this.chatSocket.emit('message', value) + } } } } \ No newline at end of file diff --git a/site/src/store/modules/chat.js b/site/src/store/modules/chat.js index d57584e..1df5e8e 100644 --- a/site/src/store/modules/chat.js +++ b/site/src/store/modules/chat.js @@ -24,9 +24,14 @@ export default { state.user = data }, - askUpdateUser(state, data) + setPendingUser(state, data) { state.pendingUser = data + }, + + setPendingMessage(state, data) + { + state.pendingMessage = data } } } \ No newline at end of file