diff --git a/resources/assets/js/components/Entry/Title.vue b/resources/assets/js/components/Entry/Title.vue index c37e1cd..8524b82 100644 --- a/resources/assets/js/components/Entry/Title.vue +++ b/resources/assets/js/components/Entry/Title.vue @@ -2,7 +2,18 @@
- {{ title }} {{ version }} by {{ showName }} + {{ title }} {{ version }} by + + {{ o.showname }} + + , and + + + + + , + +
@@ -52,7 +63,7 @@ Submitted: {{ submit_date }}
-
+
Updated: {{ last_date }}
@@ -82,16 +93,30 @@ username: '', avatar: '', gender: '', + perm_id: '', display_name: '', name_colour: '', views: 0, downloads: 0, submit_date: 0, last_date: 0, - showName: [], + showName: '', + showCol: '', + groupCol: [], } }, created: function () { + axios.get('/api/rpc/user/getgroupcolours').then(res => { + res.data.forEach(cb => { + this.groupCol.push({ + 'id': cb.id, + 'name': cb.name, + 'male': cb.colour_m, + 'female': cb.colour_f, + 'unknown': cb.colour_u, + }); + }); + }) axios.get('/api/rpc/file/getfiletitle/' + this.id).then(data => { this.uid = data.data[0].user_id; this.title = data.data[0].title; @@ -99,28 +124,46 @@ this.views = data.data[0].views; this.downloads = data.data[0].downloads; this.submit_date = moment.unix(data.data[0].submit_date).format("YYYY/MM/DD"); - this.last_date = data.data[0].last_date; + if (data.data[0].last_date !== 0) { + this.last_date = moment.unix(data.data[0].last_date).format("YYYY/MM/DD"); + } data.data.forEach(cb => { - this.owners.push( - { - 'username': cb.username, - 'display_name': cb.display_name, - 'avatar': cb.avatar, - 'gender': cb.gender, - 'name_colour': cb.name_colour, - } - ); - - if (this.last_date !== 0) { - this.last_date = moment.unix(this.last_date).format("YYYY/MM/DD"); - } if (cb.display_name !== '') { - this.showName += cb.display_name; + this.showName = cb.display_name; } else { - this.showName += cb.username; + this.showName = cb.username; } + + if (cb.name_colour !== '') { + this.showCol = cb.name_colour; + } + else { + this.groupCol.forEach(re => { + if (re.id === cb.perm_id) { + if (cb.gender === 1) { + this.showCol = re.male; + } + else if (cb.gender === 2) { + this.showCol = re.female; + } + else { + this.showCol = re.unknown; + } + } + }); + } + + this.owners.push({ + 'uid': cb.user_id, + 'showname': this.showName, + 'username': cb.username, + 'display_name': cb.display_name, + 'avatar': cb.avatar, + 'gender': cb.gender, + 'name_colour': this.showCol, + }); }); this.username = data.data[0].username; this.display_name = data.data[0].display_name; @@ -134,6 +177,6 @@ \ No newline at end of file