From 03426296abd5090327213bcb2643a3434e697c80 Mon Sep 17 00:00:00 2001
From: Baptiste Lemoine <baptiste.lemoine@ext.ercom.fr>
Date: Mon, 27 Aug 2018 16:16:54 +0200
Subject: [PATCH] responsive style on homepage

---
 .../views/default/description-app.html.twig   | 12 +++++-----
 .../views/default/main-screen.html.twig       | 12 +++++-----
 assets/css/pages/global.scss                  |  1 -
 assets/css/pages/home.scss                    |  1 +
 assets/css/pages/responsive.scss              | 24 +++++++++++++++++++
 .../Controller/DefaultController.php          |  7 ++++--
 6 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/app/Resources/views/default/description-app.html.twig b/app/Resources/views/default/description-app.html.twig
index bf36a696..46df9446 100755
--- a/app/Resources/views/default/description-app.html.twig
+++ b/app/Resources/views/default/description-app.html.twig
@@ -1,19 +1,19 @@
 <div class="product-values marged-v">
     <div class="row">
-        <div class="col-xs-12 col-sm-4 text-center">
+        <div class="col-xs-12 col-sm-4 text-center product-values-block">
             <i class="fa fa-check-circle fa-3x"></i>
             <h2 class="text-center">Gratuit</h2>
             <p>Gérez votre comptabilité de stand en ligne sans dépenser un rond. Plus besoin de transporter un
                 inventaire et des feuilles de calcul faites à l'arrache.</p>
         </div>
-        <div class="col-xs-12 col-sm-4 text-center">
+        <div class="col-xs-12 col-sm-4 text-center product-values-block">
             <i class="fa fa-random fa-3x"></i>
             <h2>Flexible</h2>
             <p>Modifiez vos produits à la volée, soyez plusieurs à gérer la caisse si vous le souhaitez, changez de
                 responsable en cours de journée. Créez plusieurs produits juste en écrivant leur nom avec l'interface
                 d'importation simplifiée.</p>
         </div>
-        <div class="col-xs-12 col-sm-4 text-center">
+        <div class="col-xs-12 col-sm-4 text-center product-values-block">
             <i class="fa fa-truck fa-3x"></i>
             <h2>Portable</h2>
             <p>Fait pour être utilisé sur les marchés et les salons. Votre gestion des stocks n'en sera que
@@ -21,7 +21,7 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-xs-12 col-sm-4 text-center">
+        <div class="col-xs-12 col-sm-4 text-center product-values-block">
             <i class="fa fa-rotate-left fa-3x"></i>
 
             <h2>Open Source</h2>
@@ -32,12 +32,12 @@
                 .
             </p>
         </div>
-        <div class="col-xs-12 col-sm-4 text-center">
+        <div class="col-xs-12 col-sm-4 text-center product-values-block">
             <i class="fa fa-pie-chart fa-3x"></i>
             <h2>Statistiques</h2>
             <p>Données statistiques et gestion des stocks actualisée au fur et à mesure des ventes.</p>
         </div>
-        <div class="col-xs-12 col-sm-4 text-center">
+        <div class="col-xs-12 col-sm-4 text-center product-values-block">
             <i class="fa fa-heart-o fa-3x"></i>
             <h2>Data Love</h2>
             <p>Données exportables et importables en masse librement.</p>
diff --git a/app/Resources/views/default/main-screen.html.twig b/app/Resources/views/default/main-screen.html.twig
index ce6d3955..dc3725c9 100755
--- a/app/Resources/views/default/main-screen.html.twig
+++ b/app/Resources/views/default/main-screen.html.twig
@@ -9,13 +9,13 @@
                     <div class="bg-shader">
                         <div class="container main-section">
                             <div class="row">
-                                <div class="col-xs-6">
+                                <div class="col-xs-12 col-sm-6 padded-v">
                                     <h1>
                                         {#<i class="fa fa-circle-o-notch logo-main"></i>#}
                                         Caisse Bliss
                                     </h1>
                                 </div>
-                                <div class="col-xs-6">
+                                <div class="col-xs-12 col-sm-6 padded-v">
                                     <div class="description">
                                         <strong> Votre caisse mobile dynamique en ligne </strong> Pensé pour les
                                         exposants et les créateurs divers en festival, cette caisse saura s'adapter à
@@ -25,14 +25,14 @@
                                     <div class="try">
                                         <br>
                                         <div class="row">
-                                            <div class="col-xs-6 padded text-right">
+                                            <div class="col-xs-12 col-sm-6 padded text-right">
                                                 <a class="btn btn-primary"
                                                         href="{{ path('fos_user_security_login') }}"
                                                         class="btn btn-primary">
                                                     Essayez dès maintenant
                                                 </a>
                                             </div>
-                                            <div class="col-xs-6">
+                                            <div class="col-xs-12 col-sm-6">
                                                 <sub> Démonstration en vous connectant avec le login:
                                                     <strong>demo</strong> et le mot de passe <strong>demo</strong>.
                                                 </sub>
@@ -59,7 +59,7 @@
                         <div class="try">
                             <fieldset class="bg-dark padded">
                                 <div class="row">
-                                    <div class="col-xs-6">
+                                    <div class="col-xs-12 col-sm-6">
                                         <a class="btn btn-primary" href="{{ path('dashboard') }}"
                                                 class="btn btn-success">
                                             Essayez dès maintenant
@@ -69,7 +69,7 @@
                                             mot de passe <strong>demo</strong>.
                                         </p>
                                     </div>
-                                    <div class="col-xs-6">
+                                    <div class="col-xs-12 col-sm-6">
                                         {#<a class="btn btn-default" href="{{ path('fos_user_security_login') }}">#}
                                         {#<i class="fa fa-key"></i>#}
                                         {#Se connecter#}
diff --git a/assets/css/pages/global.scss b/assets/css/pages/global.scss
index 94e58dff..96ebc3d8 100755
--- a/assets/css/pages/global.scss
+++ b/assets/css/pages/global.scss
@@ -66,7 +66,6 @@ body {
   height: 4em;
   padding: 1em;
   box-sizing: border-box;
-  margin-top: 4em;
 }
 
 thead {
diff --git a/assets/css/pages/home.scss b/assets/css/pages/home.scss
index 34527056..888b83a6 100755
--- a/assets/css/pages/home.scss
+++ b/assets/css/pages/home.scss
@@ -27,4 +27,5 @@
   h2, h3, h4, h5, h6 {
     color: $light;
   }
+  font-size: 1.25rem;
 }
diff --git a/assets/css/pages/responsive.scss b/assets/css/pages/responsive.scss
index f92e6955..fd5a9f0b 100755
--- a/assets/css/pages/responsive.scss
+++ b/assets/css/pages/responsive.scss
@@ -1,5 +1,26 @@
 
 @media all and(max-width: 1200px) {
+  html,body{
+    font-size: 1.2rem;
+  }
+  .bg-shader {
+     height: 100%;
+     min-height: 100vh;
+   }
+  .product-values-block {
+    padding: 1em;
+  }
+
+  #homepage{
+    .main-section{
+      padding: 2rem;
+    }
+    .btn{
+      display:block;
+      width: 100%;
+      font-size: 1.25em;
+    }
+  }
   #caisse-now {
     .product-box {
       width: 100%;
@@ -11,6 +32,9 @@
 }
 
 @media all and(max-width: 600px) {
+  html,body{
+    font-size: 1.5rem;
+  }
   .category-listing{
     width: calc(100% - 2rem);
   }
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
index 8da1f41b..a8ac3797 100755
--- a/src/AppBundle/Controller/DefaultController.php
+++ b/src/AppBundle/Controller/DefaultController.php
@@ -3,7 +3,6 @@
 namespace AppBundle\Controller;
 
 use AppBundle\Entity\ExpenseKind;
-use AppBundle\Entity\Festival;
 use AppBundle\Entity\Product;
 use AppBundle\Entity\ProductCategory;
 use AppBundle\Entity\ProductSold;
@@ -219,10 +218,14 @@ class DefaultController extends Controller
 
         $m->persist($currentUser);
         $m->flush();
-        $expensesOfUser = $currentUser->getExpenses();
+
+        $ownerService = $this->ownerService;
+        $expensesOfUser = $ownerService->serializeExpensesOfUser($currentUser);
 
         return new JsonResponse([
             'expenses' => $expensesOfUser,
+            'disponibility' => $currentUser->getDisponibility(),
+            'averageMonthlyEarnings' => $currentUser->getAverageMonthlyEarnings(),
         ]);
     }