Андрей Ларионов / rekamore.su

Download as
Browse Code »

Commit e9eb2a96e507f9e533fc8f49f4fb99a1f0190aa5

Authored by Андрей Ларионов
1 parent cd67850f4d
Exists in master

Коммит на сервере

Showing 4 changed files with 12 additions and 97 deletions Side-by-side Diff

app/Http/Controllers/WorkerController.php
Diff comments   View file @ e9eb2a9
... ... @@ -117,7 +117,7 @@ class WorkerController extends Controller
117 117 // Избранный
118 118 public function favorite()
119 119 {
120   -
  120 + dd('dgfghfghfgh');
121 121 return view('workers.favorite');
122 122 }
123 123  
... ... @@ -199,5 +199,10 @@ class WorkerController extends Controller
199 199 ]);
200 200 dd($Code_user);
201 201 }
  202 +
  203 + public function colorado() {
  204 + return view('workers.favorite');
  205 +
  206 + }
202 207 }
203 208  
resources/views/modals/register.blade.php
Diff comments   View file @ e9eb2a9
... ... @@ -9,21 +9,6 @@
9 9 <div class="modal__reg-item form-group">
10 10 <label class="form-group__label">Электронная почта</label>
11 11 <div class="form-group__item">
12   -<<<<<<< HEAD
13   - <input type="email" class="input" placeholder="info@rekamore.su" required>
14   - </div>
15   - </div>
16   - <div class="modal__reg-item form-group">
17   - <label class="form-group__label">Пароль</label>
18   - <div class="form-group__item">
19   - <input type="password" class="input" placeholder="**********" required>
20   - <button type="button" class="eye">
21   - <svg class="js-password-show">
22   - <use xlink:href="images/sprite.svg#eye"></use>
23   - </svg>
24   - <svg class="js-password-hide">
25   - <use xlink:href="images/sprite.svg#eye-2"></use>
26   -=======
27 12 <input type="email" id="email_worker" name="email_worker" class="input" placeholder="info@rekamore.su" required>
28 13 </div>
29 14 </div>
... ... @@ -38,23 +23,10 @@
38 23 </svg>
39 24 <svg class="js-password-hide">
40 25 <use xlink:href="{{ asset('images/sprite.svg#eye-2') }}"></use>
41   ->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
42 26 </svg>
43 27 </button>
44 28 </div>
45 29 </div>
46   -<<<<<<< HEAD
47   - <div class="modal__reg-item form-group">
48   - <label class="form-group__label">Подтвердить пароль</label>
49   - <div class="form-group__item">
50   - <input type="password" class="input" placeholder="**********" required>
51   - <button type="button" class="eye">
52   - <svg class="js-password-show">
53   - <use xlink:href="images/sprite.svg#eye"></use>
54   - </svg>
55   - <svg class="js-password-hide">
56   - <use xlink:href="images/sprite.svg#eye-2"></use>
57   -=======
58 30  
59 31 <div class="modal__reg-item form-group">
60 32 <label class="form-group__label">Подтвердить пароль</label>
... ... @@ -66,35 +38,10 @@
66 38 </svg>
67 39 <svg class="js-password-hide">
68 40 <use xlink:href="{{ asset('images/sprite.svg#eye-2') }}"></use>
69   ->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
70 41 </svg>
71 42 </button>
72 43 </div>
73 44 </div>
74   -<<<<<<< HEAD
75   - <div class="modal__reg-item form-group">
76   - <label class="form-group__label">Статус</label>
77   - <div class="form-group__item">
78   - <div class="select">
79   - <select class="js-select2">
80   - <option selected disabled>Не указано</option>
81   - <option>Вариант 1</option>
82   - <option>Вариант 2</option>
83   - <option>Вариант 3</option>
84   - <option>Вариант 4</option>
85   - <option>Вариант 5</option>
86   - <option>Вариант 6</option>
87   - </select>
88   - </div>
89   - </div>
90   - </div>
91   - <div class="modal__reg-item form-group">
92   - <label class="form-group__label">Ф.И.О.</label>
93   - <div class="form-group__item">
94   - <input type="text" class="input" placeholder="Шестаков Михаил Юрьевич" required>
95   - </div>
96   - </div>
97   -=======
98 45  
99 46 <div class="modal__reg-item form-group">
100 47 <label class="form-group__label">Фамилия</label>
... ... @@ -117,19 +64,11 @@
117 64 </div>
118 65 </div>
119 66 <!--
120   ->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
121 67 <div class="modal__reg-item form-group">
122 68 <label class="form-group__label">Должность</label>
123 69 <div class="form-group__item">
124 70 <input type="text" class="input" placeholder="Палуба" required>
125 71 </div>
126   -<<<<<<< HEAD
127   - </div>
128   - <div class="modal__reg-item form-group">
129   - <label class="form-group__label">Номер телефона</label>
130   - <div class="form-group__item">
131   - <input type="tel" class="input" placeholder="+7 (___) ___-__-__" required>
132   -=======
133 72 </div>-->
134 73  
135 74 <div class="modal__reg-item form-group">
... ... @@ -152,31 +91,11 @@
152 91 <label class="form-group__label">Номер телефона</label>
153 92 <div class="form-group__item">
154 93 <input type="tel" name="telephone_worker" id="telephone_worker" class="input" placeholder="+7 (___) ___-__-__" required>
155   ->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
156 94 </div>
157 95 </div>
158 96 <div class="modal__reg-item">
159 97 <img src="images/catpcha.jpg" alt="" class="captcha">
160 98 </div>
161   -<<<<<<< HEAD
162   - <div class="modal__reg-item">
163   - <label class="checkbox">
164   - <input type="checkbox" class="checkbox__input" required>
165   - <span class="checkbox__icon">
166   - <svg>
167   - <use xlink:href="images/sprite.svg#v"></use>
168   - </svg>
169   - </span>
170   - <span class="checkbox__text">
171   - <span>
172   - Я согласен(на) с <a href="#">Политикой конфиденциальности</a>
173   - </span>
174   - </span>
175   - </label>
176   - </div>
177   - <button type="submit" class="button">Зарегистрироваться</button>
178   - </form>
179   -=======
180 99  
181 100 <div class="modal__reg-item">
182 101 <label class="checkbox">
... ... @@ -196,7 +115,6 @@
196 115 <button type="submit" id="button_reg_worker" name="button_reg_worker" class="button">Зарегистрироваться</button>
197 116 </form>
198 117  
199   ->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
200 118 <form class="modal__reg" data-body="2">
201 119 <div class="modal__reg-item form-group">
202 120 <label class="form-group__label">Электронная почта</label>
... ... @@ -262,20 +180,12 @@
262 180 </span>
263 181 </label>
264 182 </div>
265   -<<<<<<< HEAD
266   - <button type="submit" class="button">Зарегистрироваться</button>
267   -=======
268 183 <button type="submit" id="button_reg_employer" name="button_reg_employer" class="button">Зарегистрироваться</button>
269   ->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
270 184 </form>
271 185 <div class="modal__text">
272 186 <span>Вспомнили пароль?</span>
273 187 &nbsp;
274   -<<<<<<< HEAD
275   - <a href="#">Войти</a>
276   -=======
277 188 <a data-fancybox data-src="#sign" data-options='{"touch":false,"autoFocus":false}'>Войти</a>
278   ->>>>>>> 142d287bd2121b81beccd97aa148f5aa0284ee0c
279 189 </div>
280 190 </div>
281 191 </div>
resources/views/workers/menu.blade.php
Diff comments   View file @ e9eb2a9
... ... @@ -33,7 +33,7 @@
33 33 </i>
34 34 <span>Сообщения</span>
35 35 </a>
36   - <a href="{{ route('worker.favorite') }}" class="cabinet__menu-item @if ($item==3) active @endif">
  36 + <a href="{{ route('worker.colorado') }}" class="cabinet__menu-item @if ($item==3) active @endif">
37 37 <i>
38 38 <svg>
39 39 <use xlink:href="{{ asset('images/sprite.svg#cabinet-6') }}"></use>
... ... @@ -435,9 +435,7 @@ Route::get(&#39;login&#39;, [MainController::class, &#39;input_login&#39;])-&gt;name(&#39;login&#39;);
435 435 // Выход из кабинета
436 436 Route::get('logout', [EmployerController::class, 'logout'])->name('logout');
437 437  
438   -// Регистрация соискателя
439   -Route::get('register-worker', [WorkerController::class, 'register_worker'])->name('register_worker');
440   -
  438 +Route::get( 'register_worker', [WorkerController::class, 'register_worker'])->name('register_worker');
441 439  
442 440 // Личный кабинет работника
443 441 Route::group([
... ... @@ -454,14 +452,16 @@ Route::group([
454 452  
455 453 // 3 страница - Избранные вакансии
456 454 Route::get('cabinet/favorite', [WorkerController::class, 'favorite'])->name('favorite');
  455 + Route::get('кабинет/favorite', [WorkerController::class, 'colorado'])->name('colorado');
457 456  
458 457 // 4 страница - Сменить пароль
459   - Route::get('cabinet/new_password', [WorkerController::class, 'new_password'])->name('new_password');
  458 + Route::get('кабинет/new_password', [WorkerController::class, 'new_password'])->name('new_password');
460 459  
461 460 // 5 страница - Удалить профиль
462   - Route::get('cabinet/delete_profile', [WorkerController::class, 'delete_profile'])->name('delete_profile');
  461 + Route::get('кабинет/delete_profile', [WorkerController::class, 'delete_profile'])->name('delete_profile');
463 462  
464 463 // 6 страница - Выход
  464 +
465 465 });
466 466  
467 467 // Личный кабинет работодателя