Gebruik min versie van style.css en functions.js

Reviewed-on: #3

.env.example

@@ -0,0 +1,39 @@
+APP_NAME="NH Gooi"
+APP_ENV=production
+APP_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+APP_DEBUG=false
+APP_LOG_LEVEL=error
+APP_URL=https://dev.nhgooi.nl
+IMAGE_BASE_URL=https://dev.nhgooi.nl
+
+API_URL=https://api.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=mailjet_username
+MAIL_PASSWORD=mailjet_password
+MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+
+DB_CONNECTION=mysql
+DB_HOST=nhgooi.nl
+DB_PORT=3306
+DB_DATABASE=dbname
+DB_USERNAME=6fmstats
+DB_PASSWORD=dbpass
+
+CACHE_DRIVER=file
+QUEUE_DRIVER=sync

.gitattributes

@@ -0,0 +1,5 @@
+* text=auto
+*.css linguist-vendored
+*.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore

.gitignore

@@ -0,0 +1,12 @@
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+/.idea
+/.vagrant
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+.env

.hgignore.orig

@@ -0,0 +1,5 @@
+syntax: glob
+
+.env
+storage
+website/public/images/banners

Dockerfile

@@ -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.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

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

Gruntfile.js

@@ -0,0 +1,37 @@
+module.exports = function(grunt) {
+
+  // Project configuration.
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    uglify: {
+      options: {
+        banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
+      },
+      build: {
+        src: 'public/js/functions.js',
+        dest: 'public/js/functions.min.js'
+      }
+    },
+    concat: {
+      js: {
+        src: ['resources/assets/js/functions/*.js'],
+        dest: 'public/js/functions.js'
+      }
+    },
+    watch: {
+      scripts: {
+        files: 'resources/assets/js/functions/*.js',
+        tasks: ['concat', 'uglify'],
+        options: {
+          interrupt: true,
+        },
+      },
+    },
+  });
+
+  // Load the plugin that provides the "uglify" task.
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+
+};

app/Console/Kernel.php

@@ -27,7 +27,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-		$this->API_URL = env('API_URL', 'https://api-dev.nhgooi.nl/');
+		$this->API_URL = env('API_URL', 'https://api.nhgooi.nl/');
 
 		// Update latest news (3 items)
 		$schedule->call(function() {

app/Exceptions/Handler.php

@@ -2,7 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
+//use Exception;
+use Throwable;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
@@ -30,7 +31,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -42,7 +43,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

app/Http/Controllers/CalendarController.php

@@ -6,13 +6,19 @@ 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);
 
-        return view('calendarevent', ['event' => $calendarEvent, 'metadata' => $calendarEvent->metadata]);
+        return view('calendarevent', array_merge($this->getSidebareData(), ['event' => $calendarEvent, 'metadata' => $calendarEvent->metadata]));
     }
 
     public function overview(Request $request)
@@ -24,6 +30,6 @@ class CalendarController extends Controller
             $calendar[] = new \Model\CalendarEvent($calendarItem);
         }
 
-        return view('calendarlist', ['events' => $calendar]);
+        return view('calendarlist', array_merge($this->getSidebareData(), ['events' => $calendar]));
     }
 }

app/Http/Controllers/Controller.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\View;
@@ -15,112 +15,168 @@ class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
-      protected $API_URL;
+    protected $API_URL;
 
-	private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0) 
+    private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0)
-	{
+    {
-		$data = json_decode(Storage::disk('local')->get($file));
+        $data = json_decode(Storage::disk('local')->get($file));
-		foreach($path as $subobject) { $data = $data->$subobject; }
+        foreach ($path as $subobject) {
-		$items = [];
+            $data = $data->$subobject;
-		foreach($data as $item_data) 
+        }
-		{
+        $items = [];
-			$items[] = new $class($item_data);
+        foreach ($data as $item_data) {
-			if($maxItems && count($items) == $maxItems) { break; }
+            $items[] = new $class($item_data);
-		}
+            if ($maxItems && count($items) == $maxItems) {
+                break;
+            }
+        }
 
-		return $items;
+        return $items;
-	}
+    }
 
     public function __construct()
     {
-		View::share('apiUrl', $this->API_URL = env('API_URL', 'http://api.6fm.nl/'));
+        View::share('apiUrl', $this->API_URL = env('API_URL', 'http://api.6fm.nl/'));
-		View::share('imgBase', env('IMAGE_BASE_URL', '/'));
+        View::share('imgBase', env('IMAGE_BASE_URL', '/'));
 
-		$blogs = $this->getDataFromFileAndConvert('blogs.json', [], '\Model\Blog', 1);
+        $blogs = $this->getDataFromFileAndConvert('blogs.json', [], '\Model\Blog', 1);
-		$activeBlog = count($blogs) && $blogs[0]->is_active ? $blogs[0] : null;
+        $activeBlog = count($blogs) && $blogs[0]->is_active ? $blogs[0] : null;
-		View::share('activeBlog', $activeBlog);
+        View::share('activeBlog', $activeBlog);
 
 
-		//View::share('onAir', file_get_contents(url('onair')));
+        //View::share('onAir', file_get_contents(url('onair')));
-		View::composer('widgets.laatstenieuws', function($view) {
+        View::composer('widgets.laatstenieuws', function ($view) {
-			$view->with('data', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'));
+            $view->with('data', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'));
-		});
+        });
-		View::composer('widgets.populairnieuws', function($view) {
+        View::composer('widgets.populairnieuws', function ($view) {
-			$view->with('data', $this->getDataFromFileAndConvert('populair_nieuws.json', [], '\Model\NewsItem'));
+            $view->with('data', $this->getDataFromFileAndConvert('populair_nieuws.json', [], '\Model\NewsItem'));
-		});
+        });
-		View::composer('widgets.nustraks', function($view) {
+        View::composer('widgets.nustraks', function ($view) {
-			$data = json_decode(Storage::disk('local')->get('nu_straks.json'))->schedule;
+            $data = json_decode(Storage::disk('local')->get('nu_straks.json'))->schedule;
-			$programs = [];
+            $programs = [];
-			foreach($data as $item_data) 
+            foreach ($data as $item_data) {
-			{
+                $programs[] = $program = new \Model\Program($item_data->program);
-				$programs[] = $program = new \Model\Program($item_data->program);
+                $program->start = new \DateTimeImmutable($item_data->start->date,
-				$program->start = new \DateTimeImmutable($item_data->start->date, new \DateTimeZone($item_data->start->timezone));
+                    new \DateTimeZone($item_data->start->timezone));
-				$program->end = new \DateTimeImmutable($item_data->end->date, new \DateTimeZone($item_data->end->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
+            // Need a bit of slack here, otherwise the current program may show up
-			$now = new \DateTimeImmutable('2 minutes ago');
+            $now = new \DateTimeImmutable('2 minutes ago');
-			$data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule;
+            $data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule;
-			$i = 0;
+            $i = 0;
-			foreach(array_reverse($data) as $item_data) 
+            foreach (array_reverse($data) as $item_data) {
-			{
+                $recent = $program = new \Model\Program($item_data->program);
-				$recent = $program = new \Model\Program($item_data->program);
+                $recent->start = new \DateTimeImmutable($item_data->start->date,
-				$recent->start = new \DateTimeImmutable($item_data->start->date, new \DateTimeZone($item_data->start->timezone));
+                    new \DateTimeZone($item_data->start->timezone));
-				$recent->end = new \DateTimeImmutable($item_data->end->date, new \DateTimeZone($item_data->end->timezone));
+                $recent->end = new \DateTimeImmutable($item_data->end->date,
-				if(($recent->end < $now) && (!$recent->nonstop) && (!$recent->rerun)) {
+                    new \DateTimeZone($item_data->end->timezone));
-					$view->with('recent', $recent);
+                if (($recent->end < $now) && (!$recent->nonstop) && (!$recent->rerun)) {
-					break;
+                    $view->with('recent', $recent);
-				}
+                    break;
-			}
+                }
+            }
 
-			$view->with('data', $programs);
+            $view->with('data', $programs);
-		});
+        });
-		View::composer('widgets.laatstepodcasts', function($view) {
+        View::composer('widgets.laatstepodcasts', function ($view) {
-			$view->with('data', $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+            $view->with('data',
-		});
+                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
-		View::composer('widgets.regioagenda', function($view) {
+        });
-			$view->with('data', $this->getDataFromFileAndConvert('regioagenda.json', [], '\Model\CalendarEvent'));
+        View::composer('widgets.regioagenda', function ($view) {
-		});
+            $view->with('data', $this->getDataFromFileAndConvert('regioagenda.json', [], '\Model\CalendarEvent'));
-		View::composer('widgets.beelden', function($view) {
+        });
-			$view->with('data', $this->getDataFromFileAndConvert('beelden.json', ['items'], '\Model\NewsItem'));
+        View::composer('widgets.beelden', function ($view) {
-		});
+            $view->with('data', $this->getDataFromFileAndConvert('beelden.json', ['items'], '\Model\NewsItem'));
-		View::composer('widgets.menu', function($view) {
+        });
-			$view->with('news', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'))
+        View::composer('widgets.menu', function ($view) {
-				->with('popular', $this->getDataFromFileAndConvert('populair_nieuws.json', [], '\Model\NewsItem', 3))
+            $view->with('news', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'))
-				->with('podcasts', $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+                ->with('popular', $this->getDataFromFileAndConvert('populair_nieuws.json', [], '\Model\NewsItem', 3))
-		});
+                ->with('podcasts',
+                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+        });
+
+        View::share('disableBanners', env('DISABLE_BANNERS', true));
     }
 
     protected function registerView(Request $request, $type, $id)
     {
-	if(config('app.env') == 'local') {	
+        if (config('app.env') == 'local') {
-        	return;
+            return;
-	}
+        }
 
-        app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)', [
+        app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
-            'type' => $type,
+            [
-            'id' => $id,
+                'type' => $type,
-            'ip' => $request->server('REMOTE_ADDR'),
+                'id' => $id,
-            'session' => md5(Session::getId()),
+                'ip' => $request->server('REMOTE_ADDR'),
-            'referer' => $request->server('HTTP_REFERRER')
+                'session' => md5(Session::getId()),
-        ]);
+                'referer' => $request->server('HTTP_REFERRER')
+            ]);
     }
 
     protected function API($url)
     {
-        return json_decode(file_get_contents($this->API_URL . $url));
+//        if (strpos($url, 'nieuws/overzicht') !== false) {
+//            return json_decode(file_get_contents(__DIR__ . '/../../../storage/app/laatste_nieuws.json'));
+//        }
+//        return [];
+
+        $arrContextOptions = [
+            'ssl' => [
+                "verify_peer" => false,
+                "verify_peer_name" => false,
+            ],
+        ];
+
+        return json_decode(file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions)));
     }
 
+    protected function checkAPI($url)
+    {
+        return $this->get_http_response_code($this->API_URL . $url);
+    }
+
+    protected function get_http_response_code($url)
+    {
+        $headers = get_headers($url);
+        return substr($headers[0], 9, 3);
+    }
+
+
+
     protected static function JsonToDateTime($obj)
     {
         return new \DateTime($obj->date, new \DateTimeZone($obj->timezone));
     }
 
-    public function __call($method, $arguments) {
+    public function __call($method, $arguments)
-      if(substr($method, 0, 5) == 'view_') { 
+    {
-        $view = substr($method, 5);
+        if (substr($method, 0, 5) == 'view_') {
-        if(view()->exists($view)) { return view($view); }
+            $view = substr($method, 5);
-      }
+            if (view()->exists($view)) {
-      return abort(404);
+                return view($view);
+            }
+        }
+
+        return abort(404);
+    }
+
+    public function getSidebareData()
+    {
+        $populair = [];
+        $apiResult = $this->API('nieuws/populair?aantal=5');
+        foreach ($apiResult as $_newsItem) {
+            $populair[] = new \Model\NewsItem($_newsItem);
+        }
+
+        $newsItems = [];
+        $apiResult = $this->API('nieuws/overzicht?aantal=5');
+        foreach ($apiResult->news as $_newsItem) {
+            $newsItems[] = new \Model\NewsItem($_newsItem);
+        }
+
+        return ['newsItems' => $newsItems, 'populair' => $populair];
     }
 }

app/Http/Controllers/HomeController.php

@@ -2,36 +2,33 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Http\Request;
 use \Model\NewsItem;
 
 class HomeController extends Controller
 {
-    public function show()
+    public function show(Request $request)
     {
-        $apiResult = $this->API('nieuws/overzicht?aantal=12');
+        $page = (int)$request->get('pagina', 1);
+        $apiResult = $this->API('nieuws/overzicht?pagina=' . (int)max(1, $page) . '&aantal=10');
         $news = [];
-        foreach($apiResult->news as $newsItem)
+        foreach ($apiResult->news as $newsItem) {
-        {
+            $news[] = new \Model\NewsItem($newsItem);
-          $news[] = new \Model\NewsItem($newsItem);
         }
 
-        $apiResult = $this->API('programma/schema/nustraks');
+        $populair = [];
-        $comingUp = [];
+        $apiResult = $this->API('nieuws/populair?pagina=' . (int)max(1, $page) . '&aantal=5');
-        foreach($apiResult->schedule as $program)
+        foreach ($apiResult as $newsItem) {
-        {
+            $populair[] = new \Model\NewsItem($newsItem);
-          $comingUp[] = [
-            'start' => self::JsonToDateTime($program->start),
-            'end' => self::JsonToDateTime($program->end),
-            'program' => new \Model\Program($program->program) 
-          ];
         }
 
-        $apiResult = $this->API('podcast/overzicht?aantal=20');
         $podcasts = [];
-        foreach($apiResult->podcasts as $podcast) { 
+        $apiResult = $this->API('podcast/overzicht?aantal=3');
-          $podcasts[] = new \Model\Podcast($podcast);
+        $podcast = new \Model\Podcast($apiResult->podcasts[0]);
+        foreach ($apiResult->podcasts as $_podcast) {
+            $podcasts[] = new \Model\Podcast($_podcast);
         }
 
-        return view('home', ['news' => $news, 'podcasts' => $podcasts, 'comingUp' => $comingUp]);
+        return view('home', ['populair' => $populair, 'podcasts' => $podcasts, 'podcast' => $podcast, 'title' => 'Home', 'news' => $news, 'searchURL' => 'nieuws/zoeken']);
     }
 }

app/Http/Controllers/JobsController.php

@@ -18,7 +18,7 @@ class JobsController extends Controller
         parent::registerView($request, 'nieuws', $id);
         $apiResult = $this->API('vacatures/details/' . $id);
 	$jobsItem = new \Model\JobOpening($apiResult->item);
-	return view('jobsitem', ['job' => $jobsItem, 'metadata' => $jobsItem->metadata]);
+	return view('jobsitem', array_merge($this->getSidebareData(), ['job' => $jobsItem, 'metadata' => $jobsItem->metadata]));
     }
 
     public function overview(Request $request)
@@ -36,7 +36,7 @@ class JobsController extends Controller
             $jobs[] = new \Model\JobOpening($jobsItem);
         }
 
-        return view('jobslist', ['title' => $title, 'jobs' => $jobs]);
+        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']);
     }
 
@@ -45,8 +45,11 @@ class JobsController extends Controller
     }
 
     public function aanmelden(Request $request) {
+      if(!(trim(strtolower($request['antispam'])) == 'vijf' || trim($request['antispam']) == 5)) {
+        return view('kennismakingsbijeenkomst', ['antispam' => 'failed']);
+      }
       $data = array('email' => $request->input('email'), 'name' => $request->input('name'));
-      $message = $request['message'] ? "Hierover schreef je zelf het volgende: " . $request['message'] : '';
+      $message = $request['message'] ? "De informatie die je bij ons achtergelaten hebt is: " . $request['message'] : '';
 /*
       $body = <<<BODY
 Beste {$request['name']},
@@ -67,14 +70,15 @@ BODY;
       $body = <<<BODY
 Beste {$request['name']},
 
-Wat leuk dat je je hebt aangemeld om kennis te maken met NH Gooi! 
+Wat leuk dat je je hebt aangemeld om kennis te maken met NH Gooi! Dank voor je interesse. Wij nemen binnenkort contact met je op voor een kennismaking. $message
 
-We kunnen je van alles aanbieden: van radio en podcasts maken tot techniek en van TV-interview produceren tot marketing en communicatie. $message
+We nemen binnenkort persoonlijk contact met je op om ons nader voor te stellen en om te kijken waar je bij ons zou passen, via {$request['email']} of telefonisch op {$request['phone']}.
-Onze geplande kennismakingsbijeenkomst op 27 november kon door de aangescherpte Coronamaatregelen niet doorgaan, maar we nemen binnenkort persoonlijk contact met je op om ons nader voor te stellen en om te kijken waar je bij ons zou passen, via {$request['email']} of telefonisch op {$request['phone']}.
 
-Hartelijke groeten,
+Graag tot binnenkort en hartelijke groet.
 
-Het team van NH Gooi
+Het team van NH Gooi,
+
+Léon Haver
 
 BODY;
       \Mail::raw($body, function($message) use($data) {
@@ -82,7 +86,7 @@ BODY;
                 ->from('meebouwen@nhgooi.nl', 'meebouwen@nhgooi.nl')
                 ->bcc('meebouwen@nhgooi.nl', 'meebouwen@nhgooi.nl')
 		->to($data['email'], $data['name'])
-		->subject('Aanmelding kennismakingsdag');
+		->subject('Meebouwen aan NH Gooi');
       });
 
       return view('kennismakingsbijeenkomst', ['bevestiging' => $request->input('email')]);

app/Http/Controllers/NewsController.php

@@ -7,38 +7,69 @@ use \Model\NewsItem;
 
 class NewsController extends Controller
 {
-    private static function TimestampToDateTime($timestamp) {
+    private static function TimestampToDateTime($timestamp)
-      $result = new \DateTime;
+    {
-      $result->setTimestamp($timestamp);
+        $result = new \DateTime;
-      return $result;
+        $result->setTimestamp($timestamp);
+        return $result;
     }
 
     public function show(Request $request, $id)
     {
         parent::registerView($request, 'nieuws', $id);
         $apiResult = $this->API('nieuws/bericht/' . $id);
-	$newsItem = new \Model\NewsItem($apiResult->news);
+        $newsItem = new \Model\NewsItem($apiResult->news);
 
-	switch($apiResult->version) {
+        switch ($apiResult->version) {
-		case 1:
+            case 1:
-			return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
+                if (!$newsItem->content) return redirect('//nhnieuws.nl/gooi');
-			break;
+                return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
+                break;
 
-		case 2:
+            case 2:
-			$source = $apiResult->source;
+                $source = $apiResult->source;
-			$newsItem->published = self::TimestampToDateTime($source->created);
+                $newsItem->published = self::TimestampToDateTime($source->created);
-			$newsItem->edited = self::TimestampToDateTime($source->updated);
+                $newsItem->edited = self::TimestampToDateTime($source->updated);
-			$newsItem->author = $source->author;
+                $newsItem->author = $source->author;
-			$newsItem->images = null; // Images will be embedded
+                $newsItem->images = null; // Images will be embedded
-			$newsItem->video = null; // Videos will be embedded
+                $newsItem->video = null; // Videos will be embedded
-			$newsItem->content = $source->blocks;
+                $newsItem->content = $source->blocks;
-			return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
+
+
+
+                return view('newsitem', array_merge($this->getSidebareData(), ['news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
         }
     }
 
     public function overview(Request $request)
     {
-        return $this->listNews($request, 'overzicht');
+        return $this->listNews($request, 'overzicht', null, 'items-more-news', 10);
+    }
+
+    public function more(Request $request)
+    {
+        $page = (int)$request->get('pagina', 1);
+        $id = $request->get('id', '');
+        $apiResult = $this->API('nieuws/overzicht?pagina=' . (int)max(1, $page) . '&aantal=5');
+        $news = [];
+        foreach ($apiResult->news as $newsItem) {
+            $news[] = new \Model\NewsItem($newsItem);
+        }
+
+        return view('partial/newslist_small', ['id' => $id, 'news' => $news]);
+    }
+
+    public function populair(Request $request)
+    {
+        $page = (int)$request->get('pagina', 1);
+        $id = $request->get('id', '');
+        $populair = [];
+        $apiResult = $this->API('nieuws/populair?pagina=' . (int)max(1, $page) . '&aantal=5');
+        foreach ($apiResult as $_newsItem) {
+            $populair[] = new \Model\NewsItem($_newsItem);
+        }
+
+        return view('partial/newslist_small', ['id' => $id, 'news' => $populair]);
     }
 
     public function regionlist(Request $request, $region)
@@ -60,10 +91,10 @@ class NewsController extends Controller
     public function activeblog()
     {
         $apiResult = $this->API('blog/overzicht');
-        if(count($apiResult)) {
+        if (count($apiResult)) {
             $blog = new \Model\Blog($apiResult[0]);
-            if($blog->is_active) {
+            if ($blog->is_active) {
-              return redirect($blog->url);
+                return redirect($blog->url);
             }
         }
 
@@ -76,47 +107,72 @@ class NewsController extends Controller
 
         $page = (int)$request->get('pagina', 1);
         $hasNext = true;
-        while($page > 0) {
+        while ($page > 0) {
-          $apiResult = $this->API('blog/overzicht/' . (int)$id . '?pagina=' . (int)max(1, $page));
+            $apiResult = $this->API('blog/overzicht/' . (int)$id . '?pagina=' . (int)max(1, $page));
 
-          $blog = new \Model\Blog($apiResult->blog);
+            $blog = new \Model\Blog($apiResult->blog);
-          $items = [];
+            $items = [];
-          foreach($apiResult->items as $blogItem)
+            foreach ($apiResult->items as $blogItem) {
-          {
+                $items[] = new \Model\NewsItem($blogItem);
-              $items[] = new \Model\NewsItem($blogItem);
+            }
-          }
 
-          if(count($items) || ($page == 1)) 
+            if (count($items) || ($page == 1)) {
-          {
+                return view('blog', ['blog' => $blog, 'pagina' => $page, 'items' => $items, 'hasNext' => $hasNext && count($items) == 15]);
-            return view('blog', ['blog' => $blog, 'pagina' => $page, 'items' => $items, 'hasNext' => $hasNext && count($items) == 15]);
+            }
-          }
 
-          $hasNext = false;
+            $hasNext = false;
-          --$page;
+            --$page;
         }
 
         return abort(404);
     }
 
-    private function listNews(Request $request, $url, $title = null)
+    private function listNews(Request $request, $url, $title = null, $id = 'items', $total = null)
     {
+        if ($request->ajax()) {
+            $total = 5;
+        }
         $page = (int)$request->get('pagina', 1);
-        $apiResult = $this->API('nieuws/' . $url . '?pagina=' . (int)max(1, $page));
+        $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);
         }
 
-        return view($request->ajax() ? 'partial/newslist_small' : ($title == null ? 'home' : 'newslist'), ['title' => $title, 'news' => $news, 'searchURL' => 'nieuws/zoeken']);
+        $populair = [];
+        if ($title == null) {
+            $total = 5;
+        }
+        $apiResult = $this->API('nieuws/populair?pagina=' . (int)max(1,
+                $page) . ($total ? '&aantal=' . $total : ''));
+        foreach ($apiResult as $newsItem) {
+            $populair[] = new \Model\NewsItem($newsItem);
+        }
+
+        $podcast = null;
+        $podcasts = [];
+        if ($title == null) {
+            $apiResult = $this->API('podcast/overzicht?aantal=3');
+            $podcast = new \Model\Podcast($apiResult->podcasts[0]);
+            foreach ($apiResult->podcasts as $_podcast) {
+                $podcasts[] = new \Model\Podcast($_podcast);
+            }
+        }
+
+        $newsItems = [];
+        $apiResult = $this->API('nieuws/overzicht?aantal=5');
+        foreach ($apiResult->news as $_newsItem) {
+            $newsItems[] = new \Model\NewsItem($_newsItem);
+        }
+
+        return view($request->ajax() ? ($title == null ? 'partial/home_newslist_small' : 'partial/newslist_small') : ($title == null ? 'news' : 'newslist'), ['populair' => $populair, 'newsItems' => $newsItems, 'podcasts' => $podcasts, 'podcast' => $podcast, 'id' => $id, 'title' => $title, 'news' => $news, 'searchURL' => 'nieuws/zoeken']);
     }
 
     public function popular()
     {
         $apiResult = $this->API('nieuws/populair');
         $news = [];
-        foreach($apiResult as $newsItem)
+        foreach ($apiResult as $newsItem) {
-        {
             $news[] = new \Model\NewsItem($newsItem);
         }
 
@@ -130,6 +186,6 @@ class NewsController extends Controller
             'title' => 'Regionieuws',
             'content' => 'het laatste nieuws uit de regio',
             'isStream' => false,
-            'canDownload' => true ]);
+            'canDownload' => true]);
     }
 }

app/Http/Controllers/PodcastController.php

@@ -22,7 +22,7 @@ class PodcastController extends Controller
     private function getPodcastList(Request $request, $action, $viewData = [])
     {
         $page = (int)$request->get('pagina', 1);
-        $apiResult = $this->API('podcast/' . $action . '?pagina=' . (int)max(1, $page) . '&aantal=100');
+        $apiResult = $this->API('podcast/' . $action . '?pagina=' . (int)max(1, $page) . '&aantal=8');
         $podcasts = [];
         foreach($apiResult->podcasts as $podcast)
         {

app/Http/Controllers/RadioController.php

@@ -7,24 +7,38 @@ use \Model\Programma;
 
 class RadioController extends Controller
 {
-    public function schedule(Request $request, $shiftWeeks = 0) 
+    public function schedule(Request $request, $date = '')
     {
-        $apiResult = $this->API('programma/schema/week/' . (int)$shiftWeeks);
+        $start = $date ? (new \DateTime($date))->format('Y-m-d') : (new \DateTime("-2 day"))->format('Y-m-d');
-        $start = self::JsonToDateTime($apiResult->startdate);
+        $end = $date ? (new \DateTime($date))->modify('+1 day')->format('Y-m-d') : (new \DateTime("+3 day"))->format('Y-m-d');
-        $end = self::JsonToDateTime($apiResult->enddate);
+        $apiResult = $this->API('programma/schema/periode/' . $start . '/' . $end);
-    
         $schedule = [];
         foreach($apiResult->schedule as $program)
         {
-            $schedule[] = [
+            $schedule[self::JsonToDateTime($program->start)->format('Ymd')][] = [
                 'starttime' => self::JsonToDateTime($program->start),
                 'endtime' => self::JsonToDateTime($program->end),
-				'shift' => (int)$shiftWeeks,
+				'shift' => 0,
                 'program' => new \Model\Program($program->program)
             ];
         }
 
-        return view($request->ajax() ? 'radioscheduleweek' : 'radioschedule', ['start' => $start, 'end' => $end, 'schedule' => $schedule, 'shift' => $shiftWeeks]);
+        if ($date) {
+            $days = [
+                'custom' => (new \DateTime($date))->format('Ymd'),
+            ];
+        } else {
+            $days = [
+                'day_before_yesterday' => (new \DateTime("-2 day"))->format('Ymd'),
+                'yesterday' => (new \DateTime("yesterday"))->format('Ymd'),
+                'today' => (new \DateTime("now"))->format('Ymd'),
+                'tomorrow' => (new \DateTime("+1 day"))->format('Ymd'),
+                'day_after_tomorrow' => (new \DateTime("+2 day"))->format('Ymd'),
+                'custom' => (new \DateTime($date))->format('Ymd'),
+            ];
+        }
+
+        return view($request->ajax() ? 'partial/radioscheduleweek' : 'radioschedule', ['start' => $start, 'end' => $end, 'schedule' => $schedule, 'shift' => 0, 'days' => $days, 'date' => $date]);
     }
 
     public function onair()
@@ -39,23 +53,25 @@ class RadioController extends Controller
         return view('radioprogram', ['program' => new \Model\Program($apiResult)]);
     }
 
-    public function podcast(Request $request, $id)
+    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']));
+        }
+
 		parent::registerView($request, 'podcast', $id);
 		$apiResult = $this->API('podcast/details/' . (int)$id);
         $podcast = new \Model\Podcast($apiResult);
 
-        $related = [];
+        $page = (int)$request->get('pagina', 1);
-        if($podcast->program != null) 
+        $apiResult = $this->API('podcast/overzicht?pagina=' . (int)max(1, $page) . '&aantal=6');
+        $podcasts = [];
+        foreach($apiResult->podcasts as $_podcast)
         {
-            $apiRelated = $this->API("podcast/programma/{$podcast->program->id}?date={$podcast->created->format('Y-m-d')}");
+            $podcasts[] = new \Model\Podcast($_podcast);
-            foreach($apiRelated->podcasts as $relatedItem)
-            {
-                $related[] = new \Model\Podcast($relatedItem);
-            }
         }
 
-        return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata, 'related' => $related, 'searchURL' => 'gemist/zoeken']);
+        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)
@@ -67,7 +83,7 @@ class RadioController extends Controller
           $viewData['program'] = new \Model\Program($this->API('programma/details/' . (int)$programma));
         }
 
-        return $this->getPodcastList($request, $action, $viewData);
+        return $this->getPodcastList($request, $action, array_merge($this->getSidebareData(), $viewData));
     }
 
     public function searchpodcast(Request $request, $query)
@@ -79,7 +95,8 @@ class RadioController extends Controller
 	{
 		$programs = [];
 		$now = new \DateTimeImmutable('2 minutes ago');
-		$apiResult = $this->API('programma/schema/recent');
+        $page = (int)$request->get('pagina', 1);
+		$apiResult = $this->API('programma/schema/recent?pagina=' . (int)max(1, $page) . '&aantal=12');
 		foreach($apiResult->schedule as $item) {
 			if(!$item->program->nonstop && !$item->program->rerun) {
         			$item->start = self::JsonToDateTime($item->start);
@@ -90,7 +107,7 @@ class RadioController extends Controller
 			}
 		}
 
-		return view('programlist', ['programs' => array_reverse($programs)]);
+		return view($request->ajax() ? 'partial/programitems' : 'programlist', ['programs' => array_reverse($programs)]);
 	}
 
     private function getPodcastList(Request $request, $action, $viewData = [])
@@ -103,7 +120,7 @@ class RadioController extends Controller
             $podcasts[] = new \Model\Podcast($podcast);
         }
 
-        return view($request->ajax() ? 'partial.podcastitems' : 'podcastlist', array_merge($viewData, ['podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken']));
+        return view($request->ajax() ? 'partial/podcastitems' : 'podcastlist', array_merge($viewData, ['id' => 'items-podcasts', 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken']));
     }
 
 }

app/Http/Controllers/StreamController.php

@@ -20,13 +20,14 @@ class StreamController extends Controller
 
     public function livetv()
     {
-        return view('watch', ['stream' => 'https://rrr.sz.xlcdn.com/?account=nhnieuws&file=nhgooi&type=live&service=wowza&protocol=https&output=playlist.m3u8']);
+        return view('watch', ['title' => 'Kijk NH Gooi Tv', 'stream' => 'https://rrr.sz.xlcdn.com/?account=nhnieuws&file=nhgooi&type=live&service=wowza&protocol=https&output=playlist.m3u8']);
         // return view('watch', ['stream' => 'https://stream.nhgooi.nl:81/tv']);
     }
 
     public function studio()
     {
-        return view('watch', ['stream' => 'https://stream.nhgooi.nl:81/live/studio']);
+        // return view('watch', ['stream' => 'https://stream.nhgooi.nl:81/live/studio']);
+        return view('watch', ['title' => 'Kijk NH Gooi Tv Studio', 'stream' => 'https://studiocam.nhgooi.nl/studiocam/live/index.m3u8']);
     }
 
     public function podcast(Request $request, $id)

app/Providers/AppServiceProvider.php

@@ -13,7 +13,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        \Illuminate\Support\Facades\URL::forceScheme('https');
     }
 
     /**

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

@@ -12,23 +12,31 @@
     8 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
     9 => 'Illuminate\\Foundation\\Providers\\FoundationServiceProvider',
     10 => 'Illuminate\\Hashing\\HashServiceProvider',
-    11 => 'Collective\\Html\\HtmlServiceProvider',
+    11 => 'Illuminate\\Mail\\MailServiceProvider',
-    12 => 'Illuminate\\Mail\\MailServiceProvider',
+    12 => 'Illuminate\\Notifications\\NotificationServiceProvider',
-    13 => 'Illuminate\\Notifications\\NotificationServiceProvider',
+    13 => 'Illuminate\\Pagination\\PaginationServiceProvider',
-    14 => 'Illuminate\\Pagination\\PaginationServiceProvider',
+    14 => 'Illuminate\\Pipeline\\PipelineServiceProvider',
-    15 => 'Illuminate\\Pipeline\\PipelineServiceProvider',
+    15 => 'Illuminate\\Queue\\QueueServiceProvider',
-    16 => 'Illuminate\\Queue\\QueueServiceProvider',
+    16 => 'Illuminate\\Redis\\RedisServiceProvider',
-    17 => 'Illuminate\\Redis\\RedisServiceProvider',
+    17 => 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider',
-    18 => 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider',
+    18 => 'Illuminate\\Session\\SessionServiceProvider',
-    19 => 'Illuminate\\Session\\SessionServiceProvider',
+    19 => 'Illuminate\\Translation\\TranslationServiceProvider',
-    20 => 'Illuminate\\Translation\\TranslationServiceProvider',
+    20 => 'Illuminate\\Validation\\ValidationServiceProvider',
-    21 => 'Illuminate\\Validation\\ValidationServiceProvider',
+    21 => 'Illuminate\\View\\ViewServiceProvider',
-    22 => 'Illuminate\\View\\ViewServiceProvider',
+    22 => 'Laravel\\Sail\\SailServiceProvider',
-    23 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    23 => 'Laravel\\Sanctum\\SanctumServiceProvider',
-    24 => 'App\\Providers\\AppServiceProvider',
+    24 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    25 => 'App\\Providers\\AuthServiceProvider',
+    25 => 'Collective\\Html\\HtmlServiceProvider',
-    26 => 'App\\Providers\\EventServiceProvider',
+    26 => 'Carbon\\Laravel\\ServiceProvider',
-    27 => 'App\\Providers\\RouteServiceProvider',
+    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 (
@@ -42,10 +50,15 @@
     7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
     8 => 'Illuminate\\Session\\SessionServiceProvider',
     9 => 'Illuminate\\View\\ViewServiceProvider',
-    10 => 'App\\Providers\\AppServiceProvider',
+    10 => 'Laravel\\Sanctum\\SanctumServiceProvider',
-    11 => 'App\\Providers\\AuthServiceProvider',
+    11 => 'Carbon\\Laravel\\ServiceProvider',
-    12 => 'App\\Providers\\EventServiceProvider',
+    12 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    13 => 'App\\Providers\\RouteServiceProvider',
+    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 (
@@ -55,85 +68,122 @@
     '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',
-    'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Cache\\RateLimiter' => 'Illuminate\\Cache\\CacheServiceProvider',
-    'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\AboutCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.clear-compiled' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Cache\\Console\\ClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Cache\\Console\\ForgetCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ClearCompiledCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Auth\\Console\\ClearResetsCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ConfigCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ConfigClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\DbCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\MonitorCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\PruneCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\ShowCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\TableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\WipeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\DownCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EnvironmentCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.failed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EnvironmentDecryptCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.flush' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EnvironmentEncryptCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.listen' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.restart' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventListCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.retry' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\KeyGenerateCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.work' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\OptimizeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.route.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\OptimizeClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.route.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.route.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Queue\\Console\\ClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.seed' => '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',
-    'command.storage.link' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleClearCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleTestCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleWorkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ShowModelCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\StorageLinkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\UpCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ViewCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.controller.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ViewClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.event.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Cache\\Console\\CacheTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.event.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\CastMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.job.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ChannelMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ComponentMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ConsoleMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Routing\\Console\\ControllerMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\DocsCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventGenerateCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\EventMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ExceptionMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.policy.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Database\\Console\\Factories\\FactoryMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.provider.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\JobMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.failed-table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ListenerMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.queue.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\MailMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.request.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Routing\\Console\\MiddlewareMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.seeder.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ModelMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.session.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.serve' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Notifications\\Console\\NotificationTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.test.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.vendor.publish' => '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',
-    'html' => 'Collective\\Html\\HtmlServiceProvider',
+    'hash.driver' => 'Illuminate\\Hashing\\HashServiceProvider',
-    'form' => 'Collective\\Html\\HtmlServiceProvider',
+    'mail.manager' => 'Illuminate\\Mail\\MailServiceProvider',
-    'Collective\\Html\\HtmlBuilder' => 'Collective\\Html\\HtmlServiceProvider',
-    'Collective\\Html\\FormBuilder' => 'Collective\\Html\\HtmlServiceProvider',
     'mailer' => 'Illuminate\\Mail\\MailServiceProvider',
-    'swift.mailer' => 'Illuminate\\Mail\\MailServiceProvider',
-    'swift.transport' => 'Illuminate\\Mail\\MailServiceProvider',
     'Illuminate\\Mail\\Markdown' => 'Illuminate\\Mail\\MailServiceProvider',
     'Illuminate\\Contracts\\Pipeline\\Hub' => 'Illuminate\\Pipeline\\PipelineServiceProvider',
     'queue' => 'Illuminate\\Queue\\QueueServiceProvider',
-    'queue.worker' => 'Illuminate\\Queue\\QueueServiceProvider',
-    'queue.listener' => 'Illuminate\\Queue\\QueueServiceProvider',
-    'queue.failer' => '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',
@@ -142,7 +192,13 @@
     '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 (
@@ -161,9 +217,6 @@
     'Illuminate\\Hashing\\HashServiceProvider' => 
     array (
     ),
-    'Collective\\Html\\HtmlServiceProvider' => 
-    array (
-    ),
     'Illuminate\\Mail\\MailServiceProvider' => 
     array (
     ),
@@ -185,8 +238,14 @@
     'Illuminate\\Validation\\ValidationServiceProvider' => 
     array (
     ),
+    'Laravel\\Sail\\SailServiceProvider' => 
+    array (
+    ),
     'Laravel\\Tinker\\TinkerServiceProvider' => 
     array (
     ),
+    'Collective\\Html\\HtmlServiceProvider' => 
+    array (
+    ),
   ),
 );

composer.json

@@ -1,28 +1,33 @@
 {
     "name": "laravel/laravel",
+    "type": "project",
     "description": "The Laravel Framework.",
     "keywords": ["framework", "laravel"],
     "license": "MIT",
-    "type": "project",
     "require": {
-        "php": ">=5.6.4",
+        "php": "^8.0",
-        "laravel/framework": "5.4.*",
+        "guzzlehttp/guzzle": "^7.2",
-        "laravel/tinker": "~1.0",
+        "laravel/framework": "^9.19",
-        "laravelcollective/html": "5.*"
+        "laravel/sanctum": "^3.0",
+        "laravel/tinker": "^2.7",
+        "laravelcollective/html": "^6.3"
     },
     "require-dev": {
-        "fzaninotto/faker": "~1.4",
+        "fakerphp/faker": "^1.9.1",
-        "mockery/mockery": "0.9.*",
+        "laravel/pint": "^1.0",
-        "phpunit/phpunit": "~5.7"
+        "laravel/sail": "^1.0.1",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^6.1",
+        "phpunit/phpunit": "^9.5.10",
+        "spatie/laravel-ignition": "^1.0"
     },
     "autoload": {
-        "classmap": [
-            "database"
-        ],
         "psr-4": {
             "App\\": "app/",
-            "Helpers\\": "app/Helpers/",
+            "Database\\Factories\\": "database/factories/",
-            "Model\\": "../api-dev/common/classes/"
+            "Database\\Seeders\\": "database/seeders/",
+	    "Helpers\\": "app/Helpers",
+	    "Model\\": "/srv/api/common/classes"
         }
     },
     "autoload-dev": {
@@ -31,24 +36,33 @@
         }
     },
     "scripts": {
-        "post-root-package-install": [
+        "post-autoload-dump": [
-            "php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-        ],
+            "@php artisan package:discover --ansi"
-        "post-create-project-cmd": [
-            "php artisan key:generate"
-        ],
-        "post-install-cmd": [
-            "Illuminate\\Foundation\\ComposerScripts::postInstall",
-            "php artisan optimize"
         ],
         "post-update-cmd": [
-            "Illuminate\\Foundation\\ComposerScripts::postUpdate",
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
-            "php artisan optimize"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
         ]
     },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
     "config": {
+        "optimize-autoloader": true,
         "preferred-install": "dist",
         "sort-packages": true,
-        "optimize-autoloader": true
+        "allow-plugins": {
-    }
+            "pestphp/pest-plugin": true
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

config/app.php

@@ -105,7 +105,7 @@ return [
 
     'key' => env('APP_KEY'),
 
-    'cipher' => 'AES-256-CBC',
+    'cipher' => 'aes-256-cbc',
 
     /*
     |--------------------------------------------------------------------------

config/session.php

@@ -161,7 +161,7 @@ return [
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure' => env('SESSION_SECURE_COOKIE', null),
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2024_02_27_000000_create_pagestats_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePagestatsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('pagestats', function (Blueprint $table) {
+            $table->string('type');
+            $table->integer('item_id');
+            $table->string('visitor_ip');
+            $table->string('session');
+            $table->text('referer')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('pagestats');
+    }
+}

docker-compose.dev.yml

@@ -0,0 +1,24 @@
+version: '3.8'
+
+services:
+  web:
+    build:
+      context: ./
+      dockerfile: Dockerfile.dev
+    ports:
+      - 8080:80
+      - 8443:443
+    volumes:
+      - .:/var/www/html
+      - ./srv:/srv
+  db:
+    image: mysql:5.5
+    ports:
+      - "3306:3306"
+    expose:
+      - "3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: development-password
+      MYSQL_DATABASE: forge
+      MYSQL_USER: forge
+      MYSQL_PASSWORD: secret

docker-compose.yml

@@ -0,0 +1,22 @@
+version: '3.8'
+
+services:
+  web:
+    build: ./
+    ports:
+      - 8080:80
+      - 8443:443
+    volumes:
+      - .:/var/www/html
+      - ./srv:/srv
+  db:
+    image: mysql:5.5
+    ports:
+      - "3306:3306"
+    expose:
+      - "3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: development-password
+      MYSQL_DATABASE: forge
+      MYSQL_USER: forge
+      MYSQL_PASSWORD: secret

docker/apache.conf

@@ -0,0 +1,46 @@
+Header set X-Content-Type-Options: "nosniff"
+Header set X-Frame-Options: "sameorigin"
+
+ServerTokens Prod
+
+<VirtualHost *:80>
+  ServerName localhost
+  ServerAdmin support@websight.nl
+  DocumentRoot /var/www/html
+
+  <Directory /var/www/html/>
+      Options -Indexes +FollowSymLinks +MultiViews
+      AllowOverride All
+      Order deny,allow
+      Allow from all
+  </Directory>
+
+  ErrorLog /var/log/apache2/vhost-error.log
+  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

@@ -0,0 +1,46 @@
+Header set X-Content-Type-Options: "nosniff"
+Header set X-Frame-Options: "sameorigin"
+
+ServerTokens Prod
+
+<VirtualHost *:80>
+  ServerName localhost
+  ServerAdmin support@websight.nl
+  DocumentRoot /var/www/html
+
+  <Directory /var/www/html/>
+      Options -Indexes +FollowSymLinks +MultiViews
+      AllowOverride All
+      Order deny,allow
+      Allow from all
+  </Directory>
+
+  ErrorLog /var/log/apache2/vhost-error.log
+  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>

env.example

@@ -0,0 +1,39 @@
+APP_NAME="NH Gooi"
+APP_ENV=production
+APP_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+APP_DEBUG=false
+APP_LOG_LEVEL=error
+APP_URL=https://dev.nhgooi.nl
+IMAGE_BASE_URL=https://dev.nhgooi.nl
+
+API_URL=https://api.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=mailjet_username
+MAIL_PASSWORD=mailjet_password
+MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+
+DB_CONNECTION=mysql
+DB_HOST=nhgooi.nl
+DB_PORT=3306
+DB_DATABASE=dbname
+DB_USERNAME=6fmstats
+DB_PASSWORD=dbpass
+
+CACHE_DRIVER=file
+QUEUE_DRIVER=sync

package.json

@@ -1,21 +1,17 @@
 {
   "private": true,
   "scripts": {
-    "dev": "npm run development",
+    "sass": "sass resources/assets/sass:public/css",
-    "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "sass-watch": "sass --watch resources/assets/sass:public/css",
-    "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "sass-minify": "sass resources/assets/sass/style.scss:public/css/style.min.css --style compressed",
-    "watch-poll": "npm run watch -- --watch-poll",
+    "sass-minify-watch": "sass --watch resources/assets/sass/style.scss:public/css/style.min.css --style compressed",
-    "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "js-watch": "grunt watch"
-    "prod": "npm run production",
-    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
-    "axios": "^0.16.2",
+    "grunt": "^1.6.1",
-    "bootstrap-sass": "^3.3.7",
+    "grunt-contrib-concat": "^2.1.0",
-    "cross-env": "^5.0.1",
+    "grunt-contrib-uglify": "^5.2.2",
-    "jquery": "^3.1.1",
+    "grunt-contrib-watch": "^1.1.0",
-    "laravel-mix": "^1.0",
+    "sass": "^1.71.1"
-    "lodash": "^4.17.4",
-    "vue": "^2.1.10"
   }
 }

public/.htaccess

@@ -5,6 +5,13 @@
 
     RewriteEngine On
 
+    # 6fm -> nhgooi
+    RewriteCond %{HTTP_HOST} ^(www\.)6fm.nl(.*)$ [NC]
+    RewriteRule ^(.*)$ https://nhgooi.nl/$2 [R=301,L]
+
+    RewriteCond %{HTTP_HOST} nhgooigemist.nl [NC]
+    RewriteRule ^(.*)$ https://nhgooi.nl/gemist [R=301,L]
+
     # Remove www.
     RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
     RewriteRule ^(.*)$ http://%1/$1 [R=301,L]

public/css/app.css

@@ -0,0 +1,3 @@
+@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
+
+/*# sourceMappingURL=app.css.map */

public/css/app.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../resources/assets/sass/app.scss"],"names":[],"mappings":"AAEQ","file":"app.css"}

public/css/components/posts.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../../resources/assets/sass/components/posts.scss","../../../resources/assets/sass/abstracts/_mixin.scss"],"names":[],"mappings":"AAEE;EACE;ECAF;EACA;EACA;EDAE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAIN;ECzBA;EACA;EACA;EDyBE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EAEA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAIJ;ECvGF;EACA;EACA;;ADwGI;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAKN;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE","file":"posts.css"}

public/css/components/pretty_photo.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../../resources/assets/sass/components/pretty_photo.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EASE;EACA;;;AAEF;EAEE;;;AAEF;EAEE;EACA;EACA;EACA;EACA;;;AAEF;EAEE;EACA;;;AAEF;EAEE;EACA","file":"pretty_photo.css"}

public/css/dark_skin.css

@@ -1,914 +0,0 @@
-body
-{
-	background-color: #2d3136;
-}
-.site_container,
-.value_container
-{
-	background-color: #363B40;
-}
-.site_container.boxed
-{
-	box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
-	-moz-box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
-	-webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
-}
-.header_container.style_2
-{
-	margin-bottom: 0;
-}
-.header_top_bar_container .latest_news_scrolling_list_container
-{
-	border-color: #363b40;
-}
-.post_details li.date,
-.more, .more[type="submit"],
-.post.single .post_details,
-.share_box,
-.taxonomies a,
-.comment_form .text_input:focus, 
-.comment_form textarea:focus, 
-.contact_form .text_input:focus, 
-.contact_form textarea:focus,
-.column.border_top,
-.accordion .ui-accordion-header,
-.list,
-.search_form input[type="text"]:focus,
-.item_content.border_top
-{
-	border-color: #464D53;
-}
-.box_header,
-.more.active, 
-.more:hover,
-.tabs_navigation.small li a:hover, 
-.tabs_navigation.small li a.selected, 
-.tabs_navigation.small li.ui-tabs-active a,
-.more.highlight, 
-.more.active:hover,
-.taxonomies a:hover,
-.review_summary .number,
-.accordion .ui-accordion-header.ui-state-active,
-.mobile-menu-switch
-{
-	border-color: #8CC152;
-}
-h1, h2, h3, h4, h5, h6,
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a,
-.box_header,
-.read_more,
-.tabs_navigation li a,
-.more, 
-.more[type="submit"],
-.more.highlight:hover,
-.tabs_navigation.small li a,
-.tabs_navigation.small li a:hover, 
-.tabs_navigation.small li a.selected, 
-.tabs_navigation.small li.ui-tabs-active a,
-blockquote,
-label,
-.comment_form input, 
-.comment_form textarea, 
-.contact_form input, 
-.contact_form textarea,
-.review_block h5, 
-.review_summary h5,
-.list li, 
-.list li a,
-.dropcap .dropcap_label h3,
-input, 
-textarea,
-.mobile-menu li a,
-.mobile-menu li.selected ul a,
-.mobile-menu li.selected ul li.selected ul a,
-.slider_posts_list li.current h5, 
-.slider_posts_list li:hover h5,
-.bread_crumb li a:hover
-{
-	color: #FFF;
-}
-.box_header,
-.tabs_navigation li a,
-.post a.comments_number,
-.blog.rating .post .value_bar,
-.author .value_bar,
-.divider,
-.pagination li a,
-blockquote,
-.comment_form input, 
-.comment_form textarea, 
-.contact_form input, 
-.contact_form textarea,
-.review_block,
-.review_summary .value_bar,
-.item_content .features_icon,
-.accordion .ui-accordion-header .ui-accordion-header-icon,
-.announcement,
-.dropcap .dropcap_label,
-input, 
-textarea,
-.mobile-menu li a,
-.mobile-menu li.selected ul a,
-.mobile-menu li.selected ul li.selected ul a,
-.slider_posts_list .slider_posts_list_progress_block
-{
-	background-color: #42494F;
-}
-.tabs_navigation.small,
-.slider_posts_list li
-{
-	border-color: #42494F;
-}
- .post_details li.category,
-.slider_navigation .slider_control a:hover, 
-a.slider_control:hover,
-.slider_posts_list .slider_posts_list_bar,
-.read_more .arrow,
-.tabs_navigation li a:hover, 
-.tabs_navigation li a.selected, 
-.tabs_navigation li.ui-tabs-active a,
-.post .comments_number:hover, 
-.footer .post .comments_number:hover,
-.more.active, 
-.more:hover,
-.slider_posts_list_container a.slider_control,
-.pagination li a:hover, 
-.pagination li.selected a,
-.taxonomies a:hover,
-.value_container .value_bar,
-.accordion .ui-accordion-header.ui-state-active,
-.accordion .ui-accordion-header:hover .ui-accordion-header-icon,
-.dropcap .dropcap_label.active,
-.icon.fullscreen:hover,
-.gallery_popup .slider_navigation .slider_control a:hover,
-.mobile-menu-switch .line,
-.mobile-menu-switch:hover,
-.mobile-menu li.selected a,
-.mobile-menu li.selected ul li.selected a,
-.mobile-menu li.selected ul li.selected ul li.selected a
-{
-	background-color: #8CC152;
-}
-.tabs_navigation li.ui-tabs-active span,
-.post .comments_number:hover .arrow_comments, 
-.footer .post .comments_number:hover .arrow_comments
-{
-	border-color: #8CC152 transparent;
-}
-.blog ul.post_details.simple li.category, 
-.blog ul.post_details.simple li.category a,
-.post.single .post_details a,
-.more.highlight, 
-.more.active:hover,
-.review_summary .number,
-.about_subtitle,
-.announcement .expose,
-p a
-{
-	color: #8CC152;
-}
- ul.post_details.simple li
-{
-	background: none;
-}
-.post_details li.date,
-.post a.comments_number,
-.author h6,
-.bread_crumb li, 
-.bread_crumb li a,
-.pagination li a,
-.post.single li.detail,
-.taxonomies a,
-.posted_by abbr.timeago,
-.post.single .sentence .text, 
-.gallery_popup .sentence .text,
-.slider_posts_list li h5
-{
-	color: #9DA4AB;
-}
-.post .arrow_comments
-{
-	border-color: #42494F transparent;
-}
-p,
-.review_block .list li, 
-.review_block .list li a,
-.review_summary .text p
-{
-	color: #D7DCE0;
-}
-span.number, 
-span.odometer.number,
-.post.single .sentence .author, 
-.gallery_popup .sentence .author, 
-blockquote .author,
-input.hint, 
-textarea.hint,
-.comment_form .hint,
-.contact_form .hint,
-.posted_by .in_reply,
-.slider_posts_list li .date
-{
-	color: #858D94;
-}
-::-webkit-input-placeholder 
-{
-	color: #858D94;
-}
-:-moz-placeholder 
-{
-	color: #858D94;
-}
-::-moz-placeholder
-{
-	color: #858D94;
-}
-:-ms-input-placeholder 
-{
-	color: #858D94;
-}
-.tabs_navigation li a
-{
-	border-color: #52595F;
-}
-.footer_container
-{
-	background-color: #2D3136;
-}
-.divider.subheader_arrow
-{
-	background-image: url("../images/icons/other/dark_bg/subheader_arrow.png");
-}
-.pagination li.left a
-{
-	background-image: url("../images/icons/navigation/dark_bg/pagination_arrow_left.png");
-}
-.pagination li.right a
-{
-	background-image: url("../images/icons/navigation/dark_bg/pagination_arrow_right.png");
-}
-blockquote
-{
-	background-image: url("../images/icons/other/dark_bg/quote_content.png");
-}
-#comments_list .children .comment .parent_arrow
-{
-	background-image: url("../images/icons/other/dark_bg/comment_reply.png");
-}
-.bullet.style_1
-{
-	background-image: url("../images/icons/other/dark_bg/bullet_style_1.png");
-	padding-left: 15px;
-}
-.bullet.style_2
-{
-	background-image: url("../images/icons/other/dark_bg/bullet_style_2.png");
-}
-.bullet.style_3
-{
-	background-image: url("../images/icons/other/dark_bg/bullet_style_3.png");
-}
-.bullet.style_4
-{
-	background-image: url("../images/icons/other/dark_bg/bullet_style_4.png");
-}
-.item_content .not_found
-{
-	background-image: url("../images/icons/other/dark_bg/404.png");
-}
-.app
-{
-	background-image: url("../images/icons/features/dark_bg/app.png");
-}
-.calendar
-{
-	background-image: url("../images/icons/features/dark_bg/calendar.png");
-}
-.chart
-{
-	background-image: url("../images/icons/features/dark_bg/chart.png");
-}
-.chat
-{
-	background-image: url("../images/icons/features/dark_bg/chat.png");
-}
-.clock
-{
-	background-image: url("../images/icons/features/dark_bg/clock.png");
-}
-.database
-{
-	background-image: url("../images/icons/features/dark_bg/database.png");
-}
-.document
-{
-	background-image: url("../images/icons/features/dark_bg/document.png");
-}
-.envelope
-{
-	background-image: url("../images/icons/features/dark_bg/envelope.png");
-}
-.faq
-{
-	background-image: url("../images/icons/features/dark_bg/faq.png");
-}
-.graph
-{
-	background-image: url("../images/icons/features/dark_bg/graph.png");
-}
-.image
-{
-	background-image: url("../images/icons/features/dark_bg/image.png");
-}
-.laptop
-{
-	background-image: url("../images/icons/features/dark_bg/laptop.png");
-}
-.magnifier
-{
-	background-image: url("../images/icons/features/dark_bg/magnifier.png");
-}
-.features_icon.mobile
-{
-	background-image: url("../images/icons/features/dark_bg/mobile.png");
-}
-.pin
-{
-	background-image: url("../images/icons/features/dark_bg/pin.png");
-}
-.printer
-{
-	background-image: url("../images/icons/features/dark_bg/printer.png");
-}
-.quote
-{
-	background-image: url("../images/icons/features/dark_bg/quote.png");
-}
-.screen
-{
-	background-image: url("../images/icons/features/dark_bg/screen.png");
-}
-.speaker
-{
-	background-image: url("../images/icons/features/dark_bg/speaker.png");
-}
-.video
-{
-	background-image: url("../images/icons/features/dark_bg/video.png");
-}
-li.detail.category
-{
-	background-image: url("../images/icons/other/dark_bg/post_category.png");
-}	
-.detail.date
-{
-	background-image: url("../images/icons/other/dark_bg/post_date.png");
-}
-.detail.author
-{
-	background-image: url("../images/icons/other/dark_bg/post_author.png");
-}
-.detail.views
-{
-	background-image: url("../images/icons/other/dark_bg/post_views.png");
-}
-.detail.comments
-{
-	background-image: url("../images/icons/other/dark_bg/post_comments.png");
-}
-.taxonomies.tags
-{
-	background-image: url("../images/icons/other/dark_bg/post_footer_tags.png");
-}
-.taxonomies.categories
-{
-	background-image: url("../images/icons/other/dark_bg/post_footer_category.png");
-}
-.behance
-{
-	background-image: url("../images/icons/social/dark_bg/behance.png");
-}
-.bing
-{
-	background-image: url("../images/icons/social/dark_bg/bing.png");
-}
-.blogger
-{
-	background-image: url("../images/icons/social/dark_bg/blogger.png");
-}
-.deezer
-{
-	background-image: url("../images/icons/social/dark_bg/deezer.png");
-}
-.designfloat
-{
-	background-image: url("../images/icons/social/dark_bg/designfloat.png");
-}
-.deviantart
-{
-	background-image: url("../images/icons/social/dark_bg/deviantart.png");
-}
-.digg
-{
-	background-image: url("../images/icons/social/dark_bg/digg.png");
-}
-.digg
-{
-	background-image: url("../images/icons/social/dark_bg/digg.png");
-}
-.dribbble
-{
-	background-image: url("../images/icons/social/dark_bg/dribbble.png");
-}
-.envato
-{
-	background-image: url("../images/icons/social/dark_bg/envato.png");
-}
-.facebook
-{
-	background-image: url("../images/icons/social/dark_bg/facebook.png");
-}
-.flickr
-{
-	background-image: url("../images/icons/social/dark_bg/flickr.png");
-}
-.form
-{
-	background-image: url("../images/icons/social/dark_bg/form.png");
-}
-.forrst
-{
-	background-image: url("../images/icons/social/dark_bg/forrst.png");
-}
-.foursquare
-{
-	background-image: url("../images/icons/social/dark_bg/foursquare.png");
-}
-.friendfeed
-{
-	background-image: url("../images/icons/social/dark_bg/friendfeed.png");
-}
-.googleplus
-{
-	background-image: url("../images/icons/social/dark_bg/googleplus.png");
-}
-.instagram
-{
-	background-image: url("../images/icons/social/dark_bg/instagram.png");
-}
-.linkedin
-{
-	background-image: url("../images/icons/social/dark_bg/linkedin.png");
-}
-.mail
-{
-	background-image: url("../images/icons/social/dark_bg/mail.png");
-}
-.mobile
-{
-	background-image: url("../images/icons/social/dark_bg/mobile.png");
-}
-.myspace
-{
-	background-image: url("../images/icons/social/dark_bg/myspace.png");
-}
-.picasa
-{
-	background-image: url("../images/icons/social/dark_bg/picasa.png");
-}
-.pinterest
-{
-	background-image: url("../images/icons/social/dark_bg/pinterest.png");
-}
-.reddit
-{
-	background-image: url("../images/icons/social/dark_bg/reddit.png");
-}
-.rss
-{
-	background-image: url("../images/icons/social/dark_bg/rss.png");
-}
-.skype
-{
-	background-image: url("../images/icons/social/dark_bg/skype.png");
-}
-.soundcloud
-{
-	background-image: url("../images/icons/social/dark_bg/soundcloud.png");
-}
-.spotify
-{
-	background-image: url("../images/icons/social/dark_bg/spotify.png");
-}
-.stumbleupon
-{
-	background-image: url("../images/icons/social/dark_bg/stumbleupon.png");
-}
-.technorati
-{
-	background-image: url("../images/icons/social/dark_bg/technorati.png");
-}
-.tumblr
-{
-	background-image: url("../images/icons/social/dark_bg/tumblr.png");
-}
-.twitter
-{
-	background-image: url("../images/icons/social/dark_bg/twitter.png");
-}
-.vimeo
-{
-	background-image: url("../images/icons/social/dark_bg/vimeo.png");
-}
-.wykop
-{
-	background-image: url("../images/icons/social/dark_bg/wykop.png");
-}
-.xing
-{
-	background-image: url("../images/icons/social/dark_bg/xing.png");
-}
-.youtube
-{
-	background-image: url("../images/icons/social/dark_bg/youtube.png");
-}
-.light .behance
-{
-	background-image: url("../images/icons/social/behance.png");
-}
-.light .bing
-{
-	background-image: url("../images/icons/social/bing.png");
-}
-.light .blogger
-{
-	background-image: url("../images/icons/social/blogger.png");
-}
-.light .deezer
-{
-	background-image: url("../images/icons/social/deezer.png");
-}
-.light .designfloat
-{
-	background-image: url("../images/icons/social/designfloat.png");
-}
-.light .deviantart
-{
-	background-image: url("../images/icons/social/deviantart.png");
-}
-.light .digg
-{
-	background-image: url("../images/icons/social/digg.png");
-}
-.light .digg
-{
-	background-image: url("../images/icons/social/digg.png");
-}
-.light .dribbble
-{
-	background-image: url("../images/icons/social/dribbble.png");
-}
-.light .envato
-{
-	background-image: url("../images/icons/social/envato.png");
-}
-.light .facebook
-{
-	background-image: url("../images/icons/social/facebook.png");
-}
-.light .flickr
-{
-	background-image: url("../images/icons/social/flickr.png");
-}
-.light .form
-{
-	background-image: url("../images/icons/social/form.png");
-}
-.light .forrst
-{
-	background-image: url("../images/icons/social/forrst.png");
-}
-.light .foursquare
-{
-	background-image: url("../images/icons/social/foursquare.png");
-}
-.light .friendfeed
-{
-	background-image: url("../images/icons/social/friendfeed.png");
-}
-.light .googleplus
-{
-	background-image: url("../images/icons/social/googleplus.png");
-}
-.light .instagram
-{
-	background-image: url("../images/icons/social/instagram.png");
-}
-.light .linkedin
-{
-	background-image: url("../images/icons/social/linkedin.png");
-}
-.light .mail
-{
-	background-image: url("../images/icons/social/mail.png");
-}
-.light .mobile
-{
-	background-image: url("../images/icons/social/mobile.png");
-}
-.light .myspace
-{
-	background-image: url("../images/icons/social/myspace.png");
-}
-.light .picasa
-{
-	background-image: url("../images/icons/social/picasa.png");
-}
-.light .pinterest
-{
-	background-image: url("../images/icons/social/pinterest.png");
-}
-.light .reddit
-{
-	background-image: url("../images/icons/social/reddit.png");
-}
-.light .rss
-{
-	background-image: url("../images/icons/social/rss.png");
-}
-.light .skype
-{
-	background-image: url("../images/icons/social/skype.png");
-}
-.light .soundcloud
-{
-	background-image: url("../images/icons/social/soundcloud.png");
-}
-.light .spotify
-{
-	background-image: url("../images/icons/social/spotify.png");
-}
-.light .stumbleupon
-{
-	background-image: url("../images/icons/social/stumbleupon.png");
-}
-.light .technorati
-{
-	background-image: url("../images/icons/social/technorati.png");
-}
-.light .tumblr
-{
-	background-image: url("../images/icons/social/tumblr.png");
-}
-.light .twitter
-{
-	background-image: url("../images/icons/social/twitter.png");
-}
-.light .vimeo
-{
-	background-image: url("../images/icons/social/vimeo.png");
-}
-.light .wykop
-{
-	background-image: url("../images/icons/social/wykop.png");
-}
-.light .xing
-{
-	background-image: url("../images/icons/social/xing.png");
-}
-.light .youtube
-{
-	background-image: url("../images/icons/social/youtube.png");
-}
-.bread_crumb .separator
-{
-	background-image: url("../images/icons/navigation/dark_bg/breadcrumb_arrow.png");
-}
-.accordion  .ui-accordion-header .ui-accordion-header-icon
-{
-	background-image: url("../images/icons/navigation/dark_bg/accordion_arrow_down.png");
-}
-/* --- menu --- */
-.menu_container
-{
-	border-top-color: #464D53;
-	border-bottom-color: #464D53;
-	background: #363B40;
-}
-.menu_container.sticky.move
-{
-	box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.4);
-	-moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.4);
-	-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.4);
-	border-bottom-color: transparent;
-}
-.menu_container.sticky.move .sf-menu li
-{
-	border-bottom-color: transparent;
-}
-.sf-menu li
-{
-	background-color: #363B40;
-	border-bottom-color: #42494F;
-	border-top-color: #464D53;
-}
-.sf-menu li a, 
-.sf-menu li a:visited
-{
-	color: #FFF;
-}
-.menu_container .sf-menu li.submenu a,
-.menu_container .sf-menu li.selected.submenu a,
-.menu_container .sf-menu li.submenu:hover a
-{
-	background-image: url("../images/icons/navigation/dark_bg/menu_arrow.png");
-}
-.sf-menu a:hover,
-.sf-menu a:hover
-{
-	background-color: #42494F;
-}
-.sf-menu li.submenu ul,
-.menu_container .sf-menu li:hover ul a,
-.menu_container .sf-menu li.submenu:hover ul a,
-.menu_container .sf-menu li ul li a,
-.menu_container .sf-menu li.submenu:hover ul li.selected ul li a
-{
-	background-color: #2D3136;
-}
-.menu_container .sf-menu li ul li a:hover, .menu_container .sf-menu li ul li.selected a,
-.menu_container .sf-menu li.submenu ul li a:hover, .menu_container .sf-menu li.submenu:hover ul li.selected a,
-.menu_container .sf-menu li.submenu:hover ul li.selected ul li a:hover, .menu_container .sf-menu li.submenu:hover ul li ul li.selected a, .menu_container .sf-menu li.submenu:hover ul li.selected ul li.selected a,
-.menu_container .sf-menu li:hover ul li.sfHover>a,
-ul.sf-menu .mega_menu,
-ul.sf-menu .mega_menu li,
-.sf-menu li.submenu .mega_menu
-{	
-	background-color: #212429;
-}
-.sf-menu li:hover, .sf-menu li.selected,
-.sf-menu li.submenu:hover,
-.sf-menu li:hover a, .sf-menu li.selected a,
-.sf-menu li.submenu:hover a
-{
-	background-color: #42494F;
-	border-top-color: #8CC152;
-	border-bottom-color: #42494F;
-}
-/* --- menu style 2 & 3 & 5 & 6 & 7 & 8 & 9 & 10 --- */
-.style_2.menu_container
-{
-	background: #42494F;
-	border-color: #42494F;
-}
-.style_2 .sf-menu
-{
-	border-top-color: #52595F;
-}
-.style_2 .sf-menu li
-{
-	background-color: #42494F;
-	border-bottom-color: #42494F;
-	border-top-color: #52595F;
-}
-.style_2 .sf-menu a:hover,
-.style_3 .sf-menu a:hover
-{
-	background-color: #8CC152;
-}
-.style_2 .sf-menu li:hover, .style_2 .sf-menu li.selected,
-.style_2 .sf-menu li.submenu:hover,
-.style_2 .sf-menu li:hover a, .style_2 .sf-menu li.selected a,
-.style_2 .sf-menu li.submenu:hover a,
-.style_3 .sf-menu li:hover, .style_3 .sf-menu li.selected,
-.style_3 .sf-menu li.submenu:hover,
-.style_3 .sf-menu li:hover a, .style_3 .sf-menu li.selected a,
-.style_3 .sf-menu li.submenu:hover a,
-.style_5 .sf-menu li:hover, .style_5 .sf-menu li.selected,
-.style_5 .sf-menu li.submenu:hover,
-.style_5 .sf-menu li:hover a, .style_5 .sf-menu li.selected a,
-.style_5 .sf-menu li.submenu:hover a,
-.style_10 .sf-menu li:hover, .style_10 .sf-menu li.selected,
-.style_10 .sf-menu li.submenu:hover,
-.style_10 .sf-menu li:hover a, .style_10 .sf-menu li.selected a,
-.style_10 .sf-menu li.submenu:hover a
-{
-	background-color: #8CC152;
-	border-top-color: #8CC152;
-	border-bottom-color: #8CC152;
-}
-.style_2 .sf-menu li a,
-.style_2 .sf-menu li.selected a,
-.style_2 .sf-menu li:hover a,
-.style_3 .sf-menu li.selected a,
-.style_3 .sf-menu li:hover a,
-.style_5 .sf-menu li a,
-.style_6 .sf-menu li.selected a,
-.style_6 .sf-menu li:hover a,
-.style_7 .sf-menu li a,
-.style_8 .sf-menu li.selected a,
-.style_8 .sf-menu li:hover a,
-.style_9 .sf-menu li a,
-.style_10 .sf-menu li.selected a,
-.style_10 .sf-menu li:hover a
-{
-	color: #FFF;
-}
-/* --- menu style 3 --- */
-.style_3.menu_container,
-.style_3 .sf-menu li
-{
-	border-top-color: #8CC152;
-}
-/* --- menu style 4 --- */
-.style_4.menu_container,
-.style_4 .sf-menu li
-{
-	background-color: #42494F;
-	border-color: #42494F;
-}
-.style_4 .sf-menu li:hover, .style_4 .sf-menu li.selected,
-.style_4 .sf-menu li.submenu:hover,
-.style_4 .sf-menu li:hover a, .style_4 .sf-menu li.selected a,
-.style_4 .sf-menu li.submenu:hover a
-{
-	background-color: #363B40;
-	border-bottom-color: #363B40;
-	border-top-color: #8CC152;
-}
-/* --- menu style 5 & 7 & 9 & 10 --- */
-.style_5.menu_container,
-.style_5 .sf-menu li,
-.style_7.menu_container,
-.style_7 .sf-menu li,
-.style_9.menu_container,
-.style_9 .sf-menu li
-{
-	background-color: #2D3136;
-	border-color: #2D3136;
-}
-.style_5 .sf-menu a:hover,
-.style_10 .sf-menu a:hover
-{
-	background-color: #8CC152;
-}
-/* --- menu style 6 --- */
-.style_6.menu_container.sticky.move,
-.style_6.menu_container,
-.style_6.menu_container.sticky.move .sf-menu li,
-.style_6 .sf-menu li
-{
-	border-bottom-color: #2D3136;
-}
-.style_6 .sf-menu a:hover
-{
-	background-color: #2D3136;
-}
-.style_6 .sf-menu li:hover, .style_6 .sf-menu li.selected,
-.style_6 .sf-menu li.submenu:hover,
-.style_6 .sf-menu li:hover a, .style_6 .sf-menu li.selected a,
-.style_6 .sf-menu li.submenu:hover a
-{
-	background-color: #2D3136;
-}
-/* --- menu style 7 --- */
-.style_7 .sf-menu a:hover
-{
-	background-color: #25282A;
-}
-.style_7 .sf-menu li:hover, .style_7 .sf-menu li.selected,
-.style_7 .sf-menu li.submenu:hover,
-.style_7 .sf-menu li:hover a, .style_7 .sf-menu li.selected a,
-.style_7 .sf-menu li.submenu:hover a
-{
-	background-color: #363B40;
-	border-top-color: #363B40;
-	border-bottom-color: #363B40;
-	color: #FFF;
-}
-/* --- menu style 8 & 9 & 10 --- */
-.style_8 .sf-menu li,
-.style_8.menu_container,
-.style_10 .sf-menu li,
-.style_10.menu_container
-{
-	border-top-color: #363B40;
-}
-.style_8 .sf-menu a:hover,
-.style_9 .sf-menu a:hover
-{
-	background-color: #42494F;
-}
-.style_8 .sf-menu li:hover, .style_8 .sf-menu li.selected,
-.style_8 .sf-menu li.submenu:hover,
-.style_8 .sf-menu li:hover a, .style_8 .sf-menu li.selected a,
-.style_8 .sf-menu li.submenu:hover a,
-.style_9 .sf-menu li:hover, .style_9 .sf-menu li.selected,
-.style_9 .sf-menu li.submenu:hover,
-.style_9 .sf-menu li:hover a, .style_9 .sf-menu li.selected a,
-.style_9 .sf-menu li.submenu:hover a
-{
-	background-color: #42494F;
-	border-top-color: #42494F;
-	border-bottom-color: #42494F;
-}

public/css/font.css

@@ -1,3 +0,0 @@
-@font-face{font-family:"Oswald"; font-style:normal; font-weight:400; src:local("Oswald Regular"),local("Oswald-Regular"),url("../fonts/Oswald-Regular-400.woff") format("woff")}
-@font-face{font-family:"Varela"; font-style:normal; font-weight:400; src:local("Varela"),url("../fonts/Varela-400.woff") format("woff")}
-@font-face{font-family:"Open Sans"; font-style:normal; font-weight:400; src:local("Open Sans"),local("OpenSans"),url("../fonts/OpenSans-400.woff") format("woff")}

public/css/high_contrast_skin.css

@@ -1,386 +0,0 @@
-a:focus,
-.comment_form [type='submit']:focus,
-.contact_form [type='submit']:focus,
-.tabs_navigation li a:focus,
-.social_icons .social_icon:focus 
-{
-	outline: 1px dotted #FFF;
-}
-a,
-a:hover,
-.read_more:hover,
-.more.active, 
-.more:hover,
-.post .comments_number:hover, 
-.taxonomies a:hover, 
-.pagination li a:hover,
-.slider_posts_list li h5
-{
-	text-decoration: underline;
-}
-.slider_content_box ul.post_details li.category a,
-.social_icons .social_icon,
-.pagination li.left a,
-.pagination li.right a
-{
-	text-decoration: none;
-}
-.icon,
-.footer_container,
-.icon.fullscreen:hover,
-.site_container,
-.value_container,
-.gallery_popup,
-.gallery_overlay,
-.menu_container
-{
-	background-color: #000;
-}
-.box_header,
-.more.active, 
-.more:hover,
-.tabs_navigation.small li a:hover, 
-.tabs_navigation.small li a.selected, 
-.tabs_navigation.small li.ui-tabs-active a,
-.more.highlight, 
-.more.active:hover,
-.taxonomies a:hover,
-.review_summary .number,
-.accordion .ui-accordion-header.ui-state-active,
-.mobile-menu-switch
-{
-	border-color: #FFDD00;
-}
-.slider_content_box ul.post_details li.category a
-{
-	color: #FFF;
-}
-.post_details li.category,
-.post_details li.category a,
-.read_more:hover,
-.more.active, 
-.more:hover,
-.post .comments_number:hover, 
-.footer .post .comments_number:hover,
-.more.highlight:hover,
-.taxonomies a:hover,
-.pagination li a:hover, 
-.pagination li.selected a,
-.value_container .value_bar .number,
-.tabs_navigation li a:hover, 
-.tabs_navigation li a.selected, 
-.tabs_navigation li.ui-tabs-active a,
-.accordion .ui-accordion-header.ui-state-active h4,
-.mobile-menu li.selected a,
-.mobile-menu li.selected ul li.selected a,
-.mobile-menu li.selected ul li.selected ul li.selected a
-{
-	color: #000;
-}
-.post_details li.category,
-.slider_navigation .slider_control a:hover, 
-a.slider_control:hover,
-.slider_posts_list .slider_posts_list_bar,
-.read_more .arrow,
-.tabs_navigation li a:hover, 
-.tabs_navigation li a.selected, 
-.tabs_navigation li.ui-tabs-active a,
-.post .comments_number:hover, 
-.footer .post .comments_number:hover,
-.more.active, 
-.more:hover,
-.slider_posts_list_container a.slider_control,
-.pagination li a:hover, 
-.pagination li.selected a,
-.taxonomies a:hover,
-.value_container .value_bar,
-.accordion .ui-accordion-header.ui-state-active,
-.accordion .ui-accordion-header:hover .ui-accordion-header-icon,
-.dropcap .dropcap_label.active,
-.gallery_popup .slider_navigation .slider_control a:hover,
-.gallery_popup .slider_navigation .slider_control a,
-.mobile-menu-switch .line,
-.mobile-menu-switch:hover,
-.mobile-menu li.selected a,
-.mobile-menu li.selected ul li.selected a,
-.mobile-menu li.selected ul li.selected ul li.selected a
-{
-	background-color: #FFDD00 ;
-}
-.tabs_navigation li.ui-tabs-active span,
-.post .comments_number:hover .arrow_comments, 
-.footer .post .comments_number:hover .arrow_comments
-{
-	border-color: #FFDD00  transparent;
-}
-.blog ul.post_details.simple li.category, 
-.blog ul.post_details.simple li.category a,
-.post.single .post_details a,
-.more.highlight, 
-.more.active:hover,
-.review_summary .number,
-.about_subtitle,
-.announcement .expose,
-p a,
-span.number, 
-span.odometer.number
-{
-	color: #FFDD00;
-}
-.post .arrow_comments
-{
-	border-color: #42494F transparent;
-}
-p,
-.review_block .list li, 
-.review_block .list li a,
-.review_summary .text p
-{
-	color: #D7DCE0;
-}
-input.hint, 
-textarea.hint,
-.comment_form .hint,
-.contact_form .hint,
-.posted_by .in_reply
-{
-	color: #FFF;
-}
-.footer_container
-{
-	border-top: 1px solid #464D53;
-}
-.divider.subheader_arrow
-{
-	background-image: url("../images/icons/other/high_contrast/subheader_arrow.png");
-}
-blockquote
-{
-	background-image: url("../images/icons/other/dark_bg/quote_content.png");
-}
-.read_more .arrow
-{
-	background-image: url("../images/icons/navigation/high_contrast/call_to_action_arrow.png");
-}
-.slider_navigation .slider_control a, 
-a.slider_control
-{
-	background-image: url("../images/icons/navigation/high_contrast/navigation_arrow_right.png");
-	background-color: #FFDD00;
-}
-.slider_navigation .slider_control:first-child a, 
-a.slider_control.left
-{
-	background-image: url("../images/icons/navigation/high_contrast/navigation_arrow_left.png");
-}
-.pagination li.left a
-{
-	background-image: url("../images/icons/navigation/high_contrast/pagination_arrow_left.png");
-}
-.pagination li.right a
-{
-	background-image: url("../images/icons/navigation/high_contrast/pagination_arrow_right.png");
-}
-a.slider_control.up
-{
-	background-image: url("../images/icons/navigation/high_contrast/navigation_arrow_up.png");
-}
-a.slider_control.down
-{
-	background-image: url("../images/icons/navigation/high_contrast/navigation_arrow_down.png");
-}
-#comments_list .children .comment .parent_arrow
-{
-	background-image: url("../images/icons/other/dark_bg/comment_reply.png");
-}
-.accordion .ui-accordion-header:hover .ui-accordion-header-icon
-{
-	background-image: url("../images/icons/navigation/high_contrast/accordion_arrow_down_hover.png");
-}
-.accordion .ui-accordion-header.ui-state-active .ui-accordion-header-icon
-{
-	background-image: url("../images/icons/navigation/high_contrast/accordion_arrow_up.png");
-}
-.item_content .not_found
-{
-	background-image: url("../images/icons/other/high_contrast/404.png");
-}
-.app
-{
-	background-image: url("../images/icons/features/high_contrast/app.png");
-}
-.calendar
-{
-	background-image: url("../images/icons/features/high_contrast/calendar.png");
-}
-.chart
-{
-	background-image: url("../images/icons/features/high_contrast/chart.png");
-}
-.chat
-{
-	background-image: url("../images/icons/features/high_contrast/chat.png");
-}
-.clock
-{
-	background-image: url("../images/icons/features/high_contrast/clock.png");
-}
-.database
-{
-	background-image: url("../images/icons/features/high_contrast/database.png");
-}
-.document
-{
-	background-image: url("../images/icons/features/high_contrast/document.png");
-}
-.envelope
-{
-	background-image: url("../images/icons/features/high_contrast/envelope.png");
-}
-.faq
-{
-	background-image: url("../images/icons/features/high_contrast/faq.png");
-}
-.graph
-{
-	background-image: url("../images/icons/features/high_contrast/graph.png");
-}
-.image
-{
-	background-image: url("../images/icons/features/high_contrast/image.png");
-}
-.laptop
-{
-	background-image: url("../images/icons/features/high_contrast/laptop.png");
-}
-.magnifier
-{
-	background-image: url("../images/icons/features/high_contrast/magnifier.png");
-}
-.features_icon.mobile
-{
-	background-image: url("../images/icons/features/high_contrast/mobile.png");
-}
-.pin
-{
-	background-image: url("../images/icons/features/high_contrast/pin.png");
-}
-.printer
-{
-	background-image: url("../images/icons/features/high_contrast/printer.png");
-}
-.quote
-{
-	background-image: url("../images/icons/features/high_contrast/quote.png");
-}
-.screen
-{
-	background-image: url("../images/icons/features/high_contrast/screen.png");
-}
-.speaker
-{
-	background-image: url("../images/icons/features/high_contrast/speaker.png");
-}
-.video
-{
-	background-image: url("../images/icons/features/high_contrast/video.png");
-}
-/* --- menu --- */
-.menu_container.sticky.move,
-.menu_container.sticky.move .sf-menu li
-{
-	border-bottom-color: #464d53;
-}
-.sf-menu li
-{
-	background-color: #000;
-}
-.sf-menu li a, 
-.sf-menu li a:visited
-{
-	text-decoration: underline;
-}
-.sf-menu a:hover,
-.sf-menu a:hover
-{
-	text-decoration: underline;
-}
-.sf-menu li:hover, .sf-menu li.selected,
-.sf-menu li.submenu:hover,
-.sf-menu li:hover a, .sf-menu li.selected a,
-.sf-menu li.submenu:hover a
-{
-	border-top-color: #FFDD00;
-}
-/* --- font selector --- */
-.font_selector 
-{
-    position: fixed;
-	left: 0;
-    top: 15%;
-	width: 45px;
-    z-index: 10;
-}
-.font_selector .increase,
-.font_selector .decrease
-{
-	display: block;
-	width: 45px;
-	height: 45px;
-	background-repeat: no-repeat;
-	background-color: #FFDD00;
-}
-.font_selector .increase
-{
-	background-image: url("../images/icons/other/high_contrast/font_increase.png");
-}
-.font_selector .decrease
-{
-	background-image: url("../images/icons/other/high_contrast/font_decrease.png");
-}
-/* --- aminations --- */
-.slideRightBack, .slideLeftBack, .slideDownBack, .slideUpBack
-{
-	opacity: 1;
-}
-/* --- slideRightBackBack --- */
-a.slider_control, .icon.fullscreen.animated
-{
-	visibility: visible;
-}
-a.slider_control, .icon.fullscreen.animated
-{
-	-webkit-animation-duration: 0ms;
-    animation-duration: 0ms;
-}
-.slideRightBack
-{
-	animation-name: slideRightBack;
-	-webkit-animation-name: slideRightBack;	
-}
-@keyframes slideRightBack 
-{
-	0% 
-	{
-		opacity: 0;
-		transform: translateX(-100%);
-	}
-	100% 
-	{
-		opacity: 1;
-		transform: translateX(0%);
-	}
-}
-@-webkit-keyframes slideRightBack 
-{
-	0% 
-	{
-		opacity: 0;
-		-webkit-transform: translateX(-100%);
-	}
-	100% 
-	{
-		opacity: 1;
-		-webkit-transform: translateX(0%);
-	}
-}

public/css/old/airplay.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" width="17" height="14" viewBox="0 0 16.9 13.9"><defs><style>.fill{fill:#fff;}</style></defs><title>7</title><g id="airplay"><polygon class="fill" points="0 0 16.9 0 16.9 10.4 13.2 10.4 11.9 8.9 15.4 8.9 15.4 1.6 1.5 1.6 1.5 8.9 5 8.9 3.6 10.4 0 10.4 0 0"/><polygon class="fill" points="2.7 13.9 8.4 7 14.2 13.9 2.7 13.9"/></g></svg>

public/css/old/chromecast.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16.3 13.4" x="0" y="0" width="17" height="14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>5</title><path id="chromecast" class="cls-1" d="M80.4,13v2.2h2.2A2.22,2.22,0,0,0,80.4,13Zm0-2.9v1.5a3.69,3.69,0,0,1,3.7,3.68s0,0,0,0h1.5a5.29,5.29,0,0,0-5.2-5.2h0ZM93.7,4.9H83.4V6.1a9.59,9.59,0,0,1,6.2,6.2h4.1V4.9h0ZM80.4,7.1V8.6a6.7,6.7,0,0,1,6.7,6.7h1.4a8.15,8.15,0,0,0-8.1-8.2h0ZM95.1,1.9H81.8a1.54,1.54,0,0,0-1.5,1.5V5.6h1.5V3.4H95.1V13.7H89.9v1.5h5.2a1.54,1.54,0,0,0,1.5-1.5V3.4A1.54,1.54,0,0,0,95.1,1.9Z" transform="translate(-80.3 -1.9)"/></svg>

public/css/old/dark_skin.css

@@ -0,0 +1,914 @@
+body
+{
+	background-color: #2d3136;
+}
+.site_container,
+.value_container
+{
+	background-color: #363B40;
+}
+.site_container.boxed
+{
+	box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
+	-moz-box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
+	-webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 0.25);
+}
+.header_container.style_2
+{
+	margin-bottom: 0;
+}
+.header_top_bar_container .latest_news_scrolling_list_container
+{
+	border-color: #363b40;
+}
+.post_details li.date,
+.more, .more[type="submit"],
+.post.single .post_details,
+.share_box,
+.taxonomies a,
+.comment_form .text_input:focus,
+.comment_form textarea:focus,
+.contact_form .text_input:focus,
+.contact_form textarea:focus,
+.column.border_top,
+.accordion .ui-accordion-header,
+.list,
+.search_form input[type="text"]:focus,
+.item_content.border_top
+{
+	border-color: #464D53;
+}
+.box_header,
+.more.active,
+.more:hover,
+.tabs_navigation.small li a:hover,
+.tabs_navigation.small li a.selected,
+.tabs_navigation.small li.ui-tabs-active a,
+.more.highlight,
+.more.active:hover,
+.taxonomies a:hover,
+.review_summary .number,
+.accordion .ui-accordion-header.ui-state-active,
+.mobile-menu-switch
+{
+	border-color: #8CC152;
+}
+h1, h2, h3, h4, h5, h6,
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a,
+.box_header,
+.read_more,
+.tabs_navigation li a,
+.more,
+.more[type="submit"],
+.more.highlight:hover,
+.tabs_navigation.small li a,
+.tabs_navigation.small li a:hover,
+.tabs_navigation.small li a.selected,
+.tabs_navigation.small li.ui-tabs-active a,
+blockquote,
+label,
+.comment_form input,
+.comment_form textarea,
+.contact_form input,
+.contact_form textarea,
+.review_block h5,
+.review_summary h5,
+.list li,
+.list li a,
+.dropcap .dropcap_label h3,
+input,
+textarea,
+.mobile-menu li a,
+.mobile-menu li.selected ul a,
+.mobile-menu li.selected ul li.selected ul a,
+.slider_posts_list li.current h5,
+.slider_posts_list li:hover h5,
+.bread_crumb li a:hover
+{
+	color: #FFF;
+}
+.box_header,
+.tabs_navigation li a,
+.post a.comments_number,
+.blog.rating .post .value_bar,
+.author .value_bar,
+.divider,
+.pagination li a,
+blockquote,
+.comment_form input,
+.comment_form textarea,
+.contact_form input,
+.contact_form textarea,
+.review_block,
+.review_summary .value_bar,
+.item_content .features_icon,
+.accordion .ui-accordion-header .ui-accordion-header-icon,
+.announcement,
+.dropcap .dropcap_label,
+input,
+textarea,
+.mobile-menu li a,
+.mobile-menu li.selected ul a,
+.mobile-menu li.selected ul li.selected ul a,
+.slider_posts_list .slider_posts_list_progress_block
+{
+	background-color: #42494F;
+}
+.tabs_navigation.small,
+.slider_posts_list li
+{
+	border-color: #42494F;
+}
+ .post_details li.category,
+.slider_navigation .slider_control a:hover,
+a.slider_control:hover,
+.slider_posts_list .slider_posts_list_bar,
+.read_more .arrow,
+.tabs_navigation li a:hover,
+.tabs_navigation li a.selected,
+.tabs_navigation li.ui-tabs-active a,
+.post .comments_number:hover,
+.footer .post .comments_number:hover,
+.more.active,
+.more:hover,
+.slider_posts_list_container a.slider_control,
+.pagination li a:hover,
+.pagination li.selected a,
+.taxonomies a:hover,
+.value_container .value_bar,
+.accordion .ui-accordion-header.ui-state-active,
+.accordion .ui-accordion-header:hover .ui-accordion-header-icon,
+.dropcap .dropcap_label.active,
+.icon.fullscreen:hover,
+.gallery_popup .slider_navigation .slider_control a:hover,
+.mobile-menu-switch .line,
+.mobile-menu-switch:hover,
+.mobile-menu li.selected a,
+.mobile-menu li.selected ul li.selected a,
+.mobile-menu li.selected ul li.selected ul li.selected a
+{
+	background-color: #8CC152;
+}
+.tabs_navigation li.ui-tabs-active span,
+.post .comments_number:hover .arrow_comments,
+.footer .post .comments_number:hover .arrow_comments
+{
+	border-color: #8CC152 transparent;
+}
+.blog ul.post_details.simple li.category,
+.blog ul.post_details.simple li.category a,
+.post.single .post_details a,
+.more.highlight,
+.more.active:hover,
+.review_summary .number,
+.about_subtitle,
+.announcement .expose,
+p a
+{
+	color: #8CC152;
+}
+ ul.post_details.simple li
+{
+	background: none;
+}
+.post_details li.date,
+.post a.comments_number,
+.author h6,
+.bread_crumb li,
+.bread_crumb li a,
+.pagination li a,
+.post.single li.detail,
+.taxonomies a,
+.posted_by abbr.timeago,
+.post.single .sentence .text,
+.gallery_popup .sentence .text,
+.slider_posts_list li h5
+{
+	color: #9DA4AB;
+}
+.post .arrow_comments
+{
+	border-color: #42494F transparent;
+}
+p,
+.review_block .list li,
+.review_block .list li a,
+.review_summary .text p
+{
+	color: #D7DCE0;
+}
+span.number,
+span.odometer.number,
+.post.single .sentence .author,
+.gallery_popup .sentence .author,
+blockquote .author,
+input.hint,
+textarea.hint,
+.comment_form .hint,
+.contact_form .hint,
+.posted_by .in_reply,
+.slider_posts_list li .date
+{
+	color: #858D94;
+}
+::-webkit-input-placeholder
+{
+	color: #858D94;
+}
+:-moz-placeholder
+{
+	color: #858D94;
+}
+::-moz-placeholder
+{
+	color: #858D94;
+}
+:-ms-input-placeholder
+{
+	color: #858D94;
+}
+.tabs_navigation li a
+{
+	border-color: #52595F;
+}
+.footer_container
+{
+	background-color: #2D3136;
+}
+.divider.subheader_arrow
+{
+	background-image: url("../../images/icons/other/dark_bg/subheader_arrow.png");
+}
+.pagination li.left a
+{
+	background-image: url("../../images/icons/navigation/dark_bg/pagination_arrow_left.png");
+}
+.pagination li.right a
+{
+	background-image: url("../../images/icons/navigation/dark_bg/pagination_arrow_right.png");
+}
+blockquote
+{
+	background-image: url("../../images/icons/other/dark_bg/quote_content.png");
+}
+#comments_list .children .comment .parent_arrow
+{
+	background-image: url("../../images/icons/other/dark_bg/comment_reply.png");
+}
+.bullet.style_1
+{
+	background-image: url("../../images/icons/other/dark_bg/bullet_style_1.png");
+	padding-left: 15px;
+}
+.bullet.style_2
+{
+	background-image: url("../../images/icons/other/dark_bg/bullet_style_2.png");
+}
+.bullet.style_3
+{
+	background-image: url("../../images/icons/other/dark_bg/bullet_style_3.png");
+}
+.bullet.style_4
+{
+	background-image: url("../../images/icons/other/dark_bg/bullet_style_4.png");
+}
+.item_content .not_found
+{
+	background-image: url("../../images/icons/other/dark_bg/404.png");
+}
+.app
+{
+	background-image: url("../../images/icons/features/dark_bg/app.png");
+}
+.calendar
+{
+	background-image: url("../../images/icons/features/dark_bg/calendar.png");
+}
+.chart
+{
+	background-image: url("../../images/icons/features/dark_bg/chart.png");
+}
+.chat
+{
+	background-image: url("../../images/icons/features/dark_bg/chat.png");
+}
+.clock
+{
+	background-image: url("../../images/icons/features/dark_bg/clock.png");
+}
+.database
+{
+	background-image: url("../../images/icons/features/dark_bg/database.png");
+}
+.document
+{
+	background-image: url("../../images/icons/features/dark_bg/document.png");
+}
+.envelope
+{
+	background-image: url("../../images/icons/features/dark_bg/envelope.png");
+}
+.faq
+{
+	background-image: url("../../images/icons/features/dark_bg/faq.png");
+}
+.graph
+{
+	background-image: url("../../images/icons/features/dark_bg/graph.png");
+}
+.image
+{
+	background-image: url("../../images/icons/features/dark_bg/image.png");
+}
+.laptop
+{
+	background-image: url("../../images/icons/features/dark_bg/laptop.png");
+}
+.magnifier
+{
+	background-image: url("../../images/icons/features/dark_bg/magnifier.png");
+}
+.features_icon.mobile
+{
+	background-image: url("../../images/icons/features/dark_bg/mobile.png");
+}
+.pin
+{
+	background-image: url("../../images/icons/features/dark_bg/pin.png");
+}
+.printer
+{
+	background-image: url("../../images/icons/features/dark_bg/printer.png");
+}
+.quote
+{
+	background-image: url("../../images/icons/features/dark_bg/quote.png");
+}
+.screen
+{
+	background-image: url("../../images/icons/features/dark_bg/screen.png");
+}
+.speaker
+{
+	background-image: url("../../images/icons/features/dark_bg/speaker.png");
+}
+.video
+{
+	background-image: url("../../images/icons/features/dark_bg/video.png");
+}
+li.detail.category
+{
+	background-image: url("../../images/icons/other/dark_bg/post_category.png");
+}
+.detail.date
+{
+	background-image: url("../../images/icons/other/dark_bg/post_date.png");
+}
+.detail.author
+{
+	background-image: url("../../images/icons/other/dark_bg/post_author.png");
+}
+.detail.views
+{
+	background-image: url("../../images/icons/other/dark_bg/post_views.png");
+}
+.detail.comments
+{
+	background-image: url("../../images/icons/other/dark_bg/post_comments.png");
+}
+.taxonomies.tags
+{
+	background-image: url("../../images/icons/other/dark_bg/post_footer_tags.png");
+}
+.taxonomies.categories
+{
+	background-image: url("../../images/icons/other/dark_bg/post_footer_category.png");
+}
+.behance
+{
+	background-image: url("../../images/icons/social/dark_bg/behance.png");
+}
+.bing
+{
+	background-image: url("../../images/icons/social/dark_bg/bing.png");
+}
+.blogger
+{
+	background-image: url("../../images/icons/social/dark_bg/blogger.png");
+}
+.deezer
+{
+	background-image: url("../../images/icons/social/dark_bg/deezer.png");
+}
+.designfloat
+{
+	background-image: url("../../images/icons/social/dark_bg/designfloat.png");
+}
+.deviantart
+{
+	background-image: url("../../images/icons/social/dark_bg/deviantart.png");
+}
+.digg
+{
+	background-image: url("../../images/icons/social/dark_bg/digg.png");
+}
+.digg
+{
+	background-image: url("../../images/icons/social/dark_bg/digg.png");
+}
+.dribbble
+{
+	background-image: url("../../images/icons/social/dark_bg/dribbble.png");
+}
+.envato
+{
+	background-image: url("../../images/icons/social/dark_bg/envato.png");
+}
+.facebook
+{
+	background-image: url("../../images/icons/social/dark_bg/facebook.png");
+}
+.flickr
+{
+	background-image: url("../../images/icons/social/dark_bg/flickr.png");
+}
+.form
+{
+	background-image: url("../../images/icons/social/dark_bg/form.png");
+}
+.forrst
+{
+	background-image: url("../../images/icons/social/dark_bg/forrst.png");
+}
+.foursquare
+{
+	background-image: url("../../images/icons/social/dark_bg/foursquare.png");
+}
+.friendfeed
+{
+	background-image: url("../../images/icons/social/dark_bg/friendfeed.png");
+}
+.googleplus
+{
+	background-image: url("../../images/icons/social/dark_bg/googleplus.png");
+}
+.instagram
+{
+	background-image: url("../../images/icons/social/dark_bg/instagram.png");
+}
+.linkedin
+{
+	background-image: url("../../images/icons/social/dark_bg/linkedin.png");
+}
+.mail
+{
+	background-image: url("../../images/icons/social/dark_bg/mail.png");
+}
+.mobile
+{
+	background-image: url("../../images/icons/social/dark_bg/mobile.png");
+}
+.myspace
+{
+	background-image: url("../../images/icons/social/dark_bg/myspace.png");
+}
+.picasa
+{
+	background-image: url("../../images/icons/social/dark_bg/picasa.png");
+}
+.pinterest
+{
+	background-image: url("../../images/icons/social/dark_bg/pinterest.png");
+}
+.reddit
+{
+	background-image: url("../../images/icons/social/dark_bg/reddit.png");
+}
+.rss
+{
+	background-image: url("../../images/icons/social/dark_bg/rss.png");
+}
+.skype
+{
+	background-image: url("../../images/icons/social/dark_bg/skype.png");
+}
+.soundcloud
+{
+	background-image: url("../../images/icons/social/dark_bg/soundcloud.png");
+}
+.spotify
+{
+	background-image: url("../../images/icons/social/dark_bg/spotify.png");
+}
+.stumbleupon
+{
+	background-image: url("../../images/icons/social/dark_bg/stumbleupon.png");
+}
+.technorati
+{
+	background-image: url("../../images/icons/social/dark_bg/technorati.png");
+}
+.tumblr
+{
+	background-image: url("../../images/icons/social/dark_bg/tumblr.png");
+}
+.twitter
+{
+	background-image: url("../../images/icons/social/dark_bg/twitter.png");
+}
+.vimeo
+{
+	background-image: url("../../images/icons/social/dark_bg/vimeo.png");
+}
+.wykop
+{
+	background-image: url("../../images/icons/social/dark_bg/wykop.png");
+}
+.xing
+{
+	background-image: url("../../images/icons/social/dark_bg/xing.png");
+}
+.youtube
+{
+	background-image: url("../../images/icons/social/dark_bg/youtube.png");
+}
+.light .behance
+{
+	background-image: url("../../images/icons/social/behance.png");
+}
+.light .bing
+{
+	background-image: url("../../images/icons/social/bing.png");
+}
+.light .blogger
+{
+	background-image: url("../../images/icons/social/blogger.png");
+}
+.light .deezer
+{
+	background-image: url("../../images/icons/social/deezer.png");
+}
+.light .designfloat
+{
+	background-image: url("../../images/icons/social/designfloat.png");
+}
+.light .deviantart
+{
+	background-image: url("../../images/icons/social/deviantart.png");
+}
+.light .digg
+{
+	background-image: url("../../images/icons/social/digg.png");
+}
+.light .digg
+{
+	background-image: url("../../images/icons/social/digg.png");
+}
+.light .dribbble
+{
+	background-image: url("../../images/icons/social/dribbble.png");
+}
+.light .envato
+{
+	background-image: url("../../images/icons/social/envato.png");
+}
+.light .facebook
+{
+	background-image: url("../../images/icons/social/facebook.png");
+}
+.light .flickr
+{
+	background-image: url("../../images/icons/social/flickr.png");
+}
+.light .form
+{
+	background-image: url("../../images/icons/social/form.png");
+}
+.light .forrst
+{
+	background-image: url("../../images/icons/social/forrst.png");
+}
+.light .foursquare
+{
+	background-image: url("../../images/icons/social/foursquare.png");
+}
+.light .friendfeed
+{
+	background-image: url("../../images/icons/social/friendfeed.png");
+}
+.light .googleplus
+{
+	background-image: url("../../images/icons/social/googleplus.png");
+}
+.light .instagram
+{
+	background-image: url("../../images/icons/social/instagram.png");
+}
+.light .linkedin
+{
+	background-image: url("../../images/icons/social/linkedin.png");
+}
+.light .mail
+{
+	background-image: url("../../images/icons/social/mail.png");
+}
+.light .mobile
+{
+	background-image: url("../../images/icons/social/mobile.png");
+}
+.light .myspace
+{
+	background-image: url("../../images/icons/social/myspace.png");
+}
+.light .picasa
+{
+	background-image: url("../../images/icons/social/picasa.png");
+}
+.light .pinterest
+{
+	background-image: url("../../images/icons/social/pinterest.png");
+}
+.light .reddit
+{
+	background-image: url("../../images/icons/social/reddit.png");
+}
+.light .rss
+{
+	background-image: url("../../images/icons/social/rss.png");
+}
+.light .skype
+{
+	background-image: url("../../images/icons/social/skype.png");
+}
+.light .soundcloud
+{
+	background-image: url("../../images/icons/social/soundcloud.png");
+}
+.light .spotify
+{
+	background-image: url("../../images/icons/social/spotify.png");
+}
+.light .stumbleupon
+{
+	background-image: url("../../images/icons/social/stumbleupon.png");
+}
+.light .technorati
+{
+	background-image: url("../../images/icons/social/technorati.png");
+}
+.light .tumblr
+{
+	background-image: url("../../images/icons/social/tumblr.png");
+}
+.light .twitter
+{
+	background-image: url("../../images/icons/social/twitter.png");
+}
+.light .vimeo
+{
+	background-image: url("../../images/icons/social/vimeo.png");
+}
+.light .wykop
+{
+	background-image: url("../../images/icons/social/wykop.png");
+}
+.light .xing
+{
+	background-image: url("../../images/icons/social/xing.png");
+}
+.light .youtube
+{
+	background-image: url("../../images/icons/social/youtube.png");
+}
+.bread_crumb .separator
+{
+	background-image: url("../../images/icons/navigation/dark_bg/breadcrumb_arrow.png");
+}
+.accordion  .ui-accordion-header .ui-accordion-header-icon
+{
+	background-image: url("../../images/icons/navigation/dark_bg/accordion_arrow_down.png");
+}
+/* --- menu --- */
+.menu_container
+{
+	border-top-color: #464D53;
+	border-bottom-color: #464D53;
+	background: #363B40;
+}
+.menu_container.sticky.move
+{
+	box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.4);
+	-moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.4);
+	-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.4);
+	border-bottom-color: transparent;
+}
+.menu_container.sticky.move .sf-menu li
+{
+	border-bottom-color: transparent;
+}
+.sf-menu li
+{
+	background-color: #363B40;
+	border-bottom-color: #42494F;
+	border-top-color: #464D53;
+}
+.sf-menu li a,
+.sf-menu li a:visited
+{
+	color: #FFF;
+}
+.menu_container .sf-menu li.submenu a,
+.menu_container .sf-menu li.selected.submenu a,
+.menu_container .sf-menu li.submenu:hover a
+{
+	background-image: url("../../images/icons/navigation/dark_bg/menu_arrow.png");
+}
+.sf-menu a:hover,
+.sf-menu a:hover
+{
+	background-color: #42494F;
+}
+.sf-menu li.submenu ul,
+.menu_container .sf-menu li:hover ul a,
+.menu_container .sf-menu li.submenu:hover ul a,
+.menu_container .sf-menu li ul li a,
+.menu_container .sf-menu li.submenu:hover ul li.selected ul li a
+{
+	background-color: #2D3136;
+}
+.menu_container .sf-menu li ul li a:hover, .menu_container .sf-menu li ul li.selected a,
+.menu_container .sf-menu li.submenu ul li a:hover, .menu_container .sf-menu li.submenu:hover ul li.selected a,
+.menu_container .sf-menu li.submenu:hover ul li.selected ul li a:hover, .menu_container .sf-menu li.submenu:hover ul li ul li.selected a, .menu_container .sf-menu li.submenu:hover ul li.selected ul li.selected a,
+.menu_container .sf-menu li:hover ul li.sfHover>a,
+ul.sf-menu .mega_menu,
+ul.sf-menu .mega_menu li,
+.sf-menu li.submenu .mega_menu
+{
+	background-color: #212429;
+}
+.sf-menu li:hover, .sf-menu li.selected,
+.sf-menu li.submenu:hover,
+.sf-menu li:hover a, .sf-menu li.selected a,
+.sf-menu li.submenu:hover a
+{
+	background-color: #42494F;
+	border-top-color: #8CC152;
+	border-bottom-color: #42494F;
+}
+/* --- menu style 2 & 3 & 5 & 6 & 7 & 8 & 9 & 10 --- */
+.style_2.menu_container
+{
+	background: #42494F;
+	border-color: #42494F;
+}
+.style_2 .sf-menu
+{
+	border-top-color: #52595F;
+}
+.style_2 .sf-menu li
+{
+	background-color: #42494F;
+	border-bottom-color: #42494F;
+	border-top-color: #52595F;
+}
+.style_2 .sf-menu a:hover,
+.style_3 .sf-menu a:hover
+{
+	background-color: #8CC152;
+}
+.style_2 .sf-menu li:hover, .style_2 .sf-menu li.selected,
+.style_2 .sf-menu li.submenu:hover,
+.style_2 .sf-menu li:hover a, .style_2 .sf-menu li.selected a,
+.style_2 .sf-menu li.submenu:hover a,
+.style_3 .sf-menu li:hover, .style_3 .sf-menu li.selected,
+.style_3 .sf-menu li.submenu:hover,
+.style_3 .sf-menu li:hover a, .style_3 .sf-menu li.selected a,
+.style_3 .sf-menu li.submenu:hover a,
+.style_5 .sf-menu li:hover, .style_5 .sf-menu li.selected,
+.style_5 .sf-menu li.submenu:hover,
+.style_5 .sf-menu li:hover a, .style_5 .sf-menu li.selected a,
+.style_5 .sf-menu li.submenu:hover a,
+.style_10 .sf-menu li:hover, .style_10 .sf-menu li.selected,
+.style_10 .sf-menu li.submenu:hover,
+.style_10 .sf-menu li:hover a, .style_10 .sf-menu li.selected a,
+.style_10 .sf-menu li.submenu:hover a
+{
+	background-color: #8CC152;
+	border-top-color: #8CC152;
+	border-bottom-color: #8CC152;
+}
+.style_2 .sf-menu li a,
+.style_2 .sf-menu li.selected a,
+.style_2 .sf-menu li:hover a,
+.style_3 .sf-menu li.selected a,
+.style_3 .sf-menu li:hover a,
+.style_5 .sf-menu li a,
+.style_6 .sf-menu li.selected a,
+.style_6 .sf-menu li:hover a,
+.style_7 .sf-menu li a,
+.style_8 .sf-menu li.selected a,
+.style_8 .sf-menu li:hover a,
+.style_9 .sf-menu li a,
+.style_10 .sf-menu li.selected a,
+.style_10 .sf-menu li:hover a
+{
+	color: #FFF;
+}
+/* --- menu style 3 --- */
+.style_3.menu_container,
+.style_3 .sf-menu li
+{
+	border-top-color: #8CC152;
+}
+/* --- menu style 4 --- */
+.style_4.menu_container,
+.style_4 .sf-menu li
+{
+	background-color: #42494F;
+	border-color: #42494F;
+}
+.style_4 .sf-menu li:hover, .style_4 .sf-menu li.selected,
+.style_4 .sf-menu li.submenu:hover,
+.style_4 .sf-menu li:hover a, .style_4 .sf-menu li.selected a,
+.style_4 .sf-menu li.submenu:hover a
+{
+	background-color: #363B40;
+	border-bottom-color: #363B40;
+	border-top-color: #8CC152;
+}
+/* --- menu style 5 & 7 & 9 & 10 --- */
+.style_5.menu_container,
+.style_5 .sf-menu li,
+.style_7.menu_container,
+.style_7 .sf-menu li,
+.style_9.menu_container,
+.style_9 .sf-menu li
+{
+	background-color: #2D3136;
+	border-color: #2D3136;
+}
+.style_5 .sf-menu a:hover,
+.style_10 .sf-menu a:hover
+{
+	background-color: #8CC152;
+}
+/* --- menu style 6 --- */
+.style_6.menu_container.sticky.move,
+.style_6.menu_container,
+.style_6.menu_container.sticky.move .sf-menu li,
+.style_6 .sf-menu li
+{
+	border-bottom-color: #2D3136;
+}
+.style_6 .sf-menu a:hover
+{
+	background-color: #2D3136;
+}
+.style_6 .sf-menu li:hover, .style_6 .sf-menu li.selected,
+.style_6 .sf-menu li.submenu:hover,
+.style_6 .sf-menu li:hover a, .style_6 .sf-menu li.selected a,
+.style_6 .sf-menu li.submenu:hover a
+{
+	background-color: #2D3136;
+}
+/* --- menu style 7 --- */
+.style_7 .sf-menu a:hover
+{
+	background-color: #25282A;
+}
+.style_7 .sf-menu li:hover, .style_7 .sf-menu li.selected,
+.style_7 .sf-menu li.submenu:hover,
+.style_7 .sf-menu li:hover a, .style_7 .sf-menu li.selected a,
+.style_7 .sf-menu li.submenu:hover a
+{
+	background-color: #363B40;
+	border-top-color: #363B40;
+	border-bottom-color: #363B40;
+	color: #FFF;
+}
+/* --- menu style 8 & 9 & 10 --- */
+.style_8 .sf-menu li,
+.style_8.menu_container,
+.style_10 .sf-menu li,
+.style_10.menu_container
+{
+	border-top-color: #363B40;
+}
+.style_8 .sf-menu a:hover,
+.style_9 .sf-menu a:hover
+{
+	background-color: #42494F;
+}
+.style_8 .sf-menu li:hover, .style_8 .sf-menu li.selected,
+.style_8 .sf-menu li.submenu:hover,
+.style_8 .sf-menu li:hover a, .style_8 .sf-menu li.selected a,
+.style_8 .sf-menu li.submenu:hover a,
+.style_9 .sf-menu li:hover, .style_9 .sf-menu li.selected,
+.style_9 .sf-menu li.submenu:hover,
+.style_9 .sf-menu li:hover a, .style_9 .sf-menu li.selected a,
+.style_9 .sf-menu li.submenu:hover a
+{
+	background-color: #42494F;
+	border-top-color: #42494F;
+	border-bottom-color: #42494F;
+}

public/css/old/font.css

@@ -0,0 +1,3 @@
+@font-face{font-family:"Oswald"; font-style:normal; font-weight:400; src:local("Oswald Regular"),local("Oswald-Regular"),url("../../fonts/Oswald-Regular-400.woff") format("woff")}
+@font-face{font-family:"Varela"; font-style:normal; font-weight:400; src:local("Varela"),url("../../fonts/Varela-400.woff") format("woff")}
+@font-face{font-family:"Open Sans"; font-style:normal; font-weight:400; src:local("Open Sans"),local("OpenSans"),url("../../fonts/OpenSans-400.woff") format("woff")}

public/css/old/high_contrast_skin.css

@@ -0,0 +1,386 @@
+a:focus,
+.comment_form [type='submit']:focus,
+.contact_form [type='submit']:focus,
+.tabs_navigation li a:focus,
+.social_icons .social_icon:focus
+{
+	outline: 1px dotted #FFF;
+}
+a,
+a:hover,
+.read_more:hover,
+.more.active,
+.more:hover,
+.post .comments_number:hover,
+.taxonomies a:hover,
+.pagination li a:hover,
+.slider_posts_list li h5
+{
+	text-decoration: underline;
+}
+.slider_content_box ul.post_details li.category a,
+.social_icons .social_icon,
+.pagination li.left a,
+.pagination li.right a
+{
+	text-decoration: none;
+}
+.icon,
+.footer_container,
+.icon.fullscreen:hover,
+.site_container,
+.value_container,
+.gallery_popup,
+.gallery_overlay,
+.menu_container
+{
+	background-color: #000;
+}
+.box_header,
+.more.active,
+.more:hover,
+.tabs_navigation.small li a:hover,
+.tabs_navigation.small li a.selected,
+.tabs_navigation.small li.ui-tabs-active a,
+.more.highlight,
+.more.active:hover,
+.taxonomies a:hover,
+.review_summary .number,
+.accordion .ui-accordion-header.ui-state-active,
+.mobile-menu-switch
+{
+	border-color: #FFDD00;
+}
+.slider_content_box ul.post_details li.category a
+{
+	color: #FFF;
+}
+.post_details li.category,
+.post_details li.category a,
+.read_more:hover,
+.more.active,
+.more:hover,
+.post .comments_number:hover,
+.footer .post .comments_number:hover,
+.more.highlight:hover,
+.taxonomies a:hover,
+.pagination li a:hover,
+.pagination li.selected a,
+.value_container .value_bar .number,
+.tabs_navigation li a:hover,
+.tabs_navigation li a.selected,
+.tabs_navigation li.ui-tabs-active a,
+.accordion .ui-accordion-header.ui-state-active h4,
+.mobile-menu li.selected a,
+.mobile-menu li.selected ul li.selected a,
+.mobile-menu li.selected ul li.selected ul li.selected a
+{
+	color: #000;
+}
+.post_details li.category,
+.slider_navigation .slider_control a:hover,
+a.slider_control:hover,
+.slider_posts_list .slider_posts_list_bar,
+.read_more .arrow,
+.tabs_navigation li a:hover,
+.tabs_navigation li a.selected,
+.tabs_navigation li.ui-tabs-active a,
+.post .comments_number:hover,
+.footer .post .comments_number:hover,
+.more.active,
+.more:hover,
+.slider_posts_list_container a.slider_control,
+.pagination li a:hover,
+.pagination li.selected a,
+.taxonomies a:hover,
+.value_container .value_bar,
+.accordion .ui-accordion-header.ui-state-active,
+.accordion .ui-accordion-header:hover .ui-accordion-header-icon,
+.dropcap .dropcap_label.active,
+.gallery_popup .slider_navigation .slider_control a:hover,
+.gallery_popup .slider_navigation .slider_control a,
+.mobile-menu-switch .line,
+.mobile-menu-switch:hover,
+.mobile-menu li.selected a,
+.mobile-menu li.selected ul li.selected a,
+.mobile-menu li.selected ul li.selected ul li.selected a
+{
+	background-color: #FFDD00 ;
+}
+.tabs_navigation li.ui-tabs-active span,
+.post .comments_number:hover .arrow_comments,
+.footer .post .comments_number:hover .arrow_comments
+{
+	border-color: #FFDD00  transparent;
+}
+.blog ul.post_details.simple li.category,
+.blog ul.post_details.simple li.category a,
+.post.single .post_details a,
+.more.highlight,
+.more.active:hover,
+.review_summary .number,
+.about_subtitle,
+.announcement .expose,
+p a,
+span.number,
+span.odometer.number
+{
+	color: #FFDD00;
+}
+.post .arrow_comments
+{
+	border-color: #42494F transparent;
+}
+p,
+.review_block .list li,
+.review_block .list li a,
+.review_summary .text p
+{
+	color: #D7DCE0;
+}
+input.hint,
+textarea.hint,
+.comment_form .hint,
+.contact_form .hint,
+.posted_by .in_reply
+{
+	color: #FFF;
+}
+.footer_container
+{
+	border-top: 1px solid #464D53;
+}
+.divider.subheader_arrow
+{
+	background-image: url("../../images/icons/other/high_contrast/subheader_arrow.png");
+}
+blockquote
+{
+	background-image: url("../../images/icons/other/dark_bg/quote_content.png");
+}
+.read_more .arrow
+{
+	background-image: url("../../images/icons/navigation/high_contrast/call_to_action_arrow.png");
+}
+.slider_navigation .slider_control a,
+a.slider_control
+{
+	background-image: url("../../images/icons/navigation/high_contrast/navigation_arrow_right.png");
+	background-color: #FFDD00;
+}
+.slider_navigation .slider_control:first-child a,
+a.slider_control.left
+{
+	background-image: url("../../images/icons/navigation/high_contrast/navigation_arrow_left.png");
+}
+.pagination li.left a
+{
+	background-image: url("../../images/icons/navigation/high_contrast/pagination_arrow_left.png");
+}
+.pagination li.right a
+{
+	background-image: url("../../images/icons/navigation/high_contrast/pagination_arrow_right.png");
+}
+a.slider_control.up
+{
+	background-image: url("../../images/icons/navigation/high_contrast/navigation_arrow_up.png");
+}
+a.slider_control.down
+{
+	background-image: url("../../images/icons/navigation/high_contrast/navigation_arrow_down.png");
+}
+#comments_list .children .comment .parent_arrow
+{
+	background-image: url("../../images/icons/other/dark_bg/comment_reply.png");
+}
+.accordion .ui-accordion-header:hover .ui-accordion-header-icon
+{
+	background-image: url("../../images/icons/navigation/high_contrast/accordion_arrow_down_hover.png");
+}
+.accordion .ui-accordion-header.ui-state-active .ui-accordion-header-icon
+{
+	background-image: url("../../images/icons/navigation/high_contrast/accordion_arrow_up.png");
+}
+.item_content .not_found
+{
+	background-image: url("../../images/icons/other/high_contrast/404.png");
+}
+.app
+{
+	background-image: url("../../images/icons/features/high_contrast/app.png");
+}
+.calendar
+{
+	background-image: url("../../images/icons/features/high_contrast/calendar.png");
+}
+.chart
+{
+	background-image: url("../../images/icons/features/high_contrast/chart.png");
+}
+.chat
+{
+	background-image: url("../../images/icons/features/high_contrast/chat.png");
+}
+.clock
+{
+	background-image: url("../../images/icons/features/high_contrast/clock.png");
+}
+.database
+{
+	background-image: url("../../images/icons/features/high_contrast/database.png");
+}
+.document
+{
+	background-image: url("../../images/icons/features/high_contrast/document.png");
+}
+.envelope
+{
+	background-image: url("../../images/icons/features/high_contrast/envelope.png");
+}
+.faq
+{
+	background-image: url("../../images/icons/features/high_contrast/faq.png");
+}
+.graph
+{
+	background-image: url("../../images/icons/features/high_contrast/graph.png");
+}
+.image
+{
+	background-image: url("../../images/icons/features/high_contrast/image.png");
+}
+.laptop
+{
+	background-image: url("../../images/icons/features/high_contrast/laptop.png");
+}
+.magnifier
+{
+	background-image: url("../../images/icons/features/high_contrast/magnifier.png");
+}
+.features_icon.mobile
+{
+	background-image: url("../../images/icons/features/high_contrast/mobile.png");
+}
+.pin
+{
+	background-image: url("../../images/icons/features/high_contrast/pin.png");
+}
+.printer
+{
+	background-image: url("../../images/icons/features/high_contrast/printer.png");
+}
+.quote
+{
+	background-image: url("../../images/icons/features/high_contrast/quote.png");
+}
+.screen
+{
+	background-image: url("../../images/icons/features/high_contrast/screen.png");
+}
+.speaker
+{
+	background-image: url("../../images/icons/features/high_contrast/speaker.png");
+}
+.video
+{
+	background-image: url("../../images/icons/features/high_contrast/video.png");
+}
+/* --- menu --- */
+.menu_container.sticky.move,
+.menu_container.sticky.move .sf-menu li
+{
+	border-bottom-color: #464d53;
+}
+.sf-menu li
+{
+	background-color: #000;
+}
+.sf-menu li a,
+.sf-menu li a:visited
+{
+	text-decoration: underline;
+}
+.sf-menu a:hover,
+.sf-menu a:hover
+{
+	text-decoration: underline;
+}
+.sf-menu li:hover, .sf-menu li.selected,
+.sf-menu li.submenu:hover,
+.sf-menu li:hover a, .sf-menu li.selected a,
+.sf-menu li.submenu:hover a
+{
+	border-top-color: #FFDD00;
+}
+/* --- font selector --- */
+.font_selector
+{
+    position: fixed;
+	left: 0;
+    top: 15%;
+	width: 45px;
+    z-index: 10;
+}
+.font_selector .increase,
+.font_selector .decrease
+{
+	display: block;
+	width: 45px;
+	height: 45px;
+	background-repeat: no-repeat;
+	background-color: #FFDD00;
+}
+.font_selector .increase
+{
+	background-image: url("../../images/icons/other/high_contrast/font_increase.png");
+}
+.font_selector .decrease
+{
+	background-image: url("../../images/icons/other/high_contrast/font_decrease.png");
+}
+/* --- aminations --- */
+.slideRightBack, .slideLeftBack, .slideDownBack, .slideUpBack
+{
+	opacity: 1;
+}
+/* --- slideRightBackBack --- */
+a.slider_control, .icon.fullscreen.animated
+{
+	visibility: visible;
+}
+a.slider_control, .icon.fullscreen.animated
+{
+	-webkit-animation-duration: 0ms;
+    animation-duration: 0ms;
+}
+.slideRightBack
+{
+	animation-name: slideRightBack;
+	-webkit-animation-name: slideRightBack;
+}
+@keyframes slideRightBack
+{
+	0%
+	{
+		opacity: 0;
+		transform: translateX(-100%);
+	}
+	100%
+	{
+		opacity: 1;
+		transform: translateX(0%);
+	}
+}
+@-webkit-keyframes slideRightBack
+{
+	0%
+	{
+		opacity: 0;
+		-webkit-transform: translateX(-100%);
+	}
+	100%
+	{
+		opacity: 1;
+		-webkit-transform: translateX(0%);
+	}
+}

public/css/old/jumpforward.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 19" x="0" y="0" width="19" height="19"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:none;stroke:#fff;stroke-width:2px;}</style></defs><title>2</title><g id="jumpforward"><path class="cls-1" d="M32.1,2.3L27.8,4.5V0.2Z" transform="translate(-20.7 -0.2)"/><path class="cls-1" d="M34.8,2.3L30.5,4.5V0.2Z" transform="translate(-20.7 -0.2)"/><path class="cls-2" d="M29.9,2.3a8.15,8.15,0,0,0-8.2,8.1h0" transform="translate(-20.7 -0.2)"/><path class="cls-2" d="M21.8,10a8.15,8.15,0,0,0,8.1,8.2h0" transform="translate(-20.7 -0.2)"/><path class="cls-2" d="M29.5,18.2a8.15,8.15,0,0,0,8.2-8.1h0" transform="translate(-20.7 -0.2)"/></g></svg>

public/css/old/mediaplayer_plugins.min.css

@@ -0,0 +1 @@
+.mejs-airplay-button>button,.mejs__airplay-button>button{background:url(airplay.svg) no-repeat 0 4px}.mejs-airplay-button>button .fill,.mejs__airplay-button>button .fill{fill:#fff}.mejs-airplay-button>button.active .fill,.mejs__airplay-button>button.active .fill{fill:#66a8cc}.mejs-chromecast-button>button,.mejs__chromecast-button>button{--disconnected-color:#fff;background:none;display:inline-block}.mejs-chromecast-container,.mejs__chromecast-container{background:#000;color:#fff;font-size:10px;left:0;padding:5px;position:absolute;top:0;z-index:1}.mejs-chromecast-layer>img,.mejs__chromecast-layer>img{left:0;position:absolute;top:0;z-index:0}.mejs-chromecast-icon,.mejs__chromecast-icon{background:url(chromecast.svg) no-repeat 0 0;display:inline-block;height:14px;margin-right:5px;width:17px}.mejs-contextmenu,.mejs__contextmenu{background:#fff;border:1px solid #999;border-radius:4px;left:0;padding:10px;position:absolute;top:0;width:150px;z-index:1}.mejs-contextmenu-separator,.mejs__contextmenu-separator{background:#333;font-size:0;height:1px;margin:5px 6px}.mejs-contextmenu-item,.mejs__contextmenu-item{color:#333;cursor:pointer;font-size:12px;padding:4px 6px}.mejs-contextmenu-item:hover,.mejs__contextmenu-item:hover{background:#2c7c91;color:#fff}.mejs-jump-forward-button>button,.mejs__jump-forward-button>button{background:url(jumpforward.svg) no-repeat 0 0;color:#fff;font-size:8px;line-height:normal;position:relative}.mejs-skip-back-button>button,.mejs__skip-back-button>button{background:url(skipback.svg) no-repeat 0 -1px;color:#fff;font-size:8px;line-height:normal;position:relative}

public/css/old/menu_styles.css

@@ -22,7 +22,7 @@
 .style_7 .sf-menu li.selected.submenu a,
 .style_7 .sf-menu li.submenu:hover a
 {
-	background-image: url("../images/icons/navigation/menu_arrow.png");
+	background-image: url("../../images/icons/navigation/menu_arrow.png");
 }
 .style_2 .sf-menu a:hover,
 .style_3 .sf-menu a:hover
@@ -64,7 +64,7 @@
 .style_10 .sf-menu li.selected.submenu a,
 .style_10 .sf-menu li.submenu:hover a
 {
-	background-image: url("../images/icons/navigation/dark_bg/menu_arrow.png");
+	background-image: url("../../images/icons/navigation/dark_bg/menu_arrow.png");
 }
 .style_2 .sf-menu li.selected a,
 .style_2 .sf-menu li:hover a,

public/css/old/nhgooi.css

@@ -67,7 +67,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
 }
 
 .header_container {
-	background-image: url('../images/nh-banner.png');
+	background-image: url('../../images/nh-banner.png');
 	background-size: 100% ;
 }
 
@@ -462,3 +462,15 @@ a.fixed-height img {
     top: 0;
     width: 100%;
 }
+
+div.info {
+    padding: 1em;
+    color: #3E3E3E;
+    line-height: 150%;
+    border-radius: 10px;
+    margin: 1em;
+}
+
+div.info p {
+    padding: 0;
+}

public/css/old/skipback.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-290 291 19 19" style="enable-background:new -290 291 19 19;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#fff;}
+	.st1{fill:none;stroke:#fff;stroke-width:2;}
+</style>
+<title>2</title>
+<g id="jumpforward">
+	<path class="st0" d="M-278.6,291v4.3l-4.3-2.2L-278.6,291z"/>
+	<path class="st0" d="M-281.3,291v4.3l-4.3-2.2L-281.3,291z"/>
+	<path class="st1" d="M-272.5,301.2L-272.5,301.2C-272.5,301.2-272.5,301.2-272.5,301.2c0-4.5-3.7-8.1-8.2-8.1"/>
+	<path class="st1" d="M-280.7,309L-280.7,309C-280.7,309-280.7,309-280.7,309c4.5,0,8.1-3.7,8.1-8.2"/>
+	<path class="st1" d="M-288.5,300.9L-288.5,300.9C-288.5,300.9-288.5,300.9-288.5,300.9c0,4.5,3.7,8.1,8.2,8.1"/>
+</g>
+</svg>

public/images/Slogan_DIAP white.svg

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230mm"
+   height="40mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg4553"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Slogan_DIAP white.svg">
+  <defs
+     id="defs4547" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.47"
+     inkscape:cx="803.9187"
+     inkscape:cy="284.95533"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4550">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g44"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+       transform="matrix(1.3988443,0,0,1.3988443,-949.97686,-1243.7313)">
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 220.9,998.2 c -5.3,-2.3 -12.1,-4.4 -20.6,-6.3 -8,-1.8 -13.6,-3.7 -16.9,-5.8 -3.3,-2.1 -5,-5.1 -5,-9 0,-4.6 1.9,-8.3 5.6,-10.9 3.7,-2.6 8.8,-3.9 15.3,-3.9 10.8,0 20.7,3.6 29.6,10.7 l 6.1,-13.4 c -4.1,-3.7 -9.3,-6.6 -15.7,-8.8 -6.4,-2.1 -13,-3.2 -20.1,-3.2 -7.7,0 -14.5,1.3 -20.3,3.9 -5.9,2.6 -10.4,6.2 -13.7,10.9 -3.2,4.6 -4.8,9.9 -4.8,15.8 0,5.7 1.3,10.4 4,14.1 2.7,3.7 6.6,6.7 11.8,9.1 5.2,2.4 12,4.5 20.3,6.3 8.1,1.8 13.8,3.7 17.3,5.7 3.5,2 5.2,4.9 5.2,8.7 0,4.4 -1.9,7.8 -5.6,10.2 -3.7,2.4 -9.1,3.6 -16,3.6 -6.3,0 -12.1,-0.9 -17.4,-2.6 -5.4,-1.7 -10.5,-4.4 -15.3,-8.1 l -6.1,13.4 c 4.6,3.8 10.3,6.7 17.1,8.8 6.7,2.1 13.9,3.1 21.6,3.1 8.2,0 15.2,-1.2 21.3,-3.6 6,-2.4 10.6,-5.9 13.8,-10.4 3.2,-4.5 4.8,-9.7 4.8,-15.7 0,-5.5 -1.4,-10.1 -4.2,-13.7 -2.8,-3.6 -6.9,-6.5 -12.1,-8.9 z"
+         id="path14"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 274.1,1023.1 v -30 h 18.4 v -13.4 h -18.4 v -20.8 h -17.8 v 20.8 H 243 V 993 h 13.4 v 30.3 c 0,8.9 2.3,15.6 7,20.1 4.6,4.5 11.9,6.8 21.6,6.8 2.4,0 5,-0.1 7.8,-0.4 l 0.9,-13.2 c -2.3,0.3 -4.5,0.4 -6.5,0.4 -8.7,0 -13.1,-4.6 -13.1,-13.9 z"
+         id="path16"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 334,978 c -6.5,0 -12.4,1.5 -17.6,4.6 -5.2,3 -9.2,7.3 -12,12.8 -2.8,5.5 -4.3,11.8 -4.3,18.9 0,11.2 3.3,20 9.9,26.5 6.6,6.5 15.6,9.7 27,9.7 4.9,0 9.8,-0.8 14.7,-2.4 4.9,-1.6 8.9,-3.7 12.2,-6.4 l -5.1,-12.2 c -6.4,4.9 -13.4,7.4 -21.1,7.4 -6.2,0 -10.9,-1.6 -14.2,-4.7 -3.3,-3.1 -5.3,-7.9 -5.8,-14.4 h 47.4 v -5 c 0,-10.8 -2.8,-19.3 -8.3,-25.5 C 351.2,981 343.6,978 334,978 Z m -16.3,30.1 c 0.7,-5.7 2.4,-10.1 5.3,-13.1 2.9,-3 6.7,-4.6 11.5,-4.6 4.7,0 8.4,1.5 11.1,4.5 2.7,3 4.1,7.4 4.3,13.2 z"
+         id="path18"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 462.2,978 c -5,0 -9.6,1.2 -13.7,3.5 -4.1,2.3 -7.2,5.5 -9.4,9.6 -3.4,-8.7 -10.4,-13.1 -20.9,-13.1 -4.7,0 -9,1 -12.7,2.9 -3.7,1.9 -6.6,4.8 -8.7,8.6 v -9.8 h -17.4 v 69.6 h 17.8 v -38.8 c 0,-5.8 1.3,-10.3 4,-13.5 2.7,-3.2 6.3,-4.8 11,-4.8 4.1,0 7,1.2 8.8,3.6 1.8,2.4 2.6,6.3 2.6,11.6 v 42 h 17.8 v -38.8 c 0,-5.8 1.3,-10.3 4,-13.5 2.7,-3.2 6.4,-4.8 11.1,-4.8 4,0 6.9,1.2 8.7,3.6 1.8,2.4 2.7,6.3 2.7,11.6 v 42 h 17.8 v -42.7 c 0,-9.7 -1.9,-16.9 -5.8,-21.6 -3.9,-4.9 -9.8,-7.2 -17.7,-7.2 z"
+         id="path20"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <polygon
+         class="st1"
+         points="562.7,1049.2 578.2,1049.2 608.6,979.8 591.1,979.8 570.9,1028.9 551.3,979.8 532.5,979.8 "
+         id="polygon22"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 646.1,978 c -4.9,0 -10.2,0.8 -15.7,2.4 -5.5,1.6 -10.2,3.7 -14.1,6.1 l 5,12.2 c 3.9,-2.3 7.8,-4.1 11.9,-5.3 4,-1.3 7.9,-1.9 11.6,-1.9 4.7,0 8.1,1 10.2,3.1 2,2.1 3.1,5.5 3.1,10.2 v 3.3 h -3.6 c -10.3,0 -18.4,0.7 -24.3,2 -5.9,1.3 -10.1,3.5 -12.7,6.4 -2.6,2.9 -3.9,7 -3.9,12.1 0,4.1 1.1,7.8 3.3,11.1 2.2,3.3 5.2,5.9 9,7.8 3.8,1.9 8,2.8 12.7,2.8 4.6,0 8.6,-1 12,-3.1 3.5,-2.1 6,-5 7.6,-8.7 v 10.7 h 16.9 V 1007 c 0,-9.9 -2.4,-17.2 -7.1,-21.9 -4.9,-4.8 -12.2,-7.1 -21.9,-7.1 z m 11.9,42.5 c 0,5 -1.5,9.1 -4.5,12.3 -3,3.2 -6.9,4.8 -11.6,4.8 -3.2,0 -5.9,-1 -8,-2.9 -2.1,-1.9 -3.1,-4.4 -3.1,-7.5 0,-2.5 0.8,-4.4 2.3,-5.8 1.5,-1.4 4,-2.4 7.5,-3 3.5,-0.6 8.4,-0.9 14.8,-0.9 h 2.6 z"
+         id="path24"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 733.4,978 c -5,0 -9.5,1 -13.5,3.1 -4,2.1 -7.2,5.1 -9.5,9 V 979.7 H 693 v 69.6 h 17.8 v -39.4 c 0,-5.4 1.5,-9.7 4.6,-12.9 3.1,-3.2 7.2,-4.8 12.3,-4.8 4.4,0 7.6,1.2 9.6,3.7 2,2.5 3.1,6.4 3.1,11.8 v 41.7 h 17.8 v -42.7 c 0,-9.6 -2,-16.7 -6.1,-21.5 -4.1,-4.9 -10.3,-7.2 -18.7,-7.2 z"
+         id="path26"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 855.2,978 c -4.8,0 -9.2,1 -13.2,2.9 -3.9,1.9 -7.1,4.8 -9.5,8.5 V 949 h -17.8 v 100.3 h 17.8 v -39.4 c 0,-5.4 1.5,-9.7 4.6,-12.9 3.1,-3.2 7.2,-4.8 12.3,-4.8 4.4,0 7.6,1.2 9.6,3.7 2,2.5 3.1,6.4 3.1,11.8 v 41.7 H 880 v -42.7 c 0,-9.6 -2,-16.7 -6.1,-21.5 -4.1,-4.9 -10.4,-7.2 -18.7,-7.2 z"
+         id="path28"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 928,978 c -6.5,0 -12.4,1.5 -17.6,4.6 -5.2,3 -9.2,7.3 -12,12.8 -2.8,5.5 -4.3,11.8 -4.3,18.9 0,11.2 3.3,20 9.9,26.5 6.6,6.5 15.6,9.7 27,9.7 4.9,0 9.8,-0.8 14.7,-2.4 4.9,-1.6 8.9,-3.7 12.2,-6.4 l -5.1,-12.2 c -6.4,4.9 -13.4,7.4 -21.1,7.4 -6.2,0 -10.9,-1.6 -14.2,-4.7 -3.3,-3.1 -5.3,-7.9 -5.8,-14.4 h 47.4 v -5 c 0,-10.8 -2.8,-19.3 -8.3,-25.5 C 945.2,981 937.6,978 928,978 Z m -16.3,30.1 c 0.7,-5.7 2.4,-10.1 5.3,-13.1 2.9,-3 6.7,-4.6 11.5,-4.6 4.7,0 8.4,1.5 11.1,4.5 2.7,3 4.1,7.4 4.3,13.2 z"
+         id="path30"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 995.2,1023.1 v -30 h 18.4 v -13.4 h -18.4 v -20.8 h -17.8 v 20.8 H 964 V 993 h 13.4 v 30.3 c 0,8.9 2.3,15.6 7,20.1 4.6,4.5 11.9,6.8 21.6,6.8 2.4,0 5,-0.1 7.8,-0.4 l 0.9,-13.2 c -2.3,0.3 -4.5,0.4 -6.5,0.4 -8.7,0 -13,-4.6 -13,-13.9 z"
+         id="path32"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 1110.9,1008.1 h 21.6 v 25.2 c -6.5,1.8 -12.9,2.7 -19.4,2.7 -21.6,0 -32.4,-12.3 -32.4,-37 0,-12 2.6,-21.1 7.9,-27.2 5.3,-6.1 13.1,-9.2 23.4,-9.2 5.4,0 10.4,0.8 14.9,2.3 4.5,1.6 9.1,4.1 13.7,7.8 l 6.1,-13.2 c -4.1,-3.8 -9.2,-6.7 -15.4,-8.8 -6.2,-2 -12.8,-3.1 -19.8,-3.1 -10.1,0 -18.8,2.1 -26.3,6.2 -7.4,4.1 -13.2,10.1 -17.2,17.8 -4,7.7 -6,16.9 -6,27.4 0,10.6 2,19.8 6,27.5 4,7.7 9.8,13.7 17.4,17.8 7.6,4.1 16.6,6.2 26.9,6.2 6.7,0 13.3,-0.7 19.8,-2 6.5,-1.3 12,-3.1 16.6,-5.4 V 995 h -38 v 13.1 z"
+         id="path34"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 1218.4,982.4 c -5.4,-2.9 -11.6,-4.4 -18.7,-4.4 -7.1,0 -13.4,1.5 -18.7,4.4 -5.4,2.9 -9.5,7.1 -12.4,12.6 -2.9,5.5 -4.4,11.8 -4.4,19.1 0,7.3 1.5,13.7 4.4,19.2 2.9,5.5 7.1,9.7 12.4,12.7 5.4,2.9 11.6,4.4 18.7,4.4 7.1,0 13.3,-1.5 18.7,-4.4 5.4,-2.9 9.5,-7.2 12.4,-12.7 2.9,-5.5 4.3,-11.9 4.3,-19.2 0,-7.3 -1.4,-13.7 -4.3,-19.1 -3,-5.5 -7.1,-9.7 -12.4,-12.6 z m -5.7,48.5 c -3,3.8 -7.4,5.7 -13.2,5.7 -5.7,0 -10.1,-1.9 -13.1,-5.7 -3,-3.8 -4.6,-9.4 -4.6,-16.8 0,-7.3 1.5,-12.9 4.6,-16.7 3.1,-3.8 7.5,-5.8 13.2,-5.8 5.7,0 10.1,1.9 13.1,5.8 3,3.8 4.6,9.4 4.6,16.7 0,7.4 -1.5,13 -4.6,16.8 z"
+         id="path36"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 1300.2,982.4 c -5.4,-2.9 -11.6,-4.4 -18.7,-4.4 -7.1,0 -13.4,1.5 -18.7,4.4 -5.4,2.9 -9.5,7.1 -12.4,12.6 -2.9,5.5 -4.4,11.8 -4.4,19.1 0,7.3 1.5,13.7 4.4,19.2 2.9,5.5 7.1,9.7 12.4,12.7 5.4,2.9 11.6,4.4 18.7,4.4 7.1,0 13.3,-1.5 18.7,-4.4 5.4,-2.9 9.5,-7.2 12.4,-12.7 2.9,-5.5 4.3,-11.9 4.3,-19.2 0,-7.3 -1.4,-13.7 -4.3,-19.1 -2.9,-5.5 -7.1,-9.7 -12.4,-12.6 z m -5.6,48.5 c -3,3.8 -7.4,5.7 -13.2,5.7 -5.7,0 -10.1,-1.9 -13.1,-5.7 -3,-3.8 -4.6,-9.4 -4.6,-16.8 0,-7.3 1.5,-12.9 4.6,-16.7 3.1,-3.8 7.5,-5.8 13.2,-5.8 5.7,0 10.1,1.9 13.1,5.8 3,3.8 4.6,9.4 4.6,16.7 -0.1,7.4 -1.6,13 -4.6,16.8 z"
+         id="path38"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <rect
+         x="1331.5"
+         y="979.70001"
+         class="st1"
+         width="17.799999"
+         height="69.599998"
+         id="rect40"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <rect
+         x="1330.5"
+         y="947.40002"
+         class="st1"
+         width="19.6"
+         height="17.5"
+         id="rect42"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>