fix display shaders on home

This commit is contained in:
Tykayn 2025-02-14 17:56:44 +01:00 committed by tykayn
parent 2d1e830895
commit e5708e9e5f
15 changed files with 365 additions and 127 deletions

View file

@ -15,45 +15,32 @@
{{ encore_entry_script_tags('app') }}
{% endblock %}
</head>
<body id="page-top">
<body id="page-top" class="
{% if app.user %}
logged
{% endif %}
">
<!-- Navigation-->
<nav class="navbar navbar-expand-lg bg-secondary text-uppercase fixed-top" id="mainNav">
<div class="container">
<a class="navbar-brand" href="/#page-top">{% trans %}menu.title{% endtrans %}</a>
<button class="navbar-toggler text-uppercase font-weight-bold bg-primary text-white rounded" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
Menu
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto">
{# <nav class="navbar navbar-expand-lg bg-secondary text-uppercase fixed-top" id="mainNav">#}
{# <div class="container">#}
{# <a class="navbar-brand" href="/#page-top">{% trans %}menu.title{% endtrans %}</a>#}
{# <button class="navbar-toggler text-uppercase font-weight-bold bg-primary text-white rounded" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">#}
{# Menu#}
{# <i class="fas fa-bars"></i>#}
{# </button>#}
{# <div class="collapse navbar-collapse" id="navbarResponsive">#}
{# <ul class="navbar-nav ms-auto">#}
<li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="/#about">About</a></li>
<li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="/#contact">Contact</a></li>
</ul>
</div>
{# #}
{# <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="/#about">About</a></li>#}
{# <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="/#contact">Contact</a></li>#}
{# </ul>#}
{# </div>#}
{# </div>#}
{# </nav>#}
{% include 'default/login-choices.html.twig' %}
</div>
</nav>
<!-- Masthead-->
<header class="masthead bg-primary text-white text-center">
<div class="container d-flex align-items-center flex-column">
<!-- Masthead Avatar Image-->
<img class="masthead-avatar mb-5" width="2rem" src="/img/avataaars.svg" alt="..." />
<!-- Masthead Heading-->
<h1 class="masthead-heading text-uppercase mb-0">Caisse Bliss</h1>
<!-- Icon Divider-->
<div class="divider-custom divider-light">
<div class="divider-custom-line"></div>
<div class="divider-custom-icon"><i class="fas fa-star"></i></div>
<div class="divider-custom-line"></div>
</div>
<!-- Masthead Subheading-->
<p class="masthead-subheading font-weight-light mb-0">Logiciel de caisse pour petits commerces</p>
</div>
</header>
<!-- Portfolio Section-->
<section class="page-section portfolio" id="portfolio">

View file

@ -40,7 +40,7 @@
</p>
</div>
<div class="col-xs-12 col-md-4 text-center product-values-block">
<i class="fa fa-heart-o fa-3x"></i>
<i class="fa fa-heart fa-3x"></i>
<h2>{% trans %}home.specs.data{% endtrans %}</h2>
<p>{% trans %}home.specs.data_text{% endtrans %}</p>
</div>

View file

@ -1,28 +1,28 @@
<div class="header-block">
<div class="nav padded">
<div class="row">
<div class="col-xs-12">
{# <div class="nav">#}
{# <div class="row">#}
{# <div class="col-xs-12">#}
</div>
</div>
<div class="nav-elements">
{# </div>#}
{# </div>#}
{# <div class="nav-elements">#}
{% if app.request.hasPreviousSession %}
{% for type, messages in app.session.flashBag.all %}
{% for message in messages %}
<div class="{{ type }}">
{{ message|trans({}, 'FOSUserBundle') }}
</div>
{% endfor %}
{% endfor %}
{% endif %}
{# {% if app.request.hasPreviousSession %}#}
{# {% for type, messages in app.session.flashBag.all %}#}
{# {% for message in messages %}#}
{# <div class="{{ type }}">#}
{# {{ message|trans({}, 'FOSUserBundle') }}#}
{# </div>#}
{# {% endfor %}#}
{# {% endfor %}#}
{# {% endif %}#}
<div>
{% block fos_user_content %}
{% endblock fos_user_content %}
</div>
{# <div>#}
{# {% block fos_user_content %}#}
{# {% endblock fos_user_content %}#}
{# </div>#}
</div>
</div>
{# </div>#}
{# </div>#}
</div>

View file

@ -15,6 +15,19 @@
{% trans %}menu.title{% endtrans %}
</a>
</li>
<li>
{% trans %}user.greet{% endtrans %}
<a href="#" class="user-info-link">
<i class="fa fa-user"></i>
{{ app.user.email }}
</a>
|
<a class="btn btn-default" href="#">
{% trans %}layout.logout{% endtrans %}
</a>
</li>
<li>
<a class="btn {% if app.request.attributes.get('_route') == 'dashboard' %}
btn-success
@ -32,7 +45,7 @@
btn-default
{% endif %} "
href="{{ path('app_group_of_products_index') }}">
<i class="fa fa-file-archive-o"></i>
<i class="fa fa-file-archive"></i>
{% trans %}menu.categories{% endtrans %}
<span class="badge">
{{ app.user.groupOfProducts|length }}
@ -95,7 +108,7 @@
btn-default
{% endif %}" href="{{ path('history') }}"
>
<i class="fa fa-clock-o"></i>
<i class="fa fa-clock"></i>
{% trans %}menu.history{% endtrans %}
</a>
</li>
@ -107,7 +120,7 @@
btn-default
{% endif %}" href="{{ path('import') }}"
>
<i class="fa fa-arrow-circle-o-up"></i>
<i class="fa fa-arrow-up"></i>
{% trans %}menu.import{% endtrans %}
</a>
@ -126,43 +139,10 @@
{% trans %}menu.future{% endtrans %}
</a>
</li>
<li>
<a href="#" id="introjs_start">
<i class="fa fa-play"></i>
{# {% trans %}menu.introjs{% endtrans %}#}
Visite guidée
</a>
{% if app.user.name == 'demo' %}
<div class="text-warning alert-sm marged ">
<i class="fa fa-info-circle"></i>
<sub> Ceci est un compte de démonstration. Créez votre compte personnel dès
maintenant. </sub>
</div>
{% endif %}
</li>
</ul>
</div>
</div>
<div class="col-xs-12 col-sm-3 text-sm-left text-md-right user-info-part">
<button class="btn btn-default visible-xs pull-right" id="menu_button">
<i class="fa fa-bars"></i>
Menu
</button>
{% trans %}user.greet{% endtrans %}
<a href="#" class="user-info-link">
<i class="fa fa-user"></i>
{{ app.user.name }}
</a>
|
<a class="btn btn-default" href="#">
{% trans %}layout.logout{% endtrans %}
</a>
</div>
</div>

View file

@ -16,7 +16,7 @@
<div class="row">
<div class="col-xs-12 padded-v">
<h1 class="text-center">
<i class="fa fa-circle-o-notch logo-main"></i>
<i class="fa fa-circle-notch logo-main"></i>
{% trans %}menu.title{% endtrans %}
</h1>
</div>

View file

@ -7,7 +7,7 @@
</button>
</div>
<div class="row marged-v" ng-if="! simpleDisplay">
<div class="col-xs-12 col-md-6" id="main_options">
<div class="col-xs-12" id="main_options">
<button class="btn btn-disabled" ng-click="toggleSimpleDisplay()">
<i class="fa fa-bars"></i> Affichage simple
</button>

View file

@ -1,19 +1,19 @@
<nav>
<ul class="nav">
<li>
<a href="/dashboard">
Dashboard
</a></li>
<li><a href="/product">Produits</a></li>
<li><a href="/festival">Festivals</a></li>
<li>
<a href="/history">
Historique
</a>
</li>
<li>
<a href="/previsionnel">Prévisionnel</a>
</li>
</ul>
{#<nav>#}
{# <ul class="nav">#}
{# <li>#}
{# <a href="/dashboard">#}
{# Dashboard#}
{# </a></li>#}
{# <li><a href="/product">Produits</a></li>#}
{# <li><a href="/festival">Festivals</a></li>#}
{# <li>#}
{# <a href="/history">#}
{#Historique#}
{# </a>#}
{# </li>#}
{# <li>#}
{# <a href="/previsionnel">Prévisionnel</a>#}
{# </li>#}
{# </ul>#}
</nav>
{#</nav>#}