Add new files

Author: mckenziearts

README.md

@@ -56,20 +56,6 @@ Une fois que vous avez installé et configuré, pour avoir des dummy data vous d
 php artisan db:seed --class=DummyDatabaseSeeder
 ```
 
-### Media Library Pro (optionnel)
-Pour que l'upload de fichier fonctionne en local (pour les elements qui utilise Media Library Pro comme la modification de la photo de profil) vous devez renseignez la Licence avec votre compte de Spatie. Pour ce projet une licence commune est disponible etant une `single Licence` pour ce projet uniquement. Vous devez copier coller ce code dans le fichier `auth.json` qui a ete cree a la racine et relancer la commande `composer install`
-
-```json
-{
-    "http-basic": {
-        "satis.spatie.be": {
-            "username": "<YOUR-SPATIE.BE-ACCOUNT-EMAIL-ADDRESS-HERE>",
-            "password": "<YOUR-MEDIA-LIBRARY-PRO-LICENSE-KEY-HERE>"
-        }
-    }
-}
-```
-
 ### Github Authentication (optionnel)
 Pour que l'authentification Github fonctionne localement, vous devez [enregistrer une nouvelle application OAuth sur Github](https://github.com/settings/applications/new). Utilisez `http://laravel.cm.test` pour l'URL de la page d'accueil et `http://laravel.cm.test/auth/github` pour l'URL de rappel. Lorsque vous avez créé l'application, remplissez l'ID et le secret dans votre fichier `.env` dans les variables d'environnement ci-dessous. Vous devriez maintenant pouvoir vous authentifier avec Github.
 

app/Http/Controllers/FileUploadController.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Auth;
+
+final class FileUploadController extends Controller
+{
+    public function process(Request $request): void
+    {
+        /** @var \App\Models\User $user */
+        $user = Auth::user();
+
+        /** @var UploadedFile[] $files */
+        $files = $request->allFiles();
+
+        if (empty($files)) {
+            abort(422, __('Aucun fichier n\'a été uploader'));
+        }
+
+        if (count($files) > 1) {
+            abort(422, __('Un seul fichier peut être téléchargé à la fois.'));
+        }
+
+        $requestKey = array_key_first($files);
+
+        $file = is_array($request->input($requestKey))
+            ? $request->file($requestKey)[0] // @phpstan-ignore-line
+            : $request->file($requestKey);
+
+        $user->addMedia($file)->toMediaCollection('avatar');
+        $user->avatar_type = 'storage';
+        $user->save();
+    }
+}

app/Http/Controllers/User/SettingController.php

@@ -35,7 +35,7 @@ public function update(UpdateProfileRequest $request): RedirectResponse
             'name' => $request->name,
             'email' => $request->email,
             'username' => strtolower($request->username),
-            'bio' => trim(strip_tags($request->bio)),
+            'bio' => trim(strip_tags((string) $request->bio)),
             'twitter_profile' => $request->twitter_profile,
             'github_profile' => $request->github_profile,
             'linkedin_profile' => $request->linkedin_profile,
@@ -44,13 +44,6 @@ public function update(UpdateProfileRequest $request): RedirectResponse
             'website' => $request->website,
         ]);
 
-        if ($request->avatar) {
-            $user->addFromMediaLibraryRequest($request->avatar)
-                ->toMediaCollection('avatar');
-            $user->avatar_type = 'storage';
-            $user->save();
-        }
-
         if ($request->email !== $emailAddress) {
             $user->email_verified_at = null;
             $user->save();

app/Http/Requests/UpdateProfileRequest.php

@@ -6,12 +6,9 @@
 
 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.
      *
@@ -37,9 +34,6 @@ public function rules(): array
             'github_profile' => 'max:255|nullable|unique:users,github_profile,'.Auth::id(),
             'bio' => 'nullable|max:160',
             'website' => 'nullable|url',
-            'avatar' => $this->validateSingleMedia()
-                ->extension(['png', 'jpg', 'jpeg', 'gif'])
-                ->maxItemSizeInKb(1024),
         ];
     }
 }

auth.json

@@ -39,7 +39,6 @@
     "spatie/laravel-feed": "^4.1",
     "spatie/laravel-google-fonts": "^1.2",
     "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",
@@ -134,10 +133,6 @@
   },
   "prefer-stable": true,
   "repositories": [
-    {
-      "type": "composer",
-      "url": "https://satis.spatie.be"
-    },
     {
       "type": "vcs",
       "url": "https://github.com/laravel-shift/uniquewith-validator.git"

composer.json

@@ -38,6 +38,10 @@
     "axios": "^0.21.1",
     "canvas-confetti": "^1.4.0",
     "choices.js": "^9.0.1",
+    "filepond": "^4.30.4",
+    "filepond-plugin-file-validate-size": "^2.2.8",
+    "filepond-plugin-file-validate-type": "^1.2.8",
+    "filepond-plugin-image-preview": "^4.6.11",
     "highlight.js": "^11.7.0",
     "htm": "^3.1.0",
     "intl-tel-input": "^17.0.13",

composer.lock

@@ -1,4 +1,31 @@
 /*!
+<<<<<<< HEAD
+=======
+ * FilePond 4.30.4
+ * Licensed under MIT, https://opensource.org/licenses/MIT/
+ * Please visit https://pqina.nl/filepond/ for details.
+ */
+
+/*!
+ * FilePondPluginFileValidateSize 2.2.8
+ * Licensed under MIT, https://opensource.org/licenses/MIT/
+ * Please visit https://pqina.nl/filepond/ for details.
+ */
+
+/*!
+ * FilePondPluginFileValidateType 1.2.8
+ * Licensed under MIT, https://opensource.org/licenses/MIT/
+ * Please visit https://pqina.nl/filepond/ for details.
+ */
+
+/*!
+ * FilePondPluginImagePreview 4.6.11
+ * Licensed under MIT, https://opensource.org/licenses/MIT/
+ * Please visit https://pqina.nl/filepond/ for details.
+ */
+
+/*!
+>>>>>>> b685f538ad416e9838d8def7efcb09ec481d8d02
  * Fuse.js v3.4.6 - Lightweight fuzzy-search (http://fusejs.io)
  * 
  * Copyright (c) 2012-2017 Kirollos Risk (http://kiro.me)

package.json

@@ -1,4 +1,8 @@
 {
+<<<<<<< HEAD
     "/js/app.js": "/js/app.js?id=cfb3a1c355f3a16467153c28d697dfd6",
+=======
+    "/js/app.js": "/js/app.js?id=67618e971ac9ca37c6e546e6f96fd9b7",
+>>>>>>> b685f538ad416e9838d8def7efcb09ec481d8d02
     "/css/app.css": "/css/app.css?id=3af27984478dd97b9f235dede4b2ea68"
 }

public/js/app.js

@@ -0,0 +1,69 @@
+.filepond--root {
+  @apply mb-0 overflow-hidden;
+}
+
+.filepond--panel-root {
+  @apply rounded-lg border border-skin-input bg-skin-input shadow-sm;
+}
+
+.filepond--drip-blob {
+  @apply bg-skin-card;
+}
+
+.filepond--drop-label {
+  @apply text-skin-muted;
+}
+
+/* Compact-only styles, excluding compact circle layouts */
+
+.filepond--root[data-style-panel-layout='compact'] .filepond--item {
+  @apply mb-0.5;
+}
+
+.filepond--root[data-style-panel-layout='compact'] .filepond--drop-label label {
+  @apply text-sm;
+}
+
+.filepond--root[data-style-panel-layout='compact'] .filepond--drop-label {
+  min-height: 2.625em;
+}
+
+.filepond--root[data-style-panel-layout='compact'] .filepond--file {
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+}
+
+/* Grid styles */
+
+.filepond--root[data-style-panel-layout='grid'] .filepond--item {
+  width: calc(50% - 0.5em);
+  display: inline;
+}
+
+@media screen(lg) {
+  .filepond--root[data-style-panel-layout='grid'] .filepond--item {
+    width: calc(33.33% - 0.5em);
+  }
+}
+
+/* Download button styles */
+
+.filepond--download-icon {
+  @apply pointer-events-auto mr-1 inline-block h-4 w-4 bg-white align-bottom hover:bg-white/70;
+  -webkit-mask-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJmZWF0aGVyIGZlYXRoZXItZG93bmxvYWQiPjxwYXRoIGQ9Ik0yMSAxNXY0YTIgMiAwIDAgMS0yIDJINWEyIDIgMCAwIDEtMi0ydi00Ij48L3BhdGg+PHBvbHlsaW5lIHBvaW50cz0iNyAxMCAxMiAxNSAxNyAxMCI+PC9wb2x5bGluZT48bGluZSB4MT0iMTIiIHkxPSIxNSIgeDI9IjEyIiB5Mj0iMyI+PC9saW5lPjwvc3ZnPg==');
+  mask-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJmZWF0aGVyIGZlYXRoZXItZG93bmxvYWQiPjxwYXRoIGQ9Ik0yMSAxNXY0YTIgMiAwIDAgMS0yIDJINWEyIDIgMCAwIDEtMi0ydi00Ij48L3BhdGg+PHBvbHlsaW5lIHBvaW50cz0iNyAxMCAxMiAxNSAxNyAxMCI+PC9wb2x5bGluZT48bGluZSB4MT0iMTIiIHkxPSIxNSIgeDI9IjEyIiB5Mj0iMyI+PC9saW5lPjwvc3ZnPg==');
+  -webkit-mask-repeat: no-repeat;
+  mask-repeat: no-repeat;
+  -webkit-mask-size: 100%;
+  mask-size: 100%;
+}
+
+.filepond--open-icon {
+  @apply pointer-events-auto mr-1 inline-block h-4 w-4 bg-white align-bottom hover:bg-white/70;
+  -webkit-mask-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGNsYXNzPSJoLTYgdy02IiBmaWxsPSJub25lIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHN0cm9rZT0iY3VycmVudENvbG9yIiBzdHJva2Utd2lkdGg9IjIiPgogIDxwYXRoIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgZD0iTTEwIDZINmEyIDIgMCAwMC0yIDJ2MTBhMiAyIDAgMDAyIDJoMTBhMiAyIDAgMDAyLTJ2LTRNMTQgNGg2bTAgMHY2bTAtNkwxMCAxNCIgLz4KPC9zdmc+Cg==);
+  mask-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGNsYXNzPSJoLTYgdy02IiBmaWxsPSJub25lIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHN0cm9rZT0iY3VycmVudENvbG9yIiBzdHJva2Utd2lkdGg9IjIiPgogIDxwYXRoIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgZD0iTTEwIDZINmEyIDIgMCAwMC0yIDJ2MTBhMiAyIDAgMDAyIDJoMTBhMiAyIDAgMDAyLTJ2LTRNMTQgNGg2bTAgMHY2bTAtNkwxMCAxNCIgLz4KPC9zdmc+Cg==);
+  -webkit-mask-repeat: no-repeat;
+  mask-repeat: no-repeat;
+  -webkit-mask-size: 100%;
+  mask-size: 100%;
+}