diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php index 551267e..838b246 100644 --- a/app/Http/Controllers/FileController.php +++ b/app/Http/Controllers/FileController.php @@ -63,7 +63,7 @@ class FileController extends Controller { return DB::table('str_owners') ->join('str_file', 'str_owners.file_id', '=', 'str_file.id') ->join('for_users', 'str_owners.user_id', '=', 'for_users.id') - ->take(1) +// ->take(1) ->where('file_id', $id) ->get(array( "user_id", diff --git a/public/js/app.js b/public/js/app.js index 15168c2..fa4e5bc 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -17645,9 +17645,9 @@ Vue.component('hot-items', __webpack_require__(168)); // Entry page. Vue.component('entry-title', __webpack_require__(214)); +Vue.component('entry-screenshots', __webpack_require__(211)); Vue.component('entry-description', __webpack_require__(206)); Vue.component('entry-changelog', __webpack_require__(201)); -Vue.component('entry-screenshots', __webpack_require__(211)); new Vue({ el: '#app' @@ -60094,7 +60094,7 @@ exports = module.exports = __webpack_require__(3)(false); // module -exports.push([module.i, "\n.col {\n\t\ttext-align: center;\n}\n", ""]); +exports.push([module.i, "\n.col {\n text-align: center;\n}\n", ""]); // exports @@ -60129,25 +60129,25 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // /* harmony default export */ __webpack_exports__["default"] = ({ - name: 'hot-items', - data: function data() { - return { - items: [] - }; - }, - created: function created() { - var _this = this; + name: 'hot-items', + data: function data() { + return { + items: [] + }; + }, + created: function created() { + var _this = this; - axios.get('/api/rpc/file/gethotfiles').then(function (data) { - data.data.forEach(function (cb) { - _this.items.push({ - 'id': cb.id, - 'title': cb.title, - 'downloads': cb.downloads - }); - }); - }); - } + axios.get('/api/rpc/file/gethotfiles').then(function (data) { + data.data.forEach(function (cb) { + _this.items.push({ + 'id': cb.id, + 'title': cb.title, + 'downloads': cb.downloads + }); + }); + }); + } }); /***/ }), @@ -60175,18 +60175,24 @@ var render = function() { }), _vm._v(" "), _c("br"), - _vm._v("\n\t\t\t\t\t\t" + _vm._s(item.title) + "\n\t\t\t\t\t") + _vm._v( + "\n " + + _vm._s(item.title) + + "\n " + ) ]), _vm._v(" "), _c("br"), _vm._v(" "), _c("a", { attrs: { href: "/profile/0" } }, [ - _vm._v("\n\t\t\t\t\t\tName\n\t\t\t\t\t") + _vm._v("\n Name\n ") ]), _vm._v(" "), _c("br"), _vm._v( - "\n\t\t\t\t\tDownloads: " + _vm._s(item.downloads) + "\n\t\t\t\t" + "\n Downloads: " + + _vm._s(item.downloads) + + "\n " ) ]) ]) @@ -60525,10 +60531,13 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ name: 'entry-description', - props: ['fid'], + props: ['fid', 'translations'], data: function data() { return { id: this.fid, @@ -60554,7 +60563,7 @@ var render = function() { var _c = _vm._self._c || _h return _c("div", { staticClass: "panel panel-default" }, [ _c("div", { staticClass: "panel-heading" }, [ - _vm._v("@lang('entry.description')") + _vm._v("\n @lang('entry.description')\n Description\n ") ]), _vm._v(" "), _c("div", { staticClass: "panel-body" }, [ @@ -60651,9 +60660,15 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ - name: 'entry-screenshots' + name: 'entry-screenshots', + data: function data() { + return {}; + } }); /***/ }), @@ -60673,7 +60688,7 @@ var staticRenderFns = [ var _c = _vm._self._c || _h return _c("div", { staticClass: "panel panel-default" }, [ _c("div", { staticClass: "panel-heading" }, [ - _vm._v("@lang('entry.screenshots')") + _vm._v("\n Screenshots\n ") ]), _vm._v(" "), _c("div", { staticClass: "panel-body" }, [ @@ -60872,6 +60887,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); props: ['fid'], data: function data() { return { + owners: [], id: this.fid, uid: 0, title: '', @@ -60885,7 +60901,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); downloads: 0, submit_date: 0, last_date: 0, - showName: '' + showName: [] }; }, created: function created() { @@ -60900,20 +60916,29 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); _this.submit_date = __WEBPACK_IMPORTED_MODULE_0_moment___default.a.unix(data.data[0].submit_date).format("YYYY/MM/DD"); _this.last_date = data.data[0].last_date; + data.data.forEach(function (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 = __WEBPACK_IMPORTED_MODULE_0_moment___default.a.unix(_this.last_date).format("YYYY/MM/DD"); + } + if (cb.display_name !== '') { + _this.showName += cb.display_name; + } else { + _this.showName += cb.username; + } + }); _this.username = data.data[0].username; _this.display_name = data.data[0].display_name; _this.gender = data.data[0].gender; _this.avatar = data.data[0].avatar; _this.name_colour = data.data[0].name_colour; - }).then(function () { - if (_this.last_date !== 0) { - _this.last_date = __WEBPACK_IMPORTED_MODULE_0_moment___default.a.unix(_this.last_date).format("YYYY/MM/DD"); - } - if (_this.display_name !== '') { - _this.showName = _this.display_name; - } else { - _this.showName = _this.username; - } }); } }); diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 3eaa9cb..241b33e 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -23,9 +23,9 @@ Vue.component('hot-items', require('./components/HotEntries.vue')); // Entry page. Vue.component('entry-title', require('./components/Entry/Title.vue')); +Vue.component('entry-screenshots', require('./components/Entry/Screenshots.vue')); Vue.component('entry-description', require('./components/Entry/Description.vue')); Vue.component('entry-changelog', require('./components/Entry/Changelog.vue')); -Vue.component('entry-screenshots', require('./components/Entry/Screenshots.vue')); new Vue({ el: '#app' diff --git a/resources/assets/js/components/Entry/Description.vue b/resources/assets/js/components/Entry/Description.vue index e5293dd..9bea14e 100644 --- a/resources/assets/js/components/Entry/Description.vue +++ b/resources/assets/js/components/Entry/Description.vue @@ -1,6 +1,9 @@