From: Vincent Vanwaelscappel Date: Fri, 30 Aug 2019 18:02:20 +0000 (+0200) Subject: wip #2974 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=74a6f634762c03bb4fd513c0d647cc069a7cf441;p=pmi.git wip #2974 @1 --- diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index bb45c5f..cd9feaf 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -2,6 +2,7 @@ namespace App\Http; +use App\Http\Middleware\Menu; use Illuminate\Foundation\Http\Kernel as HttpKernel; class Kernel extends HttpKernel @@ -21,7 +22,6 @@ class Kernel extends HttpKernel \App\Http\Middleware\TrustProxies::class, \Spatie\MissingPageRedirector\RedirectsMissingPages::class, \Spatie\Honeypot\ProtectAgainstSpam::class, - \Cubist\Backpack\app\Middleware\EmailObfuscate::class, ]; /** @@ -38,6 +38,8 @@ class Kernel extends HttpKernel \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, + \Cubist\Backpack\app\Middleware\EmailObfuscate::class, + \App\Http\Middleware\Menu::class, ], 'api' => [ diff --git a/app/Http/Middleware/Menu.php b/app/Http/Middleware/Menu.php index 4d1c27a..93ad100 100644 --- a/app/Http/Middleware/Menu.php +++ b/app/Http/Middleware/Menu.php @@ -4,6 +4,7 @@ namespace App\Http\Middleware; +use Cubist\Backpack\app\Magic\Menu\Facade as CubistMenu; use Illuminate\Http\Request; use \Closure; diff --git a/resources/js/menu.js b/resources/js/menu.js index a416228..befc811 100644 --- a/resources/js/menu.js +++ b/resources/js/menu.js @@ -1,21 +1,23 @@ //=== MMenu Setup import MmenuLight from 'mmenu-light/dist/js/mmlight'; import offcanvas from 'mmenu-light/dist/js/mmlight.offcanvas'; + MmenuLight.prototype.offcanvas = offcanvas; document.addEventListener( 'DOMContentLoaded', () => { - const menuSelector = '#menu'; - const menu = new MmenuLight(document.querySelector(menuSelector)); + let nav=document.getElementById("mobile-nav"); + window.mmenu = new MmenuLight(nav, {title: "Menu", theme: 'dark'}); - menu.enable('(max-width: 1000px)'); // Note: this should match the menu CSS breakpoint! - menu.offcanvas(); + mmenu.enable('(max-width: 1000px)'); // Note: this should match the menu CSS breakpoint! + mmenu.offcanvas(); + nav.classList.remove('hidden') - document.querySelector(`a[href="${menuSelector}"]`) + document.querySelector(`a[href="#menu"]`) .addEventListener('click', (event) => { - menu.open(); + mmenu.open(); event.preventDefault(); event.stopPropagation(); - }); + }); } ); diff --git a/resources/styles/components/navigation.styl b/resources/styles/components/navigation.styl index 3a54646..c7c0b03 100644 --- a/resources/styles/components/navigation.styl +++ b/resources/styles/components/navigation.styl @@ -78,3 +78,9 @@ min-width: 285px // Make sure both columns are a bit closer in width +#mobile-nav + display: none; + +below(1000px) + &.hidden + display none + display block diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index d9b4743..6f87e0e 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -1,3 +1,4 @@ +@include('partials.nav-mobile')