diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 12fcb81d..12948eb2 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -4,6 +4,7 @@ use App\Models\Company; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Storage; class CompanyController extends Controller { @@ -20,7 +21,8 @@ public function store(Request $request) public function show(Company $company) { // TASK: retrieve the full URL to the uploaded photo file, using Spatie Media Library - $photo = '???'; + + $photo = Storage::url($company->getFirstMediaUrl('companies')); return view('companies.show', compact('company', 'photo')); } diff --git a/app/Http/Controllers/HouseController.php b/app/Http/Controllers/HouseController.php index c330f8aa..e03158d9 100644 --- a/app/Http/Controllers/HouseController.php +++ b/app/Http/Controllers/HouseController.php @@ -22,10 +22,15 @@ public function store(Request $request) public function update(Request $request, House $house) { + $filename = $request->file('photo')->store('houses'); // TASK: Delete the old file from the storage + if (Storage::exists($house->photo)) { + Storage::delete($house->photo); + } + $house->update([ 'name' => $request->name, 'photo' => $filename, @@ -38,5 +43,7 @@ public function download(House $house) { // TASK: Return the $house->photo file from "storage/app/houses" folder // for download in browser + + return Storage::download($house->photo); } } diff --git a/app/Http/Controllers/OfficeController.php b/app/Http/Controllers/OfficeController.php index fae443fa..968f0f53 100644 --- a/app/Http/Controllers/OfficeController.php +++ b/app/Http/Controllers/OfficeController.php @@ -14,6 +14,9 @@ public function store(Request $request) // TASK: Upload the file "photo" so it would be written as // storage/app/public/offices/[original_filename] + $request->file('photo')->storeAs( + 'public/offices', $filename); + Office::create([ 'name' => $request->name, 'photo' => $filename, diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 95aed4f8..666b5a46 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -1,28 +1,25 @@ validate([ // TASK: Write the validation rule so "logo" file would be MAX 1 megabyte + 'logo' => 'max:1024' ]); // TASK: change the below line so that $filename would contain only filename // The same filename as the original uploaded file - $filename = '???'; + $filename = $request->file('logo')->getClientOriginalName(); $request->file('logo')->storeAs('logos', $filename); Project::create([ 'name' => $request->name, 'logo' => $filename, ]); - return 'Success'; } -} +} \ No newline at end of file diff --git a/app/Http/Controllers/ShopController.php b/app/Http/Controllers/ShopController.php index b2c485a3..f8a28b28 100644 --- a/app/Http/Controllers/ShopController.php +++ b/app/Http/Controllers/ShopController.php @@ -5,6 +5,7 @@ use Illuminate\Http\Request; use Intervention\Image\Facades\Image; + class ShopController extends Controller { public function store(Request $request) @@ -15,6 +16,9 @@ public function store(Request $request) // TASK: resize the uploaded image from /storage/app/shops/$filename // to size of 500x500 and store it as /storage/app/shops/resized-$filename // Use intervention/image package, it's already pre-installed for you + $image = Image::make(storage_path('app/shops/' . $filename)); + $image->resize(500, 500); + $image->save(storage_path('app/shops/resized-' . $filename)); return 'Success'; }