From b88b3207b39b29aba4428be8fd43c699915ab237 Mon Sep 17 00:00:00 2001 From: juls0730 Date: Fri, 28 Apr 2023 00:28:37 -0500 Subject: [PATCH] a bunch of bug fixes and improvements --- .eslintrc.json | 3 +- components/EmojiPicker.vue | 19 ++- components/InviteCard.vue | 12 +- components/Message.vue | 86 +++++++++-- components/MessagePane.vue | 36 ++--- components/Nav.vue | 71 ++++++++- components/Popup.vue | 10 +- components/Sidebar.vue | 43 +++++- components/UserProfile.vue | 140 ++++++++++++++++-- layouts/default.vue | 24 ++- package-lock.json | 19 --- pages/channel/@me/[dmId].vue | 16 +- pages/channel/@me/index.vue | 2 +- pages/channel/[channelId].vue | 27 +--- pages/login.vue | 8 +- pages/signup.vue | 8 +- pages/test.vue | 32 +++- prisma/schema.prisma | 2 + public/flowery-plants.jpg | Bin 220724 -> 0 bytes public/plants.jpg | Bin 160063 -> 0 bytes .../[messageId]/reactions/[name].post.ts | 35 +++-- server/api/channels/[id]/sendMessage.post.ts | 3 +- server/api/channels/create.post.ts | 13 -- stores/activeStore.ts | 48 +++++- stores/dmStore.ts | 5 +- stores/emojiPickerStore.ts | 12 +- types/index.ts | 4 +- 27 files changed, 494 insertions(+), 184 deletions(-) delete mode 100644 public/flowery-plants.jpg delete mode 100644 public/plants.jpg diff --git a/.eslintrc.json b/.eslintrc.json index d348401..a5e849b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -20,7 +20,8 @@ "storeToRefs": true, "useNuxtApp": true, "NodeJS": true, - "useHeadSafe": true + "useHeadSafe": true, + "defineEmits": true }, "parser": "vue-eslint-parser", "parserOptions": { diff --git a/components/EmojiPicker.vue b/components/EmojiPicker.vue index 21443c7..107ca5f 100755 --- a/components/EmojiPicker.vue +++ b/components/EmojiPicker.vue @@ -2,9 +2,6 @@ import emojiJson from '~/assets/json/emoji.json'; export default { - props: { - opened: Boolean, - }, emits: ['picked-emoji'], data() { return { @@ -22,7 +19,9 @@ export default { }; }, methods: { - emojiStyles(emojiShortName: string, width: number) { + emojiStyles(emojiShortName: string | undefined, width: number) { + if (!emojiShortName) return; + const emojis = emojiJson; const emoji = emojis.find((e) => e.short_names[0] === emojiShortName); if (!emoji) return; @@ -38,17 +37,17 @@ export default { }; }, scrollTo(categoryName: string) { - const emojiPane = document.getElementById('emojiPane'); + const emojiPane = (this.$refs.emojiPane as HTMLDivElement); const category = document.getElementById(categoryName); if (!emojiPane || !category) return; - emojiPane.scrollTop = category.offsetTop - 96; + emojiPane.scrollTop = category.offsetTop - 550; } } };