Ver código fonte

fix: ui правки по сайту

comp-4 1 mês atrás
pai
commit
089dc69b44

+ 1 - 1
app/Http/Controllers/AdminController.php

@@ -11,7 +11,7 @@ class AdminController extends Controller
         $filterStatus = $request->input('status', 'all');
         $per_page = $request->input('per_page', '10');
 
-        $query = Application::with('user', 'course')->orderBy('created_at');
+        $query = Application::with('user', 'course')->orderBy('updated_at', 'desc');
 
         if ($filterStatus !== 'all') {
             $query->where('status', $filterStatus);

+ 1 - 1
app/Http/Controllers/ApplicationController.php

@@ -13,7 +13,7 @@ class ApplicationController extends Controller
         $applications = Auth::user()
         ->applications()
         ->with('course')
-        ->orderBy('created_at')
+        ->orderBy('updated_at', 'desc')
         ->get();
 
         return view('applications.index', compact('applications'));

+ 3 - 2
app/Http/Controllers/Auth/RegisteredUserController.php

@@ -32,12 +32,13 @@ class RegisteredUserController extends Controller
     {
         $request->validate([
             'login' => ['required', 'string', 'min:6', 'max:255', 'unique:' . User::class],
-            'fio' => ['required', 'string', 'regex:/^[а-яА-Яёе ]+$/', 'max:255'],
+            'fio' => ['required', 'string', 'max:255'],
             'phone' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:' . User::class],
             'password' => ['required', 'confirmed', Rules\Password::defaults()],
         ], [
-            'fio' => 'В поле ФИО могут быть только символы кириллицы и пробелы'
+            'fio' => 'В поле ФИО могут быть только символы кириллицы и пробелы',
+            'phone' => 'В поле Номер телефона формат: 8(XXX)XXX-XX-XX',
         ]);
 
         $user = User::create([

+ 3 - 1
resources/views/applications/index.blade.php

@@ -59,7 +59,9 @@
                                     
                                     @if ($app->status === 'Обучение завершено')
                                     <td>
-                                        <x-primary-button type="button" data-bs-toggle="modal" data-bs-target="#reviewModal{{ $app->id }}">Отзыв</x-primary-button>
+                                        <x-primary-button type="button" data-bs-toggle="modal" data-bs-target="#reviewModal{{ $app->id }}"
+                                            style="{{ empty($app->review) ? '' : 'background-color: #198754 ' }}"
+                                            >Отзыв</x-primary-button>
 
                                         <form method="POST" action="{{ route('applications.set-review', $app->id) }}">
                                             @csrf

+ 4 - 4
resources/views/dashboard.blade.php

@@ -2,7 +2,7 @@
     <div class="py-12">
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
-                <div class="flex p-6 text-gray-900" style="align-items: start; column-gap: 50px;">
+                <div class="slider-block flex p-6 text-gray-900" style="align-items: start; column-gap: 50px;">
                     <p style="max-width: 500px;">
                         Вы можете
                         <a href="{{ route('applications.create')}}" style="color: lightblue;"> 
@@ -24,13 +24,13 @@
   </div>
   <div class="carousel-inner">
     <div class="carousel-item active" >
-      <img src="/images/image03.png" class="d-block w-100" alt="..." width="600" height="600" loading="lazy" style="object-fit: cover;">
+      <img src="/images/image03.png" class="d-block w-100" alt="..." width="600" height="600" loading="lazy" style="object-fit: cover; aspect-ratio: 1;">
     </div>
     <div class="carousel-item">
-      <img src="/images/image02.jpg" class="d-block w-100" alt="..." width="600" height="600" loading="lazy" style="object-fit: cover;">
+      <img src="/images/image02.jpg" class="d-block w-100" alt="..." width="600" height="600" loading="lazy" style="object-fit: cover; aspect-ratio: 1;">
     </div>
     <div class="carousel-item">
-      <img src="/images/image04.jpg" class="d-block w-100" alt="..." width="600" height="600" loading="lazy" style="object-fit: cover;">
+      <img src="/images/image04.jpg" class="d-block w-100" alt="..." width="600" height="600" loading="lazy" style="object-fit: cover; aspect-ratio: 1;">
     </div>
   </div>
   <button class="carousel-control-prev" type="button" data-bs-target="#carouselExampleDark" data-bs-slide="prev">

+ 11 - 0
resources/views/layouts/app.blade.php

@@ -13,6 +13,17 @@
 
         <link rel="stylesheet" href="/libs/bootstrap/bootstrap.min.css">
 
+        <style>
+            @media(max-width: 768px) {
+                .slider-block {
+                    flex-direction: column;
+                    text-align: center;
+                    align-items: center !important;
+                    row-gap: 20px;
+                }
+            }
+        </style>
+
         <!-- Scripts -->
         @vite(['resources/css/app.css', 'resources/js/app.js'])
     </head>

+ 1 - 1
routes/web.php

@@ -20,7 +20,7 @@ Route::middleware('auth')->group(function () {
 
     Route::get('/applications', [ApplicationController::class, 'index'])->name('applications.index');
 
-    Route::post('/applications/{id}', [ApplicationController::class, 'setReview'])->name('applications.set-review');
+    Route::post('/applications/{id}/review', [ApplicationController::class, 'setReview'])->name('applications.set-review');
 
 
     Route::get('/applications/create', [ApplicationController::class, 'create'])->name('applications.create');