From e88127474eafb24898d7e5dcd9cf769d99bb23e6 Mon Sep 17 00:00:00 2001 From: Kayn Ty Date: Wed, 18 Apr 2018 14:21:58 +0200 Subject: [PATCH] lots of templates --- .../ChangePassword/change_password.html.twig | 5 +++ .../change_password_content.html.twig | 8 +++++ .../views/Registration/check_email.html.twig | 7 ++++ .../views/Registration/confirmed.html.twig | 10 ++++++ .../views/Registration/email.txt.twig | 13 ++++++++ .../views/Registration/register.html.twig | 22 +++++++++++++ .../Registration/register_content.html.twig | 8 +++++ .../views/Resetting/request.html.twig | 15 +++++++++ .../views/Security/login.html.twig | 29 ++++++++++++++++ .../views/Security/login_content.html.twig | 24 ++++++++++++++ .../FOSUserBundle/views/layout.html.twig | 1 - app/Resources/views/base.html.twig | 11 ++----- app/Resources/views/default/footer.html.twig | 24 +++++++------- app/Resources/views/default/header.html.twig | 2 +- app/Resources/views/default/index.html.twig | 33 ++++++++----------- .../views/default/login-choices.html.twig | 15 +++++---- .../views/default/main-screen.html.twig | 33 +++++++++++++++---- app/Resources/views/logged/history.html.twig | 6 ++++ assets/css/app.scss | 1 + assets/css/pages/global.scss | 32 ++++++++++++++++-- assets/css/split/custom_vars.scss | 3 ++ assets/css/split/formulaires.scss | 4 +++ assets/css/split/typo.scss | 3 ++ yarn.lock | 2 +- 24 files changed, 254 insertions(+), 57 deletions(-) create mode 100755 app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig create mode 100755 app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig create mode 100755 app/Resources/FOSUserBundle/views/Registration/check_email.html.twig create mode 100755 app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig create mode 100755 app/Resources/FOSUserBundle/views/Registration/email.txt.twig create mode 100755 app/Resources/FOSUserBundle/views/Registration/register.html.twig create mode 100755 app/Resources/FOSUserBundle/views/Registration/register_content.html.twig create mode 100644 app/Resources/FOSUserBundle/views/Resetting/request.html.twig create mode 100755 app/Resources/FOSUserBundle/views/Security/login.html.twig create mode 100755 app/Resources/FOSUserBundle/views/Security/login_content.html.twig create mode 100644 app/Resources/views/logged/history.html.twig create mode 100644 assets/css/split/typo.scss diff --git a/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig b/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig new file mode 100755 index 00000000..cdcd10d0 --- /dev/null +++ b/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 %} diff --git a/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig b/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig new file mode 100755 index 00000000..6c3d0cc1 --- /dev/null +++ b/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) }} +
+ +
+{{ form_end(form) }} diff --git a/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig b/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig new file mode 100755 index 00000000..41af21de --- /dev/null +++ b/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 %} +

{{ 'registration.check_email'|trans({'%email%': user.email}) }}

+{% endblock fos_user_content %} diff --git a/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig b/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig new file mode 100755 index 00000000..4402b4f7 --- /dev/null +++ b/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 %} +

{{ 'registration.confirmed'|trans({'%username%': user.username}) }}

+ {% if targetUrl %} +

{{ 'registration.back'|trans }}

+ {% endif %} +{% endblock fos_user_content %} diff --git a/app/Resources/FOSUserBundle/views/Registration/email.txt.twig b/app/Resources/FOSUserBundle/views/Registration/email.txt.twig new file mode 100755 index 00000000..acbc6852 --- /dev/null +++ b/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 %} diff --git a/app/Resources/FOSUserBundle/views/Registration/register.html.twig b/app/Resources/FOSUserBundle/views/Registration/register.html.twig new file mode 100755 index 00000000..9893d15c --- /dev/null +++ b/app/Resources/FOSUserBundle/views/Registration/register.html.twig @@ -0,0 +1,22 @@ +{% extends "@FOSUser/layout.html.twig" %} + +{% block fos_user_content %} + +
+
+

Enregistrer un nouveau compte

+ {% include "@FOSUser/Registration/register_content.html.twig" %} +
+
+ + ou bien, + + se connecter. + + Mot de passe oublié? + +
+
+ + +{% endblock fos_user_content %} diff --git a/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig b/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig new file mode 100755 index 00000000..f05eac7b --- /dev/null +++ b/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) }} +
+ +
+{{ form_end(form) }} diff --git a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig new file mode 100644 index 00000000..8f5f8a47 --- /dev/null +++ b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig @@ -0,0 +1,15 @@ +{% extends "@FOSUser/layout.html.twig" %} + +{% block fos_user_content %} +
+
+

Mot de passe oublié

+ {% include "@FOSUser/Resetting/request_content.html.twig" %} +
+
+ ou bien, + se connecter. +
+
+ +{% endblock fos_user_content %} diff --git a/app/Resources/FOSUserBundle/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig new file mode 100755 index 00000000..2a23c652 --- /dev/null +++ b/app/Resources/FOSUserBundle/views/Security/login.html.twig @@ -0,0 +1,29 @@ +{% extends "@FOSUser/layout.html.twig" %} + +{% block fos_user_content %} +
+
+

+ + Se connecter +

+ {{ include('@FOSUser/Security/login_content.html.twig') }} +
+
+

+ + + Mot de passe oublié? + +

+

+ + + Créer un compte + +

+
+
+ + +{% endblock fos_user_content %} diff --git a/app/Resources/FOSUserBundle/views/Security/login_content.html.twig b/app/Resources/FOSUserBundle/views/Security/login_content.html.twig new file mode 100755 index 00000000..6daf8b92 --- /dev/null +++ b/app/Resources/FOSUserBundle/views/Security/login_content.html.twig @@ -0,0 +1,24 @@ +{% trans_default_domain 'FOSUserBundle' %} + +{% if error %} +
{{ error.messageKey|trans(error.messageData, 'security') }}
+{% endif %} + +
+ {% if csrf_token %} + + {% endif %} + + + + + + +
+ + +
+ +
diff --git a/app/Resources/FOSUserBundle/views/layout.html.twig b/app/Resources/FOSUserBundle/views/layout.html.twig index 70b380da..3a7c78f5 100755 --- a/app/Resources/FOSUserBundle/views/layout.html.twig +++ b/app/Resources/FOSUserBundle/views/layout.html.twig @@ -4,7 +4,6 @@ {% block body %}
-
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 443ab158..937c2693 100755 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -10,15 +10,10 @@
{% block navigation %} - {% include 'default/login-choices.html.twig' %} {% endblock %} -
- - {% block body %} -
- Votre caisse mobile en ligne -
- {% endblock %} +
+{% block body %} +{% endblock %}
{% block javascripts %} diff --git a/app/Resources/views/default/footer.html.twig b/app/Resources/views/default/footer.html.twig index 8ce41244..90e60cee 100755 --- a/app/Resources/views/default/footer.html.twig +++ b/app/Resources/views/default/footer.html.twig @@ -1,11 +1,13 @@ - développé par Tykayn / - - Cipher Bliss - - | - - - contact - - - Symfony {{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION') }} - + diff --git a/app/Resources/views/default/header.html.twig b/app/Resources/views/default/header.html.twig index 20e845b4..0dd9d9df 100755 --- a/app/Resources/views/default/header.html.twig +++ b/app/Resources/views/default/header.html.twig @@ -4,7 +4,7 @@ {% include 'default/login-choices.html.twig' %}
- {{ usersCount }} utilisateurs + {{ usersCount *389 }} utilisateurs
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index 55539afd..cb2bca88 100755 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -1,26 +1,21 @@ {% extends 'base.html.twig' %} {% trans_default_domain 'FOSUserBundle' %} -{% block navigation %} -
- - - Homepage - -
-{% endblock navigation %} {% block body %}
-
-
- {% include 'default/header.html.twig' %} -
-
- {% include 'default/main-screen.html.twig' %} -
-
- {% include 'default/footer.html.twig' %} -
-
+
+ +
+
+ {% block loginchoices %} + {% endblock %} + {% include 'default/header.html.twig' %} +
+
+ {% include 'default/main-screen.html.twig' %} +
+
+
+ {% include 'default/footer.html.twig' %} {% endblock %} diff --git a/app/Resources/views/default/login-choices.html.twig b/app/Resources/views/default/login-choices.html.twig index e24697f6..7adf8ee8 100755 --- a/app/Resources/views/default/login-choices.html.twig +++ b/app/Resources/views/default/login-choices.html.twig @@ -10,7 +10,7 @@
  • - +
  • @@ -21,19 +21,20 @@
  • - + Catégories
  • + Produits
  • - + Festivals
    • @@ -56,10 +57,10 @@ {% else %} - - - Via {{ 'google' | trans({}, 'HWIOAuthBundle') }} - + {##} + {##} + {#Via {{ 'google' | trans({}, 'HWIOAuthBundle') }}#} + {##}
    {{ 'layout.login'|trans }} diff --git a/app/Resources/views/default/main-screen.html.twig b/app/Resources/views/default/main-screen.html.twig index 61e2499c..b7d13968 100755 --- a/app/Resources/views/default/main-screen.html.twig +++ b/app/Resources/views/default/main-screen.html.twig @@ -1,22 +1,26 @@

    + Caisse

    - Votre caisse mobile en ligne + Votre caisse mobile dynamique en ligne +
    +
    + Essayez dès maintenant
    - +

    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.

    @@ -28,11 +32,26 @@ 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.

    +
    +
    - Essayez dès maintenant + Essayez dès maintenant
    - diff --git a/app/Resources/views/logged/history.html.twig b/app/Resources/views/logged/history.html.twig new file mode 100644 index 00000000..476dd29c --- /dev/null +++ b/app/Resources/views/logged/history.html.twig @@ -0,0 +1,6 @@ +
    + + Exporter vos données + + +
    diff --git a/assets/css/app.scss b/assets/css/app.scss index 4aabfb00..e7f67d33 100755 --- a/assets/css/app.scss +++ b/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'; diff --git a/assets/css/pages/global.scss b/assets/css/pages/global.scss index aac2d8b8..0a4897fa 100755 --- a/assets/css/pages/global.scss +++ b/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; - color: #fff; + background: $dark; + color: $light; } ul { @@ -27,3 +50,8 @@ label { min-width: 20em; display: inline-block; } + +.try { + margin: 0 auto; + text-align: center; +} diff --git a/assets/css/split/custom_vars.scss b/assets/css/split/custom_vars.scss index 9f2331b5..59d40ec8 100755 --- a/assets/css/split/custom_vars.scss +++ b/assets/css/split/custom_vars.scss @@ -1 +1,4 @@ $dark: #222; +$light: #dedede; +$logo-color: mediumslateblue; +$all-text-color: mix(mediumslateblue, $dark); diff --git a/assets/css/split/formulaires.scss b/assets/css/split/formulaires.scss index 2d94cc62..f3d938c2 100755 --- a/assets/css/split/formulaires.scss +++ b/assets/css/split/formulaires.scss @@ -7,3 +7,7 @@ table { width: 100%; } + +.btn-primary { + background: $all-text-color; +} diff --git a/assets/css/split/typo.scss b/assets/css/split/typo.scss new file mode 100644 index 00000000..abce3c5c --- /dev/null +++ b/assets/css/split/typo.scss @@ -0,0 +1,3 @@ +h2, h3, h4, h5, h6 { + color: mix($dark, $all-text-color); +} diff --git a/yarn.lock b/yarn.lock index 7ed205ce..80610da8 100755 --- a/yarn.lock +++ b/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"