FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#355 Calculate distance button (#366)

Browse Source 
* #355 Calculate distance button in add/edit Flight page

* Styling

* Move add/edit flight logic out of controller and into service layer

* Styling

* Formatting

* Run styleci against modules dir

* Styleci config

* Style fixes in /modules
This commit is contained in:
Nabeel S
2019-08-26 12:32:46 -04:00
committed by GitHub
parent 25999d55a3
commit bbec276da8
57 changed files with 9819 additions and 7522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webpack.mix.js
View File

@@ -7,8 +7,8 @@ const mix = require('laravel-mix');
* Copy required assets
*/
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/fonts/');
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/admin/fonts/');
mix.copy('node_modules/bootstrap/fonts/*.woff2', 'public/assets/fonts/');
mix.copy('node_modules/bootstrap/fonts/*.woff2', 'public/assets/admin/fonts/');
mix.copy('node_modules/x-editable/dist/bootstrap3-editable/img/*', 'public/assets/admin/img/');
mix.copy('node_modules/jquery/dist/jquery.js', 'public/assets/global/js/');
mix.copy('node_modules/flag-icon-css/flags/', 'public/assets/global/flags/');
@@ -32,7 +32,7 @@ mix.sass('resources/sass/now-ui/now-ui-kit.scss',
mix.sass('resources/sass/admin/paper-dashboard.scss',
'public/assets/admin/css/vendor.min.css')
.styles([
'node_modules/bootstrap3/dist/css/bootstrap.css',
'node_modules/bootstrap/dist/css/bootstrap.css',
'node_modules/animate.css/animate.css',
'node_modules/icheck/skins/square/blue.css',
'node_modules/select2/dist/css/select2.css',
@@ -51,9 +51,9 @@ mix.scripts([
'node_modules/jquery/dist/jquery.js',
'node_modules/moment/moment.js',
//'node_modules/axios/dist/axios.js',
'node_modules/bootstrap3/dist/js/bootstrap.js',
'node_modules/bootstrap3/js/collapse.js',
'node_modules/bootstrap3/js/transition.js',
'node_modules/bootstrap/dist/js/bootstrap.js',
'node_modules/bootstrap/js/collapse.js',
'node_modules/bootstrap/js/transition.js',
'node_modules/popper.js/dist/umd/popper.js',
'node_modules/popper.js/dist/umd/popper-utils.js',
'node_modules/select2/dist/js/select2.js',
@@ -96,7 +96,7 @@ mix.styles([
*/
mix.styles([
'node_modules/bootstrap3/dist/css/bootstrap.css',
'node_modules/bootstrap/dist/css/bootstrap.css',
'public/assets/frontend/css/now-ui-kit.css',
'node_modules/select2/dist/css/select2.css',
'node_modules/flag-icon-css/css/flag-icon.css',