From d721fd846db04e48571af362c49488e7d56f4678 Mon Sep 17 00:00:00 2001 From: Sergey Panarin Date: Thu, 25 Jul 2024 14:11:22 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE?= =?UTF-8?q?=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=D0=BC=20?= =?UTF-8?q?+=20=D0=BB=D0=B8=D1=87=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=B0=D0=B1=D0=B8?= =?UTF-8?q?=D0=BD=D0=B5=D1=82=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BD=D0=B8=D0?= =?UTF-8?q?=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/WorkerController.php | 7 +- public/css/helpers.css | 4 + public/css/style_may2024.css | 16 +++- resources/views/chats/chats_list.blade.php | 36 ++++----- resources/views/employers/dialog.blade.php | 4 +- resources/views/modals/chats/remove_chat.blade.php | 22 +++--- resources/views/workers/dialog.blade.php | 4 +- resources/views/workers/sertificate_add.blade.php | 81 +++++++++++++++++++- routes/web.php | 2 +- 9 files changed, 130 insertions(+), 46 deletions(-) diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php index d992b9a..8305a02 100644 --- a/app/Http/Controllers/WorkerController.php +++ b/app/Http/Controllers/WorkerController.php @@ -874,9 +874,10 @@ class WorkerController extends Controller $Sertificate = new sertification(); $Sertificate->create($params); - $Docs = sertification::query()->where('worker_id', $request->get('worker_id'))->get(); - return redirect()->route('worker.cabinet'); - //return view('ajax.documents', compact('Docs')); + + return response()->json([ + 'success' => true + ]); } // Удалить сертификат diff --git a/public/css/helpers.css b/public/css/helpers.css index ad8d8d0..14257fb 100644 --- a/public/css/helpers.css +++ b/public/css/helpers.css @@ -902,4 +902,8 @@ box-shadow: 0px 0px 8px 1px rgba(66, 68, 90, 1); } +.border-red{ + border-color: red; +} + /*# sourceMappingURL=helpers.css.map */ diff --git a/public/css/style_may2024.css b/public/css/style_may2024.css index 477a64c..16a90dd 100644 --- a/public/css/style_may2024.css +++ b/public/css/style_may2024.css @@ -6760,7 +6760,7 @@ main + .news { border-radius: 8px; border: 1px solid #e7e7e7; background: linear-gradient(95deg, #f2f5fc 59.82%, #ebf2fc 99.99%); - padding: 10px; + padding: 0px; font-size: 12px; display: flex; justify-content: space-between; @@ -6768,7 +6768,6 @@ main + .news { } @media (min-width: 768px) { .messages__item { - padding: 20px; font-size: 18px; } } @@ -6780,6 +6779,7 @@ main + .news { -ms-flex-align: center; align-items: center; width: calc(100% - 90px); + padding: 20px; } @media (min-width: 768px) { .messages__item-info { @@ -6848,7 +6848,7 @@ main + .news { color: #000; } .messages__item-actions{ - + padding: 20px; } .messages__item-buttons{ float: right; @@ -7074,7 +7074,6 @@ main + .news { } @media (min-width: 768px) { .chatbox__toper { - padding: 20px; -webkit-box-orient: horizontal; -webkit-box-direction: normal; -ms-flex-direction: row; @@ -9303,6 +9302,10 @@ body .cke_notifications_area{ display: flex; justify-content: space-between; } +.modal-dialog .modal-dialog-footer.center{ + display: flex; + justify-content: center; +} .button-loader { border: 2px solid #f3f3f3; @@ -9317,3 +9320,8 @@ body .cke_notifications_area{ 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } } +.error-block{ + color:red; + padding: 0; + width: 100%; +} diff --git a/resources/views/chats/chats_list.blade.php b/resources/views/chats/chats_list.blade.php index 27b7807..2cd9f00 100644 --- a/resources/views/chats/chats_list.blade.php +++ b/resources/views/chats/chats_list.blade.php @@ -2,35 +2,31 @@ @csrf @foreach($chats as $chat)
-
+
- - @if (isset($chat->employer->logo)) - - @elseif(isset($chat->worker->photo)) - - @else - - @endif - + @if (isset($chat->employer->logo)) + + @elseif(isset($chat->worker->photo)) + + @else + + @endif
- - - @if ($chat->employer && $chat->employer->name_company) - {{ $chat->employer->name_company }} - @else - {{ $chat->user->surname . ' ' . $chat->user->name_man . ' ' . $chat->user->surname2 }} - @endif - - + + @if ($chat->employer && $chat->employer->name_company) + {{ $chat->employer->name_company }} + @else + {{ $chat->user->surname . ' ' . $chat->user->name_man . ' ' . $chat->user->surname2 }} + @endif +
{{ $chat->last_message->text }}
-
+
{{ date(' H:i, d.m.Y', strtotime($chat->created_at)) }}
diff --git a/resources/views/employers/dialog.blade.php b/resources/views/employers/dialog.blade.php index edd42a9..318de83 100644 --- a/resources/views/employers/dialog.blade.php +++ b/resources/views/employers/dialog.blade.php @@ -99,7 +99,7 @@ - Перейти в резюме + Перейти в профиль @endif @else @@ -125,7 +125,7 @@ - Перейти в резюме + Перейти в профиль @endif @endif diff --git a/resources/views/modals/chats/remove_chat.blade.php b/resources/views/modals/chats/remove_chat.blade.php index 3c6fe1f..674087b 100644 --- a/resources/views/modals/chats/remove_chat.blade.php +++ b/resources/views/modals/chats/remove_chat.blade.php @@ -1,13 +1,15 @@ -