Gebruik min versie van style.css en functions.js

.dockerignore

@@ -1,9 +0,0 @@
-.git
-vendor
-node_modules
-storage/logs
-storage/framework/cache/*
-storage/framework/sessions/*
-storage/framework/views/*
-storage/app/public
-.env

.env.dev

@@ -1,39 +0,0 @@
-APP_NAME="NH Gooi (dev)"
-APP_ENV=staging
-APP_KEY=pHU3XfraRBc4T54pe5hM0WsCz1zZxWG3
-APP_DEBUG=true
-APP_LOG_LEVEL=error
-APP_URL=https://dev.nhgooi.nl
-IMAGE_BASE_URL=https://dev.nhgooi.nl/
-
-API_URL=https://api-new.nhgooi.nl/
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=in-v3.mailjet.com 
-MAIL_PORT=25
-MAIL_USERNAME=08eb4dbf869367bc1478f0777b9de044
-MAIL_PASSWORD=eb26e4f3e5e6dbeb8aad361c69bf5ff1
-MAIL_ENCRYPTION=null
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-
-DB_CONNECTION=mysql
-DB_HOST=nhgooi.nl
-DB_PORT=3306
-DB_DATABASE=radio6fm_web
-DB_USERNAME=6fmstats
-DB_PASSWORD=C6h938EJ2cd5p4cT
-
-CACHE_DRIVER=file
-QUEUE_DRIVER=sync

.env.example

@@ -37,7 +37,3 @@ DB_PASSWORD=dbpass
 
 CACHE_DRIVER=file
 QUEUE_DRIVER=sync
-
-FRIENDLY_CAPTCHA_SITEKEY=
-FRIENDLY_CAPTCHA_SECRET=
-FRIENDLY_CAPTCHA_DEBUG=true

.gitea/workflows/build-docker.yml

@@ -1,56 +0,0 @@
-name: Build and Deploy
-run-name: ${{ gitea.actor }} is building ${{ gitea.repository }}
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'Dockerfile'
-      - 'composer.json'
-      - 'composer.lock'
-      - '.gitea/workflows/build-docker.yml'
-      - 'version' # Change this file to force rebuild
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    env:
-      REGISTRY: git.nhgooi.nl
-      IMAGE: git.nhgooi.nl/nh_gooi/nhgooi.nl
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        
-      - name: Login to Gitea Container Registry
-        run: |
-          echo "${{ secrets.REGISTRY_TOKEN }}" | \
-            docker login "$REGISTRY" \
-              -u "${{ gitea.actor }}" \
-              --password-stdin
-
-      - name: Build image
-        run: |
-          docker build \
-            -t "$IMAGE:${{ gitea.sha }}" \
-            -t "$IMAGE:latest" \
-            .
-
-      - name: Push image
-        run: |
-          docker push "$IMAGE:${{ gitea.sha }}"
-          docker push "$IMAGE:latest"
-
-#      - name: Trigger deployment
-#        run: |
-#          curl --fail-with-body \
-#            -X POST \
-#            -H "Content-Type: application/json" \
-#            -d '{
-#              "image": "'"$IMAGE:${{ gitea.sha }}"'",
-#              "commit": "${{ gitea.sha }}",
-#              "repository": "${{ gitea.repository }}"
-#            }' \
-#            "${{ secrets.DEPLOY_WEBHOOK_URL }}"

.gitignore

@@ -1,23 +1,12 @@
-.phpunit.cache
+/node_modules
-node_modules
+/public/hot
-app/public/build
+/public/storage
-app/public/hot
+/storage/*.key
-app/public/storage
+/vendor
-app/storage/*.key
+/.idea
-app/bootstrap
+/.vagrant
-app/storage
-bootstrap/cache
-vendor
-.env
-.env.backup
-.env.production
-.phpunit.result.cache
 Homestead.json
 Homestead.yaml
-auth.json
 npm-debug.log
 yarn-error.log
-.fleet
+.env
-.idea
-.vscode
-update

Dockerfile

@@ -1,73 +1,38 @@
-FROM php:8.3-apache
+FROM php:8.1-apache
 
-# Install Node.js
+RUN apt-get update \
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+    && apt-get -y install \
-
+            g++ \
-RUN apt-get update && apt-get install -y \
+            libcurl4-gnutls-dev \
-    git \
+            libxml2-dev \
-    curl \
+            libxslt-dev \
-    libicu-dev \
             libzip-dev \
-    libonig-dev \
+            zlib1g-dev \
-    libssh2-1 \
+            msmtp \
-    libssh2-1-dev \
+            unzip \
- && rm -rf /var/lib/apt/lists/*
+            git \
+            ssl-cert \
+            locales \
+        --no-install-recommends \
+    && docker-php-ext-install pdo pdo_mysql mysqli xsl xml zip opcache \
+    && a2enmod rewrite ssl proxy proxy_http headers \
+	&& apt-get purge -y g++ \
+    && apt-get autoremove -y \
+    && rm -r /var/lib/apt/lists/*
 
-RUN pecl install ssh2 \
+# Get latest Composer
-    && docker-php-ext-enable ssh2 \
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
-    && docker-php-ext-configure intl \
-    && docker-php-ext-install \
-    pdo \
-        pdo_mysql \
-        mysqli \
-        intl \
-        ftp \
-        mbstring \
-        bcmath \
-        zip
 
-RUN a2enmod rewrite
+# Update the default apache site with the config we created.
+ADD docker/apache.conf /etc/apache2/sites-enabled/000-default.conf
 
-COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
+WORKDIR /var/www/html
+# COPY . /var/www/html
 
-WORKDIR /var/www/app
+RUN mkdir -p storage/framework/{sessions,views,cache,cache/data} && \
+  chown -R www-data:www-data storage/framework && \
+  chmod -R 775 storage
 
-ENV APACHE_DOCUMENT_ROOT=/var/www/app/public
+RUN php artisan cache:clear && \
-
+    php artisan config:clear && \
-RUN sed -ri \
+    php artisan view:clear
-    -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' \
-    /etc/apache2/sites-available/*.conf \
-    /etc/apache2/apache2.conf \
-    /etc/apache2/conf-available/*.conf
-
-RUN echo '<Directory /var/www/app/public>\n\
-    AllowOverride All\n\
-    Require all granted\n\
-</Directory>' > /etc/apache2/conf-available/laravel.conf \
-    && a2enconf laravel 
-
-# Copy app files (composer/npm setup happens at runtime via entrypoint)
-COPY composer.json composer.lock ./
-COPY package.json package-lock.json* ./
-COPY scripts/ ./scripts/ 2>/dev/null
-
-# Note: for Laravel, the COPY . . needs to be before the composer install
-COPY . .
-
-# Create storage directories
-RUN mkdir -p \
-    storage/app \
-    storage/framework/cache/data \
-    storage/framework/sessions \
-    storage/framework/views \
-    storage/logs \
-    bootstrap/cache \
-    public/assets/vendor
-
-# Copy and set up entrypoint script
-COPY docker-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
-
-ENTRYPOINT ["docker-entrypoint.sh"]
-
-EXPOSE 80

Dockerfile.dev

@@ -0,0 +1,38 @@
+FROM php:8.1-apache
+
+RUN apt-get update \
+    && apt-get -y install \
+            g++ \
+            libcurl4-gnutls-dev \
+            libxml2-dev \
+            libxslt-dev \
+            libzip-dev \
+            zlib1g-dev \
+            msmtp \
+            unzip \
+            git \
+            ssl-cert \
+            locales \
+        --no-install-recommends \
+    && docker-php-ext-install pdo pdo_mysql mysqli xsl xml zip opcache \
+    && a2enmod rewrite ssl proxy proxy_http headers \
+	&& apt-get purge -y g++ \
+    && apt-get autoremove -y \
+    && rm -r /var/lib/apt/lists/*
+
+# Get latest Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Update the default apache site with the config we created.
+ADD docker/apache.dev.conf /etc/apache2/sites-enabled/000-default.conf
+
+WORKDIR /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 && \
+  chmod -R 775 storage
+
+# RUN php artisan cache:clear && \
+#   php artisan config:clear && \
+#  php artisan view:clear

add-packages.md

@@ -1,15 +0,0 @@
-* To add new packages, add a line below:
-```json
-    "new-package": "^1.2.3"
-```
-
-* If the npm name differs from vendor folder name: Also update the mapping in setup-vendor.js:
-```json
-    'npm-name': { folder: 'vendor-folder', subdir: 'dist' }
-```
-
-* Then regenerate lock file (do this locally, NOT in Docker)
-```bash
-    rm package-lock.json
-    docker run --rm -v "$PWD:/workspace" -w /workspace node:20 npm install --package-lock-only
-```

app/Console/Kernel.php

@@ -2,8 +2,6 @@
 
 namespace App\Console;
 
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -21,22 +19,6 @@ class Kernel extends ConsoleKernel
         //
     ];
 
-    private function getFromApi($url, $file) {
-      $response = Http::connectTimeout(5)
-        ->timeout(15)
-        ->withHeaders([
-          'Host' => $this->API_HOST
-        ])
-        ->get($this->API_URL . $url);
-
-      if ($response->successful()) {
-        Storage::disk('local')->put(
-          $file,
-          $response->body()
-        );
-      }
-    }
-
     /**
      * Define the application's command schedule.
      *
@@ -46,38 +28,37 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
 		$this->API_URL = env('API_URL', 'https://api.nhgooi.nl/');
-	$this->API_HOST = env('API_HOST', $this->API_URL);
 
 		// Update latest news (3 items)
-	$schedule->call(function () {
+		$schedule->call(function() {
-		$this->getFromApi('nieuws/overzicht?pagina=1&aantal=3', 'laatste_nieuws.json'); 
+			Storage::disk('local')->put('laatste_nieuws.json', file_get_contents($this->API_URL . 'nieuws/overzicht?pagina=1&aantal=3'));
-		$this->getFromApi('nieuws/populair', 'populair_nieuws.json');
+			Storage::disk('local')->put('populair_nieuws.json', file_get_contents($this->API_URL . 'nieuws/populair'));
 		})->everyMinute();
 
 		// Update now / later
-	$schedule->call(function () {
+		$schedule->call(function() {
-		$this->getFromApi('programma/schema/nustraks', 'nu_straks.json');
+			Storage::disk('local')->put('nu_straks.json', file_get_contents($this->API_URL . 'programma/schema/nustraks'));
-		$this->getFromApi('programma/schema/recent', 'zojuist.json');
+			Storage::disk('local')->put('zojuist.json', file_get_contents($this->API_URL . 'programma/schema/recent'));
 		})->everyMinute();
 
 		// Update latest podcasts (6 items)
-	$schedule->call(function () {
+		$schedule->call(function() {
-		$this->getFromApi('podcast/overzicht?pagina=1&aantal=6', 'laatste_podcasts.json');
+			Storage::disk('local')->put('laatste_podcasts.json', file_get_contents($this->API_URL . 'podcast/overzicht?pagina=1&aantal=6'));
 		})->everyMinute();
 
 		// Update calendar items
-	$schedule->call(function () {
+		$schedule->call(function() {
-		$this->getFromApi('agenda/overzicht', 'regioagenda.json');
+			Storage::disk('local')->put('regioagenda.json', file_get_contents($this->API_URL . 'agenda/overzicht'));
 		})->everyMinute();
 
 		// Update blogs
-	$schedule->call(function () {
+		$schedule->call(function() {
-		$this->getFromApi('blog/overzicht', 'blogs.json');
+			Storage::disk('local')->put('blogs.json', file_get_contents($this->API_URL . 'blog/overzicht'));
 		})->everyMinute();
 
 		// Update featured images
-	$schedule->call(function () {
+		$schedule->call(function() {
-		$this->getFromApi('beelden/overzicht', 'beelden.json');
+			Storage::disk('local')->put('beelden.json', file_get_contents($this->API_URL . 'beelden/overzicht'));
 		})->everyMinute();
     }
 

app/Http/Controllers/CalendarController.php

@@ -6,20 +6,26 @@ use \Illuminate\Http\Request;
 
 class CalendarController extends Controller
 {
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
     public function show(Request $request, $id)
     {
         parent::registerView($request, 'agenda', $id);
         $apiResult = $this->API('agenda/item/' . (int)$id);
-        $calendarEvent = new \Model\CalendarEvent($apiResult->news);
+        $calendarEvent = new \Model\CalendarEvent($apiResult);
 
         return view('calendarevent', array_merge($this->getSidebareData(), ['event' => $calendarEvent, 'metadata' => $calendarEvent->metadata]));
     }
 
     public function overview(Request $request)
     {
-        $apiResult = $this->API('agenda/overzicht?aantal=100');
+        $apiResult = $this->API('agenda/overzicht');
         $calendar = [];
-        foreach($apiResult->events as $calendarItem)
+        foreach($apiResult as $calendarItem)
         {
             $calendar[] = new \Model\CalendarEvent($calendarItem);
         }

app/Http/Controllers/ContactController.php

@@ -1,84 +0,0 @@
-<?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()
-    {
-        $page = $this->API('statisch/contact');
-        if ($page == null) {
-            return abort(404);
-        }
-
-        $page->published = Controller::JsonToDateTime($page->published);
-        if ($page->edited) {
-            $page->edited = Controller::JsonToDateTime($page->edited);
-        }
-
-        return view('contact', ['page' => $page]);
-    }
-
-    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

@@ -7,8 +7,6 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\View;
@@ -18,14 +16,12 @@ class Controller extends BaseController
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
     protected $API_URL;
-    protected $API_HOST;
-    
 
     private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0)
     {
-        $data = json_decode(Storage::get($file));
+        $data = json_decode(Storage::disk('local')->get($file));
         foreach ($path as $subobject) {
-            $data = $data->$subobject ?? [];
+            $data = $data->$subobject;
         }
         $items = [];
         foreach ($data as $item_data) {
@@ -42,32 +38,40 @@ class Controller extends BaseController
     {
         View::share('apiUrl', $this->API_URL = env('API_URL', 'http://api.6fm.nl/'));
         View::share('imgBase', env('IMAGE_BASE_URL', '/'));
-        $this->API_HOST = env('API_HOST', $this->API_URL);
+
+        $blogs = $this->getDataFromFileAndConvert('blogs.json', [], '\Model\Blog', 1);
+        $activeBlog = count($blogs) && $blogs[0]->is_active ? $blogs[0] : null;
+        View::share('activeBlog', $activeBlog);
+
 
         //View::share('onAir', file_get_contents(url('onair')));
         View::composer('widgets.laatstenieuws', function ($view) {
             $view->with('data', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'));
         });
         View::composer('widgets.populairnieuws', function ($view) {
-            $view->with('data', $this->getDataFromFileAndConvert('populair_nieuws.json', ['news'], '\Model\NewsItem'));
+            $view->with('data', $this->getDataFromFileAndConvert('populair_nieuws.json', [], '\Model\NewsItem'));
         });
         View::composer('widgets.nustraks', function ($view) {
-            $data = json_decode(Storage::get('nu_straks.json'))->schedule;
+            $data = json_decode(Storage::disk('local')->get('nu_straks.json'))->schedule;
             $programs = [];
             foreach ($data as $item_data) {
                 $programs[] = $program = new \Model\Program($item_data->program);
-                $program->start = self::JsonToDateTime($item_data->start);
+                $program->start = new \DateTimeImmutable($item_data->start->date,
-                $program->end = self::JsonToDateTime($item_data->end);
+                    new \DateTimeZone($item_data->start->timezone));
+                $program->end = new \DateTimeImmutable($item_data->end->date,
+                    new \DateTimeZone($item_data->end->timezone));
             }
 
             // Need a bit of slack here, otherwise the current program may show up
             $now = new \DateTimeImmutable('2 minutes ago');
-            $data = json_decode(Storage::get('zojuist.json'))->schedule;
+            $data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule;
             $i = 0;
             foreach (array_reverse($data) as $item_data) {
                 $recent = $program = new \Model\Program($item_data->program);
-                $recent->start = self::JsonToDateTime($item_data->start);
+                $recent->start = new \DateTimeImmutable($item_data->start->date,
-                $recent->end = self::JsonToDateTime($item_data->end);
+                    new \DateTimeZone($item_data->start->timezone));
+                $recent->end = new \DateTimeImmutable($item_data->end->date,
+                    new \DateTimeZone($item_data->end->timezone));
                 if (($recent->end < $now) && (!$recent->nonstop) && (!$recent->rerun)) {
                     $view->with('recent', $recent);
                     break;
@@ -77,10 +81,8 @@ class Controller extends BaseController
             $view->with('data', $programs);
         });
         View::composer('widgets.laatstepodcasts', function ($view) {
-            $view->with(
+            $view->with('data',
-                'data',
+                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
-                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast')
-            );
         });
         View::composer('widgets.regioagenda', function ($view) {
             $view->with('data', $this->getDataFromFileAndConvert('regioagenda.json', [], '\Model\CalendarEvent'));
@@ -90,22 +92,12 @@ 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('popular', $this->getDataFromFileAndConvert('populair_nieuws.json', [], '\Model\NewsItem', 3))
-                ->with(
+                ->with('podcasts',
-                    'podcasts',
+                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
-                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast')
-                );
-        });
-        View::composer('widgets.menu', function($view) {
-            try {
-                $menuData = json_decode(Storage::get('static/menu.json'));
-                $view->with('items', $menuData ?? []);
-            } catch (\Exception $e) {
-                $view->with('items', []);
-            }
         });
 
-        View::share('disableBanners', env('DISABLE_BANNERS', false));
+        View::share('disableBanners', env('DISABLE_BANNERS', true));
     }
 
     protected function registerView(Request $request, $type, $id)
@@ -114,77 +106,51 @@ class Controller extends BaseController
             return;
         }
 
-        // app('db')->insert(
+        app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
-        //     'INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
+            [
-        //     [
+                'type' => $type,
-        //         'type' => $type,
+                'id' => $id,
-        //         'id' => $id,
+                'ip' => $request->server('REMOTE_ADDR'),
-        //         'ip' => $request->server('REMOTE_ADDR'),
+                'session' => md5(Session::getId()),
-        //         'session' => md5(Session::getId()),
+                'referer' => $request->server('HTTP_REFERRER')
-        //         'referer' => $request->server('HTTP_REFERRER')
+            ]);
-        //     ]
-        // );
     }
 
     protected function API($url)
     {
-        try {
+//        if (strpos($url, 'nieuws/overzicht') !== false) {
-            $response = Http::connectTimeout(5)
+//            return json_decode(file_get_contents(__DIR__ . '/../../../storage/app/laatste_nieuws.json'));
-                ->timeout(15)
+//        }
-                ->withHeaders([
+//        return [];
-                    'Host' => $this->API_HOST,
-                    'X-Api-Key' => sha1(request()->server('REMOTE_ADDR')),
-                    'X-User-Agent' => request()->server('HTTP_USER_AGENT')
-                ])
-                ->get($this->API_URL . $url);
 
-            if ($response->successful()) {
+        $arrContextOptions = [
-                $body = $response->body();
+            'ssl' => [
-                return $body ? json_decode($body) : null;
+                "verify_peer" => false,
-            }
+                "verify_peer_name" => false,
-            Log::warning('API request failed', [
+            ],
-                'url' => $this->API_URL . $url,
+        ];
-                'status' => $response->status()
+
-            ]);
+        return json_decode(file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions)));
-            return null;
-        } catch (\Exception $e) {
-            Log::error('API request error', [
-                'url' => $this->API_URL . $url,
-                'error' => $e->getMessage()
-            ]);
-            return null;
-        }
     }
 
     protected function checkAPI($url)
     {
-        return $this->getHttpResponseCode($url);
+        return $this->get_http_response_code($this->API_URL . $url);
     }
 
-    protected function getHttpResponseCode($url)
+    protected function get_http_response_code($url)
     {
-        try {
+        $headers = get_headers($url);
-            $response = Http::connectTimeout(5)
+        return substr($headers[0], 9, 3);
-                ->timeout(15)
+    }
-                ->withHeaders([
+
-                    'Host' => $this->API_HOST,
-                    'X-Api-Key' => sha1(request()->server('REMOTE_ADDR')),
-                    'X-User-Agent' => request()->server('HTTP_USER_AGENT')
-                ])
-                ->head($this->API_URL . $url);
 
-            return $response->status();
-        } catch (\Exception $e) {
-            return null;
-        }
-    }
 
     protected static function JsonToDateTime($obj)
     {
-        return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : \Carbon\Carbon::parse($obj)->setTimezone(date_default_timezone_get());
+        return new \DateTime($obj->date, new \DateTimeZone($obj->timezone));
     }
 
-    /*
     public function __call($method, $arguments)
     {
         if (substr($method, 0, 5) == 'view_') {
@@ -196,43 +162,21 @@ class Controller extends BaseController
 
         return abort(404);
     }
-     */
 
     public function getSidebareData()
     {
         $populair = [];
-        $apiResult = (object) $this->API('nieuws/populair?aantal=5');
+        $apiResult = $this->API('nieuws/populair?aantal=5');
-        foreach ($apiResult->news as $_newsItem) {
+        foreach ($apiResult as $_newsItem) {
             $populair[] = new \Model\NewsItem($_newsItem);
         }
 
         $newsItems = [];
-        $apiResult = (object) $this->API('nieuws/overzicht?aantal=5');
+        $apiResult = $this->API('nieuws/overzicht?aantal=5');
         foreach ($apiResult->news as $_newsItem) {
             $newsItems[] = new \Model\NewsItem($_newsItem);
         }
 
         return ['newsItems' => $newsItems, 'populair' => $populair];
     }
-
-    public function static_page($slug)
-    {
-	    if (view()->exists($slug)) {
-          return view($slug);
-	}
-
-        $page = (object) $this->API('statisch/' . $slug);
-        if ($page == null || !isset($page->title)) {
-            return abort(404);
-        }
-
-        if(isset($page->published)) {
-            $page->published = Controller::JsonToDateTime($page->published);
-        }
-        if (isset($page->edited) && $page->edited) {
-            $page->edited = Controller::JsonToDateTime($page->edited);
-        }
-
-        return view('static', compact('page'));
-    }
 }

app/Http/Controllers/HomeController.php

@@ -9,25 +9,26 @@ 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) {
+        foreach ($apiResult as $newsItem) {
             $populair[] = new \Model\NewsItem($newsItem);
         }
 
-        $apiResult = $this->API('podcast/overzicht?aantal=15');
+        $podcasts = [];
-        $index = array_rand($apiResult->podcasts);
+        $apiResult = $this->API('podcast/overzicht?aantal=3');
-        $podcast = new \Model\Podcast($apiResult->podcasts[$index]);
+        $podcast = new \Model\Podcast($apiResult->podcasts[0]);
-        return view('home', ['populair' => $populair, 'podcast' => $podcast, 'title' => 'Home', 'news' => $news, 'liveblogs' => $liveblogs, 'searchURL' => 'nieuws/zoeken']);
+        foreach ($apiResult->podcasts as $_podcast) {
+            $podcasts[] = new \Model\Podcast($_podcast);
+        }
+
+        return view('home', ['populair' => $populair, 'podcasts' => $podcasts, 'podcast' => $podcast, 'title' => 'Home', 'news' => $news, 'searchURL' => 'nieuws/zoeken']);
     }
 }

app/Http/Controllers/JobsController.php

@@ -29,12 +29,12 @@ class JobsController extends Controller
     private function listJobs(Request $request, $url, $title = null)
     {
         $page = (int)$request->get('pagina', 1);
-        #$apiResult = $this->API('vacatures/' . $url . '?pagina=' . (int)max(1, $page));
+        $apiResult = $this->API('vacatures/' . $url . '?pagina=' . (int)max(1, $page));
         $jobs = [];
-        #foreach($apiResult->jobs as $jobsItem)
+        foreach($apiResult->jobs as $jobsItem)
-        #{
+        {
-        #    $jobs[] = new \Model\JobOpening($jobsItem);
+            $jobs[] = new \Model\JobOpening($jobsItem);
-        #}
+        }
 
         return view('jobslist', array_merge($this->getSidebareData(), ['title' => $title, 'jobs' => $jobs]));
         //return view($request->ajax() ? 'partial/jobslist_small' : ($title == null ? 'home' : 'jobslist'), ['title' => $title, 'jobs' => $jobs, 'searchURL' => 'vacatures/zoeken']);

app/Http/Controllers/NewsController.php

@@ -17,31 +17,27 @@ class NewsController extends Controller
     public function show(Request $request, $id)
     {
         parent::registerView($request, 'nieuws', $id);
-        $preview = "";
+        $apiResult = $this->API('nieuws/bericht/' . $id);
-        if (request()->get('preview', null) != null) {
-            $preview = "?preview=" . request()->get('preview');
-        }
-        $apiResult = $this->API('nieuws/bericht/' . $id . $preview);
         $newsItem = new \Model\NewsItem($apiResult->news);
 
         switch ($apiResult->version) {
             case 1:
-                if (!$newsItem->content)
+                if (!$newsItem->content) return redirect('//nhnieuws.nl/gooi');
-                    return redirect('//nhnieuws.nl/gooi');
+                return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
+                break;
 
             case 2:
-                if (isset($apiResult->source->article)) {
+                $source = $apiResult->source;
-                    $source = $apiResult->source->article;
                 $newsItem->published = self::TimestampToDateTime($source->created);
                 $newsItem->edited = self::TimestampToDateTime($source->updated);
                 $newsItem->author = $source->author;
                 $newsItem->images = null; // Images will be embedded
                 $newsItem->video = null; // Videos will be embedded
                 $newsItem->content = $source->blocks;
-                } elseif (isset($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(), ['news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
         }
     }
 
@@ -52,9 +48,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);
@@ -65,30 +61,25 @@ 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) {
+        foreach ($apiResult as $_newsItem) {
             $populair[] = new \Model\NewsItem($_newsItem);
         }
 
         return view('partial/newslist_small', ['id' => $id, 'news' => $populair]);
     }
 
-    public function taglist(Request $request, $tag)
-    {
-        return $this->listNews($request, 'tag/' . $tag, ucfirst($tag));
-    }
-
     public function regionlist(Request $request, $region)
     {
-        return $this->listNews($request, 'tag/' . $region, ucfirst($region));
+        return $this->listNews($request, 'regio/' . $region, ucfirst($region));
     }
 
     public function themelist(Request $request, $theme)
     {
-        return $this->listNews($request, 'tag/' . $theme, ucfirst($theme));
+        return $this->listNews($request, 'thema/' . $theme, ucfirst($theme));
     }
 
     public function search(Request $request, $query)
@@ -110,25 +101,30 @@ class NewsController extends Controller
         return abort(404);
     }
 
-    public function liveblog(Request $request, $id)
+    public function blog(Request $request, $id)
     {
-
         parent::registerView($request, 'blog', $id);
 
-        $blog = $this->API('nieuws/liveblog/' . (int) $id);
+        $page = (int)$request->get('pagina', 1);
-        foreach ($blog->artikelen as &$item) {
+        $hasNext = true;
-            $item = new \Model\NewsItem($item);
+        while ($page > 0) {
+            $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 (request()->ajax()) {
+            if (count($items) || ($page == 1)) {
-            return $blog;
+                return view('blog', ['blog' => $blog, 'pagina' => $page, 'items' => $items, 'hasNext' => $hasNext && count($items) == 15]);
             }
 
-        if (count($blog->artikelen)) {
+            $hasNext = false;
-            return view('blog', ['blog' => $blog]);
+            --$page;
         }
 
-        return abort();
+        return abort(404);
     }
 
     private function listNews(Request $request, $url, $title = null, $id = 'items', $total = null)
@@ -136,13 +132,10 @@ 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)) {
+        $apiResult = $this->API('nieuws/' . $url . '?pagina=' . (int)max(1, $page) . ($total ? '&aantal=' . $total : ''));
-            $url = 'datum/' . $request->get('dateStart', null) . '/' . $request->get('dateEnd', null);
-        }
-        $apiResult = $this->API('nieuws/' . $url . '?pagina=' . (int) max(1, $page) . ($total ? '&aantal=' . $total : ''));
         $news = [];
-        foreach ($apiResult->news ?? [] as $newsItem) {
+        foreach ($apiResult->news as $newsItem) {
             $news[] = new \Model\NewsItem($newsItem);
         }
 
@@ -150,11 +143,9 @@ class NewsController extends Controller
         if ($title == null) {
             $total = 5;
         }
-        $apiResult = $this->API('nieuws/populair?pagina=' . (int) max(
+        $apiResult = $this->API('nieuws/populair?pagina=' . (int)max(1,
-            1,
+                $page) . ($total ? '&aantal=' . $total : ''));
-            $page
+        foreach ($apiResult as $newsItem) {
-        ) . ($total ? '&aantal=' . $total : ''));
-        foreach ($apiResult->news as $newsItem) {
             $populair[] = new \Model\NewsItem($newsItem);
         }
 
@@ -181,7 +172,7 @@ class NewsController extends Controller
     {
         $apiResult = $this->API('nieuws/populair');
         $news = [];
-        foreach ($apiResult->news as $newsItem) {
+        foreach ($apiResult as $newsItem) {
             $news[] = new \Model\NewsItem($newsItem);
         }
 
@@ -190,15 +181,11 @@ class NewsController extends Controller
 
     public function regionieuws()
     {
-        $data = $this->API('nieuws/regionieuws.json');
         return view('listen', [
-            'source' => $this->API_URL . 'nieuws/regionieuws.mp3',
+            'source' => $this->API_URL . 'nieuws/regionieuws',
             'title' => 'Regionieuws',
             'content' => 'het laatste nieuws uit de regio',
             'isStream' => false,
-            'canDownload' => true,
+            'canDownload' => true]);
-            'lengte' => $data->length * 0.25,
-            'waveform' => $data
-        ]);
     }
 }

app/Http/Controllers/PodcastController.php

@@ -29,7 +29,7 @@ class PodcastController extends Controller
             $podcasts[] = new \Model\Podcast($podcast);
         }
 
-        return view($request->ajax() ? 'partial.podcastitems' : 'podcastseries', array_merge($viewData, ['podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => true]));
+        return view($request->ajax() ? 'partial.podcastitems' : 'podcastseries', array_merge($viewData, ['podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken']));
     }
 
     public function podcast(Request $request, $id)
@@ -37,15 +37,6 @@ class PodcastController extends Controller
 	parent::registerView($request, 'podcast', $id);
 	$apiResult = $this->API('podcast/details/' . (int)$id);
         $podcast = new \Model\Podcast($apiResult);
-	$podcasts = [];
+        return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata]);
-	if($podcast->program) {
-	        $apiResult = $this->API('podcast/programma/' . (int)$podcast->program->id . '?pagina=1&aantal=5');
-	        $podcasts = [];
-	        foreach($apiResult->podcasts as $p)
-	        {
-			$podcasts[] = new \Model\Podcast($p);
-		}
-	}
-        return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'isPodcast' => true]);
     }
 }

app/Http/Controllers/RadioController.php

@@ -50,16 +50,13 @@ class RadioController extends Controller
     public function program($id)
     {
         $apiResult = $this->API('programma/details/' . (int)$id);
-	if($apiResult == null) {
-		return abort(404);
-	}
         return view('radioprogram', ['program' => new \Model\Program($apiResult)]);
     }
 
     public function podcast(Request $request, $id, $title = '')
     {
         if($this->checkAPI('podcast/details/' . (int)$id) != "200"){
-            return view('podcastitem', array_merge($this->getSidebareData(), ['title' => $title, 'podcast' => null, 'metadata' => null, 'related' => [], 'searchURL' => 'gemist/zoeken', 'isPodcast' => false]));
+            return view('podcastitem', array_merge($this->getSidebareData(), ['title' => $title, 'podcast' => null, 'metadata' => null, 'related' => [], 'searchURL' => 'gemist/zoeken']));
         }
 
 		parent::registerView($request, 'podcast', $id);
@@ -74,7 +71,7 @@ class RadioController extends Controller
             $podcasts[] = new \Model\Podcast($_podcast);
         }
 
-        return view($request->ajax() ? 'partial/podcastitems' : 'podcastitem', ['title' => $title, 'podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => false]);
+        return view($request->ajax() ? 'partial/podcastitems' : 'podcastitem', ['title' => $title, 'podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken']);
     }
 
     public function podcasts(Request $request, $programma = null)
@@ -110,7 +107,7 @@ class RadioController extends Controller
 			}
 		}
 
-		return view($request->ajax() ? 'partial/programitems' : 'programlist', ['programs' => array_reverse($programs), 'isPodcast' => false]);
+		return view($request->ajax() ? 'partial/programitems' : 'programlist', ['programs' => array_reverse($programs)]);
 	}
 
     private function getPodcastList(Request $request, $action, $viewData = [])
@@ -123,7 +120,7 @@ class RadioController extends Controller
             $podcasts[] = new \Model\Podcast($podcast);
         }
 
-        return view($request->ajax() ? 'partial/podcastitems' : 'podcastlist', array_merge($viewData, ['id' => 'items-podcasts', 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => false]));
+        return view($request->ajax() ? 'partial/podcastitems' : 'podcastlist', array_merge($viewData, ['id' => 'items-podcasts', 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken']));
     }
 
 }

app/Http/Controllers/StreamController.php

@@ -14,8 +14,6 @@ class StreamController extends Controller
         return view('listen', [
             'source' => self::$STREAM_URL . 'mp3live',
             'title' => 'Luister live',
-            'lengte' => 0,
-            'waveform' => null,
             'content' => 'de live-uitzending van NH Gooi.',
             'isStream' => true ]);
     }
@@ -32,17 +30,6 @@ class StreamController extends Controller
         return view('watch', ['title' => 'Kijk NH Gooi Tv Studio', 'stream' => 'https://studiocam.nhgooi.nl/studiocam/live/index.m3u8']);
     }
 
-    public function inline(Request $request, $id)
-    {
-        $apiResult = $this->API('podcast/details/' . (int)$id);
-        $podcast = new \Model\Podcast($apiResult);
-        if(sha1($id . ':' . date('Y-m-d')) != $request->get('auth')) {
-         // return view('widgets/podcastplayer', ['podcast' => null]);
-	}
-
-        return view('widgets/podcastplayer', ['podcast' => $podcast]);
-    } 
-
     public function podcast(Request $request, $id)
     {
         $apiResult = $this->API('podcast/details/' . (int)$id);
@@ -52,24 +39,17 @@ class StreamController extends Controller
         }
 
         return view('listen', [
-            'source' => $this->API_URL . 'podcast/stream/' . $apiResult->url,
+            'source' => $this->API_URL . 'podcast/download' . $apiResult->url . '?auth=' . $podcast->auth,
             'title' => $podcast->title,
             'content' => $podcast->title,
-            'lengte' => $podcast->duration / 1000,
-            'waveform' => $podcast->waveform,
             'isStream' => false,
-            'canDownload' => $this->API_URL . 'podcast/download/' . $apiResult->url ]);
+            'canDownload' => true ]);
     }
 
     public function program(Request $request, $year, $month, $day, $hour, $duration, $offset = 0) {
         $date = (new \DateTimeImmutable())->setDate($year, $month, $day)->setTime($hour, 0, 0);
         $current = $date->add(\DateInterval::createFromDateString($offset . ' hours'));
 
-        $programma = $this->API("programma/details/" . $current->Format("Y/m/d/H"));
-        if(!$programma->is_beschikbaar) {
-            return view('listen', ['notAvailable' => true]);
-        }
-
         $hours = [];
         for($i = 0; $i < $duration; $i++) {
           $other = $date->add(\DateInterval::createFromDateString($i . ' hours'));
@@ -78,12 +58,10 @@ class StreamController extends Controller
         }
 
         return view('listen', [
-            'source' => $this->API_URL . 'programma/stream/' . $current->format('Y/m/d/H'),
+            'source' => $this->API_URL . 'programma/download/' . $current->format('Y/m/d/H') . '/1',
             'tabs' => $hours,
             'title' => 'Uitzending terugluisteren',
-            'lengte' => $programma->waveform->length,
+            'content' => 'de uitzending van ' . $current->format('d-m-Y, H') . ':00 uur',
-            'waveform' => $programma->waveform,
-            'content' => $programma->programma->name . ' van ' . $current->format('d-m-Y, H') . ':00 uur',
             'isStream' => false,
             'canDownload' => false ]);
     }
@@ -99,10 +77,10 @@ class StreamController extends Controller
 
     public function kerkdienst(Request $request) {
         return view('listen', [
-            'source' => $this->API_URL . 'kerkdienst/stream',
+            'source' => $this->API_URL . 'kerkdienst/download',
             'title' => 'Kerkdienst gemist',
             'content' => 'de kerkdienst van afgelopen zondag',
             'isStream' => false,
-            'canDownload' => $this->API_URL . 'kerkdienst/download' ]);
+            'canDownload' => true ]);
     }
 }

app/Mail/ContactFormSubmitted.php

@@ -1,45 +0,0 @@
-<?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/Blog.php

@@ -1,23 +0,0 @@
-<?php 
-
-namespace Model;
-
-class Blog extends Model {
-  public $id;
-  public $title;
-  public $description;
-  public $news_category;
-  public $start_date;
-  public $end_date; 
-  public $is_active;
-
-  public $url;
-
-  public function __construct($data, $images = null, $podcast = null) {
-    parent::__construct($data);
-    parent::ConvertToDateTime($this->start_date);
-    parent::ConvertToDateTime($this->end_date);
-
-    $this->url = "/blog/{$this->id}/" . parent::url_slug($this->title);
-  }
-}

app/Models/CalendarEvent.php

@@ -1,67 +0,0 @@
-<?php 
-
-namespace Model;
-
-class CalendarEvent extends Model {
-  public $id;
-  public $title;
-  public $region;
-  public $content;
-  public $starts;
-  public $ends; 
-  public $images;
-  public $podcast;
-  public $video;
-  public $keywords;
-  public $url;
-  public $metadata;
-  public $tags;
-
-  public function __construct($data, $images = null, $podcast = null) {
-    parent::__construct($data);
-    parent::ConvertToDateTime($this->starts);
-    parent::ConvertToDateTime($this->ends);
-
-    $this->keywords = null;
-    if(isset($data->keywords)) {
-        if(is_array($data->keywords)) {
-          $this->keywords = $data->keywords;
-        } else if(trim($data->keywords)) { 
-          $this->keywords = explode(' ', $data->keywords);
-        }
-    }
-
-    if($podcast)
-    {
-        $this->podcast = new \Model\Podcast($podcast);
-    } else if(isset($data->podcast) && $data->podcast) { 
-        $this->podcast = new \Model\Podcast($data->podcast);
-    }
-     
-    $images = ($images != null) ? $images
-            : (isset($data->images) ? $data->images : null);
-    if($images) {
-        $this->images = [];
-        foreach($images as $image) {
-            $this->images[] = new NewsImage($image, '/img/news/');
-        }
-    }
-
-    $this->url = "/agenda/{$this->id}/" . parent::url_slug($this->title);
-    $this->metadata = (new MetaData())
-      ->set('title', $this->title)
-      ->set('description', strip_tags($this->excerpt()))
-      ->set('image', isset($this->images) && count($this->images) ? $this->images[0]->url : null )
-      ->set('audio', isset($this->podcast) ? $this->podcast->url : null)
-     ;
-  }
-
-  public function excerpt() {
-    $hasImages = isset($this->images) && count($this->images) > 0;
-    $maxLength = $hasImages ? 200 : 500;
-    return '<p class="news-excerpt ' . ($hasImages ? 'short' : 'long') . '">' . 
-      substr($this->content, 0, $maxLength) . 
-      (strlen($this->content) > $maxLength ? '...' : '') . 
-      '</p>'; 
-  }
-}

app/Models/JobOpening.php

@@ -1,61 +0,0 @@
-<?php 
-
-namespace Model;
-
-class JobOpening extends Model {
-  public $id;
-  public $title;
-  public $content;
-  public $starts;
-  public $ends; 
-  public $images;
-  public $url;
-
-  public function __construct($data, $images = null, $podcast = null) {
-    parent::__construct($data);
-    parent::ConvertToDateTime($this->starts);
-    parent::ConvertToDateTime($this->ends);
-
-    $this->keywords = null;
-    if(isset($data->keywords)) {
-        if(is_array($data->keywords)) {
-          $this->keywords = $data->keywords;
-        } else if(trim($data->keywords)) { 
-          $this->keywords = explode(' ', $data->keywords);
-        }
-    }
-
-    if($podcast)
-    {
-        $this->podcast = new \Model\Podcast($podcast);
-    } else if(isset($data->podcast) && $data->podcast) { 
-        $this->podcast = new \Model\Podcast($data->podcast);
-    }
-     
-    $images = ($images != null) ? $images
-            : (isset($data->images) ? $data->images : null);
-    if($images) {
-        $this->images = [];
-        foreach($images as $image) {
-            $this->images[] = new NewsImage($image, '/img/news/');
-        }
-    }
-
-    $this->url = "/vacatures/{$this->id}/" . parent::url_slug($this->title);
-    $this->metadata = (new MetaData())
-      ->set('title', $this->title)
-      ->set('description', strip_tags($this->excerpt()))
-      ->set('image', isset($this->images) && count($this->images) ? $this->images[0]->url : null )
-      ->set('audio', isset($this->podcast) ? $this->podcast->url : null)
-     ;
-  }
-
-  public function excerpt() {
-    $hasImages = count($this->images) > 0;
-    $maxLength = $hasImages ? 200 : 500;
-    return '<p class="news-excerpt ' . ($hasImages ? 'short' : 'long') . '">' . 
-      substr($this->content, 0, $maxLength) . 
-      (strlen($this->content) > $maxLength ? '...' : '') . 
-      '</p>'; 
-  }
-}

app/Models/Kerkdienst.php

@@ -1,26 +0,0 @@
-<?php 
-
-namespace Model;
-
-class KerkdienstInstance extends Model {
-  public $name;
-  public $start;
-
-  public function __construct($data) {
-    parent::__construct($data);
-    parent::ConvertToDateTime($this->start);
-  }
-}
-
-class Kerkdienst extends Model {
-  public $isRunning;
-  public $previous;
-  public $next;
-
-  public function __construct($data) {
-    // parent::__construct($data);
-    $this->isRunning = $data->isRunning;
-    $this->previous = new KerkdienstInstance($data->previous);
-    $this->next = new KerkdienstInstance($data->next);
-  }
-}

app/Models/MetaData.php

@@ -1,35 +0,0 @@
-<?php
-namespace Model;
-
-class MetaData {
-  private $data = ['type' => 'article', 'locale' => 'nl-nl'];
-
-  public function set($prop, $val) {
-    if($val) {
-      $this->data[$prop] = $val;
-    }
-    return $this;
-  }
-
-  public function append($prop, $val) {
-    if(array_key_exists($prop, $this->data)) {
-      $this->data[$prop] .= $val;
-    }
-    return $this;
-  }
-
-  public function prepend($prop, $val) {
-    if(array_key_exists($prop, $this->data)) {
-      $this->data[$prop] = $val . $this->data[$prop];
-    }
-    return $this;
-  }
-
-  public function metaTags() {
-    foreach($this->data as $prop => $val) {
-      if($val) {
-        echo "<meta property=\"og:$prop\" content=\"" . htmlentities($val) . "\" />\n";
-      }
-    }
-  }
-}

app/Models/Model.php

@@ -1,64 +0,0 @@
-<?php 
-
-namespace Model;
-
-class Model {
-    protected function ConvertToDateTime(&$field) {
-        if($field) { 
-            // PHP7 JSON-encodes to {date: "", "timezone_type": ..., "timezone": "UTC" }
-            // In that case $field will be an object
-            if(is_object($field)) { 
-                $field = ($field->timezone) 
-                    ? new \DateTimeImmutable($field->date, new \DateTimeZone($field->timezone)) 
-                    : (new \DateTimeImmutable($field->date));
-            } else { 
-                // If $field is not an object, assume it's a plain, valid, string
-                $field = new \DateTime($field);
-            }
-
-            if($field === false || $field->getTimestamp() <= 0) {
-                // If field had data but is invalid DateTime or is 0000-00-00 00:00, set it to null.
-                $field = null;
-            } else { 
-              // If valid, return local timezone
-              $field->setTimezone(new \DateTimeZone("Europe/Amsterdam"));
-            }
-        }
-    }
-
-    public function __construct($data) {
-        $class = get_class($this);
-        foreach($data as $key => $val) {
-            if(property_exists($class, $key)) {
-                $this->$key = is_string($val) ? stripslashes($val) : $val;
-            }
-        }
-    }
-
-    public function url_slug($text) {
-        // Alles naar kleine letter
-        $text = strtolower($text);
-
-        // Vervang accent-tekens door niet-geaccentueerde versies
-        // $text = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $text);
-        $search = explode(",","ç,æ,œ,á,é,í,ó,ú,à,è,ì,ò,ù,ä,ë,ï,ö,ü,ÿ,â,ê,î,ô,û,å,e,i,ø,u");
-        $replace = explode(",","c,ae,oe,a,e,i,o,u,a,e,i,o,u,a,e,i,o,u,y,a,e,i,o,u,a,e,i,o,u");
-        $text = str_replace($search, $replace, $text);
-
-        // Verwijder alle woorden van 3 letters, behalve BEL (BEL-combinatie etc)
-        if(strlen($text) > 3) {
-          $text = preg_replace('/\b(?!bel|fm|nh)([a-z]{1,3})\b/u', '', $text);
-        }
-
-        // Vervang alles dat niet een woord-karakter is (letter, cijfer), een streepje of spatie
-        if(strlen($text) > 3) {
-          $text = preg_replace('/[^\w_\-\s]/', '', $text);
-        }
-
-        // Reeksen van één of meer spaties / streepjes vervangen door een enkel streepje
-        $text = preg_replace('/[\-\s]+/', '-', $text);
-
-        // Verwijder alle witruimte / streepjes aan begin en eind
-        return trim(strtolower($text), '-');
-    }
-}

app/Models/NewsImage.php

@@ -1,20 +0,0 @@
-<?php 
-
-namespace Model;
-
-class NewsImage extends Model {
-    public $id;
-    public $title;
-    public $author;
-    public $url;
-
-    public function __construct($data, $urlPrefix = '/') { 
-      parent::__construct($data);
-
-      // Deserialisatie van JSON heeft url in data, 
-      // lezen uit database heeft file en (als het goed is) urlPrefix
-      if(isset($data->file)) {
-          $this->url = $urlPrefix . $data->file; 
-      }
-    }
-}

app/Models/NewsItem.php

@@ -1,118 +0,0 @@
-<?php 
-
-namespace Model;
-
-require_once "NewsImage.php";
-require_once "NewsSource.php";
-require_once "MetaData.php";
-
-class NewsItem extends Model {
-  public $id;
-  public $title;
-  public $author;
-  public $content;
-  public $published;
-  public $edited; 
-  public $keywords;
-
-  public $source;
-  public $category;
-  public $theme;
-  public $region;
-  public $tags;
-  
-  public $podcast;
-  public $images;
-  public $video;
-  public $type;
-  public $url;
-  public $metadata;
-
-  public function __construct($data, $images = null, $podcast = null) {
-    parent::__construct($data);
-    parent::ConvertToDateTime($this->published);
-    parent::ConvertToDateTime($this->edited);
-
-    if($this->edited && ($this->edited->getTimestamp() - $this->published->getTimestamp() < 1800 /* == 30 minutes */)) {
-      // If last edit was within grace period, consider it unedited (note: currently RES always saves edited == published on creation)
-      $this->edited = null;
-    }
-    
-    $this->source = null;
-    if(isset($data->source))
-    {
-      if(is_object($data->source))
-      {
-         $this->source = new \Model\NewsSource($data->source->title, $data->source->url, $data->source->show);
-      } else if($data->source) {
-         $this->source = new \Model\NewsSource($data->source, $data->source_url, $data->showsource);
-      }
-    }
-
-    if($podcast) {
-        $this->podcast = new \Model\Podcast($podcast);
-    } else if(isset($data->podcast) && $data->podcast) { 
-        $this->podcast = new \Model\Podcast($data->podcast);
-    }
-
-    $this->keywords = null;
-    if(isset($data->keywords)) {
-      if(is_array($data->keywords) || is_object($data->keywords)) {
-        $this->keywords = $data->keywords;
-      } else if(trim($data->keywords)) { 
-        $this->keywords = explode(' ', $data->keywords);
-      }
-    }
-
-    if(isset($data->region)) { 
-      if(is_object($data->region)) { 
-        $this->region = new \Model\NewsRegion($data->region->title, $data->region->slug);
-      } else {
-        $this->region = new \Model\NewsRegion($data->region, $data->region_slug);
-      }
-    }
-
-    if(isset($data->theme)) { 
-      if(is_object($data->theme)) { 
-        $this->theme = new \Model\NewsRegion($data->theme->title, $data->theme->slug);
-      } else {
-        $this->theme = new \Model\NewsRegion($data->theme, $data->theme_slug);
-      }
-    }
-  
-    if(isset($data->tags)) {
-      foreach($data->tags as $tag) {
-        $this->theme = new \Model\NewsRegion($tag->titel, $tag->slug);
-      }
-    }
-
-    $images = ($images != null) ? $images
-            : (isset($data->images) ? $data->images : null);
-    if($images) {
-        $this->images = [];
-        foreach($images as $image) {
-            $this->images[] = new NewsImage($image, '/img/news/');
-        }
-    }
-
-    $this->url = "/nieuws/{$this->id}/" . parent::url_slug($this->title);
-    $this->metadata = (new MetaData())
-      ->set('title', $this->title)
-      ->set('description', strip_tags($this->excerpt()))
-      ->set('image', isset($this->images) && count($this->images) ? $this->images[0]->url : null )
-      ->set('video', isset($this->video) ? $this->video : null)
-      ->set('audio', isset($this->podcast) ? $this->podcast->url : null)
-      ->set('article:published_time', $this->published->format('r'))
-      ->set('article:modified_time', $this->edited ? $this->edited->format('r') : null)
-      ;
-  }
-
-  public function excerpt() {
-    $hasImages = isset($this->images) && count($this->images) > 0;
-    $maxLength = $hasImages ? 200 : 500;
-    return '<p class="news-excerpt ' . ($hasImages ? 'short' : 'long') . '">' . 
-      substr($this->content, 0, $maxLength) . 
-      (strlen($this->content) > $maxLength ? '...' : '') . 
-      '</p>'; 
-  }
-}

app/Models/NewsSource.php

@@ -1,25 +0,0 @@
-<?php 
-
-namespace Model;
-
-class NewsRegion {
-    public $title;
-    public $slug;
-
-    public function __construct($title, $slug = null) {
-        $this->title = $title;
-        $this->slug = $slug ? $slug : strtolower(str_replace(' ', '', $title));
-    }
-}
-
-class NewsSource {
-    public $title;
-    public $url;
-    public $show;
-
-    public function __construct($title, $url, $show) { 
-        $this->title = $title;
-        $this->url = $url;
-        $this->show = $show;
-    }
-}

app/Models/Podcast.php

@@ -1,94 +0,0 @@
-<?php 
-
-namespace Model;
-
-require_once "NewsImage.php";
-
-class Podcast extends Model {
-  public $id;
-  public $title;
-  public $content;
-  protected $soundfilename;
-  public $created; 
-  public $program;
-  public $url;
-  public $auth;
-  public $download;
-  public $duration;
-  public $image;
-  public $metadata;
-  public $waveform;
-  private $key;
-
-  public function __construct($data) {
-    parent::__construct($data);
-    parent::ConvertToDateTime($this->created);
-
-    $this->url = '/' . $this->id . '/' . parent::url_slug($this->title) . '.mp3';
-    if($this->soundfilename) {
-      // Only generate when not constructing from a JSON object
-      $this->key = sha1($this->id . ':' . date('Y-m-d') . ':' . $this->soundfilename);
-      $this->auth = $this->key;
-    }
-
-    if(isset($data->program)) {
-      $this->program = null;
-      if(is_object($data->program)) {
-        $this->program = new \Model\Program($data->program);
-      } elseif($data->program) { 
-        $this->program = new \Model\Program(['id' => $data->program, 'name' => $data->program_name, 'description' => $data->program_description]);
-      }
-    }
-
-    if(isset($data->imagefile)) {
-      $imagedata = new \stdClass();
-      $imagedata->id = $this->id;
-      $imagedata->file = $data->imagefile;
-      $imagedata->title = $data->imagecaption;
-      $this->image = new NewsImage($imagedata, '/img/podcast/');
-    }
-
-    if(isset($data->metadata, $data->metadata->waveform)){
-      $this->waveform = $data->metadata->waveform;
-    }
-
-    $this->metadata = (new MetaData())
-      ->set('title', $this->title)
-      ->set('description', strip_tags($this->excerpt()))
-      ->set('image', isset($this->image) ? $this->image->url : null )
-      ->set('audio', $this->url)
-     ;
-  }
-
-  public function titleWithoutProgram() { 
-    if(!$this->program) { return $this->title; }
-    return trim(str_replace($this->program->name, '', $this->title), "- \t\n\r\0\x0B");
-  }
-
-  public function isValidAuth($key) {
-    return ($key == $this->key);
-  }
-
-  public function getSoundfile() {
-    return '/var/audio/podcast/' . $this->soundfilename; 
-  }
-
-  public function formatDuration() {
-    $seconds = $this->duration / 1000;
-    $milliseconds = $this->duration % 1000;
-  
-    $hours = ($seconds > 3600) ? floor($seconds / 3600) : 0;
-    $seconds %= 3600;
-    return str_pad($hours, 2, '0', STR_PAD_LEFT)
-         . gmdate(':i:s', $seconds)
-         ;//. ($milliseconds ? ".$milliseconds" : '') ;
-  }
-
-  public function excerpt() {
-    $maxLength = 500;
-    return '<p class="news-excerpt long">' . 
-      substr($this->content, 0, $maxLength) . 
-      (strlen($this->content) > $maxLength ? '...' : '') . 
-      '</p>'; 
-  }
-}

app/Models/Program.php

@@ -1,55 +0,0 @@
-<?php 
-
-namespace Model;
-
-class Program extends Model {
-  public $id;
-  public $name;
-  public $tagline;
-  public $description;
-  public $email;
-  public $nonstop;
-  public $rerun;
-  public $priority;
-  public $image;
-
-  public $hosts;
-  public $recent;
-  public $next;
-
-  public function __construct($data) {
-    parent::__construct($data);
-
-    if(isset($data->suffix) && $data->suffix) { 
-      $this->name .= ' ' . $data->suffix;
-    } 
-
-    if($this->recent && $this->recent) {
-      foreach($this->recent as &$recent) {
-        parent::ConvertToDateTime($recent->starts);
-        parent::ConvertToDateTime($recent->ends);
-      }
-    }
-    if($this->next && $this->next) {
-      foreach($this->next as &$next) {
-        parent::ConvertToDateTime($next->starts);
-        parent::ConvertToDateTime($next->ends);
-      }
-    }
-
-    if(isset($data->email) && ($mailComma = strpos($data->email, ',')) !== false) {
-      $this->email = substr($data->email, 0, $mailComma);
-    }
-
-    if(isset($data->state)) {
-      $this->nonstop = $data->state == 0;
-      $this->rerun = $data->state == 3;
-    }
-
-    $this->url = "/{$this->id}/" . parent::url_slug($this->name);
-  }
- 
-  public function isSpecial() {
-    return ($this->priority < 2);
-  }
-}

app/Models/ProgramHost.php

@@ -1,10 +0,0 @@
-<?php 
-
-namespace Model;
-
-class ProgramHost extends Model {
-  public $id;
-  public $name;
-  public $email;
-}
-

app/Models/Track.php

@@ -1,47 +0,0 @@
-<?php 
-
-namespace Model;
-
-class Track extends Model {
-  public $start;
-  public $itemCode;
-  public $title;
-  public $artist;
-  public $duration;
-  public $ends;
-  public $isLayout;
-
-  public function __construct($data) {
-    parent::__construct($data);
-    parent::ConvertToDateTime($this->start);
-    parent::ConvertToDateTime($this->ends);
-    $isLayout = $this->isLayout();
-  }
-
-  private static $IDENTS = ['UURSLUITER' => 'Nieuws', 'NIEUWSOPEN ' => 'Nieuws', 'ANWB' => 'Verkeersinformatie', 'REGIO' => 'Regionieuws', 'CB' => 'Reclame'];
-
-  public function isLayout() {
-    foreach(self::$IDENTS as $ident => $display) {
-      if(substr($this->itemCode, 0, strlen($ident)) == $ident || substr($this->title, 0, strlen($ident)) == $ident) {
-        $this->title = $display;
-         $this->artist = "";
-         $this->itemCode = '_' . $this->itemCode;
-         return false;
-       }
-     }
-
-    if(strlen($this->itemCode) > 0 && ($this->itemCode[0] == 'V')) {
-      return true;
-    }
-
-    return false;
-  }
-
-  public function ends($ends = null) {
-    $this->ends = $ends;
-  }
-
-  public function secondsRemaining() {
-    return ($this->ends) ? ($this->ends->getTimestamp() - time()) : -1;
-  }
-}

app/Providers/AppServiceProvider.php

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

bootstrap/cache/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

bootstrap/cache/packages.php

@@ -0,0 +1,67 @@
+<?php return array (
+  'laravel/sail' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Laravel\\Sail\\SailServiceProvider',
+    ),
+  ),
+  'laravel/sanctum' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Laravel\\Sanctum\\SanctumServiceProvider',
+    ),
+  ),
+  'laravel/tinker' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    ),
+  ),
+  'laravelcollective/html' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Collective\\Html\\HtmlServiceProvider',
+    ),
+    'aliases' => 
+    array (
+      'Form' => 'Collective\\Html\\FormFacade',
+      'Html' => 'Collective\\Html\\HtmlFacade',
+    ),
+  ),
+  'nesbot/carbon' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Carbon\\Laravel\\ServiceProvider',
+    ),
+  ),
+  'nunomaduro/collision' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    ),
+  ),
+  'nunomaduro/termwind' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Termwind\\Laravel\\TermwindServiceProvider',
+    ),
+  ),
+  'spatie/laravel-ignition' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+    ),
+    'aliases' => 
+    array (
+      'Flare' => 'Spatie\\LaravelIgnition\\Facades\\Flare',
+    ),
+  ),
+);

bootstrap/cache/services.php

@@ -0,0 +1,251 @@
+<?php return array (
+  'providers' => 
+  array (
+    0 => 'Illuminate\\Auth\\AuthServiceProvider',
+    1 => 'Illuminate\\Broadcasting\\BroadcastServiceProvider',
+    2 => 'Illuminate\\Bus\\BusServiceProvider',
+    3 => 'Illuminate\\Cache\\CacheServiceProvider',
+    4 => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    5 => 'Illuminate\\Cookie\\CookieServiceProvider',
+    6 => 'Illuminate\\Database\\DatabaseServiceProvider',
+    7 => 'Illuminate\\Encryption\\EncryptionServiceProvider',
+    8 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
+    9 => 'Illuminate\\Foundation\\Providers\\FoundationServiceProvider',
+    10 => 'Illuminate\\Hashing\\HashServiceProvider',
+    11 => 'Illuminate\\Mail\\MailServiceProvider',
+    12 => 'Illuminate\\Notifications\\NotificationServiceProvider',
+    13 => 'Illuminate\\Pagination\\PaginationServiceProvider',
+    14 => 'Illuminate\\Pipeline\\PipelineServiceProvider',
+    15 => 'Illuminate\\Queue\\QueueServiceProvider',
+    16 => 'Illuminate\\Redis\\RedisServiceProvider',
+    17 => 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider',
+    18 => 'Illuminate\\Session\\SessionServiceProvider',
+    19 => 'Illuminate\\Translation\\TranslationServiceProvider',
+    20 => 'Illuminate\\Validation\\ValidationServiceProvider',
+    21 => 'Illuminate\\View\\ViewServiceProvider',
+    22 => 'Laravel\\Sail\\SailServiceProvider',
+    23 => 'Laravel\\Sanctum\\SanctumServiceProvider',
+    24 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    25 => 'Collective\\Html\\HtmlServiceProvider',
+    26 => 'Carbon\\Laravel\\ServiceProvider',
+    27 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    28 => 'Termwind\\Laravel\\TermwindServiceProvider',
+    29 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+    30 => 'Collective\\Html\\HtmlServiceProvider',
+    31 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    32 => 'App\\Providers\\AppServiceProvider',
+    33 => 'App\\Providers\\AuthServiceProvider',
+    34 => 'App\\Providers\\EventServiceProvider',
+    35 => 'App\\Providers\\RouteServiceProvider',
+  ),
+  'eager' => 
+  array (
+    0 => 'Illuminate\\Auth\\AuthServiceProvider',
+    1 => 'Illuminate\\Cookie\\CookieServiceProvider',
+    2 => 'Illuminate\\Database\\DatabaseServiceProvider',
+    3 => 'Illuminate\\Encryption\\EncryptionServiceProvider',
+    4 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
+    5 => 'Illuminate\\Foundation\\Providers\\FoundationServiceProvider',
+    6 => 'Illuminate\\Notifications\\NotificationServiceProvider',
+    7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
+    8 => 'Illuminate\\Session\\SessionServiceProvider',
+    9 => 'Illuminate\\View\\ViewServiceProvider',
+    10 => 'Laravel\\Sanctum\\SanctumServiceProvider',
+    11 => 'Carbon\\Laravel\\ServiceProvider',
+    12 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    13 => 'Termwind\\Laravel\\TermwindServiceProvider',
+    14 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+    15 => 'App\\Providers\\AppServiceProvider',
+    16 => 'App\\Providers\\AuthServiceProvider',
+    17 => 'App\\Providers\\EventServiceProvider',
+    18 => 'App\\Providers\\RouteServiceProvider',
+  ),
+  'deferred' => 
+  array (
+    'Illuminate\\Broadcasting\\BroadcastManager' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider',
+    'Illuminate\\Contracts\\Broadcasting\\Factory' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider',
+    'Illuminate\\Contracts\\Broadcasting\\Broadcaster' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider',
+    'Illuminate\\Bus\\Dispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
+    'Illuminate\\Contracts\\Bus\\Dispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
+    'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
+    'Illuminate\\Bus\\BatchRepository' => 'Illuminate\\Bus\\BusServiceProvider',
+    'Illuminate\\Bus\\DatabaseBatchRepository' => 'Illuminate\\Bus\\BusServiceProvider',
+    'cache' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'cache.psr6' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'Illuminate\\Cache\\RateLimiter' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'Illuminate\\Foundation\\Console\\AboutCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Cache\\Console\\ClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Cache\\Console\\ForgetCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ClearCompiledCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Auth\\Console\\ClearResetsCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ConfigCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ConfigClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\DbCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\MonitorCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\PruneCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\ShowCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\TableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\WipeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\DownCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EnvironmentCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EnvironmentDecryptCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EnvironmentEncryptCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventListCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\KeyGenerateCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\OptimizeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\OptimizeClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\ClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\ListFailedCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\FlushFailedCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\ForgetFailedCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\ListenCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\MonitorCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\PruneBatchesCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\PruneFailedJobsCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\RestartCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\RetryCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\RetryBatchCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\WorkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\RouteCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\RouteClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\RouteListCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\DumpCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Seeds\\SeedCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleFinishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleListCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleRunCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleClearCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleTestCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleWorkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ShowModelCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\StorageLinkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\UpCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ViewCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ViewClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Cache\\Console\\CacheTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\CastMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ChannelMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ComponentMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ConsoleMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Routing\\Console\\ControllerMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\DocsCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventGenerateCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ExceptionMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Factories\\FactoryMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\JobMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ListenerMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\MailMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Routing\\Console\\MiddlewareMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ModelMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Notifications\\Console\\NotificationTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ProviderMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\FailedTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\TableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\BatchesTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\RequestMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ResourceMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\RuleMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ScopeMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Seeds\\SeederMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Session\\Console\\SessionTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ServeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\StubPublishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\TestMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\VendorPublishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Migrations\\MigrateCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Migrations\\FreshCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Migrations\\InstallCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Migrations\\RefreshCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Migrations\\ResetCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Migrations\\RollbackCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Migrations\\StatusCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Migrations\\MigrateMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'hash' => 'Illuminate\\Hashing\\HashServiceProvider',
+    'hash.driver' => 'Illuminate\\Hashing\\HashServiceProvider',
+    'mail.manager' => 'Illuminate\\Mail\\MailServiceProvider',
+    'mailer' => 'Illuminate\\Mail\\MailServiceProvider',
+    'Illuminate\\Mail\\Markdown' => 'Illuminate\\Mail\\MailServiceProvider',
+    'Illuminate\\Contracts\\Pipeline\\Hub' => 'Illuminate\\Pipeline\\PipelineServiceProvider',
+    'queue' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'queue.connection' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'queue.failer' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'queue.listener' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'queue.worker' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'redis' => 'Illuminate\\Redis\\RedisServiceProvider',
+    'redis.connection' => 'Illuminate\\Redis\\RedisServiceProvider',
+    'auth.password' => 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider',
+    'auth.password.broker' => 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider',
+    'translator' => 'Illuminate\\Translation\\TranslationServiceProvider',
+    'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider',
+    'validator' => 'Illuminate\\Validation\\ValidationServiceProvider',
+    'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider',
+    'Laravel\\Sail\\Console\\InstallCommand' => 'Laravel\\Sail\\SailServiceProvider',
+    'Laravel\\Sail\\Console\\PublishCommand' => 'Laravel\\Sail\\SailServiceProvider',
+    'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider',
+    'html' => 'Collective\\Html\\HtmlServiceProvider',
+    'form' => 'Collective\\Html\\HtmlServiceProvider',
+    'Collective\\Html\\HtmlBuilder' => 'Collective\\Html\\HtmlServiceProvider',
+    'Collective\\Html\\FormBuilder' => 'Collective\\Html\\HtmlServiceProvider',
+  ),
+  'when' => 
+  array (
+    'Illuminate\\Broadcasting\\BroadcastServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Bus\\BusServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Cache\\CacheServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Hashing\\HashServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Mail\\MailServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Pipeline\\PipelineServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Queue\\QueueServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Redis\\RedisServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Translation\\TranslationServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Validation\\ValidationServiceProvider' => 
+    array (
+    ),
+    'Laravel\\Sail\\SailServiceProvider' => 
+    array (
+    ),
+    'Laravel\\Tinker\\TinkerServiceProvider' => 
+    array (
+    ),
+    'Collective\\Html\\HtmlServiceProvider' => 
+    array (
+    ),
+  ),
+);

composer.json

@@ -10,8 +10,7 @@
         "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",
@@ -28,7 +27,7 @@
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/",
 	    "Helpers\\": "app/Helpers",
-	    "Model\\": "app/Models"
+	    "Model\\": "/srv/api/common/classes"
         }
     },
     "autoload-dev": {

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": "f9a3eebc09010b2b187541a3e59a0eff",
+    "content-hash": "f70c81adf2990f185a8632535bd08631",
     "packages": [
         {
             "name": "brick/math",
@@ -1934,37 +1934,34 @@
         },
         {
             "name": "nette/schema",
-            "version": "v1.3.3",
+            "version": "v1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004"
+                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/2befc2f42d7c715fd9d95efc31b1081e5d765004",
+                "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
-                "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004",
+                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
                 "shasum": ""
             },
             "require": {
-                "nette/utils": "^4.0",
+                "nette/utils": "^2.5.7 || ^3.1.5 ||  ^4.0",
-                "php": "8.1 - 8.5"
+                "php": ">=7.1 <8.3"
             },
             "require-dev": {
-                "nette/tester": "^2.5.2",
+                "nette/tester": "^2.3 || ^2.4",
-                "phpstan/phpstan-nette": "^2.0@stable",
+                "phpstan/phpstan-nette": "^1.0",
-                "tracy/tracy": "^2.8"
+                "tracy/tracy": "^2.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Nette\\": "src"
-                },
                 "classmap": [
                     "src/"
                 ]
@@ -1993,36 +1990,34 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.3"
+                "source": "https://github.com/nette/schema/tree/v1.2.3"
             },
-            "time": "2025-10-30T22:57:59+00:00"
+            "time": "2022-10-13T01:24:26+00:00"
         },
         {
             "name": "nette/utils",
-            "version": "v4.1.1",
+            "version": "v3.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "c99059c0315591f1a0db7ad6002000288ab8dc72"
+                "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/c99059c0315591f1a0db7ad6002000288ab8dc72",
+                "url": "https://api.github.com/repos/nette/utils/zipball/02a54c4c872b99e4ec05c4aec54b5a06eb0f6368",
-                "reference": "c99059c0315591f1a0db7ad6002000288ab8dc72",
+                "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368",
                 "shasum": ""
             },
             "require": {
-                "php": "8.2 - 8.5"
+                "php": ">=7.2 <8.3"
             },
             "conflict": {
-                "nette/finder": "<3",
+                "nette/di": "<3.0.6"
-                "nette/schema": "<1.2.2"
             },
             "require-dev": {
-                "jetbrains/phpstorm-attributes": "^1.2",
+                "nette/tester": "~2.0",
-                "nette/tester": "^2.5",
+                "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-nette": "^2.0@stable",
+                "tracy/tracy": "^2.3"
-                "tracy/tracy": "^2.9"
             },
             "suggest": {
                 "ext-gd": "to use Image",
@@ -2030,18 +2025,16 @@
                 "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": "4.1-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Nette\\": "src"
-                },
                 "classmap": [
                     "src/"
                 ]
@@ -2082,9 +2075,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.1.1"
+                "source": "https://github.com/nette/utils/tree/v3.2.8"
             },
-            "time": "2025-12-22T12:14:32+00:00"
+            "time": "2022-09-12T23:36:20+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -2228,69 +2221,6 @@
             ],
             "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",
@@ -8001,12 +7931,12 @@
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": {},
+    "stability-flags": [],
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.0"
+        "php": "^8.0.2"
     },
-    "platform-dev": {},
+    "platform-dev": [],
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.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',

config/logging.php

@@ -1,105 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Log Channel
-    |--------------------------------------------------------------------------
-    |
-    | This option defines the default log channel that gets used when writing
-    | messages to the logs. The name specified in this channel must be listed
-    | in the channels configuration array defined below.
-    |
-    */
-
-    'default' => env('LOG_CHANNEL', 'stack'),
-
-    'deprecations' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Log Channels
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure the log channels for your application. Out of
-    | the box, Laravel uses the Monolog PHP logging library. This gives
-    | you a variety of powerful log handlers / formatters to utilize.
-    |
-    | Available Drivers: "single", "daily", "slack", "syslog",
-    |                    "errorlog", "monolog", "custom", "stack"
-    |
-    */
-
-    'channels' => [
-        'stack' => [
-            'driver' => 'stack',
-            'channels' => ['single'],
-            'ignore_exceptions' => false,
-        ],
-
-        'single' => [
-            'driver' => 'single',
-            'path' => storage_path('logs/laravel.log'),
-            'level' => env('LOG_LEVEL', 'debug'),
-        ],
-
-        'daily' => [
-            'driver' => 'daily',
-            'path' => storage_path('logs/laravel.log'),
-            'level' => env('LOG_LEVEL', 'debug'),
-            'days' => 14,
-        ],
-
-        'slack' => [
-            'driver' => 'slack',
-            'url' => env('LOG_SLACK_WEBHOOK_URL'),
-            'username' => 'Laravel Log',
-            'emoji' => ':boom:',
-            'level' => env('LOG_LEVEL', 'critical'),
-        ],
-
-        'papertrail' => [
-            'driver' => 'monolog',
-            'level' => env('LOG_LEVEL', 'debug'),
-            'handler' => \Monolog\Handler\SyslogUdpHandler::class,
-            'handler_with' => [
-                'host' => env('PAPERTRAIL_URL'),
-                'port' => env('PAPERTRAIL_PORT'),
-                'facility' => LOG_USER,
-                'level' => env('LOG_LEVEL', 'debug'),
-            ],
-        ],
-
-        'stderr' => [
-            'driver' => 'monolog',
-            'level' => env('LOG_LEVEL', 'debug'),
-            'handler' => \Monolog\Handler\StreamHandler::class,
-            'formatter' => env('LOG_STDERR_FORMATTER'),
-            'with' => [
-                'stream' => 'php://stderr',
-            ],
-        ],
-
-        'syslog' => [
-            'driver' => 'syslog',
-            'level' => env('LOG_LEVEL', 'debug'),
-            'facility' => LOG_USER,
-        ],
-
-        'errorlog' => [
-            'driver' => 'errorlog',
-            'level' => env('LOG_LEVEL', 'debug'),
-        ],
-
-        'null' => [
-            'driver' => 'monolog',
-            'handler' => \Monolog\Handler\NullHandler::class,
-        ],
-
-        'emergency' => [
-            'path' => storage_path('logs/laravel.log'),
-        ],
-    ],
-
-];

docker-compose.dev.yml

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

docker-entrypoint.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-set -e
-
-cd /var/www/app
-
-# Set HOME for npm cache (www-data user needs writable cache directory)
-export HOME=/tmp
-
-echo "Setting up dependencies..."
-
-# Create vendor directories and fix permissions
-echo "Fixing permissions..."
-mkdir -p bootstrap/cache storage/framework storage/logs public/assets/vendor
-chown -R www-data:www-data bootstrap/cache storage/framework storage/logs public/assets/vendor
-chmod -R ug+rwX bootstrap/cache storage/framework storage/logs public/assets/vendor
-
-# Install PHP dependencies
-echo "Installing PHP packages..."
-composer install \
-    --no-dev \
-    --prefer-dist \
-    --no-interaction \
-    --optimize-autoloader
-
-# Install npm dependencies if package.json has dependencies
-if grep -q "\"dependencies\"" package.json; then
-    echo "Installing npm packages..."
-    npm ci --omit=dev
-    node scripts/setup-vendor.js
-fi
-
-# Fix permissions
-echo "Fixing permissions..."
-chown -R www-data:www-data \
-    bootstrap/cache \
-    public/assets/vendor
-
-chmod -R ug+rwX bootstrap/cache
-
-echo "✓ Setup complete, starting Apache..."
-exec apache2-foreground

docker/apache.conf

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

docker/apache.dev.conf

@@ -23,7 +23,7 @@ ServerTokens Prod
     <VirtualHost *:443>
       ServerName localhost
       ServerAdmin support@websight.nl
-      DocumentRoot /var/www/html/public
+      DocumentRoot /var/www/html
 
       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/public>
+      <Directory /var/www/html/>
           Options -Indexes +FollowSymLinks +MultiViews
           AllowOverride All
           Order deny,allow
           Allow from all
       </Directory>
 
-      ErrorLog /var/log/apache2/error.log
+      ErrorLog /var/log/apache2/ssl-vhost-error.log
-      CustomLog /var/log/apache2/access.log combined
+      CustomLog /var/log/apache2/ssl-vhost-access.log combined
 
     </VirtualHost>
 </IfModule>

env.example

@@ -37,7 +37,3 @@ DB_PASSWORD=dbpass
 
 CACHE_DRIVER=file
 QUEUE_DRIVER=sync
-
-FRIENDLY_CAPTCHA_SITEKEY=
-FRIENDLY_CAPTCHA_SECRET=
-FRIENDLY_CAPTCHA_DEBUG=true

fix-permissions

@@ -1,14 +0,0 @@
-
-# Set ownership
-chown -R www-data:www-data .
-
-# Normal permissions
-find . -type d -exec chmod 775 {} \;
-find . -type f -exec chmod 664 {} \;
-
-# Laravel writable directories
-find storage bootstrap/cache -type d -exec chmod 775 {} \;
-find storage bootstrap/cache -type f -exec chmod 664 {} \;
-
-# Laravel CLI
-chmod 755 artisan

package-lock.json

@@ -1,18 +1,9 @@
 {
-  "name": "workspace",
+  "name": "nhgooi.nl",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "hasInstallScript": true,
-      "dependencies": {
-        "air-datepicker": "^3.5.0",
-        "daterangepicker": "^3.1.0",
-        "jquery": "^3.7.0",
-        "jquery-ui": "^1.13.0",
-        "moment": "^2.30.0",
-        "wavesurfer.js": "^7.8.0"
-      },
       "devDependencies": {
         "grunt": "^1.6.1",
         "grunt-contrib-concat": "^2.1.0",
@@ -27,12 +18,6 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
-    "node_modules/air-datepicker": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/air-datepicker/-/air-datepicker-3.6.0.tgz",
-      "integrity": "sha512-+txUkqa949rXBJDmkQAIb/GehZECJYF4rm9XJxVYtEX22C9WvBpE/XwCUQZBopKIkpg4ycAySJ9lH3JOg9qQTw==",
-      "license": "MIT"
-    },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -256,16 +241,6 @@
         "node": "*"
       }
     },
-    "node_modules/daterangepicker": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/daterangepicker/-/daterangepicker-3.1.0.tgz",
-      "integrity": "sha512-DxWXvvPq4srWLCqFugqSV+6CBt/CvQ0dnpXhQ3gl0autcIDAruG1PuGG3gC7yPRNytAD1oU1AcUOzaYhOawhTw==",
-      "license": "MIT",
-      "dependencies": {
-        "jquery": ">=1.10",
-        "moment": "^2.9.0"
-      }
-    },
     "node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -1100,21 +1075,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/jquery": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
-      "license": "MIT"
-    },
-    "node_modules/jquery-ui": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.14.2.tgz",
-      "integrity": "sha512-1gSl7PUjyipa2adSr780Ujk16faicrV7PjPPzPtvWk7tTqBnsqp67NNV9jZK2+BIxUPXWSnIUU/LBCgwgGZE+Q==",
-      "license": "MIT",
-      "dependencies": {
-        "jquery": ">=1.12.0 <5.0.0"
-      }
-    },
     "node_modules/js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
@@ -1247,15 +1207,6 @@
         "node": "*"
       }
     },
-    "node_modules/moment": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -1789,12 +1740,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/wavesurfer.js": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/wavesurfer.js/-/wavesurfer.js-7.12.11.tgz",
-      "integrity": "sha512-Sx0yZIz7jRJ9J9p7UL+pl9y0UQBB6UN/XNo+R7Gy4tCR5xZI9jMyA0dnt1R8TMVSQ4LZ10SeB2HJYQ+dV2dPSA==",
-      "license": "BSD-3-Clause"
-    },
     "node_modules/websocket-driver": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",

package.json

@@ -1,24 +1,12 @@
 {
   "private": true,
-  "type": "module",
   "scripts": {
-    "dev": "grunt watch",
-    "build": "grunt uglify concat",
-    "postinstall": "node scripts/setup-vendor.js || true",
     "sass": "sass resources/assets/sass:public/css",
     "sass-watch": "sass --watch resources/assets/sass:public/css",
     "sass-minify": "sass resources/assets/sass/style.scss:public/css/style.min.css --style compressed",
     "sass-minify-watch": "sass --watch resources/assets/sass/style.scss:public/css/style.min.css --style compressed",
     "js-watch": "grunt watch"
   },
-  "dependencies": {
-    "jquery": "^3.7.0",
-    "jquery-ui": "^1.13.0",
-    "moment": "^2.30.0",
-    "daterangepicker": "^3.1.0",
-    "wavesurfer.js": "^7.8.0",
-    "air-datepicker": "^3.5.0"
-  },
   "devDependencies": {
     "grunt": "^1.6.1",
     "grunt-contrib-concat": "^2.1.0",

public/css/style.css

@@ -58,7 +58,7 @@ body {
 .btn {
   display: block;
   width: calc(100% - 78px);
-  padding: 10px 39px;
+  padding: 10px 39px 10px 39px;
   border-radius: 3px;
   background-image: linear-gradient(to right, #0f259d, #5ba8f4);
   font-family: Nunito, serif;
@@ -74,6 +74,21 @@ body {
 .btn:hover, .btn:active {
   color: #fff;
 }
+.btn.auto_width {
+  width: fit-content;
+  margin: 0 auto;
+}
+.btn.fit_content {
+  width: fit-content;
+}
+.btn.btn_facebook_share {
+  background-image: none;
+  background-color: #0f259d;
+}
+.btn.btn_twitter_x_share {
+  background-image: none;
+  background-color: #5ba8f4;
+}
 
 div.pp_default .pp_content_container .pp_left,
 div.pp_default .pp_content_container .pp_right,
@@ -147,53 +162,6 @@ div.pp_default .pp_close:hover {
   list-style: none;
 }
 
-.ad-prefix {
-  width: 100%;
-  font-family: Nunito, serif;
-  font-size: 12px;
-  font-weight: 500;
-  line-height: 3.17;
-  text-align: center;
-  color: #666;
-}
-
-.contant-form .form-group {
-  display: flex;
-  margin-bottom: 10px;
-}
-.contant-form .form-group label {
-  width: 160px;
-}
-.contant-form .form-group input, .contant-form .form-group textarea {
-  flex-grow: 1;
-}
-.contant-form .action_button {
-  margin-top: 10px;
-  cursor: pointer;
-}
-.contant-form .form-control-file::file-selector-button {
-  display: block;
-  width: calc(100% - 78px);
-  padding: 10px 39px;
-  border-radius: 3px;
-  background-image: linear-gradient(to right, #0f259d, #5ba8f4);
-  font-family: Nunito, serif;
-  font-size: 14px;
-  font-weight: bold;
-  line-height: 0.93;
-  text-align: center;
-  color: #fff;
-  margin-bottom: 10px;
-  text-decoration: none;
-  text-transform: uppercase;
-  width: fit-content;
-  margin-bottom: 0;
-  cursor: pointer;
-}
-.contant-form .form-control-file::file-selector-button:hover, .contant-form .form-control-file::file-selector-button:active {
-  color: #fff;
-}
-
 .header {
   height: 111px;
 }
@@ -204,11 +172,10 @@ div.pp_default .pp_close:hover {
 .header .logo img {
   height: 95px;
 }
-.header ins[data-revive-zoneid] {
+.header .advertisement {
   float: right;
   width: 728px;
   height: 90px;
-  margin-top: 10px;
 }
 
 @media (max-width: 1170px) {
@@ -223,7 +190,7 @@ div.pp_default .pp_close:hover {
   .header .logo {
     float: none;
   }
-  .header ins[data-revive-zoneid] {
+  .header .advertisement {
     float: none;
   }
 }
@@ -352,7 +319,7 @@ div.pp_default .pp_close:hover {
   padding: 3px 9px 3px 6px;
   margin: 8px auto;
 }
-.top_menu_container ul.right_menu li.search, .menu_mobile_container ul.right_menu li.search {
+.top_menu_container ul.right_menu li:last-child, .menu_mobile_container ul.right_menu li:last-child {
   border: none;
   line-height: 1;
 }
@@ -758,8 +725,6 @@ div.pp_default .pp_close:hover {
   margin: 0;
   padding: 0;
   list-style: none;
-  display: flex;
-  gap: 3px;
 }
 .blog_grid .post .slider_content_box .post_details .category a {
   padding: 6px 11px 7px;
@@ -811,11 +776,6 @@ div.pp_default .pp_close:hover {
   color: #fff;
 }
 
-.article-iframe {
-  width: 100%;
-  aspect-ratio: 1;
-}
-
 .box_header {
   border-bottom: 1px solid #efefef;
   padding-right: 20px;
@@ -1189,16 +1149,6 @@ div.pp_default .pp_close:hover {
   white-space: nowrap;
 }
 
-@media (max-width: 576px) {
-  ins[data-revive-zoneid] img {
-    max-width: 100%;
-    height: auto;
-  }
-}
-.homepage-body-banners {
-  margin-top: -4rem;
-}
-
 .news .blog .post {
   height: 115px;
 }
@@ -1252,19 +1202,6 @@ div.pp_default .pp_close:hover {
   font-size: 30px;
 }
 
-.box.featured .sentence, .post_container .post_body .sentence {
-  font-size: 12px;
-  font-style: italic;
-  line-height: 1.3;
-  text-align: right;
-  color: #585858;
-  display: block;
-  width: 100%;
-}
-.box.featured .sentence span, .post_container .post_body .sentence span {
-  padding: 0 5px;
-}
-
 .post_container {
   max-width: 1170px;
   margin: 0 auto;
@@ -1292,8 +1229,17 @@ div.pp_default .pp_close:hover {
 .post_container .post_body h3 {
   font-size: 15px;
 }
-.post_container .post_body div.text {
+.post_container .post_body .sentence {
-  margin-bottom: 20px;
+  font-size: 12px;
+  font-style: italic;
+  line-height: 1.3;
+  text-align: right;
+  color: #585858;
+  display: block;
+  width: 100%;
+}
+.post_container .post_body .sentence span {
+  padding: 0 5px;
 }
 .post_container .post_body blockquote {
   border-left: 3px solid #5ba8f4;
@@ -1359,9 +1305,19 @@ div.pp_default .pp_close:hover {
   color: #ED1C24;
 }
 
-#schedule .onair, .post_tags li a {
+.post_tags {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  height: 31px;
+  margin: 20px 0;
+}
+.post_tags li {
+  float: left;
+  margin-right: 10px;
+}
+.post_tags li a {
   display: block;
-  width: 4rem;
   padding: 6px 15px 7px;
   border-radius: 3px;
   background-image: linear-gradient(to left, #0d1ca3, #45aaf8);
@@ -1374,34 +1330,6 @@ div.pp_default .pp_close:hover {
   text-transform: uppercase;
 }
 
-.post_tags {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  height: 31px;
-  margin: 20px 0;
-}
-.post_tags li {
-  float: left;
-  margin-right: 10px;
-}
-@keyframes tilt-shaking {
-  0% {
-    transform: rotate(0deg);
-  }
-  25% {
-    transform: rotate(5deg);
-  }
-  50% {
-    transform: rotate(0deg);
-  }
-  75% {
-    transform: rotate(-5deg);
-  }
-  100% {
-    transform: rotate(0deg);
-  }
-}
 #schedule a {
   text-decoration: none;
 }
@@ -1443,9 +1371,6 @@ div.pp_default .pp_close:hover {
 #schedule .no-results span, #schedule .loading span {
   margin-right: 10px;
 }
-#schedule .onair {
-  animation: tilt-shaking 1s linear infinite;
-}
 
 .page_container {
   max-width: 1170px;
@@ -1535,90 +1460,6 @@ div.pp_default .pp_close:hover {
   margin: 10px 20px 0 0;
 }
 
-.podcast-player .content {
-  border: solid 1px #333;
-  border-radius: 5px;
-  padding: 0.4rem;
-}
-
-.audioplayer .waveform {
-  cursor: pointer;
-  position: relative;
-}
-.audioplayer .hover {
-  position: absolute;
-  left: 0;
-  top: 0;
-  z-index: 10;
-  pointer-events: none;
-  height: 100%;
-  width: 0;
-  mix-blend-mode: overlay;
-  background: rgba(255, 255, 255, 0.5);
-  opacity: 0;
-  transition: opacity 0.2s ease;
-}
-.audioplayer .waveform:hover .hover {
-  opacity: 1;
-}
-.audioplayer .time,
-.audioplayer .duration {
-  position: absolute;
-  z-index: 11;
-  top: 50%;
-  margin-top: -1px;
-  transform: translateY(-50%);
-  font-size: 11px;
-  background: rgba(0, 0, 0, 0.75);
-  padding: 2px;
-  color: #ddd;
-}
-.audioplayer .time {
-  left: 0;
-}
-.audioplayer .duration {
-  right: 0;
-}
-.audioplayer .audio-controls {
-  width: 100%;
-  justify-content: center;
-  display: flex;
-}
-.audioplayer .audio-controls .btn {
-  padding-left: 0;
-  padding-right: 0;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  text-transform: none;
-}
-@media (max-width: 720px) {
-  .audioplayer .audio-controls .btn label {
-    display: none;
-  }
-}
-.audioplayer .audio-controls .btn.btn-play {
-  flex: 50% 1 0;
-}
-.audioplayer .volume-controls {
-  display: flex;
-}
-.audioplayer .volume-controls .volume-slider {
-  flex: 100% 1 1;
-}
-.audioplayer .audio-controls .btn,
-.audioplayer .volume-controls .btn-toggle-mute {
-  flex: 100px 1 1;
-  padding: 10px 0 10px 0;
-  background: #5ba8f4;
-  border-radius: 5px;
-  border-color: solid 1px #0f259d;
-  color: white;
-  font-family: Nunito, serif;
-  text-align: center;
-  text-decoration: none;
-}
-
 .footer_container {
   font-family: Montserrat, serif;
   font-size: 14px;

public/images/icons/calendar.svg

@@ -1 +0,0 @@
-<svg id="Layer_1" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg" data-name="Layer 1"><path d="m40.873 54.653h72.749v-36.653a12 12 0 0 1 24 0v36.653h106.378v-36.653a12 12 0 0 1 24 0v36.653h106.378v-36.653a12 12 0 0 1 24 0v36.653h72.749a28.958 28.958 0 0 1 28.873 28.873v81.25h-488v-81.25a28.958 28.958 0 0 1 28.873-28.873zm72.749 0v36.653a12 12 0 0 0 24 0v-36.653zm130.378 0v36.653a12 12 0 0 0 24 0v-36.653zm130.378 0v36.653a12 12 0 0 0 24 0v-36.653zm-85.24 186.469a12 12 0 0 1 16.969 16.968l-55.5 55.5a12 12 0 0 1 -16.969 0l-27.748-27.748a12 12 0 0 1 16.969-16.969l19.264 19.264 47.012-47.012zm-148.879 0a12 12 0 0 1 16.968 16.968l-55.5 55.5a12 12 0 0 1 -16.969 0l-27.744-27.751a12 12 0 0 1 16.969-16.969l19.264 19.264zm223 124.551h83.241a12 12 0 0 1 12 12v55.5a12 12 0 0 1 -12 12h-83.243a12 12 0 0 1 -12-12v-55.5a12 12 0 0 1 12-12zm71.245 24h-59.247v31.5h59.243v-31.5zm-220.124-24h83.245a12 12 0 0 1 12 12v55.5a12 12 0 0 1 -12 12h-83.247a12 12 0 0 1 -12-12v-55.5a12 12 0 0 1 12-12zm71.245 24h-59.247v31.5h59.245v-31.5zm-220.125-24h83.245a12 12 0 0 1 12 12v55.5a12 12 0 0 1 -12 12h-83.245a12 12 0 0 1 -12-12v-55.5a12 12 0 0 1 12-12zm71.245 24h-59.245v31.5h59.245zm226.512-152.067h83.243a12 12 0 0 1 12 12v55.5a12 12 0 0 1 -12 12h-83.243a12 12 0 0 1 -12-12v-55.5a12 12 0 0 1 12-12zm71.245 24h-59.245v31.5h59.243v-31.5zm65.5-72.83h-488.002v288.351a28.958 28.958 0 0 0 28.873 28.873h430.254a28.958 28.958 0 0 0 28.873-28.873z" fill-rule="evenodd"/></svg>

public/images/logo-NH.svg

@@ -1,10 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.0816 24H22.8C23.4624 24 24 23.4624 24 22.8V1.2C24 0.5376 23.4624 0 22.8 0H15.6C14.9376 0 14.4 0.5376 14.4 1.2V4.8L11.1696 0.9336C10.572 0.336 9.7632 0 8.9184 0H1.2C0.5376 0 0 0.5376 0 1.2V22.8C0 23.4624 0.5376 24 1.2 24H8.4C9.0624 24 9.6 23.4624 9.6 22.8V19.2L12.8304 23.0664C13.428 23.664 14.2368 24 15.0816 24Z" fill="url(#paint0_linear_378_19431)"/>
-<path d="M14.4025 4.80005V9.60005H9.59767V5.52005C9.59767 5.12165 9.27607 4.80005 8.87767 4.80005H5.04007C4.64167 4.80005 4.32007 5.12165 4.32007 5.52005V18.48C4.32007 18.8784 4.64167 19.2 5.04007 19.2H9.59767V14.4H14.4025V18.48C14.4025 18.8784 14.7241 19.2 15.1225 19.2H18.9601C19.3585 19.2 19.6801 18.8784 19.6801 18.48V5.52005C19.6801 5.12165 19.3585 4.80005 18.9601 4.80005H14.4025Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_378_19431" x1="0" y1="12" x2="24" y2="12" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0017A0"/>
-<stop offset="1" stop-color="#41A5F7"/>
-</linearGradient>
-</defs>
-</svg>

public/img/.htaccess

@@ -1 +0,0 @@
-RewriteEngine Off

public/img/acties/.htaccess

@@ -1 +0,0 @@
-RewriteEngine Off

public/img/acties/trekkertrek2010/submit.php

@@ -1,15 +0,0 @@
-<?php
-include("../../connect.php");
-if ( (($_POST['fullname']!='')) && 
-     (($_POST['email']!='')) && 
-     (($_POST['phonefixed']!='')) && 
-     (($_POST['phonemobile']!='')) && 
-     (($_POST['age']!='')) ) {
-     mysql_query("insert into actiedeelnemers(fullname, email, phonehome, phonemobile, age, ip) values ('".addslashes($_POST['fullname'])."','".addslashes($_POST['email'])."','".addslashes($_POST['phonefixed'])."','".addslashes($_POST['phonemobile'])."','".addslashes($_POST['age'])."','".$_SERVER[REMOTE_ADDR]."')");
-     echo "Bedankt voor je deelname! Als je gewonnen hebt bellen we je op de dag van de trekkertrek op.";
-     echo "<br>";
-     echo "<a href=\"/\">terug naar de website</a>";
-} else {
-  echo "Niet alle velden zijn ingevuld. Probeer het opnieuw.";
-}
-?>

public/img/amplitude.css

@@ -1,97 +0,0 @@
-body{
-    background-color: #30629a;
-}
-p{
-    font-family: 'Roboto', sans-serif;
-    font-weight: 500;
-    color: white;
-    text-align: center;
-    margin: 30px 0px;
-}
-a{
-    font-family: 'Roboto', sans-serif;
-    font-weight: 300;
-    color: white;
-    text-decoration: none;
-}
-div#single-song-player{
-    width: 320px;
-    height: 120px;
-    margin-top: 100px;
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 200px;
-}
-div#top{
-    padding: 20px 25px;
-    background-color: #ffffff;
-    width: 270px;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-}
-div#song-information-container{
-    float: left;
-}
-div#song-action-container{
-    float: right;
-}
-div#bottom-container{
-    width: 320px;
-    text-align: center;
-    margin-top: -35px;
-}
-div#amplitude-song-time-visualization{
-    background-color: #fff;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    width: 320px;
-    height: 45px;
-}
-div#amplitude-song-time-visualization-status{
-    background-color: #cddff1;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    height: 45px;
-}
-span#song-timing{
-    color: #41557d;
-    font-family: 'Roboto', sans-serif;
-    font-weight: 300;
-    font-size: 14px;
-}
-div.clear{
-    clear: both;
-}
-#amplitude-play-pause{
-    width: 30px;
-    height: 30px;
-    margin-top: 7px;
-    cursor: pointer;
-}
-.amplitude-paused{
-    background-image: url('../images/blue-play.png');
-    background-repeat: no-repeat;
-}
-.amplitude-playing{
-    background-image: url('../images/blue-pause.png');
-    background-repeat: no-repeat;
-}
-#amplitude-now-playing-artist{
-    color: #45587f;
-    font-family: 'Roboto', sans-serif;
-    font-weight: 500;
-    font-size: 18px;
-}
-#amplitude-now-playing-album{
-    color: #7b7b7b;
-    font-family: 'Roboto', sans-serif;
-    font-weight: 500;
-    font-size: 12px;
-}
-#amplitude-now-playing-title{
-    color: #45587f;
-    font-family: 'Roboto', sans-serif;
-    font-weight: 500;
-    font-size: 14px;
-    margin-right: 10px;
-}

public/img/artikel

@@ -1 +0,0 @@
-news