diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 12fcb81d..3125deaf 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -20,7 +20,7 @@ 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 = $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..ef13dbfd 100644 --- a/app/Http/Controllers/HouseController.php +++ b/app/Http/Controllers/HouseController.php @@ -4,6 +4,7 @@ use App\Models\House; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Storage; class HouseController extends Controller @@ -25,6 +26,10 @@ public function update(Request $request, House $house) $filename = $request->file('photo')->store('houses'); // TASK: Delete the old file from the storage + if($house->photo) + { + Storage::delete($house->photo); + } $house->update([ 'name' => $request->name, @@ -38,5 +43,13 @@ public function download(House $house) { // TASK: Return the $house->photo file from "storage/app/houses" folder // for download in browser + $filePath = storage_path('app/houses/'); + + // Check if the file exists + if (!Storage::exists('houses/' . $house->photo)) { + abort(404); + } + + return response()->download($filePath, $house->photo); } -} +} \ No newline at end of file diff --git a/app/Http/Controllers/OfficeController.php b/app/Http/Controllers/OfficeController.php index fae443fa..528efa7d 100644 --- a/app/Http/Controllers/OfficeController.php +++ b/app/Http/Controllers/OfficeController.php @@ -13,7 +13,7 @@ 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..683f9d63 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -11,11 +11,13 @@ public function store(Request $request) { $request->validate([ // TASK: Write the validation rule so "logo" file would be MAX 1 megabyte + 'logo'=>'required|file|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([ diff --git a/app/Http/Controllers/ShopController.php b/app/Http/Controllers/ShopController.php index b2c485a3..8d6f8572 100644 --- a/app/Http/Controllers/ShopController.php +++ b/app/Http/Controllers/ShopController.php @@ -14,7 +14,18 @@ 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 + $originalName=storage_path('app/shops/' . $filename); + + + $resizedImage=Image::make($originalName)->resize(500,500)->encode(); + + + $resizedImageName='resized-' . $filename; + + + $resizedImagePath=storage_path('app/shops/' . $resizedImageName); + + file_put_contents($resizedImagePath,$resizedImage); return 'Success'; }