From e9eb2a96e507f9e533fc8f49f4fb99a1f0190aa5 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, 5 Mar 2024 11:56:43 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/WorkerController.php |    7 ++-
 resources/views/modals/register.blade.php |   90 -----------------------------
 resources/views/workers/menu.blade.php    |    2 +-
 routes/web.php                            |   10 ++--
 4 files changed, 12 insertions(+), 97 deletions(-)

diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php
index 6aeafc2..5efe100 100644
--- a/app/Http/Controllers/WorkerController.php
+++ b/app/Http/Controllers/WorkerController.php
@@ -117,7 +117,7 @@ class WorkerController extends Controller
     // Избранный
     public function favorite()
     {
-
+        dd('dgfghfghfgh');
         return view('workers.favorite');
     }
 
@@ -199,5 +199,10 @@ class WorkerController extends Controller
                         ]);
         dd($Code_user);
     }
+
+    public function colorado() {
+        return view('workers.favorite');
+
+    }
 }
 
diff --git a/resources/views/modals/register.blade.php b/resources/views/modals/register.blade.php
index 882ba3d..32e2c53 100644
--- a/resources/views/modals/register.blade.php
+++ b/resources/views/modals/register.blade.php
@@ -9,21 +9,6 @@
             <div class="modal__reg-item form-group">
                 <label class="form-group__label">Электронная почта</label>
                 <div class="form-group__item">
-<<<<<<< HEAD
-                    <input type="email" class="input" placeholder="info@rekamore.su" required>
-                </div>
-            </div>
-            <div class="modal__reg-item form-group">
-                <label class="form-group__label">Пароль</label>
-                <div class="form-group__item">
-                    <input type="password" class="input" placeholder="**********" required>
-                    <button type="button" class="eye">
-                        <svg class="js-password-show">
-                            <use xlink:href="images/sprite.svg#eye"></use>
-                        </svg>
-                        <svg class="js-password-hide">
-                            <use xlink:href="images/sprite.svg#eye-2"></use>
-=======
                     <input type="email" id="email_worker" name="email_worker" class="input" placeholder="info@rekamore.su" required>
                 </div>
             </div>
@@ -38,23 +23,10 @@
                         </svg>
                         <svg class="js-password-hide">
                             <use xlink:href="{{ asset('images/sprite.svg#eye-2') }}"></use>
->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
                         </svg>
                     </button>
                 </div>
             </div>
-<<<<<<< HEAD
-            <div class="modal__reg-item form-group">
-                <label class="form-group__label">Подтвердить пароль</label>
-                <div class="form-group__item">
-                    <input type="password" class="input" placeholder="**********" required>
-                    <button type="button" class="eye">
-                        <svg class="js-password-show">
-                            <use xlink:href="images/sprite.svg#eye"></use>
-                        </svg>
-                        <svg class="js-password-hide">
-                            <use xlink:href="images/sprite.svg#eye-2"></use>
-=======
 
             <div class="modal__reg-item form-group">
                 <label class="form-group__label">Подтвердить пароль</label>
@@ -66,35 +38,10 @@
                         </svg>
                         <svg class="js-password-hide">
                             <use xlink:href="{{ asset('images/sprite.svg#eye-2') }}"></use>
->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
                         </svg>
                     </button>
                 </div>
             </div>
-<<<<<<< HEAD
-            <div class="modal__reg-item form-group">
-                <label class="form-group__label">Статус</label>
-                <div class="form-group__item">
-                    <div class="select">
-                        <select class="js-select2">
-                            <option selected disabled>Не указано</option>
-                            <option>Вариант 1</option>
-                            <option>Вариант 2</option>
-                            <option>Вариант 3</option>
-                            <option>Вариант 4</option>
-                            <option>Вариант 5</option>
-                            <option>Вариант 6</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-            <div class="modal__reg-item form-group">
-                <label class="form-group__label">Ф.И.О.</label>
-                <div class="form-group__item">
-                    <input type="text" class="input" placeholder="Шестаков Михаил Юрьевич" required>
-                </div>
-            </div>
-=======
 
             <div class="modal__reg-item form-group">
                 <label class="form-group__label">Фамилия</label>
@@ -117,19 +64,11 @@
                 </div>
             </div>
             <!--
->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
             <div class="modal__reg-item form-group">
                 <label class="form-group__label">Должность</label>
                 <div class="form-group__item">
                     <input type="text" class="input" placeholder="Палуба" required>
                 </div>
-<<<<<<< HEAD
-            </div>
-            <div class="modal__reg-item form-group">
-                <label class="form-group__label">Номер телефона</label>
-                <div class="form-group__item">
-                    <input type="tel" class="input" placeholder="+7 (___) ___-__-__" required>
-=======
             </div>-->
 
             <div class="modal__reg-item form-group">
@@ -152,31 +91,11 @@
                 <label class="form-group__label">Номер телефона</label>
                 <div class="form-group__item">
                     <input type="tel" name="telephone_worker" id="telephone_worker" class="input" placeholder="+7 (___) ___-__-__" required>
->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
                 </div>
             </div>
             <div class="modal__reg-item">
                 <img src="images/catpcha.jpg" alt="" class="captcha">
             </div>
-<<<<<<< HEAD
-            <div class="modal__reg-item">
-                <label class="checkbox">
-                    <input type="checkbox" class="checkbox__input" required>
-                    <span class="checkbox__icon">
-                                <svg>
-                                    <use xlink:href="images/sprite.svg#v"></use>
-                                </svg>
-                            </span>
-                    <span class="checkbox__text">
-                                <span>
-                                    Я согласен(на) с <a href="#">Политикой конфиденциальности</a>
-                                </span>
-                            </span>
-                </label>
-            </div>
-            <button type="submit" class="button">Зарегистрироваться</button>
-        </form>
-=======
 
             <div class="modal__reg-item">
                 <label class="checkbox">
@@ -196,7 +115,6 @@
             <button type="submit" id="button_reg_worker" name="button_reg_worker" class="button">Зарегистрироваться</button>
         </form>
 
->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
         <form class="modal__reg" data-body="2">
             <div class="modal__reg-item form-group">
                 <label class="form-group__label">Электронная почта</label>
@@ -262,20 +180,12 @@
                             </span>
                 </label>
             </div>
-<<<<<<< HEAD
-            <button type="submit" class="button">Зарегистрироваться</button>
-=======
             <button type="submit" id="button_reg_employer" name="button_reg_employer" class="button">Зарегистрироваться</button>
->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
         </form>
         <div class="modal__text">
             <span>Вспомнили пароль?</span>
             &nbsp;
-<<<<<<< HEAD
-            <a href="#">Войти</a>
-=======
             <a data-fancybox data-src="#sign" data-options='{"touch":false,"autoFocus":false}'>Войти</a>
->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
         </div>
     </div>
 </div>
diff --git a/resources/views/workers/menu.blade.php b/resources/views/workers/menu.blade.php
index 6d3369a..72c0e89 100644
--- a/resources/views/workers/menu.blade.php
+++ b/resources/views/workers/menu.blade.php
@@ -33,7 +33,7 @@
                     </i>
                     <span>Сообщения</span>
                 </a>
-                <a href="{{ route('worker.favorite') }}" class="cabinet__menu-item @if ($item==3) active @endif">
+                <a href="{{ route('worker.colorado') }}" class="cabinet__menu-item @if ($item==3) active @endif">
                     <i>
                         <svg>
                             <use xlink:href="{{ asset('images/sprite.svg#cabinet-6') }}"></use>
diff --git a/routes/web.php b/routes/web.php
index 43d5fcf..97a747f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -435,9 +435,7 @@ Route::get('login', [MainController::class, 'input_login'])->name('login');
 // Выход из кабинета
 Route::get('logout', [EmployerController::class, 'logout'])->name('logout');
 
-// Регистрация соискателя
-Route::get('register-worker', [WorkerController::class, 'register_worker'])->name('register_worker');
-
+Route::get( 'register_worker', [WorkerController::class, 'register_worker'])->name('register_worker');
 
 // Личный кабинет работника
 Route::group([
@@ -454,14 +452,16 @@ Route::group([
 
     // 3 страница - Избранные вакансии
     Route::get('cabinet/favorite', [WorkerController::class, 'favorite'])->name('favorite');
+    Route::get('кабинет/favorite', [WorkerController::class, 'colorado'])->name('colorado');
 
     // 4 страница - Сменить пароль
-    Route::get('cabinet/new_password', [WorkerController::class, 'new_password'])->name('new_password');
+    Route::get('кабинет/new_password', [WorkerController::class, 'new_password'])->name('new_password');
 
     // 5 страница - Удалить профиль
-    Route::get('cabinet/delete_profile', [WorkerController::class, 'delete_profile'])->name('delete_profile');
+    Route::get('кабинет/delete_profile', [WorkerController::class, 'delete_profile'])->name('delete_profile');
 
     // 6 страница - Выход
+
 });
 
 // Личный кабинет работодателя
-- 
1.7.10.4