Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

add suffix to assets entrypoints + replace link/script html tags by encore_entry twig tag

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-07-23 12:27:30 +02:00
parent e0dbe9cf9d
commit d20a3cf9d4
9 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
View File

@@ -23,7 +23,7 @@
{{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}
</title>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
<link rel="stylesheet" href="{{ asset('build/login.css') }}"/>
{{ encore_entry_link_tags('page_login') }}
</head>
<body>
<div id="content">
@@ -42,14 +42,13 @@
<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
<br/>
<button type="submit" name="login">{{ 'Login'|trans }}</button>
</form>
<p class="forgot-password-link"><a href="{{ path('password_request_recover') }}">{{ 'Forgot your password ?'|trans }}</a></p>
{{ include('@ChillMain/Login/_footer.html.twig') }}
</div>
<script type="text/javascript" src="{{ asset('build/runtime.js') }}"></script>
{{ encore_entry_script_tags('page_login') }}
</body>
</html>

23
src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig
View File

@@ -1,5 +1,5 @@
{#
* Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
* Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
<info@champs-libres.coop> / <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
@@ -24,25 +24,20 @@
{{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}
</title>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
<link rel="stylesheet" href="{{ asset('build/chill.css') }}"/>
{{ encore_entry_link_tags('chill') }}
</head>
<body>
<header class="navigation container-fluid">
<div class="col-4 d-md-none parent">
<div class="col-10 col-md-12 offset-2 logo-container">
<a href="{{ path('chill_main_homepage') }}">
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
</a>
<div class="col-4 d-md-none parent">
<div class="col-10 col-md-12 offset-2 logo-container">
<a href="{{ path('chill_main_homepage') }}">
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
</a>
</div>
</div>
</div>
</header>
<div id="content">
<div id="content">
{% block content %}{% endblock %}
</div>
</body>

22
src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
View File

@@ -26,13 +26,13 @@
<meta charset="UTF-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{ installation.name }} - {% block title %}{% endblock %}</title>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
{{ encore_entry_link_tags('bootstrap') }}
{{ encore_entry_link_tags('forkawesome') }}
{{ encore_entry_link_tags('ckeditor5') }}
{{ encore_entry_link_tags('mod_bootstrap') }}
{{ encore_entry_link_tags('mod_forkawesome') }}
{{ encore_entry_link_tags('mod_ckeditor5') }}
{{ encore_entry_link_tags('chill') }}
{% block css%}<!-- nothing added to css -->{% endblock %}
</head>
@@ -71,7 +71,7 @@
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
</div>
{% endif %}
@@ -100,11 +100,11 @@
{{ include('@ChillMain/Layout/_footer.html.twig') }}
{{ encore_entry_script_tags('bootstrap') }}
{{ encore_entry_script_tags('forkawesome') }}
{{ encore_entry_script_tags('ckeditor5') }}
{{ encore_entry_script_tags('mod_bootstrap') }}
{{ encore_entry_script_tags('mod_forkawesome') }}
{{ encore_entry_script_tags('mod_ckeditor5') }}
{{ encore_entry_script_tags('chill') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function(e) {
chill.checkOtherValueOnChange();
@@ -115,7 +115,7 @@
chill.categoryLinkParentChildSelect();
});
</script>
{% block js%}<!-- nothing added to js -->{% endblock %}
</body>
</html>

18
src/Bundle/ChillMainBundle/chill.webpack.config.js
View File

@@ -45,23 +45,19 @@ module.exports = function(encore, entries)
// Aliases are used when webpack is trying to resolve modules path
encore.addAliases({
ChillMainAssets: __dirname + '/Resources/public',
//ChillMainSass: __dirname + '/Resources/public/modules/scratch',
ShowHide: __dirname + '/Resources/public/modules/show_hide'
});
// Add separate entrypoints
encore.addEntry('login', __dirname + '/Resources/public/modules/login_page/index.js');
//encore.addEntry('scratch', __dirname + '/Resources/public/modules/scratch/index.js');
// Page entrypoints
encore.addEntry('page_login', __dirname + '/Resources/public/modules/login_page/index.js');
// Chill2 new assets
encore.addEntry('forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js');
encore.addEntry('bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js');
// CKEditor5
// Modules entrypoints
encore.addEntry('mod_forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js');
encore.addEntry('mod_bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js');
buildCKEditor(encore);
encore.addEntry('ckeditor5', __dirname + '/Resources/public/modules/ckeditor5/index.js');
encore.addEntry('mod_ckeditor5', __dirname + '/Resources/public/modules/ckeditor5/index.js');
// Address
// Vue entrypoints
encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js');
};