diff options
| author | Marvin Borner | 2018-07-14 16:57:30 +0200 |
|---|---|---|
| committer | Marvin Borner | 2018-07-14 16:57:30 +0200 |
| commit | c4654913a951e0fc9835367617ceed8827b10108 (patch) | |
| tree | 139c235243e44eba99f5aa0f201341548e3dd556 /resources | |
| parent | 012632c1bb9899eeb9fbddbbcf743e95b1322548 (diff) | |
Replaced bower modules with node_modules (less spam)
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/assets/js/admin.js | 5 | ||||
| -rwxr-xr-x | resources/assets/js/app.js | 2 | ||||
| -rw-r--r-- | resources/assets/sass/admin.scss | 5 | ||||
| -rwxr-xr-x | resources/views/admin/layouts/app.blade.php | 14 | ||||
| -rwxr-xr-x | resources/views/layouts/app.blade.php | 15 |
5 files changed, 28 insertions, 13 deletions
diff --git a/resources/assets/js/admin.js b/resources/assets/js/admin.js new file mode 100644 index 0000000..19ea318 --- /dev/null +++ b/resources/assets/js/admin.js @@ -0,0 +1,5 @@ +require('jquery'); +require('bootstrap'); +require('adminlte'); +require('jquery-slimscroll'); +require('fastclick');
\ No newline at end of file diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index f50f805..7a42989 100755 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -9,4 +9,4 @@ window.Vue = require('vue'); require('./bootstrap'); require('./setup'); require('./profile'); -require('./chat'); +require('./chat');
\ No newline at end of file diff --git a/resources/assets/sass/admin.scss b/resources/assets/sass/admin.scss new file mode 100644 index 0000000..d5701e1 --- /dev/null +++ b/resources/assets/sass/admin.scss @@ -0,0 +1,5 @@ +@import "~bootstrap/dist/css/bootstrap.min.css"; +@import "~font-awesome/css/font-awesome.min.css"; +@import "~ionicons/dist/css/ionicons.min.css"; +@import "~adminlte/dist/css/AdminLTE.min.css"; +@import "~adminlte/dist/css/skins/skin-blue.min.css";
\ No newline at end of file diff --git a/resources/views/admin/layouts/app.blade.php b/resources/views/admin/layouts/app.blade.php index d1feb8f..216c3c8 100755 --- a/resources/views/admin/layouts/app.blade.php +++ b/resources/views/admin/layouts/app.blade.php @@ -7,13 +7,7 @@ <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'> <title>Admin interface of BEAM-Messenger</title> - <link href="{{ asset("/bower_components/bootstrap/dist/css/bootstrap.min.css ") }}" rel="stylesheet" type="text/css" /> - <link href="{{ asset("/bower_components/font-awesome/css/font-awesome.min.css ") }}" rel="stylesheet" type="text/css" /> - <link href="{{ asset("/bower_components/Ionicons/css/ionicons.min.css ") }}" rel="stylesheet" type="text/css" /> - <link href="{{ asset("/bower_components/admin-lte/dist/css/AdminLTE.min.css ")}}" rel="stylesheet" type="text/css" /> - <link href="{{ asset("/bower_components/admin-lte/dist/css/skins/skin-blue.min.css ")}}" rel="stylesheet" type="text/css" - /> - + <link href="{{ asset("css/admin.css") }}" rel="stylesheet" type="text/css" /> <!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> @@ -118,11 +112,7 @@ </div> - <script src="{{ asset("/bower_components/jquery/dist/jquery.min.js ") }}"></script> - <script src="{{ asset("/bower_components/bootstrap/dist/js/bootstrap.min.js ") }}" type="text/javascript"></script> - <script src="{{ asset("/bower_components/admin-lte/dist/js/adminlte.min.js ") }}" type="text/javascript"></script> - <script src="{{ asset("/bower_components/jquery-slimscroll/jquery.slimscroll.min.js ") }}" type="text/javascript"></script> - <script src="{{ asset("/bower_components/fastclick/lib/fastclick.js ") }}"></script> + <script src="{{ asset("js/admin.js") }}"></script> </body> </html>
\ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f20d74a..2d8b36c 100755 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -20,6 +20,9 @@ <!-- Styles --> <link href="{{ asset('css/app.css') }}" rel="stylesheet"> + + <!-- Manifests --> + <link rel="manifest" href="/manifest.json"> </head> <body> @@ -84,6 +87,18 @@ </div> {{ csrf_field() }} + + <script> + if ('serviceWorker' in navigator) { + window.addEventListener("load", function(){ + navigator.serviceWorker.register('service-worker.js').then(function (registration) { + console.log('ServiceWorker registration successful with scope:', registration.scope); + }, function (err) { + console.log('ServiceWorker failed:', err); + }); + }); + } + </script> </body> </html>
\ No newline at end of file |