This commit is contained in:
kieran@4bis.nl 2024-04-18 14:36:12 +02:00
parent b6dd3abb3b
commit 9121047d33
4 changed files with 112 additions and 131 deletions

View File

@ -12,7 +12,7 @@
"doctrine/doctrine-bundle": "^2.12", "doctrine/doctrine-bundle": "^2.12",
"doctrine/doctrine-migrations-bundle": "^3.3", "doctrine/doctrine-migrations-bundle": "^3.3",
"doctrine/orm": "2.*", "doctrine/orm": "2.*",
"fourbis/cms-bundle": "2.*", "fourbis/cms-bundle": "dev-master",
"league/flysystem-webdav": "^3.24", "league/flysystem-webdav": "^3.24",
"phpdocumentor/reflection-docblock": "^5.4", "phpdocumentor/reflection-docblock": "^5.4",
"phpstan/phpdoc-parser": "^1.28", "phpstan/phpdoc-parser": "^1.28",

19
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b4f3cf07ae0e653b182d56fa960e5511", "content-hash": "8c12162ceb43812a1ed7bc9bf9122fa8",
"packages": [ "packages": [
{ {
"name": "deployer/deployer", "name": "deployer/deployer",
@ -1441,11 +1441,11 @@
}, },
{ {
"name": "fourbis/cms-bundle", "name": "fourbis/cms-bundle",
"version": "2.4.25", "version": "dev-master",
"source": { "dist": {
"type": "git", "type": "path",
"url": "ssh://git@tunnel.git.4bis.tech:2213/4BIS_Innovations/CmsBundle.git", "url": "CmsBundle",
"reference": "baf99cf3aa6a9b72a543a21c1abde3785a6d2885" "reference": "859704ef6181caa19e9e2529668fdb2bb02ab7d0"
}, },
"require": { "require": {
"doctrine/doctrine-bundle": "2.*", "doctrine/doctrine-bundle": "2.*",
@ -1473,7 +1473,9 @@
"Fourbis\\CmsBundle\\Tests\\": "tests" "Fourbis\\CmsBundle\\Tests\\": "tests"
} }
}, },
"time": "2024-04-09T10:04:32+00:00" "transport-options": {
"relative": true
}
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
@ -10739,7 +10741,8 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"deployer/deployer": 5 "deployer/deployer": 5,
"fourbis/cms-bundle": 20
}, },
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,

View File

@ -1,113 +1,56 @@
{% extends "layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %} {% block page_title %}{% block title %}{% endblock %} {{ cms_setting('seo-site-title').title |raw }}{% endblock page_title %}
AffiliateMNGR
{% block head_description %}
{{- (page | default(null) ? page.translate().description :
post | default(null) ? post.translate().description :
category | default(null) ? category.translate().description) |striptags -}}
{% endblock %} {% endblock %}
{% block favicons %} {% block meta %}
<link href="assets/img/favicon.png" rel="icon"> {{ parent() }}
<link href="assets/img/apple-touch-icon.png" rel="apple-touch-icon"> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link rel="preconnect" href="https://cdn.4b.is" crossorigin>
{% if not app.debug %}
<link rel="preconnect" href="https://www.googletagmanager.com" crossorigin>
<link rel="preconnect" href="https://www.google-analytics.com/" crossorigin>
<link rel="preload" href="https://www.googletagmanager.com/gtm.js?id={{ cms_setting('gtm-code')['code'] |raw }}"
crossorigin>
{% endif %}
{% endblock %} {% endblock %}
{% block fonts %} {% block gtm_head_part %}
<link href="https://fonts.gstatic.com" rel="preconnect">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Nunito:300,300i,400,400i,600,600i,700,700i|Poppins:300,300i,400,400i,500,500i,600,600i,700,700i"
rel="stylesheet">
{% endblock %} {% endblock %}
{% block flash %}
<div class="position-absolute" style="z-index: 999999">
{# <div {{ react_component("Alert", {flashes: app.flashes}) }}></div> #} {% block gtm_body_part %}
</div>
{% endblock %} {% endblock %}
{% block header_javascripts %} {% block navbar %}
{# {{ encore_entry_script_tags('enginizer') }} #} {# {% include 'blocks/menu_test.html.twig' %} #}
{{ cms_render('nav-bar') | default('') |raw }}
{% endblock %} {% endblock %}
{% block stylesheets %} {% block default_head_javascripts %}
{{ encore_entry_link_tags("app") }} {{ encore_entry_script_tags('app') }}
{% endblock %} {% endblock default_head_javascripts %}
{% block header %} {% block head_javascripts %}
<header id="header" class="header fixed-top d-flex align-items-center"> {{ cms_render_save('head-javascripts') | default('') |raw }}
<div class="d-flex align-items-center justify-content-between"> {% endblock head_javascripts %}
<a href="{{ path("home_index") }}" class="logo d-flex flex-row align-items-center">
{# <img src="{{ asset("assets/affiliatemngr_logo.svg") }}" class="img-fluid" alt=""> #}
<span class="d-none d-lg-block">&nbsp;Dev</span>
</a>
<i class="bi bi-list toggle-sidebar-btn"></i>
</div>
{% block search_bar %}
{# {% include 'widgets/search_bar.html.twig' %}#}
<nav class="header-nav ms-auto"> {% block stylesheets %}
<ul class="d-flex align-items-center"> {{ encore_entry_link_tags('app') }}
<li class="nav-item d-block d-lg-none">
<a class="nav-link nav-icon search-bar-toggle " href="#">
<i class="bi bi-search"></i>
</a>
</li>
{% endblock %}
{% block notifications %}
{% endblock %}
{% block messages %}
{% endblock %}
{% block profile %}
{% endblock %}
</ul>
</nav>
</header>
{% endblock %} {% endblock %}
{% block sidebar %} {% block above_footer %}
{% include 'menu/sidebar.html.twig' %} <!-- above footer -->
{% endblock %} {{ cms_render_save('above-footer') | default('') |raw }}
<!-- end above footer -->
{% block main %}
<main id="main" class="main">
<div class="pagetitle">
<div class="row">
<div class="col">
<h1>{% block page_title %}{% endblock %}</h1>
<h6>{% block page_sub_title %}{% endblock %}</h6>
</div>
<div class="col-auto">
{% block extra_header_options %}{% endblock %}
</div>
<div class="col-auto text-end">
{% block buttons %}{% endblock %}
</div>
</div>
<nav class="d-flex flex-row justify-content-between">
<ol class="breadcrumb">
{% block breadcrumbs %}{% endblock %}
</ol>
</nav>
</div>
<section class="section dashboard">
{% block content %}{% endblock %}
</section>
</main>
{% endblock %} {% endblock %}
{% block footer_content %}
{% block footer %} {{ cms_render('footer') | default('') |raw }}
{# <footer id="footer" class="footer"> #}
{# <div class="copyright"> #}
{# &copy; Copyright <strong><span>4BIS Innovations B.V.</span></strong> #}
{# </div> #}
{# </footer> #}
{% endblock %}
{% block back_to_top %}
<a href="#" class="back-to-top d-flex align-items-center justify-content-center"><i
class="bi bi-arrow-up-short"></i></a>
{% endblock %}
{% block javascripts %}
{{ encore_entry_script_tags("app") }}
{% endblock %} {% endblock %}

View File

@ -1,36 +1,71 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <!--[if IE 8]> <html lang="{{ cms_locale() }}" class="ie8 no-js"> <![endif]-->
<!--[if IE 9]> <html lang="{{ cms_locale() }}" class="ie9 no-js"> <![endif]-->
<!--[if !IE]><!-->
<html lang="{{ cms_locale() }}">
<!--<![endif]-->
<head> <head>
<meta charset="utf-8"> <meta charset="UTF-8">
<meta content="width=device-width, initial-scale=1.0" name="viewport"> <title>{% block page_title %}{% endblock page_title %}</title>
{% block meta %}
<link rel="shortcut icon" href="{{ cms_setting('branding-favicon')|default('')|raw }}">
<link rel="icon" type="image/x-icon" href="{{ cms_setting('branding-favicon')|default('')|raw }}">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta name="viewport"
content="width=device-width, initial-scale=1.0">
{% if block('head_description') %}
<meta name="description" content="{% block head_description %}{% endblock %}" >
{% endif %}
{% endblock meta %}
{% block meta_robots %}
<meta name="robots" content="index,follow">
{% endblock meta_robots %}
<title>{% block title %}{% endblock %} | Kieran Dev Project</title> {%- include '@cms_bundle/snippets/breadcrumbs.html.twig' -%}
<meta content="" name="description"> {% block stylesheets %}{% endblock stylesheets %}
<meta content="" name="keywords">
{# <link rel="shortcut icon" href="{{ asset('/assets/Ill.favicon.affiliate-mngr_2021.png') }}">#}
{# <link rel="icon" type="image/x-icon" href="{{ asset('/assets/Ill.favicon.affiliate-mngr_2021.png') }}">#}
{% block favicons %}{% endblock %} {% block default_head_javascripts %}{% endblock default_head_javascripts %}
{% block head_javascripts %}{% endblock head_javascripts %}
{% block fonts %}{% endblock %} {% block gtm_head_part %}{% endblock gtm_head_part %}
{% block header_javascripts %}{% endblock %}
{% block stylesheets %}{% endblock %}
</head> </head>
{% block body %}
<body id="page-top" class="{% block body_class %}{% endblock %}">
{% block gtm_body_part %}{% endblock %}
{% block nav %}
{% block navbar %}{% endblock %}
{% endblock %}
{% block page_wrapper %}
<div id="wrapper">
{% block page_wrapper_content %}
{% block content_wrapper %}
<!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column">
{% block content_wrapper_content %}
<!-- Main Content -->
{% block content_breadcrumbs %}{% endblock %}
{% block main_content_body %}
{% block main_content_title %}{% endblock main_content_title %}
{% block main_content %}{% endblock main_content %}
{% endblock %}
<body> <!-- End of Main Content -->
{% block flash %}{% endblock %} {% endblock content_wrapper_content %}
</div>
<!-- End of Content Wrapper -->
{% endblock content_wrapper %}
{% endblock page_wrapper_content %}
</div>
{% endblock page_wrapper %}
<!-- bottom footer -->
{% block above_footer %}{% endblock %}
{% block header %}{% endblock %} {% block footer_wrapper %}
{% block footer_content %}{% endblock footer_content %}
{% block sidebar %}{% endblock %} {% endblock footer_wrapper %}
<!-- /bottom footer -->
{% block main %}{% endblock %} {% block default_footer_javascripts %}{% endblock default_footer_javascripts %}
{% block footer_javascripts %}{% endblock footer_javascripts %}
{% block footer %}{% endblock %} </body>
{% endblock body %}
{% block back_to_top %}{% endblock %}
{% block javascripts %}{% endblock %}
</body>
</html> </html>