Browse Source

Add webpack encore needed to load files with yarn (instead of bower)

For more info see:
http://symfony.com/doc/master/frontend/encore/installation.html
jmontoyaa 7 years ago
parent
commit
afe5a2bcc6

+ 0 - 1
.bowerrc

@@ -1 +0,0 @@
-{ "directory": "web/assets" }

+ 3 - 0
.gitignore

@@ -37,6 +37,9 @@ app/upload/*
 # Composer
 composer.lock
 
+#css
+node_modules/*
+
 # IDE settings
 .idea
 .idea/*

+ 0 - 20
app.json

@@ -1,20 +0,0 @@
-{
-  "name": "chamilo-lms",
-  "scripts": {
-  },
-  "env": {
-    "CLEARDB_DATABASE_URL": {
-      "required": true
-    }
-  },
-  "formation": {
-  },
-  "addons": [
-    "cleardb"
-  ],
-  "buildpacks": [
-    {
-      "url": "heroku/php"
-    }
-  ]
-}

+ 1 - 0
public/assets/css/main.scss

@@ -0,0 +1 @@
+@import '~bootstrap-sass/assets/stylesheets/bootstrap';

+ 12 - 0
public/assets/js/main.js

@@ -0,0 +1,12 @@
+const $ = require('jquery');
+// create global $ and jQuery variables
+global.$ = global.jQuery = $;
+
+// JS is equivalent to the normal "bootstrap" package
+// no need to set this to a variable, just require it
+require('bootstrap-sass');
+var moment = require('moment');
+require('jquery-ui');
+
+require('jquery-ui-timepicker-addon');
+

File diff suppressed because it is too large
+ 30096 - 0
public/build/chamilo.js


File diff suppressed because it is too large
+ 8368 - 0
public/build/chamilo_style.css


+ 0 - 0
public/assets/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 → public/build/fonts/glyphicons-halflings-regular.448c34a5.woff2


+ 0 - 0
public/assets/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf → public/build/fonts/glyphicons-halflings-regular.e18bbf61.ttf


+ 0 - 0
public/assets/bootstrap/dist/fonts/glyphicons-halflings-regular.eot → public/build/fonts/glyphicons-halflings-regular.f4769f9b.eot


+ 0 - 0
public/assets/bootstrap/dist/fonts/glyphicons-halflings-regular.woff → public/build/fonts/glyphicons-halflings-regular.fa277232.woff


+ 0 - 0
public/assets/bootstrap/dist/fonts/glyphicons-halflings-regular.svg → public/build/images/glyphicons-halflings-regular.89889688.svg


+ 9 - 0
public/build/manifest.json

@@ -0,0 +1,9 @@
+{
+  "build/chamilo.js": "/build/chamilo.js",
+  "build/chamilo_style.css": "/build/chamilo_style.css",
+  "build/fonts/glyphicons-halflings-regular.eot": "/build/fonts/glyphicons-halflings-regular.f4769f9b.eot",
+  "build/fonts/glyphicons-halflings-regular.ttf": "/build/fonts/glyphicons-halflings-regular.e18bbf61.ttf",
+  "build/fonts/glyphicons-halflings-regular.woff": "/build/fonts/glyphicons-halflings-regular.fa277232.woff",
+  "build/fonts/glyphicons-halflings-regular.woff2": "/build/fonts/glyphicons-halflings-regular.448c34a5.woff2",
+  "build/images/glyphicons-halflings-regular.svg": "/build/images/glyphicons-halflings-regular.89889688.svg"
+}

+ 3 - 3
src/FaqBundle/Resources/views/Faq/index.html.twig

@@ -1,4 +1,4 @@
-{% extends '@ChamiloCore/layout_cms.html.twig' %}
+{% extends '@ChamiloTheme/Layout/layout_cms.html.twig' %}
 
 {% block sonata_page_container %}
  <script type="text/javascript">
@@ -41,7 +41,7 @@
             {% for question in category.questions if question.onlyAuthUsers in list %}
                 {% if question.isActive %}
                     <li>
-                        <a href="#{{ question.id }}"><i class="fa fa-file-text-o" aria-hidden="true"></i> 
+                        <a href="#{{ question.id }}"><i class="fa fa-file-text-o" aria-hidden="true"></i>
                             {{ question.getHeadline|e }}
                         </a>
                     </li>
@@ -58,7 +58,7 @@
             {% set list = [false, true] %}
              <h2 class="title"><i class="fa fa-question-circle" aria-hidden="true"></i> {{ category.getHeadline|e }}</h2>
         {% endif %}
-       
+
         {% for question in category.questions if question.onlyAuthUsers in list %}
             {% if question.isActive %}
                 <div class="panel panel-default">

+ 5 - 12
src/InstallerBundle/Resources/views/layout.html.twig

@@ -17,18 +17,11 @@
     {% endblock %}
 
     <link rel="stylesheet"
-          href="{{ asset('assets/bootstrap/dist/css/bootstrap.css') }}"/>
-    <link rel="stylesheet"
-          href="{{ asset('assets/fontawesome/css/font-awesome.css') }}"/>
-    <link rel="stylesheet"
-          href="{{ asset('css/install.css') }}"/>
-
-    <script type="text/javascript"
-            src="{{ asset('assets/jquery/dist/jquery.js') }}"></script>
-    <script type="text/javascript"
-            src="{{ asset('assets/bootstrap/dist/js/bootstrap.js') }}"></script>
-    <script type="text/javascript"
-            src="{{ asset('assets/ajaxQueue/dist/jquery.ajaxQueue.js') }}"></script>
+          href="{{ asset('build/chamilo_style.css') }}"/>
+    <link rel="stylesheet" href="{{ asset('css/install.css') }}"/>
+
+    <script type="text/javascript" src="{{ asset('build/chamilo.js') }}"></script>
+    <script type="text/javascript" src="{{ asset('assets/ajaxQueue/dist/jquery.ajaxQueue.js') }}"></script>
 
     {% block javascript %}
         <script type="text/javascript">

+ 1 - 1
src/PageBundle/Resources/views/demo_layout.html.twig

@@ -1,4 +1,4 @@
-{% extends '@ChamiloCore/layout_cms.html.twig' %}
+{% extends '@ChamiloTheme/Layout/layout_cms.html.twig' %}
 
 {% block sonata_page_body_tag %}
     {{ parent() }}

+ 6 - 10
src/ThemeBundle/Resources/views/Layout/base-layout.html.twig

@@ -53,37 +53,33 @@
     {% set profile_link = '' %}
     {% set message_link = '' %}
 
-    <link rel="stylesheet" href="{{ asset('assets/bootstrap/dist/css/bootstrap.css') }}"/>
-    <link rel="stylesheet" href="{{ asset('css/base.css') }}"/>
+    <link rel="stylesheet" href="{{ asset('build/chamilo_style.css') }}"/>
     <link rel="stylesheet" href="{{ asset('css/scorm.css') }}"/>
     <link rel="stylesheet" href="{{ asset('css/themes/'~ theme ~'/learnpath.css') }}"/>
     <link rel="stylesheet" href="{{ asset('css/themes/'~ theme ~'/default.css') }}"/>
     <link rel="stylesheet" media="print" href="{{ asset('css/print.css') }}"/>
     <link rel="stylesheet" media="print" href="{{ asset('css/themes/'~ theme ~'/print.css') }}"/>
-    <link rel="stylesheet" href="{{ asset('assets/fontawesome/css/font-awesome.min.css') }}"/>
     <link rel="stylesheet" href="{{ asset('assets/jquery-ui/themes/smoothness/theme.css') }}"/>
     <link rel="stylesheet" href="{{ asset('assets/jquery-ui/themes/smoothness/jquery-ui.min.css') }}"/>
     <link rel="stylesheet" href="{{ asset('assets/bootstrap-daterangepicker/daterangepicker.css') }}"/>
     <link rel="stylesheet" href="{{ asset('assets/chosen/chosen.css') }}"/>
     <link rel="stylesheet" href="{{ asset('assets/bootstrap-language/languages.min.css') }}"/>
 
-    <script src="{{ asset('assets/modernizr/modernizr.js') }}"></script>
-    <script src="{{ asset('assets/moment/moment.js') }}"></script>
-    <script src="{{ asset('assets/moment/min/moment-with-locales.min.js') }}"></script>
+    <script src="{{ asset('build/chamilo.js') }}"></script>
+
+    {#<script src="{{ asset('assets/modernizr/modernizr.js') }}"></script>#}
+
     {# Check chamilo_js key in assetic.yml #}
     {% block javascripts %}
     {#{%- javascripts '@chamilo_js' -%}#}
     {#<script src="{{ asset_url }} "></script>#}
     {#{% endjavascripts %}#}
 
-    <script src="{{ asset('assets/jquery/dist/jquery.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('assets/bootstrap/dist/js/bootstrap.js') }}" type="text/javascript"></script>
-    <script src="{{ asset('assets/jquery-ui/jquery-ui.min.js') }}" type="text/javascript"></script>
     <script src="{{ asset('assets/chosen/chosen.jquery.js') }}"></script>
     <script src="{{ asset('assets/bootstrap-daterangepicker/daterangepicker.js') }}"></script>
     <script src="{{ asset('assets/jquery-timeago/jquery.timeago.js') }}"></script>
     <script src="{{ asset('assets/mediaelement/build/mediaelement-and-player.min.js') }}"></script>
-    <script src="{{ asset('assets/jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js') }}"></script>
+
     <script src="{{ asset('assets/image-map-resizer/js/imageMapResizer.min.js') }}"></script>
     <script src="{{ asset('assets/jquery.scrollbar/jquery.scrollbar.min.js') }}"></script>
     <script src="{{ asset('assets/readmore-js/readmore.min.js') }}"></script>

+ 27 - 0
webpack.config.js

@@ -0,0 +1,27 @@
+var Encore = require('@symfony/webpack-encore');
+
+Encore
+    .setOutputPath('public/build/')
+    .setPublicPath('/build')
+
+    // read main.js     -> output as web/build/app.js
+    .addEntry('chamilo', './public/assets/js/main.js')
+    // read global.scss -> output as web/build/global.css
+    .addStyleEntry('chamilo_style', './public/assets/css/main.scss')
+
+    // enable features!
+    .enableSassLoader()
+    .autoProvidejQuery()
+    .enableReactPreset()
+    .enableSourceMaps(!Encore.isProduction())
+    .autoProvideVariables({
+        $: 'jquery',
+        jQuery: 'jquery',
+        'window.jQuery': 'jquery',
+    })
+    //.enableVersioning() // hashed filenames (e.g. main.abc123.js)
+;
+
+
+
+module.exports = Encore.getWebpackConfig();

Some files were not shown because too many files changed in this diff