Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

All test passed #203

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Http/Controllers/CompanyController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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->getMedia('companies')[0]->getFullUrl();

return view('companies.show', compact('company', 'photo'));
}
Expand Down
2 changes: 2 additions & 0 deletions app/Http/Controllers/HouseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public function update(Request $request, House $house)
$filename = $request->file('photo')->store('houses');

// TASK: Delete the old file from the storage
Storage::delete($house->photo);

$house->update([
'name' => $request->name,
Expand All @@ -38,5 +39,6 @@ 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);
}
}
1 change: 1 addition & 0 deletions app/Http/Controllers/OfficeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +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('offices', $filename, 'public');

Office::create([
'name' => $request->name,
Expand Down
8 changes: 7 additions & 1 deletion app/Http/Controllers/ProjectController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@

use App\Models\Project;
use Illuminate\Http\Request;
use Illuminate\Validation\Rules\File;

class ProjectController extends Controller
{
public function store(Request $request)
{
$request->validate([
// TASK: Write the validation rule so "logo" file would be MAX 1 megabyte
'logo' => [
'file',
File::image()
->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([
Expand Down
3 changes: 3 additions & 0 deletions app/Http/Controllers/ShopController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,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
$img = Image::make(storage_path('/app/shops/'.$filename));
$img->resize(500, 500);
$img->save(storage_path('/app/shops/resized-' . $filename));

return 'Success';
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"laravel/framework": "^10.0",
"laravel/sanctum": "^3.2",
"laravel/tinker": "^2.8",
"spatie/laravel-medialibrary": "^10.0.0"
"spatie/laravel-medialibrary": "^10.10"
},
"require-dev": {
"fakerphp/faker": "^1.9.1",
Expand Down
21 changes: 11 additions & 10 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading