diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png new file mode 100644 index 0000000..3473fd9 Binary files /dev/null and b/public/android-chrome-192x192.png differ diff --git a/public/android-chrome-384x384.png b/public/android-chrome-384x384.png new file mode 100644 index 0000000..4222c76 Binary files /dev/null and b/public/android-chrome-384x384.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000..2dcea57 Binary files /dev/null and b/public/apple-touch-icon.png differ diff --git a/public/browserconfig.xml b/public/browserconfig.xml new file mode 100644 index 0000000..b3930d0 --- /dev/null +++ b/public/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png new file mode 100644 index 0000000..3da4624 Binary files /dev/null and b/public/favicon-16x16.png differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png new file mode 100644 index 0000000..f9a664b Binary files /dev/null and b/public/favicon-32x32.png differ diff --git a/public/favicon.ico b/public/favicon.ico index 410ef44..51f5f9c 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index b6bc420..4b989a6 100644 --- a/public/index.html +++ b/public/index.html @@ -1,30 +1,65 @@ - - - - - - - - Nertivia - - - - - - - - -
- - - + + + + + + + + + + + + + + + + Nertivia - Chat Client + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png new file mode 100644 index 0000000..f9fe836 Binary files /dev/null and b/public/mstile-150x150.png differ diff --git a/public/site.webmanifest b/public/site.webmanifest new file mode 100644 index 0000000..a1553eb --- /dev/null +++ b/public/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-384x384.png", + "sizes": "384x384", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/src/assets/LogoAnimation/map.png b/src/assets/LogoAnimation/map.png index 0feb0e2..7c9dcb6 100644 Binary files a/src/assets/LogoAnimation/map.png and b/src/assets/LogoAnimation/map.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 0b06858..daee4aa 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue index 2065af5..98ef595 100644 --- a/src/components/app/MessageTemplate.vue +++ b/src/components/app/MessageTemplate.vue @@ -283,8 +283,8 @@ export default { diff --git a/src/components/app/SettingsPanels/ManageEmojis.vue b/src/components/app/SettingsPanels/ManageEmojis.vue new file mode 100644 index 0000000..baf2573 --- /dev/null +++ b/src/components/app/SettingsPanels/ManageEmojis.vue @@ -0,0 +1,316 @@ + + + + + + diff --git a/src/components/app/SettingsPanels/MyProfile.vue b/src/components/app/SettingsPanels/MyProfile.vue index 5a5f78d..21c3977 100644 --- a/src/components/app/SettingsPanels/MyProfile.vue +++ b/src/components/app/SettingsPanels/MyProfile.vue @@ -35,6 +35,7 @@ import AvatarUpload from "@/services/AvatarUpload.js"; import config from "@/config.js"; import { bus } from "@/main"; import path from "path"; +import {mapState} from 'vuex' export default { components: { @@ -88,7 +89,7 @@ export default { return (this.alert.show = true); }, editAvatarBtn() { - if (!this.$store.getters.settings.GDriveLinked) { + if (!this.GDriveLinked) { return this.$store.dispatch("setPopoutVisibility", { name: "GDLinkMenu", visibility: true @@ -98,6 +99,7 @@ export default { } }, computed: { + ...mapState('settingsModule', ['GDriveLinked']), user() { return this.$store.getters.user; }, diff --git a/src/components/app/emojiPanel.vue b/src/components/app/emojiPanel.vue index 66cafb4..0213a02 100644 --- a/src/components/app/emojiPanel.vue +++ b/src/components/app/emojiPanel.vue @@ -2,19 +2,40 @@
+
Recent
-
+
+ +
+
Custom Emojis
+
+
+ +
+
+
+
{{group}}
@@ -22,7 +43,7 @@ class="emoji-item" v-for="emojiSorted in emojiByGroup(index)" :key="emojiSorted.shortcodes[0]" - @click="clickEvent(emojiSorted.shortcodes[0])" + @click="emojiClickEvent(emojiSorted.shortcodes[0])" >
@@ -39,7 +60,7 @@ v-for="(emoji, index) in groupUnicodes" :key="index" @mouseenter="mouseHover(emoji, $event)" - @click="scrollToCategory(index + 1)" + @click="scrollToCategory(index + 2)" >
{{ groups[index]}}
@@ -54,7 +75,8 @@ import { bus } from "@/main"; import emojiParser from "@/utils/emojiParser.js"; import lazyLoad from "@/directives/LazyLoad.js"; - +import {mapState} from 'vuex' +import config from "@/config.js"; export default { @@ -312,12 +334,19 @@ export default { "🇨🇭" ] ], - emojis: emojiParser.getAllEmojis(), - groups: emojiParser.getGroups(), - recentEmojiList: this.$store.getters.recentEmojis + emojis: emojiParser.allEmojis, + groups: emojiParser.allGroups, + recentEmojisList: null, + customEmojisList : null, + customEmojiPath: config.domain + "/files/" + }; }, methods: { + getCustomEmoji(shortCode){ + const customEmoji = emojiParser.getCustomEmojisByShortCode(shortCode) + return (customEmoji ? this.customEmojiPath + customEmoji.emojiID : undefined) + }, closePanel() { this.$store.dispatch("setPopoutVisibility", { name: "emojiPanel", @@ -338,7 +367,10 @@ export default { const randomNum = Math.floor(Math.random() * array.length); return this.parseEmojiPath(array[randomNum]); }, - clickEvent(shortcode) { + customEmojiClickEvent(emoji) { + bus.$emit("emojiPanel:Selected", emoji.name); + }, + emojiClickEvent(shortcode) { bus.$emit("emojiPanel:Selected", shortcode); }, mouseHover(emoji, event) { @@ -349,8 +381,12 @@ export default { elements[index].scrollIntoView(); } }, - mounted() { - this.recentEmojiList = this.$store.getters.recentEmojis + beforeMount() { + this.recentEmojisList = this.recentEmojis + this.customEmojisList = this.customEmojis + }, + computed: { + ...mapState('settingsModule', ['recentEmojis', 'customEmojis']) } }; @@ -408,7 +444,7 @@ export default { padding: 2px; border-radius: 5px; height: 30px; - width: 30px; + min-width: 30px; } .emoji-item:hover { background: rgb(59, 59, 59); @@ -429,7 +465,7 @@ export default { } .tabs img { height: 20px; - width: 20px; + width: auto; margin: auto; filter: grayscale(100%); transition: 0.1s; @@ -482,7 +518,7 @@ export default { align-self: flex-end; margin-right: 70px; } -.tooltip{ +.tooltip { display: none; position: absolute; margin: auto; @@ -499,5 +535,6 @@ img.panel.emoji { margin-left: 3px; margin-top: 3px; margin: auto; + width: auto; } diff --git a/src/components/app/emojiSuggestions.vue b/src/components/app/emojiSuggestions.vue index 3359941..7f8d1f9 100644 --- a/src/components/app/emojiSuggestions.vue +++ b/src/components/app/emojiSuggestions.vue @@ -5,10 +5,15 @@ :class="{emojiItem: true, selected: index === emojiIndex}" @mouseenter="hoverEvent" @click="clickEvent" - :key="emoji.hexcode" + :key="emoji.hexcode || emoji.emojiID" > -
-
:{{emoji.shortcodes[0]}}:
+
+ + + + +
+
:{{emoji.name || emoji.shortcodes[0]}}:
@@ -16,8 +21,14 @@