✨ ajout de medialibrary pour l'upload de fichier

mckenziearts · mckenziearts · commit 40c82f573fd9 · 2022-08-15T11:47:18.000+01:00
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -24,7 +24,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('media-library:delete-old-temporary-uploads')->daily();
+        $schedule->command('media-library:delete-old-temporary-uploads')->daily();
         $schedule->command('lcm:delete-old-unverified-users')->daily();
         $schedule->command('lcm:post-article-to-twitter')->everyFourHours();
         $schedule->command('lcm:post-article-to-telegram')->everyFourHours();
diff --git a/app/Http/Controllers/User/SettingController.php b/app/Http/Controllers/User/SettingController.php
@@ -41,7 +41,7 @@ public function update(UpdateProfileRequest $request)
         ]);
 
         if ($request->avatar) {
-            $user->addMediaFromRequest('avatar')
+            $user->addFromMediaLibraryRequest($request->avatar)
                 ->toMediaCollection('avatar');
             $user->avatar_type = 'storage';
             $user->save();
diff --git a/app/Http/Requests/UpdateProfileRequest.php b/app/Http/Requests/UpdateProfileRequest.php
@@ -4,9 +4,12 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
+use Spatie\MediaLibraryPro\Rules\Concerns\ValidatesMedia;
 
 class UpdateProfileRequest extends FormRequest
 {
+    use ValidatesMedia;
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -32,7 +35,9 @@ public function rules(): array
             'github_profile' => 'max:255|nullable|unique:users,github_profile,'.Auth::id(),
             'bio' => 'nullable|max:160',
             'website' => 'nullable|url',
-            'avatar' => 'nullable|image|max:2048',
+            'avatar' => $this->validateSingleMedia()
+                ->extension(['png', 'jpg', 'jpeg', 'gif'])
+                ->maxItemSizeInKb(1024),
         ];
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -142,7 +142,7 @@ public function registerMediaCollections(): void
     {
         $this->addMediaCollection('avatar')
             ->singleFile()
-            ->acceptsMimeTypes(['image/jpg', 'image/jpeg', 'image/png']);
+            ->acceptsMimeTypes(['image/jpg', 'image/jpeg', 'image/png', 'image/gif']);
     }
 
     public static function findByUsername(string $username): self
diff --git a/auth.json b/auth.json
@@ -0,0 +1,11 @@
+{
+  "http-basic": {
+    "satis.spatie.be": {
+      "username": "monneylobe@gmail.com",
+      "password": "Jao8zKnIoRci24cErttBE7tgrjpwUYqOvbQh9y1e4DA41K2x7TJaioTD8P7oQWd4"
+    }
+  },
+  "github-oauth": {
+    "github.com": "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"
+  }
+}
diff --git a/composer.json b/composer.json
@@ -33,7 +33,8 @@
     "spatie/laravel-feed": "^4.1",
     "spatie/laravel-google-fonts": "^1.2",
     "spatie/laravel-health": "^1.11",
-    "spatie/laravel-medialibrary": "^9.0.0",
+    "spatie/laravel-medialibrary": "^10.4.3",
+    "spatie/laravel-medialibrary-pro": "^2.0.0",
     "spatie/laravel-permission": "^5.1",
     "spatie/laravel-sitemap": "^6.1",
     "stevebauman/location": "^6.2",
@@ -120,5 +121,10 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "repositories": []
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://satis.spatie.be"
+    }
+  ]
 }
diff --git a/composer.lock b/composer.lock
diff --git a/config/filesystems.php b/config/filesystems.php
@@ -56,6 +56,7 @@
             'driver' => 'local',
             'root' => public_path('media'),
             'url' => env('APP_URL').'/media',
+            'visibility' => 'public',
         ],
 
     ],
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=8749e442ea1277ea8a47668ef7c39f78",
-    "/css/app.css": "/css/app.css?id=6c79229752bab2bf32f9ffe1012fbdd8"
+    "/js/app.js": "/js/app.js",
+    "/css/app.css": "/css/app.css"
 }
diff --git a/resources/css/app.css b/resources/css/app.css
@@ -12,7 +12,7 @@
 @import "torchlight.css";
 @import "toc.css";
 @import "header.css";
-/*@import "media-library.css";*/
+@import "media-library.css";
 /*@import "christmas.css";*/
 
 :root {
diff --git a/resources/views/user/settings/profile.blade.php b/resources/views/user/settings/profile.blade.php
@@ -55,7 +55,7 @@
                         </div>
                         <div class="mt-1 sm:mt-0 sm:col-span-2">
                             <div class="w-full max-w-lg">
-                                
+                                <x-media-library-attachment name="avatar" rules="mimes:png,jpg,jpeg,gif|max:1024"/>
                             </div>
                         </div>
                     </div>
diff --git a/routes/web.php b/routes/web.php
@@ -106,3 +106,7 @@
 ]);
 
 Route::feeds();
+
+Route::middleware('auth')->group(function() {
+    Route::mediaLibrary();
+});
diff --git a/storage/media-library/temp/bRrSIA0h8Ghp1LTo5HGGOiremRPQ0T0e/Chi-typing-on-a-computer-chis-sweet-home-chis-new-address-37597964-320-240.gif b/storage/media-library/temp/bRrSIA0h8Ghp1LTo5HGGOiremRPQ0T0e/Chi-typing-on-a-computer-chis-sweet-home-chis-new-address-37597964-320-240.gif

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class Kernel extends ConsoleKernel`
`24`	`24`	`*/`
`25`	`25`	`protected function schedule(Schedule $schedule)`
`26`	`26`	`{`
`27`		`- // $schedule->command('media-library:delete-old-temporary-uploads')->daily();`
	`27`	`+ $schedule->command('media-library:delete-old-temporary-uploads')->daily();`
`28`	`28`	`$schedule->command('lcm:delete-old-unverified-users')->daily();`
`29`	`29`	`$schedule->command('lcm:post-article-to-twitter')->everyFourHours();`
`30`	`30`	`$schedule->command('lcm:post-article-to-telegram')->everyFourHours();`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,12 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Http\FormRequest;`
`6`	`6`	`use Illuminate\Support\Facades\Auth;`
	`7`	`+use Spatie\MediaLibraryPro\Rules\Concerns\ValidatesMedia;`
`7`	`8`
`8`	`9`	`class UpdateProfileRequest extends FormRequest`
`9`	`10`	`{`
	`11`	`+ use ValidatesMedia;`
	`12`	`+`
`10`	`13`	`/**`
`11`	`14`	`* Determine if the user is authorized to make this request.`
`12`	`15`	`*`
`@@ -32,7 +35,9 @@ public function rules(): array`
`32`	`35`	`'github_profile' => 'max:255\|nullable\|unique:users,github_profile,'.Auth::id(),`
`33`	`36`	`'bio' => 'nullable\|max:160',`
`34`	`37`	`'website' => 'nullable\|url',`
`35`		`- 'avatar' => 'nullable\|image\|max:2048',`
	`38`	`+ 'avatar' => $this->validateSingleMedia()`
	`39`	`+ ->extension(['png', 'jpg', 'jpeg', 'gif'])`
	`40`	`+ ->maxItemSizeInKb(1024),`
`36`	`41`	`];`
`37`	`42`	`}`
`38`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function registerMediaCollections(): void`
`142`	`142`	`{`
`143`	`143`	`$this->addMediaCollection('avatar')`
`144`	`144`	`->singleFile()`
`145`		`- ->acceptsMimeTypes(['image/jpg', 'image/jpeg', 'image/png']);`
	`145`	`+ ->acceptsMimeTypes(['image/jpg', 'image/jpeg', 'image/png', 'image/gif']);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`public static function findByUsername(string $username): self`