wip #2868 @1

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index ee7595c391b46964ebdeac092523e4a7daf84840..8881bfd3859f06d84d25da9588908beea1f7dbea 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -2,23 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Page;
-use Cubist\Backpack\app\Http\Controllers\CubistFrontController;
+use Cubist\Backpack\app\Http\Controllers\CubistPageController;
 
-class PageController extends CubistFrontController
+class PageController extends CubistPageController
 {
-    public function index($slug = 'home')
-    {
-        $page = Page::findBySlug($slug);
 
-        if (!$page) {
-            $this->_404();
-        }
-
-        $this->data['title'] = $page->title;
-        $this->data['page'] = $page->withFakes()->getDecodedAttributes();
-        $this->data['model'] = $page; // So we can access model functions like ->getMedia()
-
-        return view('pages.' . $page->template, $this->data);
-    }
 }

diff --git a/config/cubist.php b/config/cubist.php
new file mode 100644 (file)
index 0000000..ab16987
--- /dev/null
+++ b/config/cubist.php
@@ -0,0 +1,3 @@
+<?php
+return ['page_model' => '\App\Models\Page'];
+

diff --git a/resources/views/pages/solution.blade.php b/resources/views/pages/solution.blade.php
index 8b74bbad1867729b39a04e7beee77bc8dc88f235..d6740229309207d15b62f9b01a925bdd3902bb4d 100644 (file)
--- a/resources/views/pages/solution.blade.php
+++ b/resources/views/pages/solution.blade.php
@@ -2,8 +2,8 @@
 
 @section('content')
 
-    <intro-block padding="pb-4v" :title="$page->intro->title ?? ''" :image="asset('storage/uploads/images/home-wing.jpg')">
-        <p>{!! nl2br($page->intro->text) !!}</p>
-        <p><a href="#">{{ $page->intro->button->label }}</a></p>
+    <intro-block padding="pb-4v" :title="$page->get('intro.title')" :image="asset('storage/uploads/images/home-wing.jpg')">
+        <p>{!! nl2br($page->get('intro.text')) !!}</p>
+        <p><a href="#">{{ $page->get('intro.button.label') }}</a></p>
     </intro-block>
 @endsection

diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
index c2b1394cd87c2a401882f961d5336ed33247733d..c308196cb8fde062cdbab4c742afc19742b7f259 100644 (file)
--- a/resources/views/partials/footer.blade.php
+++ b/resources/views/partials/footer.blade.php
@@ -10,10 +10,10 @@
                 <p>Issue de la société Schaevitz, PM Instrumentation a su développer une gamme de capteurs et systèmes d’excellente qualité provenant principalement des Etats-Unis.</p>
             </div>
             <div class="footer-social flex">
-                <a class="text-white hover:text-blue mr-6" href="{{ $global->social->twitter }}" target="_blank" rel="noopener">
+                <a class="text-white hover:text-blue mr-6" href="{{ $global->get('social.twitter') }}" target="_blank" rel="noopener">
                     @svg('icon-twitter')
                 </a>
-                <a class="text-white hover:text-blue" href="{{ $global->social->linkedin }}" target="_blank" rel="noopener">
+                <a class="text-white hover:text-blue" href="{{ $global->get('social.linkedin') }}" target="_blank" rel="noopener">
                     @svg('icon-linkedin')
                 </a>
             </div>