Add FriendlyCaptcha vendor dir

.env.example

@@ -18,7 +18,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=in-v3.mailjet.com 
+MAIL_HOST=in-v3.mailjet.com
 MAIL_PORT=25
 MAIL_USERNAME=mailjet_username
 MAIL_PASSWORD=mailjet_password
@@ -37,3 +37,7 @@ DB_PASSWORD=dbpass
 
 CACHE_DRIVER=file
 QUEUE_DRIVER=sync
+
+FRIENDLY_CAPTCHA_SITEKEY=
+FRIENDLY_CAPTCHA_SECRET=
+FRIENDLY_CAPTCHA_DEBUG=true

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-apache
+FROM php:8.2-apache
 
 RUN apt-get update \
     && apt-get -y install \
@@ -27,7 +27,7 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 ADD docker/apache.conf /etc/apache2/sites-enabled/000-default.conf
 
 WORKDIR /var/www/html
-# COPY . /var/www/html
+COPY . /var/www/html
 
 RUN mkdir -p storage/framework/{sessions,views,cache,cache/data} && \
   chown -R www-data:www-data storage/framework && \

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM php:8.1-apache
+FROM php:8.2-apache
 
 RUN apt-get update \
     && apt-get -y install \

app/Http/Controllers/CalendarController.php

@@ -17,7 +17,7 @@ class CalendarController extends Controller
 
     public function overview(Request $request)
     {
-        $apiResult = $this->API('agenda/overzicht');
+        $apiResult = $this->API('agenda/overzicht?aantal=100');
         $calendar = [];
         foreach($apiResult->events as $calendarItem)
         {

app/Http/Controllers/ContactController.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Validation\Rule;
+use App\Mail\ContactFormSubmitted;
+
+class ContactController extends Controller
+{
+    public function show()
+    {
+        return view('contact');
+    }
+
+    public function submit(Request $request)
+    {
+        $rules = [
+            'name' => 'required|string|max:255',
+            'email' => 'required|email|max:255',
+            'message' => 'required|string',
+            'image' => 'nullable|image|max:10240',
+            'video' => 'nullable|mimetypes:video/avi,video/mpeg,video/quicktime,video/mp4|max:512000',
+        ];
+
+        $debugCaptcha = env('FRIENDLY_CAPTCHA_DEBUG', false)
+            || (app()->environment('local')
+                && (!env('FRIENDLY_CAPTCHA_SITEKEY') || !env('FRIENDLY_CAPTCHA_SECRET')));
+
+        if ($debugCaptcha) {
+            $rules['frc-captcha-solution'] = 'nullable';
+        } else {
+            $rules['frc-captcha-solution'] = ['required', Rule::friendlycaptcha()];
+        }
+
+        $request->validate($rules);
+
+        $data = $request->only(['name', 'email', 'message']);
+        $attachments = [];
+
+        // Handle Image
+        if ($request->hasFile('image')) {
+            // Store temporarily to attach
+            $imagePath = $request->file('image')->store('contact_images');
+            $attachments['image'] = storage_path('app/' . $imagePath);
+        }
+
+        // Handle Video
+        if ($request->hasFile('video')) {
+            $videoPath = $request->file('video')->store('contact_videos', 'local');
+            $data['video_link'] = route('contact.video', ['filename' => basename($videoPath)]);
+        }
+
+        // Send Email
+        Mail::to('info@nhgooi.nl')->send(new ContactFormSubmitted($data, $attachments));
+
+        return redirect()->route('contact')->with('success', 'Bedankt voor uw bericht. We nemen zo snel mogelijk contact met u op.');
+    }
+
+    public function video(string $filename)
+    {
+        $path = 'contact_videos/' . basename($filename);
+
+        if (!Storage::disk('local')->exists($path)) {
+            abort(404);
+        }
+
+        $fullPath = Storage::disk('local')->path($path);
+
+        return response()->file($fullPath);
+    }
+}

app/Http/Controllers/Controller.php

@@ -19,17 +19,17 @@ class Controller extends BaseController
 
     private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0)
     {
-        $data = json_decode(Storage::disk('local')->get($file));
+        $data = json_decode(Storage::get($file));
         foreach ($path as $subobject) {
             $data = $data->$subobject ?? [];
-	    }
+        }
         $items = [];
         foreach ($data as $item_data) {
             $items[] = new $class($item_data);
             if ($maxItems && count($items) == $maxItems) {
                 break;
             }
-	    }
+        }
 
         return $items;
     }
@@ -47,7 +47,7 @@ class Controller extends BaseController
             $view->with('data', $this->getDataFromFileAndConvert('populair_nieuws.json', ['news'], '\Model\NewsItem'));
         });
         View::composer('widgets.nustraks', function ($view) {
-            $data = json_decode(Storage::disk('local')->get('nu_straks.json'))->schedule;
+            $data = json_decode(Storage::get('nu_straks.json'))->schedule;
             $programs = [];
             foreach ($data as $item_data) {
                 $programs[] = $program = new \Model\Program($item_data->program);
@@ -57,7 +57,7 @@ class Controller extends BaseController
 
             // Need a bit of slack here, otherwise the current program may show up
             $now = new \DateTimeImmutable('2 minutes ago');
-            $data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule;
+            $data = json_decode(Storage::get('zojuist.json'))->schedule;
             $i = 0;
             foreach (array_reverse($data) as $item_data) {
                 $recent = $program = new \Model\Program($item_data->program);
@@ -72,8 +72,10 @@ class Controller extends BaseController
             $view->with('data', $programs);
         });
         View::composer('widgets.laatstepodcasts', function ($view) {
-            $view->with('data',
+            $view->with(
-                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+                'data',
+                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast')
+            );
         });
         View::composer('widgets.regioagenda', function ($view) {
             $view->with('data', $this->getDataFromFileAndConvert('regioagenda.json', [], '\Model\CalendarEvent'));
@@ -84,8 +86,13 @@ class Controller extends BaseController
         View::composer('widgets.menu', function ($view) {
             $view->with('news', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'))
                 ->with('popular', $this->getDataFromFileAndConvert('populair_nieuws.json', ['news'], '\Model\NewsItem', 3))
-                ->with('podcasts',
+                ->with(
-                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+                    'podcasts',
+                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast')
+                );
+        });
+        View::composer('widgets.menu', function($view) {
+	    $view->with('items', json_decode(Storage::get('static/menu.json')));
         });
 
         View::share('disableBanners', env('DISABLE_BANNERS', false));
@@ -97,14 +104,16 @@ class Controller extends BaseController
             return;
         }
 
-        app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
+        app('db')->insert(
+            'INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
             [
                 'type' => $type,
                 'id' => $id,
                 'ip' => $request->server('REMOTE_ADDR'),
                 'session' => md5(Session::getId()),
                 'referer' => $request->server('HTTP_REFERRER')
-            ]);
+            ]
+        );
     }
 
     protected function API($url)
@@ -115,14 +124,14 @@ class Controller extends BaseController
                 "verify_peer_name" => false,
             ],
             'http' => [
-            'method' => 'GET',
+                'method' => 'GET',
-                    'header' => 'X-Api-Key: ' . sha1(request()->server('REMOTE_ADDR')) . "\r\n"
+                'header' => 'X-Api-Key: ' . sha1(request()->server('REMOTE_ADDR')) . "\r\n"
-                             . 'X-User-Agent: ' . request()->server('HTTP_USER_AGENT') . "\r\n"
+                    . 'X-User-Agent: ' . request()->server('HTTP_USER_AGENT') . "\r\n"
             ]
         ];
-//\dump($http_response_header);
+        //\dump($http_response_header);
-	    $result = @file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions));
+        $result = @file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions));
-	    return $result ? json_decode($result) : null;
+        return $result ? json_decode($result) : null;
     }
 
     protected function checkAPI($url)
@@ -143,6 +152,7 @@ class Controller extends BaseController
         return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : \Carbon\Carbon::parse($obj)->setTimezone(date_default_timezone_get());
     }
 
+    /*
     public function __call($method, $arguments)
     {
         if (substr($method, 0, 5) == 'view_') {
@@ -152,13 +162,14 @@ class Controller extends BaseController
             }
         }
 
-        return abort(404);
+         return abort(404);
     }
+     */
 
     public function getSidebareData()
     {
         $populair = [];
-	$apiResult = $this->API('nieuws/populair?aantal=5');
+        $apiResult = $this->API('nieuws/populair?aantal=5');
         foreach ($apiResult->news as $_newsItem) {
             $populair[] = new \Model\NewsItem($_newsItem);
         }
@@ -171,4 +182,23 @@ class Controller extends BaseController
 
         return ['newsItems' => $newsItems, 'populair' => $populair];
     }
+
+    public function static_page($slug)
+    {
+	    if (view()->exists($slug)) {
+          return view($slug);
+	}
+
+        $page = $this->API('statisch/' . $slug);
+        if ($page == null) {
+            return abort(404);
+        }
+
+        $page->published = Controller::JsonToDateTime($page->published);
+        if ($page->edited) {
+            $page->edited = Controller::JsonToDateTime($page->edited);
+        }
+
+        return view('static', compact('page'));
+    }
 }

app/Http/Controllers/HomeController.php

@@ -9,22 +9,25 @@ class HomeController extends Controller
 {
     public function show(Request $request)
     {
-        $page = (int)$request->get('pagina', 1);
+        $page = (int) $request->get('pagina', 1);
-        $apiResult = $this->API('nieuws/overzicht?pagina=' . (int)max(1, $page) . '&aantal=10');
+        $apiResult = $this->API('nieuws/overzicht?pagina=' . (int) max(1, $page) . '&aantal=10');
         $news = [];
         foreach ($apiResult->news as $newsItem) {
             $news[] = new \Model\NewsItem($newsItem);
-	}
+        }
+
+        $apiResult = $this->API('nieuws/liveblogs');
+        $liveblogs = $apiResult->liveblogs;
 
         $populair = [];
-        $apiResult = $this->API('nieuws/populair?pagina=' . (int)max(1, $page) . '&aantal=5');
+        $apiResult = $this->API('nieuws/populair?pagina=' . (int) max(1, $page) . '&aantal=5');
         foreach ($apiResult->news as $newsItem) {
             $populair[] = new \Model\NewsItem($newsItem);
         }
 
-	$apiResult = $this->API('podcast/overzicht?aantal=15');
+        $apiResult = $this->API('podcast/overzicht?aantal=15');
-	$index = array_rand($apiResult->podcasts);
+        $index = array_rand($apiResult->podcasts);
         $podcast = new \Model\Podcast($apiResult->podcasts[$index]);
-        return view('home', ['populair' => $populair, 'podcast' => $podcast, 'title' => 'Home', 'news' => $news, 'searchURL' => 'nieuws/zoeken']);
+        return view('home', ['populair' => $populair, 'podcast' => $podcast, 'title' => 'Home', 'news' => $news, 'liveblogs' => $liveblogs, 'searchURL' => 'nieuws/zoeken']);
     }
 }

app/Http/Controllers/NewsController.php

@@ -18,7 +18,7 @@ class NewsController extends Controller
     {
         parent::registerView($request, 'nieuws', $id);
         $preview = "";
-        if(request()->get('preview', null) != null) {
+        if (request()->get('preview', null) != null) {
             $preview = "?preview=" . request()->get('preview');
         }
         $apiResult = $this->API('nieuws/bericht/' . $id . $preview);
@@ -26,21 +26,22 @@ class NewsController extends Controller
 
         switch ($apiResult->version) {
             case 1:
-	        if (!$newsItem->content) return redirect('//nhnieuws.nl/gooi');
+                if (!$newsItem->content)
+                    return redirect('//nhnieuws.nl/gooi');
 
-	    case 2:
+            case 2:
-		    if(isset($apiResult->source->article)) {
+                if (isset($apiResult->source->article)) {
-                $source = $apiResult->source->article;
+                    $source = $apiResult->source->article;
-                $newsItem->published = self::TimestampToDateTime($source->created);
+                    $newsItem->published = self::TimestampToDateTime($source->created);
-                $newsItem->edited = self::TimestampToDateTime($source->updated);
+                    $newsItem->edited = self::TimestampToDateTime($source->updated);
-                $newsItem->author = $source->author;
+                    $newsItem->author = $source->author;
-                $newsItem->images = null; // Images will be embedded
+                    $newsItem->images = null; // Images will be embedded
-                $newsItem->video = null; // Videos will be embedded
+                    $newsItem->video = null; // Videos will be embedded
-		        $newsItem->content = $source->blocks;
+                    $newsItem->content = $source->blocks;
-		    } elseif(isset($apiResult->source->blocks)) {
+                } elseif (isset($apiResult->source->blocks)) {
-			    $newsItem->content = $apiResult->source->blocks;
+                    $newsItem->content = $apiResult->source->blocks;
-		    }
+                }
-            return view('newsitem', array_merge($this->getSidebareData(), ['type' => $apiResult->type, 'news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
+                return view('newsitem', array_merge($this->getSidebareData(), ['type' => $apiResult->type, 'news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
         }
     }
 
@@ -51,9 +52,9 @@ class NewsController extends Controller
 
     public function more(Request $request)
     {
-        $page = (int)$request->get('pagina', 1);
+        $page = (int) $request->get('pagina', 1);
         $id = $request->get('id', '');
-        $apiResult = $this->API('nieuws/overzicht?pagina=' . (int)max(1, $page) . '&aantal=5');
+        $apiResult = $this->API('nieuws/overzicht?pagina=' . (int) max(1, $page) . '&aantal=5');
         $news = [];
         foreach ($apiResult->news as $newsItem) {
             $news[] = new \Model\NewsItem($newsItem);
@@ -64,10 +65,10 @@ class NewsController extends Controller
 
     public function populair(Request $request)
     {
-        $page = (int)$request->get('pagina', 1);
+        $page = (int) $request->get('pagina', 1);
         $id = $request->get('id', '');
         $populair = [];
-        $apiResult = $this->API('nieuws/populair?pagina=' . (int)max(1, $page) . '&aantal=5');
+        $apiResult = $this->API('nieuws/populair?pagina=' . (int) max(1, $page) . '&aantal=5');
         foreach ($apiResult->news as $_newsItem) {
             $populair[] = new \Model\NewsItem($_newsItem);
         }
@@ -109,30 +110,25 @@ class NewsController extends Controller
         return abort(404);
     }
 
-    public function blog(Request $request, $id)
+    public function liveblog(Request $request, $id)
     {
+
         parent::registerView($request, 'blog', $id);
 
-        $page = (int)$request->get('pagina', 1);
+        $blog = $this->API('nieuws/liveblog/' . (int) $id);
-        $hasNext = true;
+        foreach ($blog->artikelen as &$item) {
-        while ($page > 0) {
+            $item = new \Model\NewsItem($item);
-            $apiResult = $this->API('blog/overzicht/' . (int)$id . '?pagina=' . (int)max(1, $page));
-
-            $blog = new \Model\Blog($apiResult->blog);
-            $items = [];
-            foreach ($apiResult->items as $blogItem) {
-                $items[] = new \Model\NewsItem($blogItem);
-            }
-
-            if (count($items) || ($page == 1)) {
-                return view('blog', ['blog' => $blog, 'pagina' => $page, 'items' => $items, 'hasNext' => $hasNext && count($items) == 15]);
-            }
-
-            $hasNext = false;
-            --$page;
         }
 
-        return abort(404);
+        if (request()->ajax()) {
+            return $blog;
+        }
+
+        if (count($blog->artikelen)) {
+            return view('blog', ['blog' => $blog]);
+        }
+
+        return abort();
     }
 
     private function listNews(Request $request, $url, $title = null, $id = 'items', $total = null)
@@ -140,11 +136,11 @@ class NewsController extends Controller
         if ($request->ajax()) {
             $total = 5;
         }
-        $page = (int)$request->get('pagina', 1);
+        $page = (int) $request->get('pagina', 1);
         if ($url == 'overzicht' && $request->get('dateStart', null) && $request->get('dateEnd', null)) {
             $url = 'datum/' . $request->get('dateStart', null) . '/' . $request->get('dateEnd', null);
         }
-        $apiResult = $this->API('nieuws/' . $url . '?pagina=' . (int)max(1, $page) . ($total ? '&aantal=' . $total : ''));
+        $apiResult = $this->API('nieuws/' . $url . '?pagina=' . (int) max(1, $page) . ($total ? '&aantal=' . $total : ''));
         $news = [];
         foreach ($apiResult->news ?? [] as $newsItem) {
             $news[] = new \Model\NewsItem($newsItem);
@@ -154,8 +150,10 @@ class NewsController extends Controller
         if ($title == null) {
             $total = 5;
         }
-        $apiResult = $this->API('nieuws/populair?pagina=' . (int)max(1,
+        $apiResult = $this->API('nieuws/populair?pagina=' . (int) max(
-                $page) . ($total ? '&aantal=' . $total : ''));
+            1,
+            $page
+        ) . ($total ? '&aantal=' . $total : ''));
         foreach ($apiResult->news as $newsItem) {
             $populair[] = new \Model\NewsItem($newsItem);
         }
@@ -192,15 +190,15 @@ class NewsController extends Controller
 
     public function regionieuws()
     {
-	$data = $this->API('nieuws/regionieuws.json');
+        $data = $this->API('nieuws/regionieuws.json');
         return view('listen', [
             'source' => $this->API_URL . 'nieuws/regionieuws.mp3',
             'title' => 'Regionieuws',
             'content' => 'het laatste nieuws uit de regio',
             'isStream' => false,
-	    'canDownload' => true,
+            'canDownload' => true,
-	    'lengte' => $data->length * 0.25,
+            'lengte' => $data->length * 0.25,
-	    'waveform' => $data
+            'waveform' => $data
-	]);
+        ]);
     }
 }

app/Mail/ContactFormSubmitted.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class ContactFormSubmitted extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $data;
+    public $attachments_files;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($data, $attachments_files = [])
+    {
+        $this->data = $data;
+        $this->attachments_files = $attachments_files;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        $email = $this->view('emails.contact_submitted')
+                      ->subject('Nieuw contactformulier bericht van NH Gooi')
+                      ->replyTo($this->data['email'], $this->data['name']);
+
+        if (isset($this->attachments_files['image'])) {
+            $email->attach($this->attachments_files['image']);
+        }
+
+        return $email;
+    }
+}

app/Models/NewsItem.php

@@ -24,7 +24,7 @@ class NewsItem extends Model {
   public $podcast;
   public $images;
   public $video;
-  
+  public $type;
   public $url;
   public $metadata;
 

app/Providers/AppServiceProvider.php

@@ -3,6 +3,8 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Validation\Rule;
+use Ossycodes\FriendlyCaptcha\Rules\FriendlyCaptcha as FriendlyCaptchaRule;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -14,6 +16,10 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         \Illuminate\Support\Facades\URL::forceScheme('https');
+
+        Rule::macro('friendlycaptcha', function () {
+            return app(FriendlyCaptchaRule::class);
+        });
     }
 
     /**

bootstrap/cache/packages.php

@@ -53,6 +53,17 @@
       0 => 'Termwind\\Laravel\\TermwindServiceProvider',
     ),
   ),
+  'ossycodes/friendlycaptcha' => 
+  array (
+    'aliases' => 
+    array (
+      'FriendlyCaptcha' => 'Ossycodes\\FriendlyCaptcha\\Facades\\FriendlyCaptcha',
+    ),
+    'providers' => 
+    array (
+      0 => 'Ossycodes\\FriendlyCaptcha\\FriendlyCaptchaServiceProvider',
+    ),
+  ),
   'spatie/laravel-ignition' => 
   array (
     'providers' => 

bootstrap/cache/services.php

@@ -30,13 +30,14 @@
     26 => 'Carbon\\Laravel\\ServiceProvider',
     27 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     28 => 'Termwind\\Laravel\\TermwindServiceProvider',
-    29 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+    29 => 'Ossycodes\\FriendlyCaptcha\\FriendlyCaptchaServiceProvider',
-    30 => 'Collective\\Html\\HtmlServiceProvider',
+    30 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
-    31 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    31 => 'Collective\\Html\\HtmlServiceProvider',
-    32 => 'App\\Providers\\AppServiceProvider',
+    32 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    33 => 'App\\Providers\\AuthServiceProvider',
+    33 => 'App\\Providers\\AppServiceProvider',
-    34 => 'App\\Providers\\EventServiceProvider',
+    34 => 'App\\Providers\\AuthServiceProvider',
-    35 => 'App\\Providers\\RouteServiceProvider',
+    35 => 'App\\Providers\\EventServiceProvider',
+    36 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' => 
   array (
@@ -54,11 +55,12 @@
     11 => 'Carbon\\Laravel\\ServiceProvider',
     12 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     13 => 'Termwind\\Laravel\\TermwindServiceProvider',
-    14 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+    14 => 'Ossycodes\\FriendlyCaptcha\\FriendlyCaptchaServiceProvider',
-    15 => 'App\\Providers\\AppServiceProvider',
+    15 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
-    16 => 'App\\Providers\\AuthServiceProvider',
+    16 => 'App\\Providers\\AppServiceProvider',
-    17 => 'App\\Providers\\EventServiceProvider',
+    17 => 'App\\Providers\\AuthServiceProvider',
-    18 => 'App\\Providers\\RouteServiceProvider',
+    18 => 'App\\Providers\\EventServiceProvider',
+    19 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' => 
   array (

composer.json

@@ -10,7 +10,8 @@
         "laravel/framework": "^9.19",
         "laravel/sanctum": "^3.0",
         "laravel/tinker": "^2.7",
-        "laravelcollective/html": "^6.3"
+        "laravelcollective/html": "^6.3",
+        "ossycodes/friendlycaptcha": "^3.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",

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": "f70c81adf2990f185a8632535bd08631",
+    "content-hash": "f9a3eebc09010b2b187541a3e59a0eff",
     "packages": [
         {
             "name": "brick/math",
@@ -1934,34 +1934,37 @@
         },
         {
             "name": "nette/schema",
-            "version": "v1.2.3",
+            "version": "v1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"
+                "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
+                "url": "https://api.github.com/repos/nette/schema/zipball/2befc2f42d7c715fd9d95efc31b1081e5d765004",
-                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
+                "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004",
                 "shasum": ""
             },
             "require": {
-                "nette/utils": "^2.5.7 || ^3.1.5 ||  ^4.0",
+                "nette/utils": "^4.0",
-                "php": ">=7.1 <8.3"
+                "php": "8.1 - 8.5"
             },
             "require-dev": {
-                "nette/tester": "^2.3 || ^2.4",
+                "nette/tester": "^2.5.2",
-                "phpstan/phpstan-nette": "^1.0",
+                "phpstan/phpstan-nette": "^2.0@stable",
-                "tracy/tracy": "^2.7"
+                "tracy/tracy": "^2.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
+                "psr-4": {
+                    "Nette\\": "src"
+                },
                 "classmap": [
                     "src/"
                 ]
@@ -1990,34 +1993,36 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.2.3"
+                "source": "https://github.com/nette/schema/tree/v1.3.3"
             },
-            "time": "2022-10-13T01:24:26+00:00"
+            "time": "2025-10-30T22:57:59+00:00"
         },
         {
             "name": "nette/utils",
-            "version": "v3.2.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368"
+                "reference": "c99059c0315591f1a0db7ad6002000288ab8dc72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/02a54c4c872b99e4ec05c4aec54b5a06eb0f6368",
+                "url": "https://api.github.com/repos/nette/utils/zipball/c99059c0315591f1a0db7ad6002000288ab8dc72",
-                "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368",
+                "reference": "c99059c0315591f1a0db7ad6002000288ab8dc72",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2 <8.3"
+                "php": "8.2 - 8.5"
             },
             "conflict": {
-                "nette/di": "<3.0.6"
+                "nette/finder": "<3",
+                "nette/schema": "<1.2.2"
             },
             "require-dev": {
-                "nette/tester": "~2.0",
+                "jetbrains/phpstorm-attributes": "^1.2",
-                "phpstan/phpstan": "^1.0",
+                "nette/tester": "^2.5",
-                "tracy/tracy": "^2.3"
+                "phpstan/phpstan-nette": "^2.0@stable",
+                "tracy/tracy": "^2.9"
             },
             "suggest": {
                 "ext-gd": "to use Image",
@@ -2025,16 +2030,18 @@
                 "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
                 "ext-json": "to use Nette\\Utils\\Json",
                 "ext-mbstring": "to use Strings::lower() etc...",
-                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
-                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
+                "psr-4": {
+                    "Nette\\": "src"
+                },
                 "classmap": [
                     "src/"
                 ]
@@ -2075,9 +2082,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v3.2.8"
+                "source": "https://github.com/nette/utils/tree/v4.1.1"
             },
-            "time": "2022-09-12T23:36:20+00:00"
+            "time": "2025-12-22T12:14:32+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -2221,6 +2228,69 @@
             ],
             "time": "2022-12-20T19:00:15+00:00"
         },
+        {
+            "name": "ossycodes/friendlycaptcha",
+            "version": "v3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ossycodes/friendlycaptcha.git",
+                "reference": "b18dfab44ee5fff7d75412232eb6f834864efde6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ossycodes/friendlycaptcha/zipball/b18dfab44ee5fff7d75412232eb6f834864efde6",
+                "reference": "b18dfab44ee5fff7d75412232eb6f834864efde6",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^7.0",
+                "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0",
+                "php": "^7.4|^8.0|^8.1|^8.2|^8.3"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0",
+                "phpunit/phpunit": "^8.0 || ^9.5 || ^10.5 || ^11.0 || ^12.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "FriendlyCaptcha": "Ossycodes\\FriendlyCaptcha\\Facades\\FriendlyCaptcha"
+                    },
+                    "providers": [
+                        "Ossycodes\\FriendlyCaptcha\\FriendlyCaptchaServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ossycodes\\FriendlyCaptcha\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "ossycodes",
+                    "email": "osaigbovoemmanuel1@gmail.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple package to help integrate FriendlyCaptcha in your Laravel applications.",
+            "homepage": "https://github.com/ossycodes/friendlycaptcha",
+            "keywords": [
+                "captcha",
+                "friendlycaptcha",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/ossycodes/friendlycaptcha/issues",
+                "source": "https://github.com/ossycodes/friendlycaptcha/tree/v3.0.0"
+            },
+            "time": "2025-05-08T13:30:49+00:00"
+        },
         {
             "name": "phpoption/phpoption",
             "version": "1.9.0",
@@ -7931,12 +8001,12 @@
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.0.2"
+        "php": "^8.0"
     },
-    "platform-dev": [],
+    "platform-dev": {},
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

config/filesystems.php

@@ -48,12 +48,12 @@ return [
             'root' => storage_path('app'),
         ],
 
-        'public' => [
+        //'public' => [
-            'driver' => 'local',
+        //    'driver' => 'local',
-            'root' => storage_path('app/public'),
+        //    'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
+        //    'url' => env('APP_URL').'/storage',
-            'visibility' => 'public',
+        //    'visibility' => 'public',
-        ],
+        //],
 
         's3' => [
             'driver' => 's3',

docker-compose.dev.yml

@@ -22,3 +22,8 @@ services:
       MYSQL_DATABASE: forge
       MYSQL_USER: forge
       MYSQL_PASSWORD: secret
+  mailpit:
+    image: axllent/mailpit:latest
+    ports:
+      - "8025:8025"
+      - "1025:1025"

docker/apache.dev.conf

@@ -23,7 +23,7 @@ ServerTokens Prod
     <VirtualHost *:443>
       ServerName localhost
       ServerAdmin support@websight.nl
-      DocumentRoot /var/www/html
+      DocumentRoot /var/www/html/public
 
       SSLEngine on
       SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
@@ -32,15 +32,15 @@ ServerTokens Prod
       SSLProtocol All -SSLv2 -SSLv3
       SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH
 
-      <Directory /var/www/html/>
+      <Directory /var/www/html/public>
           Options -Indexes +FollowSymLinks +MultiViews
           AllowOverride All
           Order deny,allow
           Allow from all
       </Directory>
 
-      ErrorLog /var/log/apache2/ssl-vhost-error.log
+      ErrorLog /var/log/apache2/error.log
-      CustomLog /var/log/apache2/ssl-vhost-access.log combined
+      CustomLog /var/log/apache2/access.log combined
 
     </VirtualHost>
 </IfModule>

env.example

@@ -18,7 +18,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=in-v3.mailjet.com 
+MAIL_HOST=in-v3.mailjet.com
 MAIL_PORT=25
 MAIL_USERNAME=mailjet_username
 MAIL_PASSWORD=mailjet_password
@@ -37,3 +37,7 @@ DB_PASSWORD=dbpass
 
 CACHE_DRIVER=file
 QUEUE_DRIVER=sync
+
+FRIENDLY_CAPTCHA_SITEKEY=
+FRIENDLY_CAPTCHA_SECRET=
+FRIENDLY_CAPTCHA_DEBUG=true