From a099488c6a9b232c088d2bcf14c5bc13fdf82bfd Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 9 Jul 2020 21:59:47 +0100 Subject: [PATCH 1/9] Added send button to chat box --- client/src/components/ChatBox.vue | 63 +++++++++++++++------ client/src/styles/abstracts/_variables.scss | 3 +- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/client/src/components/ChatBox.vue b/client/src/components/ChatBox.vue index 861dda1..1f80933 100644 --- a/client/src/components/ChatBox.vue +++ b/client/src/components/ChatBox.vue @@ -1,37 +1,50 @@ @@ -54,10 +67,26 @@ export default { color: $font_color; font-family: inherit; font-size: 1.75rem; - border-radius: 100px; + border-radius: 100px 0px 0px 100px; &::placeholder { color: transparentize(white, 0.6); } + + .chatbox button { + background: $primary_accent; + padding: 0 2rem; + width: 8%; + height: 70%; + outline: none; + border: none; + color: $font_color; + border-radius: 0px 100px 100px 0px; + } + + .chatbox button:hover { + background: lighten($primary_accent, 50%); + cursor: pointer; + } } diff --git a/client/src/styles/abstracts/_variables.scss b/client/src/styles/abstracts/_variables.scss index d71121a..9e5c73f 100644 --- a/client/src/styles/abstracts/_variables.scss +++ b/client/src/styles/abstracts/_variables.scss @@ -1,5 +1,6 @@ $primary: #B6065A; +$primary_accent: #571635; $bg: #26222C; $bg_dark: #211F28; $font_color: #fafafa; -$font_family: 'Manrope', sans-serif; \ No newline at end of file +$font_family: 'Manrope', sans-serif; \ No newline at end of file From b92c77722debfe77e9fd007be01f23cffea9ede1 Mon Sep 17 00:00:00 2001 From: Colin <9614541+ColinRoitt@users.noreply.github.com> Date: Fri, 10 Jul 2020 16:53:28 +0100 Subject: [PATCH 2/9] Update ChatBox.vue Use single quotes in JS --- client/src/components/ChatBox.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/components/ChatBox.vue b/client/src/components/ChatBox.vue index 1f80933..060915e 100644 --- a/client/src/components/ChatBox.vue +++ b/client/src/components/ChatBox.vue @@ -22,22 +22,22 @@ From 794da07751dd33aed3d050416e722628fe16bffb Mon Sep 17 00:00:00 2001 From: Colin <9614541+ColinRoitt@users.noreply.github.com> Date: Fri, 10 Jul 2020 16:56:05 +0100 Subject: [PATCH 4/9] Update ChatBox.vue --- client/src/components/ChatBox.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/components/ChatBox.vue b/client/src/components/ChatBox.vue index 5bfa5bd..4106305 100644 --- a/client/src/components/ChatBox.vue +++ b/client/src/components/ChatBox.vue @@ -30,16 +30,16 @@ export default { const message = ref(''); const { user } = useState('auth', [ - 'user' + 'user', ]); const { createMessage } = useActions('messages', [ - 'createMessage' + 'createMessage', ]); const sendMessage = () => { createMessage({ - text: message.value + text: message.value, }); message.value = ''; }; From b47d4f42ad1136a662f3ae717e0e38d378deb0c9 Mon Sep 17 00:00:00 2001 From: Colin <9614541+ColinRoitt@users.noreply.github.com> Date: Fri, 10 Jul 2020 16:56:25 +0100 Subject: [PATCH 5/9] Update ChatBox.vue --- client/src/components/ChatBox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/ChatBox.vue b/client/src/components/ChatBox.vue index 4106305..736b765 100644 --- a/client/src/components/ChatBox.vue +++ b/client/src/components/ChatBox.vue @@ -31,7 +31,7 @@ export default { const { user } = useState('auth', [ 'user', - ]); + ]); const { createMessage } = useActions('messages', [ 'createMessage', From 4e4702bbc777c54fc3fd85793f77127f67bb7db7 Mon Sep 17 00:00:00 2001 From: Colin <9614541+ColinRoitt@users.noreply.github.com> Date: Fri, 10 Jul 2020 17:01:19 +0100 Subject: [PATCH 6/9] Update _variables.scss remove weird linting artefacts --- client/src/styles/abstracts/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/styles/abstracts/_variables.scss b/client/src/styles/abstracts/_variables.scss index 9e5c73f..4d4bb54 100644 --- a/client/src/styles/abstracts/_variables.scss +++ b/client/src/styles/abstracts/_variables.scss @@ -3,4 +3,4 @@ $primary_accent: #571635; $bg: #26222C; $bg_dark: #211F28; $font_color: #fafafa; -$font_family: 'Manrope', sans-serif; \ No newline at end of file +$font_family: 'Manrope', sans-serif; From c77542b303cd7634da992a95738c27c9eecbeacd Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 14 Jul 2020 15:56:26 +0100 Subject: [PATCH 7/9] Use shidotmoe custom icons --- client/src/assets/icons/send.png | Bin 0 -> 3237 bytes client/src/components/ChatBox.vue | 56 ++++++++++++------------------ 2 files changed, 23 insertions(+), 33 deletions(-) create mode 100644 client/src/assets/icons/send.png diff --git a/client/src/assets/icons/send.png b/client/src/assets/icons/send.png new file mode 100644 index 0000000000000000000000000000000000000000..fb500214b2b5add37844f83d4f9c43671bf3cbaf GIT binary patch literal 3237 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 Xm^P4R9hbt>00000NkvXXu0mjft8D-% literal 0 HcmV?d00001 diff --git a/client/src/components/ChatBox.vue b/client/src/components/ChatBox.vue index 736b765..6e4ea38 100644 --- a/client/src/components/ChatBox.vue +++ b/client/src/components/ChatBox.vue @@ -1,22 +1,8 @@ @@ -53,6 +39,26 @@ export default { From f92c6596941ec059f9d19b11fc27eda202f07207 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 14 Jul 2020 15:58:48 +0100 Subject: [PATCH 8/9] Fix typo --- client/src/components/ChatBox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/ChatBox.vue b/client/src/components/ChatBox.vue index 6e4ea38..e8df73b 100644 --- a/client/src/components/ChatBox.vue +++ b/client/src/components/ChatBox.vue @@ -1,6 +1,6 @@