From fe8b0aa111376aa8223bfa825e5af2631d375acd Mon Sep 17 00:00:00 2001 From: Kayn Ty Date: Wed, 18 Apr 2018 14:39:15 +0200 Subject: [PATCH] login redirects to dashboard --- app/Resources/views/base.html.twig | 11 +++-- .../views/default/description-app.html.twig | 40 +++++++++++++++++++ app/Resources/views/default/header.html.twig | 20 +++++++--- app/Resources/views/default/index.html.twig | 2 - .../views/default/login-choices.html.twig | 4 +- .../views/default/main-screen.html.twig | 40 +------------------ .../logged/angular/listing-products.html.twig | 3 +- .../views/logged/dashboard.html.twig | 3 +- app/config/security.yml | 5 +-- 9 files changed, 71 insertions(+), 57 deletions(-) create mode 100644 app/Resources/views/default/description-app.html.twig diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 937c2693..28ec5bab 100755 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -8,12 +8,17 @@ {% endblock %} -
+{% if app.user is not defined %} +
+{% else %} +
+{% endif %} + {% block navigation %} {% endblock %}
-{% block body %} -{% endblock %} + {% block body %} + {% endblock %}
{% block javascripts %} diff --git a/app/Resources/views/default/description-app.html.twig b/app/Resources/views/default/description-app.html.twig new file mode 100644 index 00000000..f55fea24 --- /dev/null +++ b/app/Resources/views/default/description-app.html.twig @@ -0,0 +1,40 @@ +
+
+
+ +

Gratuit

+

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.

+
+
+ +

Flexible

+

Modifiez vos produits à la volée, soyez plusieurs à gérer la caisse si vous le souhaitez, changez de + responsable en cours de journée.

+
+
+ +

Portable

+

Fait pour être utilisé sur les marchés et les salons. Votre gestion des stocks n'en sera que + simplifiée.

+
+
+
+
+ + +

Open Source

+

Auto hébergeable et modifiable à volonté. Sources disponible sur + gitlab. + Développé par + CipherBliss + . +

+
+
+ +

Statistiques

+

Données statistiques et brutes exportables librement.

+
+
+
diff --git a/app/Resources/views/default/header.html.twig b/app/Resources/views/default/header.html.twig index 0dd9d9df..6bb139b6 100755 --- a/app/Resources/views/default/header.html.twig +++ b/app/Resources/views/default/header.html.twig @@ -1,11 +1,19 @@
-
- {% include 'default/login-choices.html.twig' %} -
-
- {{ usersCount *389 }} utilisateurs -
+ + {% if usersCount is defined %} +
+ {% include 'default/login-choices.html.twig' %} +
+
+ {{ usersCount *389 }} utilisateurs +
+ {% else %} +
+ {% include 'default/login-choices.html.twig' %} +
+ {% endif %} +
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index cb2bca88..701a5989 100755 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -7,8 +7,6 @@
- {% block loginchoices %} - {% endblock %} {% include 'default/header.html.twig' %}
diff --git a/app/Resources/views/default/login-choices.html.twig b/app/Resources/views/default/login-choices.html.twig index 7adf8ee8..5256e3c0 100755 --- a/app/Resources/views/default/login-choices.html.twig +++ b/app/Resources/views/default/login-choices.html.twig @@ -5,7 +5,7 @@