From 7d263c5eb2b18951005ee4276597dd2596ab4795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= <alarionov@nologostudio.ru>
Date: Tue, 12 Mar 2024 08:33:33 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20=D0=B2=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B8=D0=BA=20-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/MainController.php            |   11 ++-----
 ...24_03_11_141704_create_response_works_table.php |   34 ++++++++++++++++++++
 resources/views/ajax/list_vacancies.blade.php      |    2 +-
 resources/views/detail_new.blade.php               |    5 ++-
 resources/views/errors/404.blade.php               |   19 +++++++++++
 resources/views/index.blade.php                    |    2 +-
 resources/views/info_company_new.blade.php         |    2 +-
 resources/views/layout/frontend.blade.php          |    2 ++
 resources/views/layout/pdf.blade.php               |   10 ++----
 resources/views/list_vacancies.blade.php           |    2 +-
 resources/views/news-list.blade.php                |    4 +--
 resources/views/paginate.blade.php                 |   12 +++++--
 resources/views/vacance-item.blade.php             |    2 +-
 resources/views/worker.blade.php                   |   31 ++++++++++++++----
 routes/web.php                                     |    2 ++
 15 files changed, 106 insertions(+), 34 deletions(-)
 create mode 100644 database/migrations/2024_03_11_141704_create_response_works_table.php
 create mode 100644 resources/views/errors/404.blade.php

diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php
index 6817021..ecbde34 100644
--- a/app/Http/Controllers/MainController.php
+++ b/app/Http/Controllers/MainController.php
@@ -58,16 +58,11 @@ class MainController extends Controller
 
         //категории и вакансии
         if (($request->has('job')) && ($request->get('job') > 0)) {
-              $categories = $categories->Where('job_title_id', '=', $request->get('job'))
-                                        ->OrderByDesc('created_at')
-                                        ->GroupBy('categories.id')
-                                        ->get();
-        } else {
-                $categories = $categories->OrderByDesc('created_at')
-                                           ->GroupBy('categories.id')
-                                           ->get();
+              $categories = $categories->Where('job_title_id', '=', $request->get('job'));
         }
 
+        $categories = $categories->OrderByDesc('created_at')->GroupBy('categories.id')->get();
+
         if ($request->ajax()) {
             return view('ajax.vacancies', compact('categories'));
         } else {
diff --git a/database/migrations/2024_03_11_141704_create_response_works_table.php b/database/migrations/2024_03_11_141704_create_response_works_table.php
new file mode 100644
index 0000000..813fb8d
--- /dev/null
+++ b/database/migrations/2024_03_11_141704_create_response_works_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('response_works', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('worker_id')->nullable(false);
+            $table->integer('stars')->nullable(true);
+            $table->string('message', 255)->default('Без комментариев');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('response_works');
+    }
+};
diff --git a/resources/views/ajax/list_vacancies.blade.php b/resources/views/ajax/list_vacancies.blade.php
index d8162b4..6cbb7ce 100644
--- a/resources/views/ajax/list_vacancies.blade.php
+++ b/resources/views/ajax/list_vacancies.blade.php
@@ -63,7 +63,7 @@
         <a href="{{ route('vacancie', ['vacancy' => $Q->id]) }}" class="button button_light main__employer-page-two-item-button">Подробнее</a>
     </div>
     <div class="main__employer-page-two-item-bottom">
-        <div class="main__employer-page-two-item-bottom-date">{{ $Q->created_at }}</div>
+        <div class="main__employer-page-two-item-bottom-date">{{ date('d.m.Y H:i:s', strtotime($Q->created_at)) }}</div>
         <button type="button" data-val="{{ $Q->id }}"  class="like main__employer-page-two-item-bottom-like js-toggle <?=App\Classes\Cookies_vacancy::selected_vacancy($Q->id);?>">
             <svg>
                 <use xlink:href="{{ asset('images/sprite.svg#heart') }}"></use>
diff --git a/resources/views/detail_new.blade.php b/resources/views/detail_new.blade.php
index 735f54b..31f1eb2 100644
--- a/resources/views/detail_new.blade.php
+++ b/resources/views/detail_new.blade.php
@@ -57,7 +57,7 @@
                     <li><b>{{ $title }}</b></li>
                 </ul>
                 <img src="{{ asset(Storage::url($Query[0]->image)) }}" alt="{{ $title }}" class="thing__pic thing__pic_two">
-                <time class="thing__date">{{ $Query[0]->created_at }}</time>
+                <time class="thing__date">{{ date('d.m.Y H:i:s', strtotime($Query[0]->created_at)) }}</time>
                 <h1 class="thing__title">{{ $title }}</h1>
                 <p class="thing__text">{{ mb_strimwidth($Query[0]->text, 0, 100, "...") }}</p>
             </div>
@@ -74,7 +74,6 @@
                     </div>
                 </div>
             </div>
-
     </main>
         <section class="news">
             <div class="container">
@@ -101,7 +100,7 @@
                             <div class="news__item">
                                 <img src="{{ asset(Storage::url($Q_item->image)) }}" alt="{{ $Q_item->title }}" class="news__item-pic">
                                 <div class="news__item-body">
-                                    <time datetime="2023-05-01" class="news__item-date">{{ $Q_item->created_at }}</time>
+                                    <time datetime="{{ date('d.m.Y H:i:s', strtotime($Q_item->created_at)) }}" class="news__item-date">{{ date('d.m.Y H:i:s', strtotime($Q_item->created_at)) }}</time>
                                     <span class="news__item-title">{{ $Q_item->title }}</span>
                                     <span class="news__item-text">{!! $Q_item->text !!}</span>
                                     <a href="{{ route('detail_new', ['new' => $Q_item->id]) }}" class="news__item-more button button_light">Читать далее</a>
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
new file mode 100644
index 0000000..aa70d9e
--- /dev/null
+++ b/resources/views/errors/404.blade.php
@@ -0,0 +1,19 @@
+@extends('layout.frontend', ['title' => 'Судоходные компании РекаМоре'])
+
+@section('scripts')
+
+@endsection
+
+@section('content')
+    <section class="page-404">
+        <div class="container">
+            <div class="page-404__body">
+                <div class="page-404__numb">404</div>
+                <div class="page-404__title">Упс! Страница не найдена</div>
+                <div class="page-404__subtitle">Такой страницы не существует. Воспользуйтесь меню или перейдите на главную.</div>
+                <a href="{{ route('index') }}" class="button page-404__button">Перейти на главную</a>
+            </div>
+        </div>
+    </section>
+@endsection
+
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 2c02550..1dcb409 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -178,7 +178,7 @@
                         <div class="news__item">
                             <img src="{{ asset(Storage::url($new->image)) }}" alt="" class="news__item-pic">
                             <div class="news__item-body">
-                                <time datetime="2023-05-01" class="news__item-date">{{ $new->created_at }}</time>
+                                <time datetime="{{ date('d.m.Y H:i:s', strtotime($new->created_at)) }}" class="news__item-date">{{ date('d.m.Y H:i:s', strtotime($new->created_at)) }}</time>
                                 <span class="news__item-title">{{ $new->title }}</span>
                                 <span class="news__item-text">{{ mb_strimwidth($new->text, 0, 100) }}</span>
                                 <a href="{{ route('detail_new', ['new' => $new->id]) }}" class="news__item-more button button_light">Читать далее</a>
diff --git a/resources/views/info_company_new.blade.php b/resources/views/info_company_new.blade.php
index 6fdbe00..3b66557 100644
--- a/resources/views/info_company_new.blade.php
+++ b/resources/views/info_company_new.blade.php
@@ -241,7 +241,7 @@
                                                    class="button button_light main__employer-page-two-item-button">Подробнее</a>-->
                                             </div>
                                             <div class="main__employer-page-two-item-bottom">
-                                                <div class="main__employer-page-two-item-bottom-date">{{ $job->updated_at }}</div>
+                                                <div class="main__employer-page-two-item-bottom-date">{{ date('d.m.Y H:i:s', strtotime($job->updated_at)) }}</div>
                                                 <button type="button"
                                                         class="like main__employer-page-two-item-bottom-like js-toggle">
                                                     <svg>
diff --git a/resources/views/layout/frontend.blade.php b/resources/views/layout/frontend.blade.php
index de07f84..5bf16c7 100644
--- a/resources/views/layout/frontend.blade.php
+++ b/resources/views/layout/frontend.blade.php
@@ -9,6 +9,7 @@
     <script src="{{ asset('js/jquery.js') }}"></script>
     <script type="text/javascript" src="{{ asset('js/jquery.cookie.js') }}"></script>
     <link rel="stylesheet" href="{{ asset('css/style_new.css') }}">
+    <link rel="stylesheet" href="{{ asset('css/star-rating.min.css') }}">
     <style>
         .err_red {
             border: red 2px solid;
@@ -276,6 +277,7 @@
 <script src="{{ asset('js/jquery.select2.js') }}"></script>
 <script src="{{ asset('js/swiper.js') }}"></script>
 <script src="{{ asset('js/script.js') }}"></script>
+<script src="{{ asset('js/star-rating.min.js') }}"></script>
 <script>
     var getUrlParameter = function getUrlParameter(sParam) {
         var sPageURL = decodeURIComponent(window.location.search.substring(1)),
diff --git a/resources/views/layout/pdf.blade.php b/resources/views/layout/pdf.blade.php
index c3866c2..0b4d2af 100644
--- a/resources/views/layout/pdf.blade.php
+++ b/resources/views/layout/pdf.blade.php
@@ -7,6 +7,9 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="theme-color" content="#377D87">
     <link rel="stylesheet" href="{{ asset('css/style.css') }}">
+    <style>
+        body{font-family:'DejaVu Sans',sans-serif;background:#fff;font-size:1.6rem;font-weight:400;color:#363A3F}
+    </style>
 </head>
 
 <body id="body" class="pdf">
@@ -176,13 +179,6 @@
         </div>
     </div>
 </main>
-<script src="{{ asset('js/jquery.js') }}"></script>
-<script src="{{ asset('js/jquery.maskedinput.js') }}"></script>
-<script src="{{ asset('js/jquery.fancybox.js') }}"></script>
-<script src="{{ asset('js/jquery.select2.js') }}"></script>
-<script src="{{ asset('js/swiper.js') }}"></script>
-<script src="{{ asset('js/star-rating.min.js') }}"></script>
-<script src="{{ asset('js/script.js') }}"></script>
 </body>
 
 </html>
diff --git a/resources/views/list_vacancies.blade.php b/resources/views/list_vacancies.blade.php
index 29b3ec1..b8ca4ec 100644
--- a/resources/views/list_vacancies.blade.php
+++ b/resources/views/list_vacancies.blade.php
@@ -225,7 +225,7 @@
                         <a href="{{ route('vacancie', ['vacancy' => $Q->id]) }}" class="button button_light main__employer-page-two-item-button">Подробнее</a>
                     </div>
                     <div class="main__employer-page-two-item-bottom">
-                        <div class="main__employer-page-two-item-bottom-date">{{ $Q->created_at }}</div>
+                        <div class="main__employer-page-two-item-bottom-date">{{ date('d.m.Y H:i:s', strtotime($Q->created_at)) }}</div>
                         <button type="button" data-val="{{ $Q->id }}"  class="like main__employer-page-two-item-bottom-like js-toggle js_vacancy_favorites <?=App\Classes\Cookies_vacancy::selected_vacancy($Q->id);?>">
                             <svg>
                                 <use xlink:href="{{ asset('images/sprite.svg#heart') }}"></use>
diff --git a/resources/views/news-list.blade.php b/resources/views/news-list.blade.php
index f108334..1b3389f 100644
--- a/resources/views/news-list.blade.php
+++ b/resources/views/news-list.blade.php
@@ -144,16 +144,14 @@
                                     <img src="{{ asset('images/8.jpg') }}" alt="{{ $Q->title }}" class="news__item-pic">
                                 @endif
                                 <div class="news__item-body">
-                                    <time datetime="2023-05-01" class="news__item-date">{{ $Q->created_at }}</time>
+                                    <time datetime="{{ date('d.m.Y H:i:s', strtotime($Q->created_at)) }}" class="news__item-date">{{ date('d.m.Y H:i:s', strtotime($Q->created_at)) }}</time>
                                     <span class="news__item-title">{{ $Q->title }}</span>
                                     <span class="news__item-text">{!! $Q->text !!}</span>
                                     <a href="{{ route('detail_new', ['new' => $Q->id]) }}" class="news__item-more button button_light">Читать далее</a>
                                 </div>
                             </div>
                             @endforeach
-
                         </div>
-
                         {{ $Query->appends($_GET)->links('paginate') }}
                         @else
                             <div class="news__items">
diff --git a/resources/views/paginate.blade.php b/resources/views/paginate.blade.php
index f10ebbd..ed46ef9 100644
--- a/resources/views/paginate.blade.php
+++ b/resources/views/paginate.blade.php
@@ -1,7 +1,11 @@
 @if ($paginator->hasPages())
 <div class="pagination">
     @if ($paginator->onFirstPage())
-
+        <a href="{{ $paginator->previousPageUrl() }}" class="pagination__nav pagination__nav_prev">
+            <svg>
+                <use xlink:href="{{ asset('images/sprite.svg#arrow-bold') }}"></use>
+            </svg>
+        </a>
     @else
     <a href="{{ $paginator->previousPageUrl() }}" class="pagination__nav pagination__nav_prev">
         <svg>
@@ -45,7 +49,11 @@
                 </svg>
             </a>
     @else
-
+            <a href="{{ $paginator->nextPageUrl() }}" class="pagination__nav pagination__nav_next">
+                <svg>
+                    <use xlink:href="{{ asset('images/sprite.svg#arrow-bold') }}"></use>
+                </svg>
+            </a>
     @endif
 </div>
 @endif
diff --git a/resources/views/vacance-item.blade.php b/resources/views/vacance-item.blade.php
index 61b377e..a371138 100644
--- a/resources/views/vacance-item.blade.php
+++ b/resources/views/vacance-item.blade.php
@@ -109,7 +109,7 @@
                     <button type="button" class="button main__employer-page-two-item-button">Откликнуться</button>
                 </div>
                 <div class="main__employer-page-two-item-bottom">
-                    <div class="main__employer-page-two-item-bottom-date">{{ $Q->created_at }}</div>
+                    <div class="main__employer-page-two-item-bottom-date">{{ date('d.m.Y H:i:s', strtotime($Q->created_at)) }}</div>
                     <button type="button" data-val="{{ $Q->id }}" class="like main__employer-page-two-item-bottom-like js_vacancy_favorites js-toggle <?=\App\Classes\RusDate::selected_vacancy($Q->id);?>">
                         <svg>
                             <use xlink:href="{{ asset('images/sprite.svg#heart') }}"></use>
diff --git a/resources/views/worker.blade.php b/resources/views/worker.blade.php
index a56d535..04d1f1d 100644
--- a/resources/views/worker.blade.php
+++ b/resources/views/worker.blade.php
@@ -222,9 +222,7 @@
                 <div class="main__resume-profile-info">
                     <h2 class="main__resume-profile-info-title">Данные о прошлых компаниях</h2>
                     <div class="main__resume-profile-info-body">
-
-                        @if (isset($Query[0]->prev_company))
-                            @if ($Query[0]->prev_company->count())
+                        @if ((isset($Query[0]->prev_company)) && ($Query[0]->prev_company->count()))
                                 @foreach ($Query[0]->prev_company as $it)
                                     <div class="main__resume-profile-info-body-item">
                                     <h3 class="main__resume-profile-info-body-subtitle">{{ $it->name_company }}</h3>
@@ -247,23 +245,44 @@
                                     </ul>
                                     </div>
                                 @endforeach
-                            @endif
+                        @else
+                            <div class="main__resume-profile-info-body-item">
+                                <h3 class="main__resume-profile-info-body-subtitle">Нету данных о компании</h3>
+                            </div>
                         @endif
                     </div>
                 </div>
+
+
+
+
+
+
+
+
                 <div class="main__resume-profile-review">
+                    <form action="{{ route('stars_answer') }}" method="POST">
+                    @csrf
                     <h2 class="main__resume-profile-review-title">Оставить отзыв о работнике</h2>
                     <div class="rate">
                         <div class="rate__label">Ваша оценка:</div>
                         <div class="rate__stars">
-                            <img src="{{ asset('images/stars.svg') }}" alt="">
+                            <select name="stars" id="stars" class="star-rating js-stars">
+                                <option value="5">5</option>
+                                <option value="4">4</option>
+                                <option value="3">3</option>
+                                <option value="2">2</option>
+                                <option value="1" selected>1</option>
+                            </select>
                         </div>
                     </div>
+                    <input type="hidden" name="worker_id" id="worker_id" value="{{ $Query[0]->id }}"/>
                     <div class="main__resume-profile-review-body">
                         <h3>Ваш отзыв</h3>
-                        <textarea class="textarea" placeholder="Текст отзыва&hellip;" required></textarea>
+                        <textarea class="textarea" name="message" id="message" placeholder="Текст отзыва&hellip;" required></textarea>
                         <button type="submit" class="button">Оставить отзыв</button>
                     </div>
+                    </form>
                 </div>
             </div>
         </div>
diff --git a/routes/web.php b/routes/web.php
index 9ead850..1107b5b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -442,6 +442,8 @@ Route::get('register_employer', [EmployerController::class, 'register_employer']
 
 //восстановление пароля
 Route::get('repair-password', [MainController::class, 'repair_password'])->name('repair_password');
+// Звезда сообщения
+Route::post('stars-answer', [WorkerController::class, 'stars_answer'])->name('stars_answer');
 
 // Борьба
 Route::get('clear_cookie', function() {
-- 
1.7.10.4