diff --git a/app/Http/Controllers/TeamFileController.php b/app/Http/Controllers/TeamFileController.php index 415e696..a1fca52 100755 --- a/app/Http/Controllers/TeamFileController.php +++ b/app/Http/Controllers/TeamFileController.php @@ -85,7 +85,7 @@ class TeamFileController extends Controller { try { - return Storage::download($teamFile->fs_location, $teamFile->name); + return Storage::download('uploads/' . $teamFile->fs_location, $teamFile->name); } catch (FileNotFoundException $ex) { @@ -130,7 +130,7 @@ class TeamFileController extends Controller try { - Storage::delete($teamFile->fs_location); + Storage::delete('uploads/' . $teamFile->fs_location); $teamFile->delete(); $request->session()->flash('success', 'File deleted successfully.'); diff --git a/webpack.mix.js b/webpack.mix.js index 8a923cb..ed04aaf 100755 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -1,15 +1,20 @@ -const mix = require('laravel-mix'); - -/* - |-------------------------------------------------------------------------- - | Mix Asset Management - |-------------------------------------------------------------------------- - | - | Mix provides a clean, fluent API for defining some Webpack build steps - | for your Laravel application. By default, we are compiling the Sass - | file for the application as well as bundling up all the JS files. - | - */ - -mix.js('resources/js/app.js', 'public/js') +mix.js(['resources/js/app.js', 'resources/js/application_charts.js', 'resources/js/calendar.js'], 'public/js') .sass('resources/sass/app.scss', 'public/css'); + +mix.styles([ + 'node_modules/@fullcalendar/core/main.css', + 'node_modules/@fullcalendar/daygrid/main.css', + 'node_modules/@fullcalendar/timeline/main.css', + 'node_modules/@fullcalendar/timegrid/main.css', + 'node_modules/@fullcalendar/list/main.css', + 'node_modules/flatpickr/dist/flatpickr.min.css' +], 'public/css/mixed.css'); + + +mix.webpackConfig({ + stats: { + warnings: false + } +}); + +mix.disableNotifications();