dan/Nertivia-Client
1
0
Fork 0
mirror of https://github.com/danbulant/Nertivia-Client synced 2026-06-24 09:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed issues.

Browse source
This commit is contained in:
supertiger1234 2019-07-10 17:07:01 +01:00
parent fe05f59cb7
commit cd488acdfe
4 changed files with 1022 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1197
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -8,7 +8,7 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"axios": "^0.18.0", "axios": "^0.19.0",
"filesize": "^4.1.2", "filesize": "^4.1.2",
"futoji": "^0.5.0", "futoji": "^0.5.0",
"highlight.js": "^9.15.8", "highlight.js": "^9.15.8",

4
src/components/app/ServerTemplate/ChannelTemplate.vue
View file

@ -2,7 +2,7 @@
<div :class="{channel: true, notifyAnimation: hasNotifications}"> <div :class="{channel: true, notifyAnimation: hasNotifications}">
<i class="material-icons">storage</i> <i class="material-icons">storage</i>
<div class="channel-name"> <div class="channel-name">
{{ ChannelData.name }} {{ channelData.name }}
</div> </div>
</div> </div>
</template> </template>
@ -13,7 +13,7 @@ export default {
computed: { computed: {
hasNotifications() { hasNotifications() {
const notifications = this.$store.getters.notifications; const notifications = this.$store.getters.notifications;
const find = notifications.find(n => n.channelID === this.ChannelData.channelID) const find = notifications.find(n => n.channelID === this.channelData.channelID)
return find return find
} }
} }

16
src/components/app/ServerTemplate/ServerTemplate.vue
View file

@ -13,7 +13,7 @@
<i class="material-icons">add</i> <i class="material-icons">add</i>
</div> </div>
<div class="server-name"> <div class="server-name">
{{ mode === 'ADD_SERVER'? 'Create / Join Server' : ServerData.name }} {{ mode === 'ADD_SERVER'? 'Create / Join Server' : serverData.name }}
</div> </div>
<div <div
v-if="mode !== 'ADD_SERVER'" v-if="mode !== 'ADD_SERVER'"
@ -30,19 +30,19 @@
> >
<div <div
class="menu-button" class="menu-button"
@click="createInvite(ServerData.server_id)" @click="createInvite(serverData.server_id)"
> >
Manage Invites Manage Invites
</div> </div>
<div <div
v-if="ServerData.creator.uniqueID !== user.uniqueID" v-if="serverData.creator.uniqueID !== user.uniqueID"
class="menu-button warn" class="menu-button warn"
@click="leaveServer(ServerData.server_id)" @click="leaveServer(serverData.server_id)"
> >
Leave Server Leave Server
</div> </div>
<div <div
v-if="ServerData.creator.uniqueID === user.uniqueID" v-if="serverData.creator.uniqueID === user.uniqueID"
class="menu-button" class="menu-button"
@click="showSettings()" @click="showSettings()"
> >
@ -53,7 +53,7 @@
<div ref="container"> <div ref="container">
<channels-list <channels-list
v-if="openChannel" v-if="openChannel"
:server-i-d="ServerData.server_id" :server-i-d="serverData.server_id"
/> />
</div> </div>
</div> </div>
@ -85,7 +85,7 @@ export default {
const notifications = this.$store.getters.notifications; const notifications = this.$store.getters.notifications;
const channels = this.$store.getters.channels const channels = this.$store.getters.channels
const notification = notifications.find(e => { const notification = notifications.find(e => {
return channels[e.channelID] && channels[e.channelID].server_id && this.ServerData && channels[e.channelID].server_id === this.ServerData.server_id return channels[e.channelID] && channels[e.channelID].server_id && this.serverData && channels[e.channelID].server_id === this.serverData.server_id
}) })
return notification; return notification;
} }
@ -98,7 +98,7 @@ export default {
methods: { methods: {
showSettings() { showSettings() {
this.showContextMenu = false; this.showContextMenu = false;
this.$store.dispatch('setServerSettings', {serverID: this.ServerData.server_id}) this.$store.dispatch('setServerSettings', {serverID: this.serverData.server_id})
}, },
createInvite(serverID) { createInvite(serverID) {
this.showContextMenu = false; this.showContextMenu = false;