Reverted recent accidental changes
This commit is contained in:
parent
e4fb438721
commit
d53e8135ee
|
@ -85,7 +85,7 @@ class TeamFileController extends Controller
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return Storage::download($teamFile->fs_location, $teamFile->name);
|
return Storage::download('uploads/' . $teamFile->fs_location, $teamFile->name);
|
||||||
}
|
}
|
||||||
catch (FileNotFoundException $ex)
|
catch (FileNotFoundException $ex)
|
||||||
{
|
{
|
||||||
|
@ -130,7 +130,7 @@ class TeamFileController extends Controller
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Storage::delete($teamFile->fs_location);
|
Storage::delete('uploads/' . $teamFile->fs_location);
|
||||||
$teamFile->delete();
|
$teamFile->delete();
|
||||||
|
|
||||||
$request->session()->flash('success', 'File deleted successfully.');
|
$request->session()->flash('success', 'File deleted successfully.');
|
||||||
|
|
|
@ -1,15 +1,20 @@
|
||||||
const mix = require('laravel-mix');
|
mix.js(['resources/js/app.js', 'resources/js/application_charts.js', 'resources/js/calendar.js'], 'public/js')
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| 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')
|
|
||||||
.sass('resources/sass/app.scss', 'public/css');
|
.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();
|
||||||
|
|
Loading…
Reference in New Issue