From 06e64936641c5d311e4238367486674fd210784d Mon Sep 17 00:00:00 2001
From: Clement <clement@desmidt.fr>
Date: Mon, 27 Jul 2020 16:16:27 +0200
Subject: [PATCH] =?UTF-8?q?:lipstick:=20Ajoute=20des=20espaces=20ins=C3=A9?=
 =?UTF-8?q?cables=20et=20formate=20les=20prix=20et=20surfaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ajoute aussi des icônes pour faire joli
Fix #10
Fix #9
---
 app/Providers/AppServiceProvider.php  |  7 +++
 resources/views/homes/view.blade.php  | 68 ++++++++++++++++++++++-----
 resources/views/public/view.blade.php | 60 +++++++++++++++++++----
 3 files changed, 113 insertions(+), 22 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 0f1ea4b..e050a4a 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -27,5 +27,12 @@ class AppServiceProvider extends ServiceProvider
         Str::macro('currency', static function ($price) {
             return sprintf('%s €', number_format($price, 0, ',', ' '));
         });
+
+        Str::macro('surface', static function ($surface) {
+            if (empty($surface)) {
+                return '';
+            }
+            return sprintf('%s m²', number_format($surface, 0, ',', ' '));
+        });
     }
 }
diff --git a/resources/views/homes/view.blade.php b/resources/views/homes/view.blade.php
index 006b0a0..513120d 100644
--- a/resources/views/homes/view.blade.php
+++ b/resources/views/homes/view.blade.php
@@ -53,19 +53,61 @@
                             {!! nl2br($home->description) !!}
                         </div>
                     </div>
-                    <div class="row mb-4">
-                        <div class="col-lg-12"><h3>Informations :</h3></div>
-                        <div class="col-lg-3"><strong>Ville : </strong> {{ $home->city }}</div>
-                        <div class="col-lg-3"><strong>Prix : </strong> {{ $home->price }}</div>
-                        <div class="col-lg-3"><strong>Surface : </strong> {{ $home->surface }} m²</div>
-                        <div class="col-lg-3"><strong>Nombre de pièces : </strong>{{ $home->rooms }}</div>
-                    </div>
-                    <div class="row mb-4">
-                        <div class="col-lg-12"><h3>Informations complémentaires :</h3></div>
-                        <div class="col-lg-3"><strong>Surface de jardin : </strong> {{ $home->garden_surface ?? '−' }}</div>
-                        <div class="col-lg-3"><strong>Énergie : </strong> {{ $home->energy ?? '−' }}</div>
-                        <div class="col-lg-3"><strong>GES : </strong> {{ $home->ges ?? '−' }}</div>
-                    </div>
+                        <div class="row mb-4">
+                            <div class="col-lg-12">
+                                <h3>
+                                    <svg class="bi" width="32" height="32" fill="currentColor">
+                                        <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#exclamation-circle"/>
+                                    </svg>
+                                    Informations
+                                </h3>
+                            </div>
+                            <div class="col-lg-3">
+                                <svg class="bi" width="16" height="16" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#bullseye"/>
+                                </svg>
+                                <strong>Ville&nbsp;: </strong> {{ $home->city }}</div>
+                            <div class="col-lg-3">
+                                <svg class="bi" width="16" height="16" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#calculator-fill"/>
+                                </svg>
+                                <strong>Prix&nbsp;: </strong> {{ Str::currency($home->price) }}</div>
+                            <div class="col-lg-3">
+                                <svg class="bi" width="16" height="16" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#house"/>
+                                </svg>
+                                <strong>Surface&nbsp;: </strong> {{ Str::surface($home->surface) }}</div>
+                            <div class="col-lg-3">
+                                <svg class="bi" width="16" height="16" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#grid-3x3"/>
+                                </svg>
+                                <strong>Pièces&nbsp;: </strong>{{ $home->rooms }}</div>
+                        </div>
+                        <div class="row mb-4">
+                            <div class="col-lg-12">
+                                <h3>
+                                    <svg class="bi" width="32" height="32" fill="currentColor">
+                                        <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#info-circle"/>
+                                    </svg>
+                                    Informations complémentaires
+                                </h3>
+                            </div>
+                            <div class="col-lg-3">
+                                <svg class="bi" width="16" height="16" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#hexagon"/>
+                                </svg>
+                                <strong>Jardin&nbsp;: </strong> {{ Str::surface($home->garden_surface) }}</div>
+                            <div class="col-lg-3">
+                                <svg class="bi" width="16" height="16" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#lightning"/>
+                                </svg>
+                                <strong>Énergie&nbsp;: </strong> {{ $home->energy ?? '−' }}</div>
+                            <div class="col-lg-3">
+                                <svg class="bi" width="16" height="16" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#life-preserver"/>
+                                </svg>
+                                <strong>GES&nbsp;: </strong> {{ $home->ges ?? '−' }}</div>
+                        </div>
                     <div class="row">
                         @if(!empty($home->slug)) <div class="col-lg-3"><a href="{{ route('public.view', $home->slug) }}" class="btn btn-light">Lien public</a></div>@endif
                         <div class="col-lg-3 offset-3"><a href="{{ route('home.update', $home->id) }}" class="btn btn-light">Mettre à jour</a></div>
diff --git a/resources/views/public/view.blade.php b/resources/views/public/view.blade.php
index 7e55720..c38ae20 100644
--- a/resources/views/public/view.blade.php
+++ b/resources/views/public/view.blade.php
@@ -49,17 +49,59 @@
                         </div>
                     </div>
                     <div class="row mb-4">
-                        <div class="col-lg-12"><h3>Informations :</h3></div>
-                        <div class="col-lg-3"><strong>Ville : </strong> {{ $home->city }}</div>
-                        <div class="col-lg-3"><strong>Prix : </strong> {{ $home->price }}</div>
-                        <div class="col-lg-3"><strong>Surface : </strong> {{ $home->surface }} m²</div>
-                        <div class="col-lg-3"><strong>Nombre de pièces : </strong>{{ $home->rooms }}</div>
+                        <div class="col-lg-12">
+                            <h3>
+                                <svg class="bi" width="32" height="32" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#exclamation-circle"/>
+                                </svg>
+                                Informations
+                            </h3>
+                        </div>
+                        <div class="col-lg-3">
+                            <svg class="bi" width="16" height="16" fill="currentColor">
+                                <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#bullseye"/>
+                            </svg>
+                            <strong>Ville&nbsp;: </strong> {{ $home->city }}</div>
+                        <div class="col-lg-3">
+                            <svg class="bi" width="16" height="16" fill="currentColor">
+                                <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#calculator-fill"/>
+                            </svg>
+                            <strong>Prix&nbsp;: </strong> {{ Str::currency($home->price) }}</div>
+                        <div class="col-lg-3">
+                            <svg class="bi" width="16" height="16" fill="currentColor">
+                                <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#house"/>
+                            </svg>
+                            <strong>Surface&nbsp;: </strong> {{ Str::surface($home->surface) }}</div>
+                        <div class="col-lg-3">
+                            <svg class="bi" width="16" height="16" fill="currentColor">
+                                <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#grid-3x3"/>
+                            </svg>
+                            <strong>Pièces&nbsp;: </strong>{{ $home->rooms }}</div>
                     </div>
                     <div class="row mb-4">
-                        <div class="col-lg-12"><h3>Informations complémentaires :</h3></div>
-                        <div class="col-lg-3"><strong>Surface de jardin : </strong> {{ $home->garden_surface ?? '−' }}</div>
-                        <div class="col-lg-3"><strong>Énergie : </strong> {{ $home->energy ?? '−' }}</div>
-                        <div class="col-lg-3"><strong>GES : </strong> {{ $home->ges ?? '−' }}</div>
+                        <div class="col-lg-12">
+                            <h3>
+                                <svg class="bi" width="32" height="32" fill="currentColor">
+                                    <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#info-circle"/>
+                                </svg>
+                                Informations complémentaires
+                            </h3>
+                        </div>
+                        <div class="col-lg-3">
+                            <svg class="bi" width="16" height="16" fill="currentColor">
+                                <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#hexagon"/>
+                            </svg>
+                            <strong>Jardin&nbsp;: </strong> {{ Str::surface($home->garden_surface) }}</div>
+                        <div class="col-lg-3">
+                            <svg class="bi" width="16" height="16" fill="currentColor">
+                                <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#lightning"/>
+                            </svg>
+                            <strong>Énergie&nbsp;: </strong> {{ $home->energy ?? '−' }}</div>
+                        <div class="col-lg-3">
+                            <svg class="bi" width="16" height="16" fill="currentColor">
+                                <use xlink:href="{{ asset('images/bootstrap-icons.svg') }}#life-preserver"/>
+                            </svg>
+                            <strong>GES&nbsp;: </strong> {{ $home->ges ?? '−' }}</div>
                     </div>
                     <div class="row">
                         <div class="col-lg-3"><a href="{{ $home->url }}" class="btn btn-success">Voir l'origine →</a></div>