From e15ddb1b28d3ff264299d9eaaa9962fb43ac7b04 Mon Sep 17 00:00:00 2001
From: Stephen Cameron <s@hybridvision.net>
Date: Wed, 3 Jul 2019 22:53:27 +0200
Subject: [PATCH] WIP #2731 @8

---
 app/Http/Middleware/GenerateMenus.php    |  3 ++
 app/SubForms/Person.php                  | 25 +++++++++
 app/SubForms/Value.php                   | 25 +++++++++
 app/Templates/Aboutus.php                | 64 ++++++++++++++++++++++--
 resources/js/components/NumberInput.vue  |  1 +
 resources/views/pages/solution.blade.php |  6 +--
 6 files changed, 116 insertions(+), 8 deletions(-)
 create mode 100644 app/SubForms/Person.php
 create mode 100644 app/SubForms/Value.php

diff --git a/app/Http/Middleware/GenerateMenus.php b/app/Http/Middleware/GenerateMenus.php
index 2446c3e..3052ae1 100644
--- a/app/Http/Middleware/GenerateMenus.php
+++ b/app/Http/Middleware/GenerateMenus.php
@@ -51,6 +51,9 @@ class GenerateMenus
 
         $nav_items = [];
         foreach ($main['children'] as $name => $item) {
+
+            if ($item['element']->status !== 1) continue; // Skip offline pages
+
             $submenus = null;
             if ($name == 'products') {
                 $submenus = $productsSubMenus;
diff --git a/app/SubForms/Person.php b/app/SubForms/Person.php
new file mode 100644
index 0000000..22f5ad5
--- /dev/null
+++ b/app/SubForms/Person.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\SubForms;
+
+use Cubist\Backpack\app\Magic\SubForm;
+
+class Person extends SubForm
+{
+    public function init()
+    {
+        parent::init();
+        $this->addField(['name' => 'name',
+            'label' => __('Nom'),
+            'type' => 'Text']);
+
+        $this->addField(['name' => 'role',
+            'label' => __('Role'),
+            'type' => 'Text']);
+
+        $this->addField(['name' => 'photo',
+            'label' => __('Photo'),
+            'type' => 'Images',
+            'maxFiles' => 1]);
+    }
+}
diff --git a/app/SubForms/Value.php b/app/SubForms/Value.php
new file mode 100644
index 0000000..4508bb7
--- /dev/null
+++ b/app/SubForms/Value.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\SubForms;
+
+use Cubist\Backpack\app\Magic\SubForm;
+
+class Value extends SubForm
+{
+    public function init()
+    {
+        parent::init();
+        $this->addField(['name' => 'title',
+            'label' => __('Titre de valeur'),
+            'type' => 'Text']);
+
+        $this->addField(['name' => 'text',
+            'label' => __('Texte de valeur'),
+            'type' => 'Textarea']);
+
+        $this->addField(['name' => 'image',
+            'label' => __('Image de valeur'),
+            'type' => 'Images',
+            'maxFiles' => 1]);
+    }
+}
diff --git a/app/Templates/Aboutus.php b/app/Templates/Aboutus.php
index cea0030..f8a6fe3 100644
--- a/app/Templates/Aboutus.php
+++ b/app/Templates/Aboutus.php
@@ -24,12 +24,70 @@ class Aboutus extends Base
     public function init()
     {
         parent::init();
+
+//        $this->addField([
+//            'name' => 'content',
+//            'label' => trans('backpack::pagemanager.content'),
+//            'type' => 'Markdown',
+//            'placeholder' => trans('backpack::pagemanager.content_placeholder'),
+//        ]);
+
+        //=== Our values
+        $this->addField([
+            'name' => 'values_title',
+            'label' => __('Titre'),
+            'type' => 'Text',
+            'tab' => __('Nos Valeurs'),
+        ]);
+
         $this->addField([
-            'name' => 'content',
-            'label' => trans('backpack::pagemanager.content'),
+            'name' => 'values_text',
+            'label' => __('Texte'),
             'type' => 'Markdown',
-            'placeholder' => trans('backpack::pagemanager.content_placeholder'),
+            'tab' => __('Nos Valeurs'),
+        ]);
+
+        $this->addField([
+            'name' => 'values',
+            'type' => 'BunchOfFieldsMultiple',
+            'bunch' => 'App\SubForms\Value',
+            'label' => __('Values'),
+            'tab' => __('Nos Valeurs'),
+        ]);
+
+
+        //=== Team
+        $this->addField([
+            'name' => 'team_title',
+            'label' => __('Titre'),
+            'type' => 'Text',
+            'tab' => __("L'équipe"),
+        ]);
+
+        $this->addField([
+            'name' => 'team',
+            'type' => 'BunchOfFieldsMultiple',
+            'bunch' => 'App\SubForms\Person',
+            'label' => __("L'équipe"),
+            'tab' => __("L'équipe"),
         ]);
+
+        //=== Partners
+        $this->addField([
+            'name' => 'partners_title',
+            'label' => __('Titre'),
+            'type' => 'Text',
+            'tab' => __('Nos Partenaires'),
+        ]);
+
+        $this->addField([
+            'name' => 'partners',
+            'type' => 'BunchOfFieldsMultiple',
+            'bunch' => 'App\SubForms\Logo',
+            'label' => __('Nos Partenaires'),
+            'tab' => __('Nos Partenaires'),
+        ]);
+
     }
 
 
diff --git a/resources/js/components/NumberInput.vue b/resources/js/components/NumberInput.vue
index a34a614..7f334da 100644
--- a/resources/js/components/NumberInput.vue
+++ b/resources/js/components/NumberInput.vue
@@ -305,6 +305,7 @@
             width: 100%
 
             // Hide browser number spinners
+            -moz-appearance: textfield
             &::-webkit-outer-spin-button,
             &::-webkit-inner-spin-button
                 -webkit-appearance: none
diff --git a/resources/views/pages/solution.blade.php b/resources/views/pages/solution.blade.php
index 7cceaac..2873b05 100644
--- a/resources/views/pages/solution.blade.php
+++ b/resources/views/pages/solution.blade.php
@@ -2,10 +2,6 @@
 
 @section('content')
 
-    @php
-        $name = ucfirst($page->title);
-    @endphp
-
     <full-width padding="pb-4v">
         <content>
             <columns>
@@ -14,7 +10,7 @@
                 </column>
 
                 <column>
-                    <text-block class="pt-2v" title_class="h1 overlap-left" :title="isset($name) ? ucfirst($name) : 'Lorem ipsum'">
+                    <text-block class="pt-2v" title_class="h1 overlap-left capitalize" :title="$page->title ?? 'Lorem ipsum'">
 
                         <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Accusamus aperiam aspernatur corporis dicta dolore, earum est et eum eveniet, harum minima non, pariatur perspiciatis possimus ratione repudiandae veniam voluptas. Aspernatur eius esse laudantium nostrum nulla?</p>
 
-- 
2.39.5