Skip to content
Snippets Groups Projects
Unverified Commit cdcf6be9 authored by Sebastian Castro's avatar Sebastian Castro
Browse files

Ability to add load custom javascript and css in custom folder

parent afe48259
No related branches found
No related tags found
No related merge requests found
......@@ -13,6 +13,7 @@ ssh_password
.idea
/web/matomo/
/docker/docker-compose.local.yml
/custom/
###> symfony/framework-bundle ###
/.env.local
......
......@@ -24,9 +24,10 @@ const scriptsElementForm = () =>
.pipe(gulp.dest('web/js'));
const scriptsLibs = () => {
const gogocarto = gulp.src(['node_modules/gogocarto-js/dist/gogocarto.js'])
const gogocarto = gulp.src(['node_modules/gogocarto-js/dist/gogocarto.js', 'assets/js/init-sw.js', 'custom/**/*.js'])
.pipe(concat('gogocarto.js'))
.pipe(gulp.dest('web/js'));
const sw = gulp.src(['assets/js/vendor/**/*', 'assets/js/init-sw.js'])
const sw = gulp.src(['assets/js/vendor/**/*'])
.pipe(gulp.dest('web/js'));
return merge(gogocarto, sw);
};
......@@ -55,7 +56,8 @@ const stylesBuild = () => {
};
const gogocarto_assets = () => {
const js = gulp.src(['node_modules/gogocarto-js/dist/*.css*',])
const js = gulp.src(['node_modules/gogocarto-js/dist/gogocarto.css', 'custom/**/*.css',])
.pipe(concat('gogocarto.css'))
.pipe(gulp.dest('web/css'));
const fonts = gulp.src(['node_modules/gogocarto-js/dist/fonts/**/*',])
.pipe(gulp.dest('web/css/fonts'));
......
......@@ -6,7 +6,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
{# gogocarto contains materializeCss lib, so we load it for all pages #}
<link rel="stylesheet" href="{{ asset('css/gogocarto.min.css?ver=' ~ version) }}">
<link rel="stylesheet" href="{{ asset('css/gogocarto.css?ver=' ~ version) }}">
{% block stylesheets %}
{% endblock %}
......@@ -28,8 +28,7 @@
{# Mains javascripts libs #}
<script src="{{ asset('js/gogocarto.js?ver=' ~ version) }}"></script>
<script src="{{ asset('js/init-sw.js?ver=' ~ version) }}"></script>
{# Block to add custom javascript to each page #}
{% block javascripts %}
{% endblock %}
......
......@@ -4,8 +4,7 @@
{% endblock fos_user_content %}
{% block page_javascripts %}
<script src="{{ asset('js/init-sw.js') }}"></script>
{% block page_javascripts %}
<script>
jQuery(document).ready(function()
{
......
......@@ -11,7 +11,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
{# gogocarto contains materializeCss lib, so we load it for all files #}
<link rel="stylesheet" href="{{ asset('css/gogocarto.min.css?ver=' ~ version) }}">
<link rel="stylesheet" href="{{ asset('css/gogocarto.css?ver=' ~ version) }}">
<link rel="stylesheet" href="{{ asset('css/saas.css?ver=' ~ version) }}">
{% block stylesheets %}
......
......@@ -10,8 +10,8 @@
<!-- TODO --><meta name="google-site-verification" content="" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" href="assets/css/gogocarto.min.css"">
<link rel="stylesheet" href="assets/css/pages.css">
<link rel="stylesheet" href="web/css/gogocarto.css"">
<link rel="stylesheet" href="web/css/pages.css">
<meta name="robots" content="index, follow, all" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link href="https://fonts.googleapis.com/css?family=Lobster|Roboto:400,700" rel="stylesheet">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment