From 37b6bcd6e76488b266a6a45e45d2e31979cd8777 Mon Sep 17 00:00:00 2001 From: cdesmidt Date: Tue, 8 Oct 2019 17:21:54 +0200 Subject: [PATCH 01/14] :ambulance: Modifie des fichiers en urgence MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * des fichiers à ne plus avoir sur Git * ajoute bootstrap --- .gitignore | 3 +++ resources/sass/app.scss | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f5b7047..9ccfa09 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ Homestead.yaml npm-debug.log yarn-error.log .idea +/public/css/ +/public/fonts/ +/public/js/ diff --git a/resources/sass/app.scss b/resources/sass/app.scss index dc1c79c..5c1925f 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -11,7 +11,7 @@ } // Bootstrap -//@import '~bootstrap/scss/bootstrap'; +@import '~bootstrap/scss/bootstrap'; @import '~tabler-ui/src/assets/scss/bundle.scss'; // Variables From 9a30d17fe0f9383568e704d5f4b342d2ae64a604 Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Thu, 5 Mar 2020 15:39:35 +0100 Subject: [PATCH 02/14] =?UTF-8?q?:sparkles:=20Permet=20l'=C3=A9dition=20et?= =?UTF-8?q?=20la=20suppression=20du=20post=20du=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #7 --- app/Http/Controllers/HomeController.php | 60 ++++++++++++++++++++ resources/js/components/Autocomplete.vue | 6 ++ resources/sass/_general.scss | 11 ++++ resources/views/home.blade.php | 70 ++++++++++++++---------- routes/web.php | 2 + 5 files changed, 121 insertions(+), 28 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b4ced9b..85e842f 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -26,6 +26,7 @@ class HomeController extends Controller * Show the application dashboard. * * @return \Illuminate\Contracts\Support\Renderable + * @throws \Exception */ public function index() { @@ -59,6 +60,65 @@ class HomeController extends Controller ]); } + /** + * Edit today's entry + */ + public function edit(TagDetectorService $tag_detector) + { + /** @var Post $today_post */ + $today_post = Post::whereDate('date_post', '=', (new DateTime())->format('Y-m-d')) + ->where('user_id', Auth::user()->getAuthIdentifier()) + ->firstOrFail(); + + $data = request()->validate([ + 'message' => 'required' + ]); + + $tags_to_delete = PostsTag::where('post_id', $today_post->id)->get(); + foreach ($tags_to_delete as $tag_to_delete) { + $tag_to_delete->delete(); + } + + $tags = $tag_detector->detectFrom($data['message']); + + $today_post->content = $data['message']; + $today_post->save(); + $all_tags = Tag::all(); + $all_tags_names = []; + foreach ($all_tags as $tag) { + $all_tags_names[$tag->id] = $tag->name; + } + + foreach ($tags as $tag) { + if (in_array($tag, $all_tags_names)) { + PostsTag::create([ + 'post_id' => $today_post->id, + 'tag_id' => array_search($tag, $all_tags_names), + ]); + } + } + + return Redirect::to('home')->withSuccess('Great! Form successfully submit with validation.'); + } + + /** + * @return \Illuminate\Http\RedirectResponse + * @throws \Exception + */ + public function delete() + { + try { + $today_post = Post::whereDate('date_post', '=', (new DateTime())->format('Y-m-d')) + ->where('user_id', Auth::user()->getAuthIdentifier()) + ->firstOrFail(); + + $today_post->delete(); + return Redirect::to('home')->withSuccess('Great! Your today\'s post is now deleted. You can make a new one!'); + } catch (\ErrorException $e) { + return Redirect::to('home')->withErrors('Oh no! We could\'t find your today\'s post.'); + } + } + public function store(TagDetectorService $tag_detector) { $today = new DateTime(); diff --git a/resources/js/components/Autocomplete.vue b/resources/js/components/Autocomplete.vue index 45b32c8..7486808 100644 --- a/resources/js/components/Autocomplete.vue +++ b/resources/js/components/Autocomplete.vue @@ -51,6 +51,12 @@ } } }); + let already = document.getElementById("collapse").classList.contains("collapse"); + if (already) { + let post = document.querySelector(".already").innerText; + document.querySelector("textarea").innerHTML = post; + this.inputValue = post; + } }, computed: { listToSearch() { diff --git a/resources/sass/_general.scss b/resources/sass/_general.scss index e84e0cc..3da8bb9 100644 --- a/resources/sass/_general.scss +++ b/resources/sass/_general.scss @@ -1,3 +1,14 @@ h1, h2, h3, h4 { font-family: $font-family-base; } + +.card-options .btn-link { + color: #9aa0ac; + text-decoration: none; + min-width: 0; + padding: 0; + margin-left: 5px; + &:hover { + color: #6e7687; + } +} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 80aca1f..ab38643 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -13,6 +13,16 @@ {{ session('status') }} @endif + @if (session('success')) + + @endif + @if (session('errors')) + + @endif
@@ -70,37 +80,35 @@
@if($already)
L'activité du jour a déjà été entrée.
- @else -
-
-
-
-

{{ strftime('%B %G', $today->format('U')) }}

-
-
-
- @csrf -
-
- -
-
-
- {{ $errors->first('message') }} -
-
-
-
- -
+ @endif +
+
+
+
+

{{ strftime('%B %G', $today->format('U')) }}

+
+
+ + @csrf +
+
+ +
+
+ {{ $errors->first('message') }}
- -
+
+
+ +
+
+
+
- @endif +
@foreach($posts as $post)
@@ -110,10 +118,16 @@

{{ ucfirst(\Carbon\Carbon::instance($post->date_post)->diffForHumans()) }}

- + @if($today->format('Y-m-d') === \Carbon\Carbon::instance($post->date_post)->format('Y-m-d')) + +
+ @csrf + +
+ @endif
-
+
{!! $tag_detector->linkTagFrom($post->content) !!}
diff --git a/routes/web.php b/routes/web.php index 3f6eb2a..f51833d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -16,4 +16,6 @@ Auth::routes(); Route::get('/', 'WelcomeController@index')->name('home'); Route::get('/home', 'HomeController@index')->name('dashboard'); Route::post('store', 'HomeController@store')->name('store'); +Route::post('delete', 'HomeController@delete')->name('delete'); +Route::post('edit', 'HomeController@edit')->name('edit'); Route::post('stats', 'StatsController@tag')->name('stats'); // TODO make a group for stats From ac5afa42e391c5b05328e6ac8e6405c65ec22ee3 Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Thu, 5 Mar 2020 17:40:24 +0100 Subject: [PATCH 03/14] :sparkles: Ajoute la gestion primaire des images Pour #4 --- app/Http/Controllers/HomeController.php | 22 ++++++++++++----- app/User.php | 22 +++++++++++++++++ resources/js/app.js | 21 ++++++++++++++++ resources/sass/_general.scss | 33 +++++++++++++++++++++++++ resources/views/home.blade.php | 8 +++++- 5 files changed, 99 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 85e842f..403bc1e 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -7,6 +7,7 @@ use App\PostsTag; use App\Services\TagDetectorService; use App\Tag; use DateTime; +use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Redirect; @@ -121,18 +122,27 @@ class HomeController extends Controller public function store(TagDetectorService $tag_detector) { - $today = new DateTime(); + $user_id = Auth::user()->getAuthIdentifier(); - $data = request()->validate([ - 'message' => 'required' + $validated_data = request()->validate([ + 'message' => 'required', + 'file' => 'file|mimes:jpeg,png,jpg,gif,svg', ]); $data = [ - 'user_id' => Auth::user()->getAuthIdentifier(), - 'date_post' => new DateTime(), // Take back the date from the form ? - 'content' => $data['message'], + 'user_id' => $user_id, + 'date_post' => new DateTime(), + 'content' => $validated_data['message'], ]; + if (!empty($validated_data['file'])) { + /** @var UploadedFile $uploaded_document */ + $uploaded_document = $validated_data['file']; + $file_name = $uploaded_document->getClientOriginalName(); + $uploaded_document->storeAs(Auth::user()->getFolder(), $file_name); + $data['image'] = $file_name; + } + $tags = $tag_detector->detectFrom($data['content']); $check = Post::create($data); diff --git a/app/User.php b/app/User.php index e79dab7..8d34633 100644 --- a/app/User.php +++ b/app/User.php @@ -36,4 +36,26 @@ class User extends Authenticatable protected $casts = [ 'email_verified_at' => 'datetime', ]; + + public function getFolder() + { + $arrayHash = str_split(strtolower(md5($this->id))); + return sprintf('%s/%s', $arrayHash[0], $arrayHash[1]); + } + + public function getImageData(Post $post) + { + if (empty($post->image)) { + return ''; + } + + $path = sprintf('%s/%s/%s', storage_path('app'), $this->getFolder(), $post->image); + + if (!is_readable($path)) { + return ''; + } + $type = pathinfo($path, PATHINFO_EXTENSION); + $data = file_get_contents($path); + return sprintf('data:image/%s;base64,%s', $type, base64_encode($data)); + } } diff --git a/resources/js/app.js b/resources/js/app.js index 093c069..0c76ddc 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -28,6 +28,7 @@ window.Vue = require('vue'); */ import App from './components/App.vue'; + Vue.config.productionTip = false; /** Function for collapse card */ @@ -41,6 +42,26 @@ document.querySelectorAll('[data-toggle="card-collapse"]').forEach(function(card }); }); +let fileNameChanged = function(element, label) { + let labelVal = label.innerText; + let fileName = ''; + if (element.value) { + fileName = element.value.split('\\').pop(); + } + if (fileName) { + label.firstChild.nextSibling.classList = "fe fe-check"; + label.querySelector('.js-fileName').innerHTML = fileName; + } else { + label.firstChild.nextSibling.classList = "fe fe-upload"; + label.querySelector('.js-fileName').innerHTML = labelVal; + } +}; +let inputFiles = document.querySelectorAll(".input-file"); +for (let i = 0, l = inputFiles.length; i < l; i++) { + inputFiles[i].onchange = fileNameChanged.bind(null, inputFiles[i], inputFiles[i].nextSibling.nextSibling); +} + +// new Vue(); const app = new Vue({ render: h => h(App), }).$mount('#app'); diff --git a/resources/sass/_general.scss b/resources/sass/_general.scss index 3da8bb9..1b8d812 100644 --- a/resources/sass/_general.scss +++ b/resources/sass/_general.scss @@ -12,3 +12,36 @@ h1, h2, h3, h4 { color: #6e7687; } } + +.btn-tertiary { + color: #555; + padding: 0; + line-height: 40px; + width: 300px; + margin: auto; + display: block; + border: 2px solid #555; + &:hover, + &:focus { + color: lighten(#555, 20%); + border-color: lighten(#555, 20%); + } +} + +/* input file style */ + +.input-file { + width: 0.1px; + height: 0.1px; + opacity: 0; + overflow: hidden; + position: absolute; + z-index: -1; + + .js-labelFile { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + padding: 0 10px; + cursor: pointer; + } +} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index ab38643..19e6c9d 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -88,7 +88,7 @@

{{ strftime('%B %G', $today->format('U')) }}

-
+ @csrf
@@ -96,6 +96,11 @@
{{ $errors->first('message') }} + +
@@ -128,6 +133,7 @@
+ @if($post->image != '')

@endif {!! $tag_detector->linkTagFrom($post->content) !!}
From d2d666da3b8a571d7dcf9b3df85cea3643ed6e5b Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Thu, 5 Mar 2020 17:41:06 +0100 Subject: [PATCH 04/14] =?UTF-8?q?:see=5Fno=5Fevil:=20Ajoute=20un=20dossier?= =?UTF-8?q?=20g=C3=A9n=C3=A9r=C3=A9=20par=20tabler-ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9ccfa09..fd66817 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ yarn-error.log /public/css/ /public/fonts/ /public/js/ +/public/images/ From d83d92ec42b54c1f6278e3ad691cf774abaa591b Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Thu, 5 Mar 2020 17:42:20 +0100 Subject: [PATCH 05/14] :recycle: Factorise la suppression de tags Pour #8 --- app/Http/Controllers/HomeController.php | 8 +++----- app/Post.php | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 403bc1e..98d18c5 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -75,10 +75,7 @@ class HomeController extends Controller 'message' => 'required' ]); - $tags_to_delete = PostsTag::where('post_id', $today_post->id)->get(); - foreach ($tags_to_delete as $tag_to_delete) { - $tag_to_delete->delete(); - } + $today_post->deleteTags(); $tags = $tag_detector->detectFrom($data['message']); @@ -112,7 +109,8 @@ class HomeController extends Controller $today_post = Post::whereDate('date_post', '=', (new DateTime())->format('Y-m-d')) ->where('user_id', Auth::user()->getAuthIdentifier()) ->firstOrFail(); - + /** @var Post $today_post */ + $today_post->deleteTags(); $today_post->delete(); return Redirect::to('home')->withSuccess('Great! Your today\'s post is now deleted. You can make a new one!'); } catch (\ErrorException $e) { diff --git a/app/Post.php b/app/Post.php index 5f112ca..3657a13 100644 --- a/app/Post.php +++ b/app/Post.php @@ -14,16 +14,16 @@ class Post extends Model protected $fillable = [ 'content', 'image', 'date_post', 'user_id' ]; - + /** * The attributes that should be hidden for arrays. * * @var array */ protected $hidden = [ - + ]; - + /** * The attributes that should be cast to native types. * @@ -32,4 +32,15 @@ class Post extends Model protected $casts = [ 'date_post' => 'datetime', ]; + + /** + * Delete this posts tags + */ + public function deleteTags() + { + $tags_to_delete = PostsTag::where('post_id', $this->id)->get(); + foreach ($tags_to_delete as $tag_to_delete) { + $tag_to_delete->delete(); + } + } } From ea3bc41ca6f34981a3eaff0a59960d0b5a831abc Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Thu, 5 Mar 2020 17:43:15 +0100 Subject: [PATCH 06/14] =?UTF-8?q?:pencil:=20Ajoute=20une=20instruction=20?= =?UTF-8?q?=C3=A0=20l'installation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Permet de peupler les tags --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a61fad1..0cc88c1 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,5 @@ éditer le fichier `.env` `php artisan migrate` + +`php artisan db:seed --class=TagsTableSeeder` From 99ec67affba055e942e1f6d07974d9f1f86ef8d7 Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Thu, 5 Mar 2020 17:43:49 +0100 Subject: [PATCH 07/14] :wrench: Indique le fuseau horaire de base --- config/app.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.php b/config/app.php index 7e4d3a8..e0a4459 100644 --- a/config/app.php +++ b/config/app.php @@ -13,7 +13,7 @@ return [ | */ - 'name' => env('APP_NAME', 'Laravel'), + 'name' => env('APP_NAME', 'Journal Intime'), /* |-------------------------------------------------------------------------- @@ -67,7 +67,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => 'Europe/Paris', /* |-------------------------------------------------------------------------- From 7cec21bc21e58b84fc09c9c8282c71d0da1d6b07 Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Tue, 10 Mar 2020 13:09:05 +0100 Subject: [PATCH 08/14] :sparkles: Ajoute la gallerie MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On utilise une libraire pour créer les miniatures Fix #4 --- app/Http/Controllers/HomeController.php | 5 + app/Http/Controllers/ImageController.php | 82 +++++++ app/User.php | 16 -- composer.json | 4 +- composer.lock | 285 ++++++++++++++++++++++- config/app.php | 3 +- config/image.php | 20 ++ resources/views/gallery/my.blade.php | 33 +++ resources/views/home.blade.php | 2 +- routes/web.php | 2 + 10 files changed, 432 insertions(+), 20 deletions(-) create mode 100644 app/Http/Controllers/ImageController.php create mode 100644 config/image.php create mode 100644 resources/views/gallery/my.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 98d18c5..2a606a5 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -118,6 +118,11 @@ class HomeController extends Controller } } + /** + * @param TagDetectorService $tag_detector + * @return mixed + * @throws \Exception + */ public function store(TagDetectorService $tag_detector) { $user_id = Auth::user()->getAuthIdentifier(); diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php new file mode 100644 index 0000000..57e0daf --- /dev/null +++ b/app/Http/Controllers/ImageController.php @@ -0,0 +1,82 @@ +getAuthIdentifier() !== (int)$post->user_id) { + throw new UnauthorizedHttpException('Cette image ne vous appartient pas.'); + } + + $path = sprintf('%s/%s/%s', storage_path('app'), Auth::user()->getFolder(), $image); + if (!is_readable($path)) { + throw new NotFoundHttpException(); + } + + + $img = Image::make($path); + + if ('o:full' !== $options) { + $options = explode('!', $options); + $width = null; + $height = null; + foreach ($options as $option) { + $current_option = explode(':', $option); + foreach ($current_option as $current_option_name => $current_option_value) { + switch ($current_option_name) { + case 'w': + $width = $current_option_value; + break; + case 'h': + $height = $current_option_value; + break; + } + } + } + //http://image.intervention.io/getting_started/ + $img->resize($width, $height, static function (Constraint $constraint) { + $constraint->aspectRatio(); + }); + } + + return $img->response(File::extension($path)); + } + + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function gallery() + { + $posts_with_image = Post::where('user_id', Auth::user()->getAuthIdentifier()) + ->where('image', '!=', 'null') + ->orderBy('created_at', 'desc') + ->paginate(30); + + return view('gallery.my', [ + 'posts' => $posts_with_image, + ]); + } +} diff --git a/app/User.php b/app/User.php index 8d34633..b7c1510 100644 --- a/app/User.php +++ b/app/User.php @@ -42,20 +42,4 @@ class User extends Authenticatable $arrayHash = str_split(strtolower(md5($this->id))); return sprintf('%s/%s', $arrayHash[0], $arrayHash[1]); } - - public function getImageData(Post $post) - { - if (empty($post->image)) { - return ''; - } - - $path = sprintf('%s/%s/%s', storage_path('app'), $this->getFolder(), $post->image); - - if (!is_readable($path)) { - return ''; - } - $type = pathinfo($path, PATHINFO_EXTENSION); - $data = file_get_contents($path); - return sprintf('data:image/%s;base64,%s', $type, base64_encode($data)); - } } diff --git a/composer.json b/composer.json index 0d3f00d..4de1904 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,10 @@ "require": { "php": "^7.2", "fideloper/proxy": "^4.0", + "intervention/image": "^2.5", "laravel/framework": "^6.0", - "laravel/tinker": "^1.0" + "laravel/tinker": "^1.0", + "lavary/laravel-menu": "^1.7" }, "require-dev": { "facade/ignition": "^1.4", diff --git a/composer.lock b/composer.lock index d8da420..a25d7a0 100644 --- a/composer.lock +++ b/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": "3f43a645b4cb3d85ae04049046b0845a", + "content-hash": "a8999b4d9f518e7a9608ff59c6ba40e9", "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", @@ -676,6 +817,58 @@ ], "time": "2019-08-07T15:10:45+00:00" }, + { + "name": "lavary/laravel-menu", + "version": "v1.7.7", + "source": { + "type": "git", + "url": "https://github.com/lavary/laravel-menu.git", + "reference": "5592778b3193ae561614ecb107467469b694ab11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/lavary/laravel-menu/zipball/5592778b3193ae561614ecb107467469b694ab11", + "reference": "5592778b3193ae561614ecb107467469b694ab11", + "shasum": "" + }, + "require": { + "illuminate/support": ">=5.0", + "illuminate/view": ">=5.0", + "php": ">=5.4.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Lavary\\Menu\\ServiceProvider" + ], + "aliases": { + "Menu": "Lavary\\Menu\\Facade" + } + } + }, + "autoload": { + "psr-0": { + "Lavary\\Menu\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lavary", + "email": "mrl.8081@gmail.com" + } + ], + "description": "A quick way to create menus in Laravel 5", + "homepage": "https://github.com/lavary/laravel-menu", + "keywords": [ + "laravel" + ], + "time": "2019-09-06T16:28:16+00:00" + }, { "name": "league/flysystem", "version": "1.0.55", @@ -1164,6 +1357,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.0", @@ -1333,6 +1576,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/config/app.php b/config/app.php index e0a4459..54da053 100644 --- a/config/app.php +++ b/config/app.php @@ -176,7 +176,7 @@ return [ App\Providers\RouteServiceProvider::class, \App\Providers\TagDetectorProvider::class, - + Intervention\Image\ImageServiceProvider::class, ], /* @@ -209,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/config/image.php b/config/image.php new file mode 100644 index 0000000..2b1d2c3 --- /dev/null +++ b/config/image.php @@ -0,0 +1,20 @@ + 'gd' + +]; diff --git a/resources/views/gallery/my.blade.php b/resources/views/gallery/my.blade.php new file mode 100644 index 0000000..5f0fca1 --- /dev/null +++ b/resources/views/gallery/my.blade.php @@ -0,0 +1,33 @@ +@extends('layouts.connected') + +@section('content') +
+
+

+ {{ __('My gallery') }} +

+
+
+ @foreach($posts as $post) +
+
+
+
+

{{ ucfirst(\Carbon\Carbon::instance($post->date_post)->diffForHumans()) }}

+
+ +
+
+
+

+ + + +

+
+
+
+ @endforeach +
+
+@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 19e6c9d..fa00d1e 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -133,7 +133,7 @@
- @if($post->image != '')

@endif + @if($post->image != '')

@endif {!! $tag_detector->linkTagFrom($post->content) !!}
diff --git a/routes/web.php b/routes/web.php index f51833d..475d5e2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,3 +19,5 @@ Route::post('store', 'HomeController@store')->name('store'); Route::post('delete', 'HomeController@delete')->name('delete'); Route::post('edit', 'HomeController@edit')->name('edit'); Route::post('stats', 'StatsController@tag')->name('stats'); // TODO make a group for stats +Route::get('/display/{post_id}/{options}/{image_name}', 'ImageController@display')->name('display_image'); +Route::get('/gallery', 'ImageController@gallery')->name('gallery'); From 4bc1c97006d5549ebe8c757b197fa3979446fa5a Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Tue, 10 Mar 2020 17:05:21 +0100 Subject: [PATCH 09/14] :lipstick: Ajoute le compteur d'image --- app/Http/Controllers/HomeController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 2a606a5..77307f4 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -39,7 +39,9 @@ class HomeController extends Controller $month_counts = Post::where('user_id', $user_id) ->whereYear('date_post', $today->format('Y')) ->whereMonth('date_post', $today->format('m'))->count(); - $image_counts = 0; // TODO #4 + $image_counts = Post::where('user_id', Auth::user()->getAuthIdentifier()) + ->where('image', '!=', 'null') + ->count(); $posts = Post::where('user_id', $user_id)->orderBy('date_post', 'DESC')->limit(9)->get(); $today_post = Post::whereDate('date_post', '=', $today->format('Y-m-d')) ->where('user_id', $user_id) From a9f40e55e77dc5cecb7e742f5c4f04cb8832e262 Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Tue, 10 Mar 2020 17:06:10 +0100 Subject: [PATCH 10/14] :alembic: Ajoute un menu dynamique pour avoir la classe active automatique --- app/Http/Kernel.php | 76 ++++++++++++------- app/Http/Middleware/GenerateMenus.php | 40 ++++++++++ config/laravel-menu/settings.php | 13 ++++ config/laravel-menu/views.php | 5 ++ resources/views/layouts/connected.blade.php | 10 +-- .../bootstrap-navbar-items.blade.php | 20 +++++ 6 files changed, 128 insertions(+), 36 deletions(-) create mode 100644 app/Http/Middleware/GenerateMenus.php create mode 100644 config/laravel-menu/settings.php create mode 100644 config/laravel-menu/views.php create mode 100644 resources/views/vendor/laravel-menu/bootstrap-navbar-items.blade.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 0d7d8c1..e4a0e03 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -2,7 +2,28 @@ namespace App\Http; +use App\Http\Middleware\Authenticate; +use App\Http\Middleware\CheckForMaintenanceMode; +use App\Http\Middleware\EncryptCookies; +use App\Http\Middleware\GenerateMenus; +use App\Http\Middleware\RedirectIfAuthenticated; +use App\Http\Middleware\TrimStrings; +use App\Http\Middleware\TrustProxies; +use App\Http\Middleware\VerifyCsrfToken; +use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth; +use Illuminate\Auth\Middleware\Authorize; +use Illuminate\Auth\Middleware\EnsureEmailIsVerified; +use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Foundation\Http\Kernel as HttpKernel; +use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull; +use Illuminate\Foundation\Http\Middleware\ValidatePostSize; +use Illuminate\Http\Middleware\SetCacheHeaders; +use Illuminate\Routing\Middleware\SubstituteBindings; +use Illuminate\Routing\Middleware\ThrottleRequests; +use Illuminate\Routing\Middleware\ValidateSignature; +use Illuminate\Session\Middleware\AuthenticateSession; +use Illuminate\Session\Middleware\StartSession; +use Illuminate\View\Middleware\ShareErrorsFromSession; class Kernel extends HttpKernel { @@ -14,11 +35,11 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - \App\Http\Middleware\TrustProxies::class, - \App\Http\Middleware\CheckForMaintenanceMode::class, - \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, - \App\Http\Middleware\TrimStrings::class, - \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, + TrustProxies::class, + CheckForMaintenanceMode::class, + ValidatePostSize::class, + TrimStrings::class, + ConvertEmptyStringsToNull::class, ]; /** @@ -28,13 +49,14 @@ class Kernel extends HttpKernel */ protected $middlewareGroups = [ 'web' => [ - \App\Http\Middleware\EncryptCookies::class, - \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, - \Illuminate\Session\Middleware\StartSession::class, + EncryptCookies::class, + AddQueuedCookiesToResponse::class, + StartSession::class, // \Illuminate\Session\Middleware\AuthenticateSession::class, - \Illuminate\View\Middleware\ShareErrorsFromSession::class, - \App\Http\Middleware\VerifyCsrfToken::class, - \Illuminate\Routing\Middleware\SubstituteBindings::class, + ShareErrorsFromSession::class, + VerifyCsrfToken::class, + SubstituteBindings::class, + GenerateMenus::class, ], 'api' => [ @@ -51,15 +73,15 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'auth' => \App\Http\Middleware\Authenticate::class, - 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, - 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class, - 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, - 'can' => \Illuminate\Auth\Middleware\Authorize::class, - 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, - 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, - 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, - 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, + 'auth' => Authenticate::class, + 'auth.basic' => AuthenticateWithBasicAuth::class, + 'bindings' => SubstituteBindings::class, + 'cache.headers' => SetCacheHeaders::class, + 'can' => Authorize::class, + 'guest' => RedirectIfAuthenticated::class, + 'signed' => ValidateSignature::class, + 'throttle' => ThrottleRequests::class, + 'verified' => EnsureEmailIsVerified::class, ]; /** @@ -70,12 +92,12 @@ class Kernel extends HttpKernel * @var array */ protected $middlewarePriority = [ - \Illuminate\Session\Middleware\StartSession::class, - \Illuminate\View\Middleware\ShareErrorsFromSession::class, - \App\Http\Middleware\Authenticate::class, - \Illuminate\Routing\Middleware\ThrottleRequests::class, - \Illuminate\Session\Middleware\AuthenticateSession::class, - \Illuminate\Routing\Middleware\SubstituteBindings::class, - \Illuminate\Auth\Middleware\Authorize::class, + StartSession::class, + ShareErrorsFromSession::class, + Authenticate::class, + ThrottleRequests::class, + AuthenticateSession::class, + SubstituteBindings::class, + Authorize::class, ]; } diff --git a/app/Http/Middleware/GenerateMenus.php b/app/Http/Middleware/GenerateMenus.php new file mode 100644 index 0000000..56178e3 --- /dev/null +++ b/app/Http/Middleware/GenerateMenus.php @@ -0,0 +1,40 @@ +make('menu', function (Builder $menu) { + $accueil = $menu->add('Accueil', ['route' => 'dashboard', 'class' => 'nav-item'])->nickname('home'); + $accueil->link->attr(['class' => 'nav-link']); + $accueil->prepend(' '); + $accueil->checkActivationStatus(); + + $stats = $menu->add('Mes statistiques', ['route' => 'stats', 'class' => 'nav-item'])->nickname('stats'); + $stats->link->attr(['class' => 'nav-link']); + $stats->prepend(' '); + $stats->checkActivationStatus(); + + $gallery = $menu->add('Ma gallerie', ['route' => 'gallery', 'class' => 'nav-item'])->nickname('gallery'); + $gallery->link->attr(['class' => 'nav-link']); + $gallery->prepend(' '); + $gallery->checkActivationStatus(); + }); + + return $next($request); + } +} diff --git a/config/laravel-menu/settings.php b/config/laravel-menu/settings.php new file mode 100644 index 0000000..2eb25b0 --- /dev/null +++ b/config/laravel-menu/settings.php @@ -0,0 +1,13 @@ + [ + 'auto_activate' => true, + 'activate_parents' => true, + 'active_class' => 'active', + 'restful' => false, + 'cascade_data' => true, + 'rest_base' => '', // string|array + 'active_element' => 'link', // item|link + ], +]; diff --git a/config/laravel-menu/views.php b/config/laravel-menu/views.php new file mode 100644 index 0000000..e136d88 --- /dev/null +++ b/config/laravel-menu/views.php @@ -0,0 +1,5 @@ + 'laravel-menu::bootstrap-navbar-items', +]; diff --git a/resources/views/layouts/connected.blade.php b/resources/views/layouts/connected.blade.php index 4c8badf..ade6e4d 100644 --- a/resources/views/layouts/connected.blade.php +++ b/resources/views/layouts/connected.blade.php @@ -101,15 +101,7 @@
diff --git a/resources/views/vendor/laravel-menu/bootstrap-navbar-items.blade.php b/resources/views/vendor/laravel-menu/bootstrap-navbar-items.blade.php new file mode 100644 index 0000000..47909dd --- /dev/null +++ b/resources/views/vendor/laravel-menu/bootstrap-navbar-items.blade.php @@ -0,0 +1,20 @@ +@foreach($items as $item) +
  • hasChildren()) class="nav-item dropdown" @endif @lm_endattrs> + @if($item->link) link) @if($item->hasChildren()) class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" @else class="nav-link" @endif @lm_endattrs href="{!! $item->url() !!}"> + {!! $item->title !!} + @if($item->hasChildren()) @endif + + @else + {!! $item->title !!} + @endif + @if($item->hasChildren()) +
      + @include(config('laravel-menu.views.bootstrap-items'), +array('items' => $item->children())) +
    + @endif +
    • + @if($item->divider) + divider) !!}> + @endif +@endforeach From 18dd6cd92dcc1cd0d86869b9460ede5471d7e510 Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Tue, 10 Mar 2020 18:13:42 +0100 Subject: [PATCH 11/14] :poop: Commence la mise en cache des miniatures Start #9 --- app/Http/Controllers/HomeController.php | 6 ++++ app/Http/Controllers/ImageController.php | 44 +++++++++++++----------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 77307f4..65bde6d 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -10,6 +10,8 @@ use DateTime; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Redirect; +use Intervention\Image\Constraint; +use Intervention\Image\Facades\Image; class HomeController extends Controller { @@ -145,6 +147,10 @@ class HomeController extends Controller $uploaded_document = $validated_data['file']; $file_name = $uploaded_document->getClientOriginalName(); $uploaded_document->storeAs(Auth::user()->getFolder(), $file_name); + $img = Image::make($uploaded_document->getRealPath()); + $img->resize(300, null, static function (Constraint $constraint) { + $constraint->aspectRatio(); + })->save(sprintf('%s/%s/%s', storage_path('app'), Auth::user()->getFolder(), sprintf('300-%s', $file_name))); $data['image'] = $file_name; } diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index 57e0daf..8b8a49c 100644 --- a/app/Http/Controllers/ImageController.php +++ b/app/Http/Controllers/ImageController.php @@ -31,38 +31,40 @@ class ImageController extends Controller throw new UnauthorizedHttpException('Cette image ne vous appartient pas.'); } - $path = sprintf('%s/%s/%s', storage_path('app'), Auth::user()->getFolder(), $image); - if (!is_readable($path)) { - throw new NotFoundHttpException(); - } - - - $img = Image::make($path); - - if ('o:full' !== $options) { + $original = sprintf('%s/%s/%s', storage_path('app'), Auth::user()->getFolder(), $image); + $thumb = sprintf('%s/%s/300-%s', storage_path('app'), Auth::user()->getFolder(), $image); + $img = Image::make($original); + if ('o:full' === $options) { + if (!is_readable($original)) { + throw new NotFoundHttpException(); + } + } elseif (!is_readable($thumb)) { + if (!is_readable($original)) { + throw new NotFoundHttpException(); + } $options = explode('!', $options); $width = null; $height = null; foreach ($options as $option) { - $current_option = explode(':', $option); - foreach ($current_option as $current_option_name => $current_option_value) { - switch ($current_option_name) { - case 'w': - $width = $current_option_value; - break; - case 'h': - $height = $current_option_value; - break; - } + [$current_option_name, $current_option_value] = explode(':', $option); + switch ($current_option_name) { + case 'w': + $width = $current_option_value; + break; + case 'h': + $height = $current_option_value; + break; } } //http://image.intervention.io/getting_started/ $img->resize($width, $height, static function (Constraint $constraint) { $constraint->aspectRatio(); - }); + })->save(sprintf('%s/%s/%s', storage_path('app'), Auth::user()->getFolder(), sprintf('300-%s', $image))); + } else { + $img = Image::make($thumb); } - return $img->response(File::extension($path)); + return $img->response(File::extension($original)); } /** From 6f5f362bf9377e3847a915b72e1db833eacbee31 Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Tue, 10 Mar 2020 18:14:19 +0100 Subject: [PATCH 12/14] =?UTF-8?q?:zap:=20Redirige=20l'utilisateur=20connec?= =?UTF-8?q?t=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/WelcomeController.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/WelcomeController.php b/app/Http/Controllers/WelcomeController.php index f7cba65..a1fa40d 100644 --- a/app/Http/Controllers/WelcomeController.php +++ b/app/Http/Controllers/WelcomeController.php @@ -3,13 +3,22 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class WelcomeController extends Controller { + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + * @throws \Exception + */ public function index() { - return view('welcome', [ - 'today' => new \DateTime(), - ]); + if (Auth::guest()) { + return view('welcome', [ + 'today' => new \DateTime(), + ]); + } + + return redirect(route('dashboard')); } } From 020eec2a602a38f767c7a1742b24c400f0650dc7 Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Thu, 12 Mar 2020 17:31:13 +0100 Subject: [PATCH 13/14] :truck: Renomme le controlleur principal --- .../{HomeController.php => DashboardController.php} | 10 ++++------ routes/web.php | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) rename app/Http/Controllers/{HomeController.php => DashboardController.php} (92%) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/DashboardController.php similarity index 92% rename from app/Http/Controllers/HomeController.php rename to app/Http/Controllers/DashboardController.php index 65bde6d..b92e488 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/DashboardController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Post; use App\PostsTag; +use App\Services\ImageService; use App\Services\TagDetectorService; use App\Tag; use DateTime; @@ -13,7 +14,7 @@ use Illuminate\Support\Facades\Redirect; use Intervention\Image\Constraint; use Intervention\Image\Facades\Image; -class HomeController extends Controller +class DashboardController extends Controller { /** * Create a new controller instance. @@ -127,7 +128,7 @@ class HomeController extends Controller * @return mixed * @throws \Exception */ - public function store(TagDetectorService $tag_detector) + public function store(TagDetectorService $tag_detector, ImageService $image_service) { $user_id = Auth::user()->getAuthIdentifier(); @@ -147,10 +148,7 @@ class HomeController extends Controller $uploaded_document = $validated_data['file']; $file_name = $uploaded_document->getClientOriginalName(); $uploaded_document->storeAs(Auth::user()->getFolder(), $file_name); - $img = Image::make($uploaded_document->getRealPath()); - $img->resize(300, null, static function (Constraint $constraint) { - $constraint->aspectRatio(); - })->save(sprintf('%s/%s/%s', storage_path('app'), Auth::user()->getFolder(), sprintf('300-%s', $file_name))); + $image_service->makeThumbnail($uploaded_document->getRealPath(), ['width' => 300]); $data['image'] = $file_name; } diff --git a/routes/web.php b/routes/web.php index 475d5e2..17626f2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,10 +14,10 @@ Auth::routes(); Route::get('/', 'WelcomeController@index')->name('home'); -Route::get('/home', 'HomeController@index')->name('dashboard'); -Route::post('store', 'HomeController@store')->name('store'); -Route::post('delete', 'HomeController@delete')->name('delete'); -Route::post('edit', 'HomeController@edit')->name('edit'); +Route::get('/home', 'DashboardController@index')->name('dashboard'); +Route::post('store', 'DashboardController@store')->name('store'); +Route::post('delete', 'DashboardController@delete')->name('delete'); +Route::post('edit', 'DashboardController@edit')->name('edit'); Route::post('stats', 'StatsController@tag')->name('stats'); // TODO make a group for stats Route::get('/display/{post_id}/{options}/{image_name}', 'ImageController@display')->name('display_image'); Route::get('/gallery', 'ImageController@gallery')->name('gallery'); From 7f1214b96b39d2e74230eaca0142a97cf42e79af Mon Sep 17 00:00:00 2001 From: Clement Desmidt Date: Thu, 12 Mar 2020 17:31:51 +0100 Subject: [PATCH 14/14] :sparkles: Finalise la mise en cache des images Fix #9 --- app/Http/Controllers/ImageController.php | 34 +++----------- app/Providers/ImageServiceProvider.php | 29 ++++++++++++ app/Services/ImageService.php | 56 ++++++++++++++++++++++++ config/app.php | 1 + 4 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 app/Providers/ImageServiceProvider.php create mode 100644 app/Services/ImageService.php diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index 8b8a49c..1d97c85 100644 --- a/app/Http/Controllers/ImageController.php +++ b/app/Http/Controllers/ImageController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Post; +use App\Services\ImageService; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\File; use Intervention\Image\Constraint; @@ -16,10 +17,11 @@ class ImageController extends Controller * @param int $post_id * @param string|array $options * @param string $image + * @param ImageService $image_service * * @return mixed */ - public function display($post_id, $options = 'o:full', $image) + public function display($post_id, $options = 'o:full', $image, ImageService $image_service) { if (Auth::guest()) { throw new UnauthorizedHttpException('Vous devez être connecté pour voir cette image.'); @@ -32,36 +34,10 @@ class ImageController extends Controller } $original = sprintf('%s/%s/%s', storage_path('app'), Auth::user()->getFolder(), $image); - $thumb = sprintf('%s/%s/300-%s', storage_path('app'), Auth::user()->getFolder(), $image); - $img = Image::make($original); if ('o:full' === $options) { - if (!is_readable($original)) { - throw new NotFoundHttpException(); - } - } elseif (!is_readable($thumb)) { - if (!is_readable($original)) { - throw new NotFoundHttpException(); - } - $options = explode('!', $options); - $width = null; - $height = null; - foreach ($options as $option) { - [$current_option_name, $current_option_value] = explode(':', $option); - switch ($current_option_name) { - case 'w': - $width = $current_option_value; - break; - case 'h': - $height = $current_option_value; - break; - } - } - //http://image.intervention.io/getting_started/ - $img->resize($width, $height, static function (Constraint $constraint) { - $constraint->aspectRatio(); - })->save(sprintf('%s/%s/%s', storage_path('app'), Auth::user()->getFolder(), sprintf('300-%s', $image))); + $img = $image_service->makeThumbnail($original); } else { - $img = Image::make($thumb); + $img = $image_service->makeThumbnail($original, ['width' => 300]); } return $img->response(File::extension($original)); diff --git a/app/Providers/ImageServiceProvider.php b/app/Providers/ImageServiceProvider.php new file mode 100644 index 0000000..2034dff --- /dev/null +++ b/app/Providers/ImageServiceProvider.php @@ -0,0 +1,29 @@ +app->bind(ImageService::class); + } + + /** + * Bootstrap services. + * + * @return void + */ + public function boot() + { + // + } +} diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php new file mode 100644 index 0000000..2e95f20 --- /dev/null +++ b/app/Services/ImageService.php @@ -0,0 +1,56 @@ +basePath()); + $file_name = basename($image); + + $width = null; + if (array_key_exists('width', $options)) { + $width = $options['width']; + $file_name = sprintf('w%u-%s', $width, $file_name); + } + + $height = null; + if (array_key_exists('$height', $options)) { + $height = $options['$height']; + $file_name = sprintf('h%u-%s', $height, $file_name); + } + + $full_path = sprintf('%s/%s', $folder, $file_name); + if (!array_key_exists('force', $options) && is_readable($full_path)) { + return Image::make($full_path); + } + + //http://image.intervention.io/getting_started/ + $img->resize($width, $height, static function (Constraint $constraint) { + $constraint->aspectRatio(); + })->save(sprintf('%s/%s', $folder, $file_name)); + + return $img; + } +} diff --git a/config/app.php b/config/app.php index 54da053..1b675c2 100644 --- a/config/app.php +++ b/config/app.php @@ -176,6 +176,7 @@ return [ App\Providers\RouteServiceProvider::class, \App\Providers\TagDetectorProvider::class, + \App\Providers\ImageServiceProvider::class, Intervention\Image\ImageServiceProvider::class, ],