diff --git a/motorradig/.idea/workspace.xml b/motorradig/.idea/workspace.xml
index 28b9120..448fb34 100644
--- a/motorradig/.idea/workspace.xml
+++ b/motorradig/.idea/workspace.xml
@@ -2,15 +2,13 @@
-
-
-
-
+
+
@@ -295,11 +293,11 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/motorradig/app/Http/Controllers/FileController.php b/motorradig/app/Http/Controllers/FileController.php
index c75535d..4c30e85 100644
--- a/motorradig/app/Http/Controllers/FileController.php
+++ b/motorradig/app/Http/Controllers/FileController.php
@@ -15,13 +15,22 @@ class FileController extends Controller
Log::info("Incoming UploadRequest");
$uploadedFile=$request->image;
- $filename=$uploadedFile->storeAs('./testFolder',$uploadedFile->getClientOriginalName(),'images');
+ $folder=$request->folder;
+ $filename=$uploadedFile->storeAs('./'.$folder,$uploadedFile->getClientOriginalName(),'images');
return response(['status'=>'success','storedName'=>$filename],200);
}
public function getFolders(Request $request) {
Log::info("Incoming getFolders request");
+ $folders=Folder::all();
+ $folderNames=array();
+ foreach ($folders as $folder) {
+ array_push($folderNames, $folder->name);
+ }
+ Log::info("Foldernames:");
+ Log::info($folderNames);
+ return response(['status'=>'success','folders'=>$folderNames],200);
}
public function createFolder(Request $request) {
@@ -37,7 +46,7 @@ class FileController extends Controller
}
public function deleteFile(Request $request) {
- Log::info("Incoming deleteFilee request");
+ Log::info("Incoming deleteFile request");
}
}
diff --git a/motorradig/public/js/Icon.js b/motorradig/public/js/Icon.js
index 9af7d34..f001292 100644
--- a/motorradig/public/js/Icon.js
+++ b/motorradig/public/js/Icon.js
@@ -391,7 +391,7 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
-module.exports = __webpack_require__(/*! /mnt/d/repos/motorradig/motorradig/resources/js/Icon.js */"./resources/js/Icon.js");
+module.exports = __webpack_require__(/*! /Users/tschneider/dev/repo/motorradig/motorradig/resources/js/Icon.js */"./resources/js/Icon.js");
/***/ })
diff --git a/motorradig/public/js/app.js b/motorradig/public/js/app.js
index d05a5dd..1ec3587 100644
--- a/motorradig/public/js/app.js
+++ b/motorradig/public/js/app.js
@@ -2142,6 +2142,11 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
+//
+//
+//
+//
+//
/* harmony default export */ __webpack_exports__["default"] = ({
@@ -2154,14 +2159,18 @@ __webpack_require__.r(__webpack_exports__);
editor: new tiptap__WEBPACK_IMPORTED_MODULE_0__["Editor"]({
extensions: [new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Blockquote"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["BulletList"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["CodeBlock"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["HardBreak"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Heading"]({
levels: [1, 2, 3]
- }), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["HorizontalRule"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["ListItem"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["OrderedList"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["TodoItem"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["TodoList"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Link"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Bold"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Code"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Italic"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Strike"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Underline"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["History"]()],
- content: this.$store.state.page_content
- })
+ }), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["HorizontalRule"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["ListItem"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["OrderedList"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["TodoItem"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["TodoList"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Link"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Bold"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Code"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Italic"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Strike"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Underline"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["History"]()]
+ }),
+ //folders: this.$store.state.folders
+ folders: ['Folder1', 'Folder2']
};
},
beforeDestroy: function beforeDestroy() {
this.editor.destroy();
},
+ created: function created() {
+ this.loadFolders();
+ },
methods: {
showContent: function showContent() {
console.log(">>"); //console.log(this.editor.view.dom.innerText);
@@ -2187,13 +2196,15 @@ __webpack_require__.r(__webpack_exports__);
_this.$router.push("/");
});
},
- onFileSelected: function onFileSelected(event) {
+ uploadFile: function uploadFile(event) {
console.log("File changed:");
console.log(event.target.files[0].name);
var selectedFile = event.target.files[0];
+ var selectedFolder = this.$store.state.selectedFolder;
var formData = new FormData(); //formData.append('image',selectedFile,selectedFile.name);
formData.append('image', selectedFile);
+ formData.append('folder', selectedFolder);
axios.post('http://localhost:8000/api/v1/auth/upload', formData, {
headers: {
'Authorization': 'Bearer ' + this.$store.state.user_token,
@@ -2214,8 +2225,28 @@ __webpack_require__.r(__webpack_exports__);
'Content-Type': 'multipart/form-data'
}
}).then(function (res) {
- console.log(res);
+ console.log(res.data);
+ loadFolders();
});
+ },
+ loadFolders: function loadFolders() {
+ var _this2 = this;
+
+ console.log("Requesting folders");
+ axios.post('http://localhost:8000/api/v1/auth/get_folders', {}, {
+ headers: {
+ 'Authorization': 'Bearer ' + this.$store.state.user_token
+ }
+ }).then(function (res) {
+ console.log("Receiving folders");
+ console.log(res.data.folders);
+ _this2.$store.state.folders = res.data.folders;
+ });
+ },
+ newFolderSelected: function newFolderSelected(event) {
+ console.log("New Folder selected:");
+ console.log(event.target.value);
+ this.$store.state.selectedFolder = event.target.value;
}
}
});
@@ -31692,7 +31723,7 @@ var render = function() {
_vm._v(" "),
_c("input", {
attrs: { name: "filename", type: "file" },
- on: { change: _vm.onFileSelected }
+ on: { change: _vm.uploadFile }
})
])
]),
@@ -31705,6 +31736,19 @@ var render = function() {
on: { change: _vm.createFolderRequest }
}),
_c("button", [_vm._v("Neuen Ordner erzeugen")])
+ ]),
+ _vm._v(" "),
+ _c("form", [
+ _c("label", [_vm._v("Ordner wählen:")]),
+ _vm._v(" "),
+ _c(
+ "select",
+ { on: { change: _vm.newFolderSelected } },
+ _vm._l(this.$store.state.folders, function(folder) {
+ return _c("option", [_vm._v(_vm._s(folder))])
+ }),
+ 0
+ )
])
],
1
@@ -48722,7 +48766,9 @@ var store = new vuex__WEBPACK_IMPORTED_MODULE_1__["default"].Store({
user_token: {},
page_name: 'main',
page_content: 'Placeholder
',
- userlist: {}
+ userlist: {},
+ folders: {},
+ selectedFolder: "default"
}
});
@@ -49160,8 +49206,8 @@ __webpack_require__.r(__webpack_exports__);
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
-__webpack_require__(/*! /mnt/d/repos/motorradig/motorradig/resources/js/app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! /mnt/d/repos/motorradig/motorradig/resources/sass/app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! /Users/tschneider/dev/repo/motorradig/motorradig/resources/js/app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! /Users/tschneider/dev/repo/motorradig/motorradig/resources/sass/app.scss */"./resources/sass/app.scss");
/***/ })
diff --git a/motorradig/public/upload/images/SuperNeurKram/Gazprom.png b/motorradig/public/upload/images/SuperNeurKram/Gazprom.png
new file mode 100644
index 0000000..9757b40
Binary files /dev/null and b/motorradig/public/upload/images/SuperNeurKram/Gazprom.png differ
diff --git a/motorradig/resources/js/store.js b/motorradig/resources/js/store.js
index 68cd20c..7e96de6 100644
--- a/motorradig/resources/js/store.js
+++ b/motorradig/resources/js/store.js
@@ -8,6 +8,8 @@ export const store = new Vuex.Store({
user_token:{},
page_name: 'main',
page_content:'Placeholder
',
- userlist:{}
+ userlist:{},
+ folders:{},
+ selectedFolder:"default"
}
});
diff --git a/motorradig/resources/js/views/Upload.vue b/motorradig/resources/js/views/Upload.vue
index 713aae7..f88df77 100644
--- a/motorradig/resources/js/views/Upload.vue
+++ b/motorradig/resources/js/views/Upload.vue
@@ -30,7 +30,7 @@
@@ -44,7 +44,12 @@
-
+
@@ -98,14 +103,18 @@
new Strike(),
new Underline(),
new History(),
- ],
- content: this.$store.state.page_content,
+ ]
}),
+ //folders: this.$store.state.folders
+ folders: ['Folder1','Folder2']
}
},
beforeDestroy() {
this.editor.destroy()
},
+ created() {
+ this.loadFolders();
+ },
methods: {
showContent() {
@@ -131,13 +140,15 @@
}
)
},
- onFileSelected(event) {
+ uploadFile(event) {
console.log("File changed:");
console.log(event.target.files[0].name);
var selectedFile=event.target.files[0];
+ var selectedFolder = this.$store.state.selectedFolder;
const formData = new FormData();
//formData.append('image',selectedFile,selectedFile.name);
formData.append('image',selectedFile);
+ formData.append('folder',selectedFolder);
axios.post('http://localhost:8000/api/v1/auth/upload',formData,{
headers: {
@@ -163,8 +174,27 @@
}
})
.then(res=>{
- console.log(res);
+ console.log(res.data);
+ loadFolders();
})
+ },
+ loadFolders() {
+ console.log("Requesting folders");
+ axios.post('http://localhost:8000/api/v1/auth/get_folders',{},{
+ headers: {
+ 'Authorization': 'Bearer ' + this.$store.state.user_token
+ }
+ })
+ .then(res=>{
+ console.log("Receiving folders");
+ console.log(res.data.folders);
+ this.$store.state.folders=res.data.folders;
+ })
+ },
+ newFolderSelected(event) {
+ console.log("New Folder selected:");
+ console.log(event.target.value);
+ this.$store.state.selectedFolder=event.target.value;
}
}
}
diff --git a/motorradig/resources/js/views/UserList.vue b/motorradig/resources/js/views/UserList.vue
index ce6d925..f04ad61 100644
Binary files a/motorradig/resources/js/views/UserList.vue and b/motorradig/resources/js/views/UserList.vue differ
diff --git a/motorradig/routes/api.php b/motorradig/routes/api.php
index 3c5735f..ec6ca25 100644
--- a/motorradig/routes/api.php
+++ b/motorradig/routes/api.php
@@ -53,6 +53,7 @@ Route::prefix('v1')->group(function () {
Route::post('create_folder','FileController@createFolder');
+ Route::post('get_folders','FileController@getFolders');
});
});
});