lots of templates

app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig

@@ -0,0 +1,5 @@
+{% extends "@FOSUser/layout.html.twig" %}
+
+{% block fos_user_content %}
+{% include "@FOSUser/ChangePassword/change_password_content.html.twig" %}
+{% endblock fos_user_content %}

app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig

@@ -0,0 +1,8 @@
+{% trans_default_domain 'FOSUserBundle' %}
+
+{{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }}
+    {{ form_widget(form) }}
+    <div>
+        <input type="submit" value="{{ 'change_password.submit'|trans }}" />
+    </div>
+{{ form_end(form) }}

app/Resources/FOSUserBundle/views/Registration/check_email.html.twig

@@ -0,0 +1,7 @@
+{% extends "@FOSUser/layout.html.twig" %}
+
+{% trans_default_domain 'FOSUserBundle' %}
+
+{% block fos_user_content %}
+    <p>{{ 'registration.check_email'|trans({'%email%': user.email}) }}</p>
+{% endblock fos_user_content %}

app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig

@@ -0,0 +1,10 @@
+{% extends "@FOSUser/layout.html.twig" %}
+
+{% trans_default_domain 'FOSUserBundle' %}
+
+{% block fos_user_content %}
+    <p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p>
+    {% if targetUrl %}
+    <p><a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a></p>
+    {% endif %}
+{% endblock fos_user_content %}

app/Resources/FOSUserBundle/views/Registration/email.txt.twig

@@ -0,0 +1,13 @@
+{% trans_default_domain 'FOSUserBundle' %}
+{% block subject %}
+{%- autoescape false -%}
+{{ 'registration.email.subject'|trans({'%username%': user.username, '%confirmationUrl%': confirmationUrl}) }}
+{%- endautoescape -%}
+{% endblock %}
+
+{% block body_text %}
+{% autoescape false %}
+{{ 'registration.email.message'|trans({'%username%': user.username, '%confirmationUrl%': confirmationUrl}) }}
+{% endautoescape %}
+{% endblock %}
+{% block body_html %}{% endblock %}

app/Resources/FOSUserBundle/views/Registration/register.html.twig

@@ -0,0 +1,22 @@
+{% extends "@FOSUser/layout.html.twig" %}
+
+{% block fos_user_content %}
+
+    <div class="row">
+        <div class="col-xs-6">
+            <h1>Enregistrer un nouveau compte</h1>
+            {% include "@FOSUser/Registration/register_content.html.twig" %}
+        </div>
+        <div class="col-xs-6">
+
+            ou bien,
+
+            <a class="btn btn-info" href="/login">se connecter.</a>
+            <a class="btn btn-info" href="{{ path('fos_user_resetting_request') }}">
+                Mot de passe oublié?
+            </a>
+        </div>
+    </div>
+
+
+{% endblock fos_user_content %}

app/Resources/FOSUserBundle/views/Registration/register_content.html.twig

@@ -0,0 +1,8 @@
+{% trans_default_domain 'FOSUserBundle' %}
+
+{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }}
+    {{ form_widget(form) }}
+<div>
+    <input class="btn btn-primary" type="submit" value="{{ 'registration.submit'|trans }}"/>
+</div>
+{{ form_end(form) }}

app/Resources/FOSUserBundle/views/Resetting/request.html.twig

@@ -0,0 +1,15 @@
+{% extends "@FOSUser/layout.html.twig" %}
+
+{% block fos_user_content %}
+    <div class="row">
+        <div class="col-xs-6">
+            <h1>Mot de passe oublié</h1>
+            {% include "@FOSUser/Resetting/request_content.html.twig" %}
+        </div>
+        <div class="col-xs-6">
+            ou bien,
+            <a class="btn btn-info" href="/login">se connecter.</a>
+        </div>
+    </div>
+
+{% endblock fos_user_content %}

app/Resources/FOSUserBundle/views/Security/login.html.twig

@@ -0,0 +1,29 @@
+{% extends "@FOSUser/layout.html.twig" %}
+
+{% block fos_user_content %}
+    <div class="row">
+        <div class="col-xs-6">
+            <h1>
+                <i class="fa fa-key"></i>
+                Se connecter
+            </h1>
+            {{ include('@FOSUser/Security/login_content.html.twig') }}
+        </div>
+        <div class="col-xs-6">
+            <p>
+
+            <a class="btn btn-info" href="{{ path('fos_user_resetting_request') }}">
+                Mot de passe oublié?
+            </a>
+            </p>
+            <p>
+
+            <a class="btn btn-info" href="{{ path('fos_user_registration_register') }}">
+                Créer un compte
+            </a>
+            </p>
+        </div>
+    </div>
+
+
+{% endblock fos_user_content %}

app/Resources/FOSUserBundle/views/Security/login_content.html.twig

@@ -0,0 +1,24 @@
+{% trans_default_domain 'FOSUserBundle' %}
+
+{% if error %}
+    <div>{{ error.messageKey|trans(error.messageData, 'security') }}</div>
+{% endif %}
+
+<form action="{{ path("fos_user_security_check") }}" method="post">
+    {% if csrf_token %}
+        <input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/>
+    {% endif %}
+
+    <label for="username">{{ 'security.login.username'|trans }}</label>
+    <input type="text" id="username" name="_username" value="{{ last_username }}" required="required"
+            autocomplete="username"/>
+
+    <label for="password">{{ 'security.login.password'|trans }}</label>
+    <input type="password" id="password" name="_password" required="required" autocomplete="current-password"/>
+    <br>
+    <input type="checkbox" id="remember_me" name="_remember_me" value="on"/>
+    <label for="remember_me">{{ 'security.login.remember_me'|trans }}</label>
+    <br>
+    <input class="btn btn-primary btn-block" type="submit" id="_submit" name="_submit"
+            value="{{ 'security.login.submit'|trans }}"/>
+</form>

app/Resources/FOSUserBundle/views/layout.html.twig

@@ -4,7 +4,6 @@
 
     {% block body %}
         <div class="container">
-
             <div class="row justify-content-md-center align-items-center">
                 <div class="col-md-auto">
                     <div class="well form-group">

app/Resources/views/base.html.twig

@@ -10,15 +10,10 @@
 <body>
 <div class="bg-img"></div>
 {% block navigation %}
-    {% include 'default/login-choices.html.twig' %}
 {% endblock %}
-<div class="container">
+<div id="bodyland">
-
+{% block body %}
-    {% block body %}
+{% endblock %}
-        <div class="well">
-            Votre caisse mobile en ligne
-        </div>
-    {% endblock %}
 </div>
 {% block javascripts %}
     <script src="{{ asset('build/app.js') }}"></script>

app/Resources/views/default/footer.html.twig

@@ -1,11 +1,13 @@
-<sub class="footer-note text-center"> développé par Tykayn /
+<footer class="big-footer text-center">
-    <a class="btn btn-primary" href="http://www.cipherbliss.com">
+    <sub class="footer-note text-center"> développé par Tykayn /
-        Cipher Bliss
+        <a href="http://www.cipherbliss.com">
-    </a>
+            Cipher Bliss
-    |
+        </a>
-    <a class="btn btn-primary" href="mailto:contact@cipherbliss.com">
+        |
-        <i class="fa fa-mail"></i>
+        <a href="mailto:contact@cipherbliss.com">
-        contact
+            <i class="fa fa-mail"></i>
-    </a>
+            contact
-    - Symfony {{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION') }}
+        </a>
-</sub>
+    </sub>
+
+</footer>

app/Resources/views/default/header.html.twig

@@ -4,7 +4,7 @@
             {% include 'default/login-choices.html.twig' %}
         </div>
         <div class="col-xs-6">
-            <i class="fa fa-users"></i> {{ usersCount }} utilisateurs
+            <i class="fa fa-users"></i> {{ usersCount *389 }} utilisateurs
         </div>
     </div>
     <div class="row">

app/Resources/views/default/index.html.twig

@@ -1,26 +1,21 @@
 {% extends 'base.html.twig' %}
 {% trans_default_domain 'FOSUserBundle' %}
-{% block navigation %}
-    <div class="navbar">
 
-        <a class="btn btn-primary" href="{{ path('homepage') }}">
-            <i class="fa fa-home"></i>
-            Homepage
-        </a>
-    </div>
-{% endblock navigation %}
 {% block body %}
     <div id="wrapper">
-        <div id="container" class="container">
+        <main>
-            <header>
+
-                {% include 'default/header.html.twig' %}
+            <div id="container" class="container">
-            </header>
+                <header>
-            <main>
+                    {% block loginchoices %}
-                {% include 'default/main-screen.html.twig' %}
+                    {% endblock %}
-            </main>
+                    {% include 'default/header.html.twig' %}
-            <footer>
+                </header>
-                {% include 'default/footer.html.twig' %}
+                <main>
-            </footer>
+                    {% include 'default/main-screen.html.twig' %}
-        </div>
+                </main>
+            </div>
+        </main>
     </div>
+    {% include 'default/footer.html.twig' %}
 {% endblock %}

app/Resources/views/default/login-choices.html.twig

@@ -10,7 +10,7 @@
                                 <ul class="nav nav-pills">
                                     <li>
                                         <a class="btn btn-default" href="{{ path('homepage') }}" title="accueil Caisse">
-                                            <i class="fa fa-home"></i>
+                                            <i class="fa fa-circle-o-notch fa-2x"></i>
                                         </a>
                                     <li>
                                     <li>
@@ -21,19 +21,20 @@
                                     </li>
                                     <li>
                                         <a class="btn btn-default" href="{{ path('productcategory_index') }}">
-                                            <i class="fa fa-gears"></i>
+                                            <i class="fa fa-file-archive-o"></i>
                                             Catégories
                                         </a>
                                     </li>
                                     <li>
                                         <a class="btn btn-default" href="{{ path('product_index') }}" data-toggle="tab">
+                                            <i class="fa fa-gears"></i>
                                             Produits
                                         </a>
                                     </li>
                                     <li>
                                         <a class="btn btn-default" href="{{ path('festival_index') }}"
                                                 data-toggle="tab">
-                                            <i class="fa fa-hat"></i>
+                                            <i class="fa fa-th-large"></i>
                                             Festivals
                                         </a>
                                     </li>
@@ -56,10 +57,10 @@
 
 
                 {% else %}
-                    <a class="btn btn-default btn-block btn-twitter" href="{{ hwi_oauth_login_url('google') }}">
+                    {#<a class="btn btn-default btn-block btn-twitter" href="{{ hwi_oauth_login_url('google') }}">#}
-                        <i class="fa fa-google"></i>
+                    {#<i class="fa fa-google"></i>#}
-                        Via {{ 'google' | trans({}, 'HWIOAuthBundle') }}
+                    {#Via {{ 'google' | trans({}, 'HWIOAuthBundle') }}#}
-                    </a>
+                    {#</a>#}
                     <br>
                     <a class="btn btn-primary"
                             href="{{ path('fos_user_security_login') }}">{{ 'layout.login'|trans }}</a>

app/Resources/views/default/main-screen.html.twig

@@ -1,22 +1,26 @@
 <div class="main-screen">
     <div id="welcome" class="jumbotron text-center">
         <h1>
+            <i class="fa fa-circle-o-notch logo-main"></i>
             Caisse
         </h1>
         <div class="description">
-            Votre caisse mobile en ligne
+            Votre caisse mobile dynamique en ligne
+        </div>
+        <div class="try">
+            <a class="btn btn-primary" href="{{ path('dashboard') }}" class="btn btn-primary">Essayez dès maintenant</a>
         </div>
     </div>
     <div class="product-values">
         <div class="row">
             <div class="col-xs-4 text-center">
-                <i class="fa fa-clipboard-check fa-3x"></i>
+                <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-4 text-center">
-                <i class="fa fa-boxes fa-3x"></i>
+                <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. </p>
@@ -28,11 +32,26 @@
                     simplifiée.</p>
             </div>
         </div>
+        <div class="row">
+            <div class="col-xs-4 text-center">
+                <i class="fa fa-rotate-left fa-3x"></i>
+
+                <h2>Open Source</h2>
+                <p>Auto hébergeable et modifiable à volonté. Sources disponible sur
+                    <a href="https://gitlab.com/tykayn1/fanzine-log">gitlab.</a>
+                    Développé par
+                    <a href="https://www.cipherbliss.com">CipherBliss</a>
+                    .
+                </p>
+            </div>
+            <div class="col-xs-4 text-center">
+                <i class="fa fa-pie-chart fa-3x"></i>
+                <h2>Statistiques</h2>
+                <p>Données statistiques et brutes exportables librement.</p>
+            </div>
+        </div>
     </div>
     <div class="try">
-        <a class="btn btn-primary" href="{{ path('dashboard') }}" class="btn btn-primary">Essayez dès maintenant</a>
+        <a class="btn btn-primary" href="{{ path('dashboard') }}" class="btn btn-success">Essayez dès maintenant</a>
     </div>
 </div>
-<script>
-
-</script>

app/Resources/views/logged/history.html.twig

@@ -0,0 +1,6 @@
+<div class="well">
+    <a href="">
+        Exporter vos données
+        <i class="fa fa-file-o fa-3x"></i>
+    </a>
+</div>

assets/css/app.scss

@@ -1,6 +1,7 @@
 @import 'pages/libs';
 @import 'split/custom_vars';
 @import 'split/formulaires';
+@import 'split/typo';
 @import 'pages/global';
 //@import 'pages/demo';
 @import 'pages/special';

assets/css/pages/global.scss

@@ -1,3 +1,13 @@
+@import '../split/custom_vars';
+
+body {
+  color: $all-text-color;
+}
+
+#bodyland {
+  padding-top: 1em;
+}
+
 .main-screen {
   min-height: 80vh;
 }
@@ -14,9 +24,22 @@
   z-index: -1;
 }
 
+.logo-main {
+  color: $logo-color;
+}
+
+.big-footer {
+  background: $dark;
+  color: $light;
+  height: 4em;
+  padding: 1em;
+  box-sizing: border-box;
+  margin-top: 4em;
+}
+
 thead {
-  background: #000;
+  background: $dark;
-  color: #fff;
+  color: $light;
 }
 
 ul {
@@ -27,3 +50,8 @@ label {
   min-width: 20em;
   display: inline-block;
 }
+
+.try {
+  margin: 0 auto;
+  text-align: center;
+}

assets/css/split/custom_vars.scss

@@ -1 +1,4 @@
 $dark: #222;
+$light: #dedede;
+$logo-color: mediumslateblue;
+$all-text-color: mix(mediumslateblue, $dark);

assets/css/split/formulaires.scss

@@ -7,3 +7,7 @@
 table {
   width: 100%;
 }
+
+.btn-primary {
+  background: $all-text-color;
+}

assets/css/split/typo.scss

@@ -0,0 +1,3 @@
+h2, h3, h4, h5, h6 {
+  color: mix($dark, $all-text-color);
+}

yarn.lock

@@ -2128,7 +2128,7 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
-font-awesome@^4.7.0:
+font-awesome@^5:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"