diff --git a/motorradig/.idea/workspace.xml b/motorradig/.idea/workspace.xml index a7c446f..28b9120 100644 --- a/motorradig/.idea/workspace.xml +++ b/motorradig/.idea/workspace.xml @@ -2,12 +2,16 @@ + + + + - + - + diff --git a/motorradig/app/File.php b/motorradig/app/File.php new file mode 100644 index 0000000..5486a4c --- /dev/null +++ b/motorradig/app/File.php @@ -0,0 +1,10 @@ +image; - $filename=$uploadedFile->storeAs('.',$uploadedFile->getClientOriginalName(),'images'); + $filename=$uploadedFile->storeAs('./testFolder',$uploadedFile->getClientOriginalName(),'images'); - //Storage::disk('image_uploads')->put('filename', $file_content); - - -/* Log::info($request); - $exploded = explode(',', $request->image); - - Log::info("exploded:"); - Log::info($exploded); - - $decoded = base64_decode($exploded[1]); - if(str_contains($exploded[0],’jpeg’)) { - $extension = 'jpg'; - } else { - $extension = 'png'; - } - $fileName=str_random().'.'.$extension; - $path = public_path().'/'.$fileName; - - file_put_contents($path, $decoded); - - - Log::info("Upload endpoint reached."); - Log::info("Filename:".$fileName); -*/ - - //return response()->json([], 200); return response(['status'=>'success','storedName'=>$filename],200); } + + public function getFolders(Request $request) { + Log::info("Incoming getFolders request"); + } + + public function createFolder(Request $request) { + Log::info("Incoming createFolder request"); + $f=Folder::create(); + $f->name=$request->folder; + $f->save(); + return response(['status'=>'success'],200); + } + + public function deleteFolder(Request $request) { + Log::info("Incoming deleteFolder request"); + } + + public function deleteFile(Request $request) { + Log::info("Incoming deleteFilee request"); + } + } diff --git a/motorradig/database/migrations/2020_02_07_094925_create_files_and_folders.php b/motorradig/database/migrations/2020_02_07_094925_create_files_and_folders.php new file mode 100644 index 0000000..e4a0da0 --- /dev/null +++ b/motorradig/database/migrations/2020_02_07_094925_create_files_and_folders.php @@ -0,0 +1,41 @@ +bigIncrements('id'); + $table->string('name')->default(''); + $table->timestamps(); + }); + + Schema::create('files', function (Blueprint $table) { + $table->bigIncrements('id'); + + $table->string('name')->default(''); + $table->bigInteger('folder_id')->default(-1); + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('files'); + } +} diff --git a/motorradig/public/js/Icon.js b/motorradig/public/js/Icon.js index f001292..9af7d34 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__(/*! /Users/tschneider/dev/repo/motorradig/motorradig/resources/js/Icon.js */"./resources/js/Icon.js"); +module.exports = __webpack_require__(/*! /mnt/d/repos/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 e0f7367..d05a5dd 100644 --- a/motorradig/public/js/app.js +++ b/motorradig/public/js/app.js @@ -2133,6 +2133,15 @@ __webpack_require__.r(__webpack_exports__); // // // +// +// +// +// +// +// +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ @@ -2185,7 +2194,21 @@ __webpack_require__.r(__webpack_exports__); var formData = new FormData(); //formData.append('image',selectedFile,selectedFile.name); formData.append('image', selectedFile); - var config = axios.post('http://localhost:8000/api/v1/auth/upload', formData, { + axios.post('http://localhost:8000/api/v1/auth/upload', formData, { + headers: { + 'Authorization': 'Bearer ' + this.$store.state.user_token, + 'Content-Type': 'multipart/form-data' + } + }).then(function (res) { + console.log(res); + }); + }, + createFolderRequest: function createFolderRequest(event) { + var folderName = event.target.value; + console.log("Request creation of folder:" + folderName); + var formData = new FormData(); + formData.append("folder", folderName); + axios.post('http://localhost:8000/api/v1/auth/create_folder', formData, { headers: { 'Authorization': 'Bearer ' + this.$store.state.user_token, 'Content-Type': 'multipart/form-data' @@ -31664,19 +31687,40 @@ var render = function() { ), _vm._v(" "), _c("div", [ - _c("span", [_vm._v("UPLOAD:")]), - _vm._v(" "), + _c("form", [ + _c("span", [_vm._v("UPLOAD:")]), + _vm._v(" "), + _c("input", { + attrs: { name: "filename", type: "file" }, + on: { change: _vm.onFileSelected } + }) + ]) + ]), + _vm._v(" "), + _vm._m(0), + _vm._v(" "), + _c("div", { staticStyle: { "background-color": "cyan" } }, [ _c("input", { - attrs: { name: "filename", type: "file" }, - on: { change: _vm.onFileSelected } - }) + attrs: { type: "text" }, + on: { change: _vm.createFolderRequest } + }), + _c("button", [_vm._v("Neuen Ordner erzeugen")]) ]) ], 1 ) ]) } -var staticRenderFns = [] +var staticRenderFns = [ + function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", { staticStyle: { "background-color": "darkmagenta" } }, [ + _c("p", [_vm._v("  ....."), _c("br")]) + ]) + } +] render._withStripped = true @@ -49116,8 +49160,8 @@ __webpack_require__.r(__webpack_exports__); /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { -__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"); +__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"); /***/ }) diff --git a/motorradig/public/upload/images/testFolder/rente.png b/motorradig/public/upload/images/testFolder/rente.png new file mode 100644 index 0000000..162a947 Binary files /dev/null and b/motorradig/public/upload/images/testFolder/rente.png differ diff --git a/motorradig/resources/js/views/Upload.vue b/motorradig/resources/js/views/Upload.vue index 8395dae..713aae7 100644 --- a/motorradig/resources/js/views/Upload.vue +++ b/motorradig/resources/js/views/Upload.vue @@ -27,15 +27,24 @@ -
- +
UPLOAD: +
+
+
+

  .....

+
+ +
+ +
+ @@ -130,8 +139,6 @@ //formData.append('image',selectedFile,selectedFile.name); formData.append('image',selectedFile); - const config= - axios.post('http://localhost:8000/api/v1/auth/upload',formData,{ headers: { 'Authorization': 'Bearer ' + this.$store.state.user_token, @@ -141,6 +148,23 @@ .then(res=>{ console.log(res); }) + }, + createFolderRequest(event) { + var folderName=event.target.value; + + console.log("Request creation of folder:"+folderName); + + const formData = new FormData(); + formData.append("folder", folderName); + axios.post('http://localhost:8000/api/v1/auth/create_folder',formData,{ + headers: { + 'Authorization': 'Bearer ' + this.$store.state.user_token, + 'Content-Type': 'multipart/form-data' + } + }) + .then(res=>{ + console.log(res); + }) } } } diff --git a/motorradig/routes/api.php b/motorradig/routes/api.php index e183bfe..3c5735f 100644 --- a/motorradig/routes/api.php +++ b/motorradig/routes/api.php @@ -50,6 +50,9 @@ Route::prefix('v1')->group(function () { Route::post('set_role','AuthController@set_role'); Route::post('delete_user','AuthController@delete_user'); Route::post('upload','FileController@upload'); + + + Route::post('create_folder','FileController@createFolder'); }); }); });