miguel456
/
rbrecruiter
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases 2 Wiki Activity

WIP: Road to 1.0.0 #1

Draft
miguel456 wants to merge 123 commits from develop into master
pull from: develop
merge into: miguel456:master
Conversation 1 Commits 123 Files Changed 586 +21 -16
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d53e8135ee - Show all commits

4
app/Http/Controllers/TeamFileController.php
View File

@ -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.');

33
webpack.mix.js vendored
View File

@ -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();