diff --git a/motorradig/.idea/motorradig.iml b/motorradig/.idea/motorradig.iml index 512bc56..165a45a 100644 --- a/motorradig/.idea/motorradig.iml +++ b/motorradig/.idea/motorradig.iml @@ -19,7 +19,9 @@ + + @@ -50,9 +52,11 @@ + + diff --git a/motorradig/.idea/php.xml b/motorradig/.idea/php.xml index f54db4e..0dc14e2 100644 --- a/motorradig/.idea/php.xml +++ b/motorradig/.idea/php.xml @@ -93,6 +93,10 @@ + + + + diff --git a/motorradig/.idea/workspace.xml b/motorradig/.idea/workspace.xml index 1c4179d..4aaa3a1 100644 --- a/motorradig/.idea/workspace.xml +++ b/motorradig/.idea/workspace.xml @@ -2,12 +2,20 @@ - - + + + + + + + + + + - + @@ -237,9 +249,7 @@ - - - + @@ -263,11 +273,10 @@ - - + + - @@ -277,20 +286,19 @@ - + - + - - + + - - + diff --git a/motorradig/app/Http/Controllers/FileController.php b/motorradig/app/Http/Controllers/FileController.php index 6c32ee7..eb587ba 100644 --- a/motorradig/app/Http/Controllers/FileController.php +++ b/motorradig/app/Http/Controllers/FileController.php @@ -8,16 +8,17 @@ use Log; use App\File; use App\Folder; +use Image; + class FileController extends Controller { public function upload(Request $request) { Log::info("Incoming UploadRequest"); - $uploadedFile=$request->image; $folder=$request->folder; - + $thumbFolder=$folder."/thumbnail"; Log::info("Folder: '".$folder."'"); $f=Folder::where('name',$folder)->first(); @@ -30,6 +31,14 @@ class FileController extends Controller $f->name = $uploadedFile->getClientOriginalName(); $f->save(); + ////////////////////// + $thumbnailImage = Image::make($uploadedFile); + $thumbnailImage->resize(128,128); + Log::info("ThumbDir: ".$thumbFolder); + mkdir($thumbFolder); + $thumbnailImage->save($thumbFolder."/".$uploadedFile->getClientOriginalName()); + ////////////////////// + return response(['status'=>'success','storedName'=>$filename],200); } diff --git a/motorradig/composer.json b/motorradig/composer.json index c6277ce..b939c4d 100644 --- a/motorradig/composer.json +++ b/motorradig/composer.json @@ -10,6 +10,7 @@ "require": { "php": "^7.2", "fideloper/proxy": "^4.0", + "intervention/image": "^2.5", "laravel/framework": "^6.2", "laravel/tinker": "^1.0", "laravel/ui": "^1.1", diff --git a/motorradig/composer.lock b/motorradig/composer.lock index 49f1c91..11bbb61 100644 --- a/motorradig/composer.lock +++ b/motorradig/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "982e21cc64e27987a84fe2d0caa51fa9", + "content-hash": "51e1d6e28388624bdaae0205b929d2bf", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -380,6 +380,147 @@ ], "time": "2019-09-03T16:45:42+00:00" }, + { + "name": "guzzlehttp/psr7", + "version": "1.6.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", + "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + }, + "suggest": { + "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Schultze", + "homepage": "https://github.com/Tobion" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" + ], + "time": "2019-07-01T23:21:34+00:00" + }, + { + "name": "intervention/image", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/Intervention/image.git", + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "~0.9.2", + "phpunit/phpunit": "^4.8 || ^5.7" + }, + "suggest": { + "ext-gd": "to use GD library based image processing.", + "ext-imagick": "to use Imagick based image processing.", + "intervention/imagecache": "Caching extension for the Intervention Image library" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + }, + "laravel": { + "providers": [ + "Intervention\\Image\\ImageServiceProvider" + ], + "aliases": { + "Image": "Intervention\\Image\\Facades\\Image" + } + } + }, + "autoload": { + "psr-4": { + "Intervention\\Image\\": "src/Intervention/Image" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oliver Vogel", + "email": "oliver@olivervogel.com", + "homepage": "http://olivervogel.com/" + } + ], + "description": "Image handling and manipulation library with support for Laravel integration", + "homepage": "http://image.intervention.io/", + "keywords": [ + "gd", + "image", + "imagick", + "laravel", + "thumbnail", + "watermark" + ], + "time": "2019-11-02T09:15:47+00:00" + }, { "name": "jakub-onderka/php-console-color", "version": "v0.2", @@ -1341,6 +1482,56 @@ ], "time": "2017-02-14T16:28:37+00:00" }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06T14:39:51+00:00" + }, { "name": "psr/log", "version": "1.1.1", @@ -1510,6 +1701,46 @@ ], "time": "2018-10-13T15:16:03+00:00" }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2019-03-08T08:55:37+00:00" + }, { "name": "ramsey/uuid", "version": "3.8.0", diff --git a/motorradig/config/app.php b/motorradig/config/app.php index c9960cd..dc1a04c 100644 --- a/motorradig/config/app.php +++ b/motorradig/config/app.php @@ -175,6 +175,8 @@ return [ App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, + Intervention\Image\ImageServiceProvider::class, + ], /* @@ -207,6 +209,7 @@ return [ 'File' => Illuminate\Support\Facades\File::class, 'Gate' => Illuminate\Support\Facades\Gate::class, 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Image' => Intervention\Image\Facades\Image::class, 'Lang' => Illuminate\Support\Facades\Lang::class, 'Log' => Illuminate\Support\Facades\Log::class, 'Mail' => Illuminate\Support\Facades\Mail::class, diff --git a/motorradig/config/image.php b/motorradig/config/image.php new file mode 100644 index 0000000..2b1d2c3 --- /dev/null +++ b/motorradig/config/image.php @@ -0,0 +1,20 @@ + 'gd' + +]; 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 7f0ee2e..4347199 100644 --- a/motorradig/public/js/app.js +++ b/motorradig/public/js/app.js @@ -49217,8 +49217,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/NeuerKram/Roblox_Dropper.png b/motorradig/public/upload/images/NeuerKram/Roblox_Dropper.png new file mode 100644 index 0000000..05e72f8 Binary files /dev/null and b/motorradig/public/upload/images/NeuerKram/Roblox_Dropper.png differ diff --git a/motorradig/public/upload/images/Superordner2/arinas_jira_link.png b/motorradig/public/upload/images/Superordner2/arinas_jira_link.png new file mode 100644 index 0000000..3ed2bfd Binary files /dev/null and b/motorradig/public/upload/images/Superordner2/arinas_jira_link.png differ diff --git a/motorradig/public/upload/images/Superordner3/automatus1.jpg b/motorradig/public/upload/images/Superordner3/automatus1.jpg new file mode 100644 index 0000000..7f9b93c Binary files /dev/null and b/motorradig/public/upload/images/Superordner3/automatus1.jpg differ diff --git a/motorradig/public/upload/images/Superordner4/arinas_jira_link.png b/motorradig/public/upload/images/Superordner4/arinas_jira_link.png new file mode 100644 index 0000000..3ed2bfd Binary files /dev/null and b/motorradig/public/upload/images/Superordner4/arinas_jira_link.png differ diff --git a/motorradig/public/upload/images/Superordner4/automatus1.jpg b/motorradig/public/upload/images/Superordner4/automatus1.jpg new file mode 100644 index 0000000..7f9b93c Binary files /dev/null and b/motorradig/public/upload/images/Superordner4/automatus1.jpg differ diff --git a/motorradig/public/upload/images/Superordner4/dsa.png b/motorradig/public/upload/images/Superordner4/dsa.png new file mode 100644 index 0000000..e853d2e Binary files /dev/null and b/motorradig/public/upload/images/Superordner4/dsa.png differ diff --git a/motorradig/public/upload/images/Superordner5/Baronie_Nordhag.jpg b/motorradig/public/upload/images/Superordner5/Baronie_Nordhag.jpg new file mode 100644 index 0000000..64f19f1 Binary files /dev/null and b/motorradig/public/upload/images/Superordner5/Baronie_Nordhag.jpg differ