diff --git a/motorradig/.idea/workspace.xml b/motorradig/.idea/workspace.xml index 1ddce01..da7555d 100644 --- a/motorradig/.idea/workspace.xml +++ b/motorradig/.idea/workspace.xml @@ -2,13 +2,14 @@ - - + + + - + diff --git a/motorradig/app/Http/Controllers/FileController.php b/motorradig/app/Http/Controllers/FileController.php index 1c9eba4..65b80ff 100644 --- a/motorradig/app/Http/Controllers/FileController.php +++ b/motorradig/app/Http/Controllers/FileController.php @@ -86,6 +86,9 @@ class FileController extends Controller folders WHERE files.folder_id=folders.id + ORDER BY + folders.created_at + DESC ;"; $filelisting = DB::select($query); diff --git a/motorradig/public/js/app.js b/motorradig/public/js/app.js index f8f0854..ce63e6d 100644 --- a/motorradig/public/js/app.js +++ b/motorradig/public/js/app.js @@ -1996,6 +1996,20 @@ __webpack_require__.r(__webpack_exports__); // // // +// +// +// +// +// +// +// +// +// +// +// +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ @@ -2012,9 +2026,15 @@ __webpack_require__.r(__webpack_exports__); }), //folders: this.$store.state.folders folders: ['Folder1', 'Folder2'], - selectedFolder: this.$store.state.selectedFolder + selectedFolder: this.$store.state.selectedFolder, + xFiles: this.$store.state.files }; }, + computed: { + xFiles2: function xFiles2() { + return this.$store.state.files; + } + }, beforeDestroy: function beforeDestroy() { this.editor.destroy(); }, @@ -2100,19 +2120,28 @@ __webpack_require__.r(__webpack_exports__); console.log("First entry:"); console.log(res.data.folders); console.log("Received the following data:"); + _this3.$store.state.files = []; for (var i = 0; i < res.data.folders.length; i++) { var folder = res.data.folders[i].folder_name; var file = res.data.folders[i].file_name; console.log('http://localhost:8000/upload/images/' + folder + "/" + file); - console.log('http://localhost:8000/upload/images/' + folder + "/thumbnail/" + file); + var thumbUrl = 'http://localhost:8000/upload/images/' + folder + "/thumbnail/" + file; + console.log(thumbUrl); + + _this3.$store.state.files.push(thumbUrl); } + + _this3.files = _this3.$store.state.files; }); }, newFolderSelected: function newFolderSelected(event) { console.log("New Folder selected:"); console.log(event.target.value); this.$store.state.selectedFolder = event.target.value; + }, + showUrlList: function showUrlList() { + console.log(this.$store.state.files); } } }); @@ -31682,9 +31711,51 @@ var render = function() { _vm._v(" "), _vm._m(0), _vm._v(" "), - _vm._m(1) + _vm._m(1), + _vm._v(" "), + _c( + "div", + [ + _c("p", [_vm._v("Static test")]), + _vm._v(" "), + _vm._l([1, 2, 3], function(entry) { + return _c("p", [_vm._v(_vm._s(entry))]) + }) + ], + 2 + ), + _vm._v(" "), + _c("p", [_vm._v("-")]), + _vm._v(" "), + _c( + "div", + { attrs: { id: "gallery" } }, + [ + _c("p", [_vm._v("Test")]), + _vm._v(" "), + _vm._l(_vm.xFiles2, function(url) { + return _c("p", [_vm._v(_vm._s(url))]) + }) + ], + 2 + ) ], 1 + ), + _vm._v(" "), + _c("p", [_vm._v("BUTTON")]), + _vm._v(" "), + _c( + "button", + { + staticClass: "button", + on: { + click: function($event) { + return _vm.showUrlList() + } + } + }, + [_vm._v("Debug output:List")] ) ]) } @@ -31843,7 +31914,7 @@ var render = function() { } } }, - [_vm._v("Bilder-Uploads")] + [_vm._v("Gallerie")] ) ]) : _vm._e(), @@ -31860,7 +31931,7 @@ var render = function() { } } }, - [_vm._v("Bilder-Uploads")] + [_vm._v("Gallerie")] ) ]) : _vm._e(), diff --git a/motorradig/public/upload/images/Superordner2/Gazprom.png b/motorradig/public/upload/images/Superordner2/Gazprom.png deleted file mode 100644 index 9757b40..0000000 Binary files a/motorradig/public/upload/images/Superordner2/Gazprom.png and /dev/null differ diff --git a/motorradig/public/upload/images/Superordner2/mod1.png b/motorradig/public/upload/images/Superordner2/mod1.png deleted file mode 100644 index 45cc48c..0000000 Binary files a/motorradig/public/upload/images/Superordner2/mod1.png and /dev/null differ diff --git a/motorradig/resources/js/app.js b/motorradig/resources/js/app.js index 5e275b1..7d94cc6 100644 --- a/motorradig/resources/js/app.js +++ b/motorradig/resources/js/app.js @@ -28,3 +28,5 @@ new Vue({ store, router }); + + diff --git a/motorradig/resources/js/views/Gallery.vue b/motorradig/resources/js/views/Gallery.vue index 924b3e2..1050396 100644 --- a/motorradig/resources/js/views/Gallery.vue +++ b/motorradig/resources/js/views/Gallery.vue @@ -15,7 +15,6 @@ - @@ -24,7 +23,6 @@ Log-In -

  .....

@@ -33,8 +31,24 @@ GALLERY: + +
+

Static test

+

{{ entry }}

+
+ +

-

+ + + +

BUTTON

+ + @@ -91,9 +105,15 @@ }), //folders: this.$store.state.folders folders: ['Folder1','Folder2'], - selectedFolder:this.$store.state.selectedFolder + selectedFolder:this.$store.state.selectedFolder, + xFiles:this.$store.state.files } }, + computed: { + xFiles2: function () { + return this.$store.state.files; + } + }, beforeDestroy() { this.editor.destroy() }, @@ -182,19 +202,25 @@ console.log(res.data.folders); console.log("Received the following data:"); + this.$store.state.files=[]; for (var i=0; i - - + +