Update

Projekt/.gitignore

@@ -2,7 +2,6 @@
 /node_modules
 /public/build
 /public/hot
-/public/storage
 /storage/*.key
 /vendor
 .env

Projekt/app/Http/Controllers/AnnouncementController.php

@@ -64,13 +64,13 @@ public function show($id)
         ]);
     }
 
-    public function oferty()
+    public function oferts()
     {
         $cars = Announcement::with('photos')->get();
 
         $recentBids = Bid::with('announcement')->orderBy('time', 'desc')->take(6)->get();
 
-        return view('cars.oferty', [
+        return view('cars.oferts', [
             'cars' => $cars,
 
             'recentBids' => $recentBids,
@@ -134,7 +134,7 @@ public function update(Request $request, $id)
             'description' => 'nullable|string',
             'min_price' => 'required|numeric|min:100',
             'end_date' => 'required|date|after:now',
-            'images.*' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048',
+            'images.*' => 'image|mimes:jpeg,png,jpg,gif,webp,svg|max:2048',
         ], [
             'name.required' => 'Pole Marka jest wymagane.',
             'name.string' => 'Pole Marka musi być ciągiem znaków.',
@@ -158,7 +158,7 @@ public function update(Request $request, $id)
             'end_date.date' => 'Pole Data końcowa musi być prawidłową datą.',
             'end_date.after' => 'Pole Data końcowa musi być datą po obecnej.',
             'images.*.image' => 'Każdy plik musi być obrazem.',
-            'images.*.mimes' => 'Każdy plik musi być typu: jpeg, png, jpg, gif, svg.',
+            'images.*.mimes' => 'Każdy plik musi być typu: jpeg, png, jpg, webp, gif, svg.',
             'images.*.max' => 'Każdy plik nie może być większy niż 2048 KB.',
         ]);
 
@@ -194,12 +194,37 @@ public function store(Request $request)
         $validatedData = $request->validate([
             'name' => 'required|string|max:255',
             'brand' => 'required|string|max:255',
-            'year' => 'required|integer',
-            'mileage' => 'required|integer',
+            'year' => 'required|integer|digits:4|min:1976|max:' . date('Y'),
+            'mileage' => 'required|numeric|min:0',
             'description' => 'nullable|string',
             'end_date' => 'required|date',
-            'min_price' => 'required|numeric',
+            'min_price' => 'required|numeric|min:100',
             'images.*' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048',
+        ],[
+            'name.required' => 'Pole Marka jest wymagane.',
+            'name.string' => 'Pole Marka musi być ciągiem znaków.',
+            'name.max' => 'Pole Marka może mieć maksymalnie 30 znaków.',
+            'brand.required' => 'Pole Model jest wymagane.',
+            'brand.string' => 'Pole Model musi być ciągiem znaków.',
+            'brand.max' => 'Pole Model może mieć maksymalnie 30 znaków.',
+            'year.required' => 'Pole Rok produkcji jest wymagane.',
+            'year.integer' => 'Pole Rok produkcji musi być liczbą całkowitą.',
+            'year.digits' => 'Pole Rok produkcji musi mieć 4 cyfry.',
+            'year.min' => 'Pole Rok produkcji nie może być wcześniejsze niż 1976.',
+            'year.max' => 'Pole Rok produkcji nie może być późniejsze niż bieżący rok.',
+            'mileage.required' => 'Pole Przebieg jest wymagane.',
+            'mileage.numeric' => 'Pole Przebieg musi być liczbą.',
+            'mileage.min' => 'Pole Przebieg nie może być mniejsze niż 0.',
+            'description.string' => 'Pole Opis musi być ciągiem znaków.',
+            'min_price.required' => 'Pole Cena jest wymagane.',
+            'min_price.numeric' => 'Pole Cena musi być liczbą.',
+            'min_price.min' => 'Pole Cena nie może być mniejsze niż 100.',
+            'end_date.required' => 'Pole Data końcowa jest wymagane.',
+            'end_date.date' => 'Pole Data końcowa musi być prawidłową datą.',
+            'end_date.after' => 'Pole Data końcowa musi być datą po obecnej.',
+            'images.*.image' => 'Każdy plik musi być obrazem.',
+            'images.*.mimes' => 'Każdy plik musi być typu: jpeg, png, jpg, webp, gif, svg.',
+            'images.*.max' => 'Każdy plik nie może być większy niż 2048 KB.',
         ]);
 
         $announcement = Announcement::create([

Projekt/app/Http/Controllers/BidController.php

@@ -41,8 +41,8 @@ public function store(Request $request, $announcementId)
                 ->withErrors(['Nie możesz przebijać swojej własnej oferty.']);
         }
 
-
-        Bid::create([
+        if(Auth::check()){
+            Bid::create([
             'announcement_id' => $announcementId,
             'user_id' => Auth::id(),
             'amount' => $request->amount,
@@ -51,5 +51,7 @@ public function store(Request $request, $announcementId)
 
         return redirect()->route('cars.show', ['id' => $announcementId])
             ->with('success', 'Twoja oferta została złożona.');
+        }
+        return view('errors.401');
     }
 }

Projekt/archiwizacja.bat

@@ -0,0 +1,7 @@
+git init
+git config --local user.name "student"
+git config --local user.email "[email protected]"
+git add --all
+git commit -m "Lab"
+git archive --format=zip HEAD -o ../MP125151_AI1_Projekt.zip
+pause

Projekt/bootstrap/app.php

@@ -39,19 +39,11 @@
             return $renderException($e, $request, 'errors.403', 'Forbidden', 403);
         });
 
-        $exceptions->render(function (UnauthorizedHttpException $e, Request $request) use ($renderException) {
-            return $renderException($e, $request, 'errors.401', 'Unauthorized', 401);
-        });
-
-        $exceptions->render(function (BadRequestHttpException $e, Request $request) use ($renderException) {
-            return $renderException($e, $request, 'errors.400', 'Bad Request', 400);
-        });
-
         $exceptions->render(function (QueryException $e, Request $request) use ($renderException) {
             return $renderException($e, $request, 'errors.500', 'Internal Server Error', 500);
         });
     })
     ->withMiddleware(function (Middleware $middleware) {
-        // Dodaj swoje middleware tutaj
+
     })
     ->create();

Projekt/database/seeders/AnnouncementSeeder.php

@@ -26,7 +26,7 @@ public function run(): void
             'year' => 2000,
             'mileage' => 321.23,
             'description' => 'Samochód w bardzo dobrym stanie pierwszy właściciel.',
-            'end_date' => '2024-06-27 18:27',
+            'end_date' => '2024-05-27 18:27',
             'is_end' => false,
             'min_price' => 200
         ],

Projekt/database/seeders/PhotoSeeder.php

@@ -26,7 +26,7 @@ public function run(): void
 
         [
             'announcement_id' => 1,
-            'photo_name' => 'img/AUDI2.png'
+            'photo_name' => 'img/AUDI2.webp'
         ],
 
         [
@@ -75,7 +75,7 @@ public function run(): void
         ],
         [
             'announcement_id' => 5,
-            'photo_name' => 'img/TOYOTA4.jpg'
+            'photo_name' => 'img/TOYOTA4.webp'
         ],
         [
             'announcement_id' => 6,

Projekt/resources/views/admin/dashboard.blade.php

@@ -99,7 +99,7 @@ class="btn btn-sm btn-warning">Edytuj</a>
             <div class="col-md-6">
                 <div class="card">
                     <div class="card-header bg-success text-white">
-                        <h2>Liczba ogłoszeń na użytkownika</h2>
+                        <h2>Liczba ogłoszeń użytkowników</h2>
                     </div>
                     <div class="card-body">
                         <canvas id="userAnnouncementsChart"></canvas>

Projekt/resources/views/admin/edit_announcement.blade.php

@@ -3,50 +3,50 @@
 @include('shared.head', ['pageTitle'=> 'Admin'])
 
 @include("shared.navbar")
+
 <body>
-<div class="container mt-5">
-    <div class="row">
-        <div class="col-md-8 offset-md-2">
-            <div class="card">
-                <div class="card-header bg-primary text-white">
-                    <h2>Edytuj ogłoszenie</h2>
-                </div>
-                <div class="card-body">
-                    <form action="{{ route('admin.updateAnnouncement', $announcement->id) }}" method="POST">
-                        @csrf
-                        @method('PUT')
-                        <div class="mb-3">
-                            <label for="name" class="form-label">Marka</label>
-                            <input type="text" class="form-control" id="name" name="name" value="{{ old('name', $announcement->name) }}" required>
-                        </div>
-                        <div class="mb-3">
-                            <label for="brand" class="form-label">Model</label>
-                            <input type="text" class="form-control" id="brand" name="brand" value="{{ old('brand', $announcement->brand) }}" required>
-                        </div>
-                        <div class="mb-3">
-                            <label for="year" class="form-label">Rok produkcji</label>
-                            <input type="number" class="form-control" id="year" name="year" value="{{ old('year', $announcement->year) }}" required>
-                        </div>
-                        <div class="mb-3">
-                            <label for="mileage" class="form-label">Przebieg</label>
-                            <input type="number" class="form-control" id="mileage" name="mileage" value="{{ old('mileage', $announcement->mileage) }}" required>
-                        </div>
-                        <div class="mb-3">
-                            <label for="min_price" class="form-label">Cena</label>
-                            <input type="number" class="form-control" id="price" name="min_price" value="{{ old('min_price', $announcement->min_price) }}" required>
-                        </div>
-                        <div class="mb-3">
-                            <label for="description" class="form-label">Opis</label>
-                            <textarea class="form-control" id="description" name="description" rows="5" required>{{ old('description', $announcement->description) }}</textarea>
-                        </div>
-                        <button type="submit" class="btn btn-success">Zapisz zmiany</button>
-                        <a href="{{ route('admin.dashboard') }}" class="btn btn-secondary">Anuluj</a>
-                    </form>
+    <div class="container mt-5">
+        <div class="row">
+            <div class="col-md-8 offset-md-2">
+                <div class="card">
+                    <div class="card-header bg-primary text-white">
+                        <h2>Edytuj ogłoszenie</h2>
+                    </div>
+                    <div class="card-body">
+                        <form action="{{ route('admin.updateAnnouncement', $announcement->id) }}" method="POST">
+                            @csrf
+                            @method('PUT')
+                            <div class="mb-3">
+                                <label for="name" class="form-label">Marka</label>
+                                <input type="text" class="form-control" id="name" name="name" value="{{ old('name', $announcement->name) }}" required maxlength="255">
+                            </div>
+                            <div class="mb-3">
+                                <label for="brand" class="form-label">Model</label>
+                                <input type="text" class="form-control" id="brand" name="brand" value="{{ old('brand', $announcement->brand) }}" required maxlength="255">
+                            </div>
+                            <div class="mb-3">
+                                <label for="year" class="form-label">Rok produkcji</label>
+                                <input type="number" class="form-control" id="year" name="year" value="{{ old('year', $announcement->year) }}" required min="1976" max="{{ date('Y') }}">
+                            </div>
+                            <div class="mb-3">
+                                <label for="mileage" class="form-label">Przebieg</label>
+                                <input type="number" class="form-control" id="mileage" name="mileage" value="{{ old('mileage', $announcement->mileage) }}" required min="0">
+                            </div>
+                            <div class="mb-3">
+                                <label for="min_price" class="form-label">Cena</label>
+                                <input type="number" class="form-control" id="price" name="min_price" value="{{ old('min_price', $announcement->min_price) }}" required min="0.01" step="0.01">
+                            </div>
+                            <div class="mb-3">
+                                <label for="description" class="form-label">Opis</label>
+                                <textarea class="form-control" id="description" name="description" rows="5" required maxlength="1000">{{ old('description', $announcement->description) }}</textarea>
+                            </div>
+                            <button type="submit" class="btn btn-success">Zapisz zmiany</button>
+                            <a href="{{ route('admin.dashboard') }}" class="btn btn-secondary">Anuluj</a>
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-@include('shared.footer')
+    @include('shared.footer')
 </body>
-

Projekt/resources/views/admin/edit_user.blade.php

@@ -29,32 +29,32 @@
                             <div class="mb-3">
                                 <label for="name" class="form-label">Imię</label>
                                 <input type="text" class="form-control" id="name" name="name"
-                                    value="{{ old('name', $user->name) }}" required>
+                                    value="{{ old('name', $user->name) }}" required maxlength="255">
                             </div>
                             <div class="mb-3">
                                 <label for="surname" class="form-label">Nazwisko</label>
                                 <input type="text" class="form-control" id="surname" name="surname"
-                                    value="{{ old('surname', $user->surname) }}" required>
+                                    value="{{ old('surname', $user->surname) }}" required maxlength="255">
                             </div>
                             <div class="mb-3">
                                 <label for="email" class="form-label">Email</label>
                                 <input type="email" class="form-control" id="email" name="email"
-                                    value="{{ old('email', $user->email) }}" required>
+                                    value="{{ old('email', $user->email) }}" required maxlength="255">
                             </div>
                             <div class="mb-3">
                                 <label for="address" class="form-label">Adres</label>
                                 <input type="text" class="form-control" id="address" name="address"
-                                    value="{{ old('address', $user->address) }}" required>
+                                    value="{{ old('address', $user->address) }}" required maxlength="255">
                             </div>
                             <div class="mb-3">
                                 <label for="phone_number" class="form-label">Numer telefonu</label>
-                                <input type="text" class="form-control" id="phone_number" name="phone_number"
-                                    value="{{ old('phone_number', $user->phone_number) }}" required>
+                                <input type="tel" class="form-control" id="phone_number" name="phone_number"
+                                    value="{{ old('phone_number', $user->phone_number) }}" required pattern="[0-9]{9,15}">
                             </div>
                             <div class="mb-3">
                                 <label for="role" class="form-label">Rola</label>
                                 <input type="text" class="form-control" id="role" name="role"
-                                    value="{{ old('role', $user->role) }}" required>
+                                    value="{{ old('role', $user->role) }}" required maxlength="50">
                             </div>
                             <button type="submit" class="btn btn-success">Zapisz zmiany</button>
                             <a href="{{ route('admin.dashboard') }}" class="btn btn-secondary">Anuluj</a>