Webpack configuration with the application

82b4a281 · bvipul · 1588679c · 82b4a281 · 82b4a281 · 82b4a281
Commit 82b4a281 authored Oct 11, 2017 by bvipul
20 changed files
--- a/app/Console/Commands/Stubs/index_view.stub
+++ b/app/Console/Commands/Stubs/index_view.stub
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.dummy_small_plural_model.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.dummy_small_plural_model.management') }}</h1>
 @endsection
@@ -45,7 +41,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}

    <script>
        //Below written line is short form of writing $(document).ready(function() { })

--- a/package-lock.json
+++ b/package-lock.json
@@ -127,6 +127,11 @@
        "repeat-string": "1.6.1"
      }
    },
+    "almond": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz",
+      "integrity": "sha1-oOfJWsdiTWQXtElLHmi/9pMWiiA="
+    },
    "alphanum-sort": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -1251,6 +1256,34 @@
        "hoek": "2.16.3"
      }
    },
+    "bootstrap": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
+      "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
+    },
+    "bootstrap-datetimepicker-npm": {
+      "version": "4.17.37-npm",
+      "resolved": "https://registry.npmjs.org/bootstrap-datetimepicker-npm/-/bootstrap-datetimepicker-npm-4.17.37-npm.tgz",
+      "integrity": "sha1-ZGHJ+raW52IaRr6+KO0VAzPL2iY=",
+      "requires": {
+        "bootstrap": "3.3.7",
+        "jquery": "2.1.4",
+        "moment": "2.8.4",
+        "moment-timezone": "0.4.1"
+      },
+      "dependencies": {
+        "jquery": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz",
+          "integrity": "sha1-IoveaYoMYUMdwmMKahVPFYkNIxc="
+        },
+        "moment": {
+          "version": "2.8.4",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.8.4.tgz",
+          "integrity": "sha1-zBdKq7GSI+//VpmpRngFoniYOL8="
+        }
+      }
+    },
    "bootstrap-sass": {
      "version": "3.3.7",
      "resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz",
@@ -4886,6 +4919,11 @@
      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
    },
+    "jquery-mousewheel": {
+      "version": "3.1.13",
+      "resolved": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz",
+      "integrity": "sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU="
+    },
    "js-base64": {
      "version": "2.1.9",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
@@ -5781,6 +5819,19 @@
        "minimist": "0.0.8"
      }
    },
+    "moment": {
+      "version": "2.18.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+      "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+    },
+    "moment-timezone": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz",
+      "integrity": "sha1-gfWYw61eIs2teWtn7NjYjQ9bqgY=",
+      "requires": {
+        "moment": "2.18.1"
+      }
+    },
    "mozjpeg": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/mozjpeg/-/mozjpeg-4.1.1.tgz",
@@ -5879,6 +5930,21 @@
      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
      "dev": true
    },
+    "nestable2": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/nestable2/-/nestable2-1.5.0.tgz",
+      "integrity": "sha512-NaEe7FfFb052VL9qhDikM7w9BFyfDmhQraUfM67mxx+M8GsJenI3kfRK+aomaamqOwA47XEjqd6DZUlAqKsLbw==",
+      "requires": {
+        "jquery": "1.12.4"
+      },
+      "dependencies": {
+        "jquery": {
+          "version": "1.12.4",
+          "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz",
+          "integrity": "sha1-AeHfuikP5z3rp3zurLD5ui/sngw="
+        }
+      }
+    },
    "no-case": {
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
@@ -7741,6 +7807,15 @@
      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
      "dev": true
    },
+    "select2": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.4.tgz",
+      "integrity": "sha1-oYpih4X5jROZmXGuldjX5XJoB2s=",
+      "requires": {
+        "almond": "0.3.3",
+        "jquery-mousewheel": "3.1.13"
+      }
+    },
    "selfsigned": {
      "version": "1.10.1",
      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.1.tgz",
@@ -8729,6 +8804,11 @@
        "setimmediate": "1.0.5"
      }
    },
+    "tinymce": {
+      "version": "4.5.8",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.5.8.tgz",
+      "integrity": "sha1-OvQu+zHFucJ+SxHvSSDhlvGl/E4="
+    },
    "to-absolute-glob": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",

--- a/package.json
+++ b/package.json
@@ -21,9 +21,14 @@
    "webpack-rtl-plugin": "^1.5.0"
  },
  "dependencies": {
+    "bootstrap": "^3.3.7",
+    "bootstrap-datetimepicker-npm": "^4.17.37-npm",
    "datatables.net": "^1.10.15",
    "datatables.net-buttons": "^1.3.1",
+    "moment": "^2.18.1",
    "nestable2": "^1.5.0",
-    "pluralize": "^7.0.0"
+    "pluralize": "^7.0.0",
+    "select2": "^4.0.4",
+    "tinymce": "^4.5.8"
  }
 }
--- a/resources/assets/js/bootstrap.js
+++ b/resources/assets/js/bootstrap.js
@@ -46,3 +46,8 @@ window.axios.defaults.headers.common = {
 //     broadcaster: 'pusher',
 //     key: 'your-pusher-key'
 // });
+// 
+// var glob = require( 'glob' )
+//   , path = require( 'path' );
+
+require('tinymce/tinymce');
\ No newline at end of file
--- a/resources/assets/sass/backend/app.scss
+++ b/resources/assets/sass/backend/app.scss
@@ -53,4 +53,7 @@
 @import "print";

 // Plugins
-@import "../plugin/sweetalert/sweetalert.scss";
\ No newline at end of file
+@import "../plugin/sweetalert/sweetalert.scss";
+
+//Select2
+@import "~select2/dist/css/select2.css";
\ No newline at end of file
--- a/resources/views/backend/access/deactivated.blade.php
+++ b/resources/views/backend/access/deactivated.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.access.users.management') . ' | ' . trans('labels.backend.access.users.deactivated'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>
        {{ trans('labels.backend.access.users.management') }}
@@ -70,7 +66,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    <script>
        $(function() {
            var dataTable = $('#users-table').dataTable({

--- a/resources/views/backend/access/deleted.blade.php
+++ b/resources/views/backend/access/deleted.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.access.users.management') . ' | ' . trans('labels.backend.access.users.deleted'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>
        {{ trans('labels.backend.access.users.management') }}
@@ -70,7 +66,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
 	<script>
 		$(function() {
            var dataTable = $('#users-table').dataTable({

--- a/resources/views/backend/access/index.blade.php
+++ b/resources/views/backend/access/index.blade.php
@@ -2,11 +2,6 @@

 @section ('title', trans('labels.backend.access.users.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-
-@endsection
-
 @section('page-header')
    <h1>
        {{ trans('labels.backend.access.users.management') }}
@@ -83,7 +78,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}

    <script>
        $(function() {

--- a/resources/views/backend/access/permissions/index.blade.php
+++ b/resources/views/backend/access/permissions/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.access.permissions.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.access.permissions.management') }}</h1>
 @endsection
@@ -68,7 +64,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/access/roles/index.blade.php
+++ b/resources/views/backend/access/roles/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.access.roles.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.access.roles.management') }}</h1>
 @endsection
@@ -70,7 +66,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/blogcategories/index.blade.php
+++ b/resources/views/backend/blogcategories/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.blogcategories.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.blogcategories.management') }}</h1>
 @endsection
@@ -66,7 +62,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/blogs/index.blade.php
+++ b/resources/views/backend/blogs/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.blogs.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.blogs.management') }}</h1>
 @endsection
@@ -68,7 +64,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/blogtags/index.blade.php
+++ b/resources/views/backend/blogtags/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.blogtags.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.blogtags.management') }}</h1>
 @endsection
@@ -66,7 +62,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/cmspages/index.blade.php
+++ b/resources/views/backend/cmspages/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.cmspages.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.cmspages.management') }}</h1>
 @endsection
@@ -66,7 +62,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/emailtemplates/index.blade.php
+++ b/resources/views/backend/emailtemplates/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.emailtemplates.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.emailtemplates.management') }}</h1>
 @endsection
@@ -84,7 +80,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/faqs/index.blade.php
+++ b/resources/views/backend/faqs/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.faqs.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.faqs.management') }}</h1>
 @endsection
@@ -70,7 +66,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/layouts/app.blade.php
+++ b/resources/views/backend/layouts/app.blade.php
@@ -25,11 +25,7 @@
        @else
            {{ Html::style(mix('css/backend.css')) }}
        @endif
-        {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-        {!! Html::style('js/select2/select2.css') !!}
-        {!! Html::style('css/bootstrap.min.css') !!}
-        {!! Html::style('css/custom-style.css') !!}
-        {!! Html::style('css/bootstrap-datetimepicker.min.css') !!}
+        {{ Html::style(mix('css/backend-custom.css')) }}
        @yield('after-styles')

        <!-- Html5 Shim and Respond.js IE8 support of Html5 elements and media queries -->
@@ -74,14 +70,8 @@

        <!-- JavaScripts -->
        @yield('before-scripts')
-        {{ Html::script("js/moment.min.js") }}
        {{ Html::script(mix('js/backend.js')) }}
-        {!! Html::script('js/backend/notification.js') !!}
-        {{ Html::script('js/backend/admin.js') }}
-        {!! Html::script('js/select2/select2.js') !!}
-        {{ Html::script("js/tinymce/tinymce.min.js") }}
-        {{ Html::script("js/bootstrap-datetimepicker.min.js") }}
-        {{ Html::script('js/backend/custom-file-input.js') }}
+        {{ Html::script(mix('js/backend-custom.js')) }}
        @yield('after-scripts')
    </body>
 </html>
\ No newline at end of file
--- a/resources/views/backend/menus/index.blade.php
+++ b/resources/views/backend/menus/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.menus.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.menus.management') }}</h1>
 @endsection
@@ -63,7 +59,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/resources/views/backend/modules/index.blade.php
+++ b/resources/views/backend/modules/index.blade.php
@@ -2,10 +2,6 @@

 @section ('title', trans('labels.backend.modules.management'))

-@section('after-styles')
-    {{ Html::style("css/backend/plugin/datatables/dataTables.bootstrap.min.css") }}
-@endsection
-
 @section('page-header')
    <h1>{{ trans('labels.backend.modules.management') }}</h1>
 @endsection
@@ -71,7 +67,7 @@

 @section('after-scripts')
    {{-- For DataTables --}}
-    @include('includes.datatables')
+    {{ Html::script(mix('js/dataTable.js')) }}
    
    <script>
        $(function() {

--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -14,6 +14,15 @@ const WebpackRTLPlugin = require('webpack-rtl-plugin');

 mix.sass('resources/assets/sass/frontend/app.scss', 'public/css/frontend.css')
    .sass('resources/assets/sass/backend/app.scss', 'public/css/backend.css')
+    .styles([
+        'public/css/plugin/datatables/jquery.dataTables.min.css',
+        'public/css/backend/plugin/datatables/dataTables.bootstrap.min.css',
+        'public/css/plugin/datatables/buttons.dataTables.min.css',
+        'public/js/select2/select2.css',
+        'public/css/bootstrap.min.css',
+        'public/css/custom-style.css',
+        'public/css/bootstrap-datetimepicker.min.css'
+    ], 'public/css/backend-custom.css')
    .js([
        'resources/assets/js/frontend/app.js',
        'resources/assets/js/plugin/sweetalert/sweetalert.min.js',
@@ -22,8 +31,32 @@ mix.sass('resources/assets/sass/frontend/app.scss', 'public/css/frontend.css')
    .js([
        'resources/assets/js/backend/app.js',
        'resources/assets/js/plugin/sweetalert/sweetalert.min.js',
-        'resources/assets/js/plugins.js',
+        'resources/assets/js/plugins.js'
    ], 'public/js/backend.js')
+    //Copying all directories of tinymce to public folder
+    .copyDirectory('node_modules/tinymce/plugins', 'public/js/plugins')
+    .copyDirectory('node_modules/tinymce/skins', 'public/js/skins')
+    .copyDirectory('node_modules/tinymce/themes', 'public/js/themes')
+    .scripts([
+        "node_modules/moment/moment.js",
+        "node_modules/select2/dist/js/select2.full.js",
+        "public/js/bootstrap-datetimepicker.min.js",
+        "public/js/backend/custom-file-input.js",
+        "public/js/backend/notification.js",
+        "public/js/backend/admin.js"
+    ], 'public/js/backend-custom.js')
+    //Datatable js
+    .scripts([
+        'node_modules/datatables.net/js/jquery.dataTables.js',
+        'public/js/plugin/datatables/dataTables.bootstrap.min.js',
+        'node_modules/datatables.net-buttons/js/dataTables.buttons.js',
+        'node_modules/datatables.net-buttons/js/buttons.flash.js',
+        'public/js/plugin/datatables/jszip.min.js',
+        'public/js/plugin/datatables/pdfmake.min.js',
+        'public/js/plugin/datatables/vfs_fonts.js',
+        'node_modules/datatables.net-buttons/js/buttons.html5.js',
+        'node_modules/datatables.net-buttons/js/buttons.print.js',
+    ], 'public/js/dataTable.js')
    .webpackConfig({
        plugins: [
            new WebpackRTLPlugin('/css/[name].rtl.css')