Commit 47843107321382cce786fa91aeb8418db06d2894
1 parent
224d9d0ee8
Exists in
master
and in
1 other branch
Баг-ошибка это с сообщениями и избранными данными
Showing 7 changed files with 243 additions and 220 deletions Side-by-side Diff
- app/Http/Controllers/EmployerController.php
- resources/views/layout/frontend.blade.php
- resources/views/modals/register.blade.php
- resources/views/modals/reset_password.blade.php
- resources/views/modals/send_message_noaut.blade.php
- resources/views/modals/thank_you_send_employer.blade.php
- resources/views/modals/thank_you_send_manager.blade.php
app/Http/Controllers/EmployerController.php
... | ... | @@ -333,12 +333,16 @@ class EmployerController extends Controller |
333 | 333 | |
334 | 334 | //Избранные люди |
335 | 335 | public function favorites(Request $request) { |
336 | - $items = RusDate::count_item_fav(); | |
337 | - $it = $_COOKIE['favorite_worker']; | |
338 | - $it = str_replace('"', "", $it); | |
339 | - $it = str_replace('[', "", $it); | |
340 | - $it = str_replace(']', "", $it); | |
341 | - $Arr = explode(",", $it); | |
336 | + if (isset($_COOKIE['favorite_worker'])) { | |
337 | + $items = RusDate::count_item_fav(); | |
338 | + $it = $_COOKIE['favorite_worker']; | |
339 | + $it = str_replace('"', "", $it); | |
340 | + $it = str_replace('[', "", $it); | |
341 | + $it = str_replace(']', "", $it); | |
342 | + $Arr = explode(",", $it); | |
343 | + } else { | |
344 | + $Arr = Array(); | |
345 | + } | |
342 | 346 | |
343 | 347 | $Workers = Worker::query(); |
344 | 348 | $Workers = $Workers->whereIn('id', $Arr); |
resources/views/layout/frontend.blade.php
... | ... | @@ -224,224 +224,28 @@ |
224 | 224 | </div> <!-- END BOTTOM WRAPPER --> |
225 | 225 | |
226 | 226 | <div hidden> <!-- BEGIN MODALS WRAPPER --> |
227 | + <!-- Отправить сообщение соискателю --> | |
227 | 228 | @include('modals.send_worker') |
228 | - <div id="question" class="modal modal_bg"> | |
229 | - <div class="modal__body"> | |
230 | - <div class="modal__title">Отправить сообщение "Наяда"</div> | |
231 | - <div class="modal__text">Вы должны быть авторизованы, чтобы отправить личное сообщение</div> | |
232 | - <div class="modal__buttons"> | |
233 | - <a href="#" class="button">Войти</a> | |
234 | - <a href="#" class="button button_light">Зарегистрироваться</a> | |
235 | - </div> | |
236 | - </div> | |
237 | - </div> | |
238 | 229 | |
230 | + <!-- Сообщение-предупреждение о том, что сообщения только можно отправить авторизованным пользователям --> | |
231 | + @include('modals.send_message_noaut') | |
232 | + | |
233 | + <!-- Форма авторизации --> | |
239 | 234 | @include('modals.send_login') |
240 | 235 | |
241 | - <div id="reset" class="modal"> | |
242 | - <div class="modal__body"> | |
243 | - <div class="modal__title left">Сбросить пароль</div> | |
244 | - <div class="modal__text left">Пожалуйста, введите имя пользователя или адрес электронной почты</div> | |
245 | - <form class="modal__sign"> | |
246 | - <div class="modal__sign-item"> | |
247 | - <input type="text" class="input" placeholder="Имя пользователя или email адрес" required> | |
248 | - </div> | |
249 | - <div class="modal__sign-item"> | |
250 | - <button type="submit" class="button">Получить новый пароль</button> | |
251 | - </div> | |
252 | - </form> | |
253 | - <div class="modal__text"> | |
254 | - <span>Вспомнили пароль?</span> | |
255 | - | |
256 | - <a href="#">Войти</a> | |
257 | - </div> | |
258 | - </div> | |
259 | - </div> | |
260 | - <div id="reg" class="modal"> | |
261 | - <div class="modal__body"> | |
262 | - <div class="modal__title left">Регистрация</div> | |
263 | - <div class="modal__tabs"> | |
264 | - <button type="button" class="modal__tabs-item button button_light active" data-tab="1">Кандидат</button> | |
265 | - <button type="button" class="modal__tabs-item button button_light" data-tab="2">Работодатель</button> | |
266 | - </div> | |
267 | - <form class="modal__reg showed" data-body="1"> | |
268 | - <div class="modal__reg-item form-group"> | |
269 | - <label class="form-group__label">Электронная почта</label> | |
270 | - <div class="form-group__item"> | |
271 | - <input type="email" class="input" placeholder="info@rekamore.su" required> | |
272 | - </div> | |
273 | - </div> | |
274 | - <div class="modal__reg-item form-group"> | |
275 | - <label class="form-group__label">Пароль</label> | |
276 | - <div class="form-group__item"> | |
277 | - <input type="password" class="input" placeholder="**********" required> | |
278 | - <button type="button" class="eye"> | |
279 | - <svg class="js-password-show"> | |
280 | - <use xlink:href="images/sprite.svg#eye"></use> | |
281 | - </svg> | |
282 | - <svg class="js-password-hide"> | |
283 | - <use xlink:href="images/sprite.svg#eye-2"></use> | |
284 | - </svg> | |
285 | - </button> | |
286 | - </div> | |
287 | - </div> | |
288 | - <div class="modal__reg-item form-group"> | |
289 | - <label class="form-group__label">Подтвердить пароль</label> | |
290 | - <div class="form-group__item"> | |
291 | - <input type="password" class="input" placeholder="**********" required> | |
292 | - <button type="button" class="eye"> | |
293 | - <svg class="js-password-show"> | |
294 | - <use xlink:href="images/sprite.svg#eye"></use> | |
295 | - </svg> | |
296 | - <svg class="js-password-hide"> | |
297 | - <use xlink:href="images/sprite.svg#eye-2"></use> | |
298 | - </svg> | |
299 | - </button> | |
300 | - </div> | |
301 | - </div> | |
302 | - <div class="modal__reg-item form-group"> | |
303 | - <label class="form-group__label">Статус</label> | |
304 | - <div class="form-group__item"> | |
305 | - <div class="select"> | |
306 | - <select class="js-select2"> | |
307 | - <option selected disabled>Не указано</option> | |
308 | - <option>Вариант 1</option> | |
309 | - <option>Вариант 2</option> | |
310 | - <option>Вариант 3</option> | |
311 | - <option>Вариант 4</option> | |
312 | - <option>Вариант 5</option> | |
313 | - <option>Вариант 6</option> | |
314 | - </select> | |
315 | - </div> | |
316 | - </div> | |
317 | - </div> | |
318 | - <div class="modal__reg-item form-group"> | |
319 | - <label class="form-group__label">Ф.И.О.</label> | |
320 | - <div class="form-group__item"> | |
321 | - <input type="text" class="input" placeholder="Шестаков Михаил Юрьевич" required> | |
322 | - </div> | |
323 | - </div> | |
324 | - <div class="modal__reg-item form-group"> | |
325 | - <label class="form-group__label">Должность</label> | |
326 | - <div class="form-group__item"> | |
327 | - <input type="text" class="input" placeholder="Палуба" required> | |
328 | - </div> | |
329 | - </div> | |
330 | - <div class="modal__reg-item form-group"> | |
331 | - <label class="form-group__label">Номер телефона</label> | |
332 | - <div class="form-group__item"> | |
333 | - <input type="tel" class="input" placeholder="+7 (___) ___-__-__" required> | |
334 | - </div> | |
335 | - </div> | |
336 | - <div class="modal__reg-item"> | |
337 | - <img src="images/catpcha.jpg" alt="" class="captcha"> | |
338 | - </div> | |
339 | - <div class="modal__reg-item"> | |
340 | - <label class="checkbox"> | |
341 | - <input type="checkbox" class="checkbox__input" required> | |
342 | - <span class="checkbox__icon"> | |
343 | - <svg> | |
344 | - <use xlink:href="images/sprite.svg#v"></use> | |
345 | - </svg> | |
346 | - </span> | |
347 | - <span class="checkbox__text"> | |
348 | - <span> | |
349 | - Я согласен(на) с <a href="#">Политикой конфиденциальности</a> | |
350 | - </span> | |
351 | - </span> | |
352 | - </label> | |
353 | - </div> | |
354 | - <button type="submit" class="button">Зарегистрироваться</button> | |
355 | - </form> | |
356 | - <form class="modal__reg" data-body="2"> | |
357 | - <div class="modal__reg-item form-group"> | |
358 | - <label class="form-group__label">Электронная почта</label> | |
359 | - <div class="form-group__item"> | |
360 | - <input type="email" class="input" placeholder="info@rekamore.su" required> | |
361 | - </div> | |
362 | - </div> | |
363 | - <div class="modal__reg-item form-group"> | |
364 | - <label class="form-group__label">Пароль</label> | |
365 | - <div class="form-group__item"> | |
366 | - <input type="password" class="input" placeholder="**********" required> | |
367 | - <button type="button" class="eye"> | |
368 | - <svg class="js-password-show"> | |
369 | - <use xlink:href="images/sprite.svg#eye"></use> | |
370 | - </svg> | |
371 | - <svg class="js-password-hide"> | |
372 | - <use xlink:href="images/sprite.svg#eye-2"></use> | |
373 | - </svg> | |
374 | - </button> | |
375 | - </div> | |
376 | - </div> | |
377 | - <div class="modal__reg-item form-group"> | |
378 | - <label class="form-group__label">Подтвердить пароль</label> | |
379 | - <div class="form-group__item"> | |
380 | - <input type="password" class="input" placeholder="**********" required> | |
381 | - <button type="button" class="eye"> | |
382 | - <svg class="js-password-show"> | |
383 | - <use xlink:href="images/sprite.svg#eye"></use> | |
384 | - </svg> | |
385 | - <svg class="js-password-hide"> | |
386 | - <use xlink:href="images/sprite.svg#eye-2"></use> | |
387 | - </svg> | |
388 | - </button> | |
389 | - </div> | |
390 | - </div> | |
391 | - <div class="modal__reg-item form-group"> | |
392 | - <label class="form-group__label">Номер телефона</label> | |
393 | - <div class="form-group__item"> | |
394 | - <input type="tel" class="input" placeholder="+7 (___) ___-__-__" required> | |
395 | - </div> | |
396 | - </div> | |
397 | - <div class="modal__reg-item form-group"> | |
398 | - <label class="form-group__label">Название судоходной компании</label> | |
399 | - <div class="form-group__item"> | |
400 | - <input type="text" class="input" placeholder="ООО Река Море" required> | |
401 | - </div> | |
402 | - </div> | |
403 | - <div class="modal__reg-item"> | |
404 | - <img src="images/catpcha.jpg" alt="" class="captcha"> | |
405 | - </div> | |
406 | - <div class="modal__reg-item"> | |
407 | - <label class="checkbox"> | |
408 | - <input type="checkbox" class="checkbox__input" required> | |
409 | - <span class="checkbox__icon"> | |
410 | - <svg> | |
411 | - <use xlink:href="images/sprite.svg#v"></use> | |
412 | - </svg> | |
413 | - </span> | |
414 | - <span class="checkbox__text"> | |
415 | - <span> | |
416 | - Я согласен(на) с <a href="#">Политикой конфиденциальности</a> | |
417 | - </span> | |
418 | - </span> | |
419 | - </label> | |
420 | - </div> | |
421 | - <button type="submit" class="button">Зарегистрироваться</button> | |
422 | - </form> | |
423 | - <div class="modal__text"> | |
424 | - <span>Вспомнили пароль?</span> | |
425 | - | |
426 | - <a href="#">Войти</a> | |
427 | - </div> | |
428 | - </div> | |
429 | - </div> | |
430 | - <div id="thanks" class="modal modal_bg"> | |
431 | - <div class="modal__body"> | |
432 | - <div class="modal__title">Спасибо!</div> | |
433 | - <div class="modal__text">Ваша сообщение успешно отправлена работодателю <a href="#">"Наяда"</a></div> | |
434 | - <a href="#" class="button button_light modal__button">На главную</a> | |
435 | - </div> | |
436 | - </div> | |
437 | - <div id="thanks-2" class="modal modal_bg"> | |
438 | - <div class="modal__body"> | |
439 | - <div class="modal__title">Спасибо!</div> | |
440 | - <div class="modal__text">Ваша заявка успешно отправлена</div> | |
441 | - <div class="modal__text"><span>В ближайшее время с вами свяжется наш менеджер для уточнения необходимой информации</span></div> | |
442 | - <a href="#" class="button button_light modal__button">На главную</a> | |
443 | - </div> | |
444 | - </div> | |
236 | + <!-- Сбросить пароль --> | |
237 | + @include('modals.reset_password') | |
238 | + | |
239 | + <!-- Регистрация --> | |
240 | + @include('modals.register') | |
241 | + | |
242 | + <!-- Благодарность по отправке сообщения работодателю --> | |
243 | + @include('modals.thank_you_send_employer') | |
244 | + | |
245 | + <!-- Благодарность по отправке сообщения менеджеру --> | |
246 | + @include('modals.thank_you_send_manager') | |
247 | + | |
248 | + | |
445 | 249 | <div id="thanks-3" class="modal modal_bg"> |
446 | 250 | <div class="modal__body"> |
447 | 251 | <div class="modal__title">Спасибо!</div> |
... | ... | @@ -451,6 +255,7 @@ |
451 | 255 | <a href="#" class="button button_light modal__button">Войти</a> |
452 | 256 | </div> |
453 | 257 | </div> |
258 | + | |
454 | 259 | <div id="thanks-4" class="modal modal_bg"> |
455 | 260 | <div class="modal__body"> |
456 | 261 | <div class="modal__title">Спасибо!</div> |
resources/views/modals/register.blade.php
... | ... | @@ -0,0 +1,170 @@ |
1 | +<div id="reg" class="modal"> | |
2 | + <div class="modal__body"> | |
3 | + <div class="modal__title left">Регистрация</div> | |
4 | + <div class="modal__tabs"> | |
5 | + <button type="button" class="modal__tabs-item button button_light active" data-tab="1">Кандидат</button> | |
6 | + <button type="button" class="modal__tabs-item button button_light" data-tab="2">Работодатель</button> | |
7 | + </div> | |
8 | + <form class="modal__reg showed" data-body="1"> | |
9 | + <div class="modal__reg-item form-group"> | |
10 | + <label class="form-group__label">Электронная почта</label> | |
11 | + <div class="form-group__item"> | |
12 | + <input type="email" class="input" placeholder="info@rekamore.su" required> | |
13 | + </div> | |
14 | + </div> | |
15 | + <div class="modal__reg-item form-group"> | |
16 | + <label class="form-group__label">Пароль</label> | |
17 | + <div class="form-group__item"> | |
18 | + <input type="password" class="input" placeholder="**********" required> | |
19 | + <button type="button" class="eye"> | |
20 | + <svg class="js-password-show"> | |
21 | + <use xlink:href="images/sprite.svg#eye"></use> | |
22 | + </svg> | |
23 | + <svg class="js-password-hide"> | |
24 | + <use xlink:href="images/sprite.svg#eye-2"></use> | |
25 | + </svg> | |
26 | + </button> | |
27 | + </div> | |
28 | + </div> | |
29 | + <div class="modal__reg-item form-group"> | |
30 | + <label class="form-group__label">Подтвердить пароль</label> | |
31 | + <div class="form-group__item"> | |
32 | + <input type="password" class="input" placeholder="**********" required> | |
33 | + <button type="button" class="eye"> | |
34 | + <svg class="js-password-show"> | |
35 | + <use xlink:href="images/sprite.svg#eye"></use> | |
36 | + </svg> | |
37 | + <svg class="js-password-hide"> | |
38 | + <use xlink:href="images/sprite.svg#eye-2"></use> | |
39 | + </svg> | |
40 | + </button> | |
41 | + </div> | |
42 | + </div> | |
43 | + <div class="modal__reg-item form-group"> | |
44 | + <label class="form-group__label">Статус</label> | |
45 | + <div class="form-group__item"> | |
46 | + <div class="select"> | |
47 | + <select class="js-select2"> | |
48 | + <option selected disabled>Не указано</option> | |
49 | + <option>Вариант 1</option> | |
50 | + <option>Вариант 2</option> | |
51 | + <option>Вариант 3</option> | |
52 | + <option>Вариант 4</option> | |
53 | + <option>Вариант 5</option> | |
54 | + <option>Вариант 6</option> | |
55 | + </select> | |
56 | + </div> | |
57 | + </div> | |
58 | + </div> | |
59 | + <div class="modal__reg-item form-group"> | |
60 | + <label class="form-group__label">Ф.И.О.</label> | |
61 | + <div class="form-group__item"> | |
62 | + <input type="text" class="input" placeholder="Шестаков Михаил Юрьевич" required> | |
63 | + </div> | |
64 | + </div> | |
65 | + <div class="modal__reg-item form-group"> | |
66 | + <label class="form-group__label">Должность</label> | |
67 | + <div class="form-group__item"> | |
68 | + <input type="text" class="input" placeholder="Палуба" required> | |
69 | + </div> | |
70 | + </div> | |
71 | + <div class="modal__reg-item form-group"> | |
72 | + <label class="form-group__label">Номер телефона</label> | |
73 | + <div class="form-group__item"> | |
74 | + <input type="tel" class="input" placeholder="+7 (___) ___-__-__" required> | |
75 | + </div> | |
76 | + </div> | |
77 | + <div class="modal__reg-item"> | |
78 | + <img src="images/catpcha.jpg" alt="" class="captcha"> | |
79 | + </div> | |
80 | + <div class="modal__reg-item"> | |
81 | + <label class="checkbox"> | |
82 | + <input type="checkbox" class="checkbox__input" required> | |
83 | + <span class="checkbox__icon"> | |
84 | + <svg> | |
85 | + <use xlink:href="images/sprite.svg#v"></use> | |
86 | + </svg> | |
87 | + </span> | |
88 | + <span class="checkbox__text"> | |
89 | + <span> | |
90 | + Я согласен(на) с <a href="#">Политикой конфиденциальности</a> | |
91 | + </span> | |
92 | + </span> | |
93 | + </label> | |
94 | + </div> | |
95 | + <button type="submit" class="button">Зарегистрироваться</button> | |
96 | + </form> | |
97 | + <form class="modal__reg" data-body="2"> | |
98 | + <div class="modal__reg-item form-group"> | |
99 | + <label class="form-group__label">Электронная почта</label> | |
100 | + <div class="form-group__item"> | |
101 | + <input type="email" class="input" placeholder="info@rekamore.su" required> | |
102 | + </div> | |
103 | + </div> | |
104 | + <div class="modal__reg-item form-group"> | |
105 | + <label class="form-group__label">Пароль</label> | |
106 | + <div class="form-group__item"> | |
107 | + <input type="password" class="input" placeholder="**********" required> | |
108 | + <button type="button" class="eye"> | |
109 | + <svg class="js-password-show"> | |
110 | + <use xlink:href="images/sprite.svg#eye"></use> | |
111 | + </svg> | |
112 | + <svg class="js-password-hide"> | |
113 | + <use xlink:href="images/sprite.svg#eye-2"></use> | |
114 | + </svg> | |
115 | + </button> | |
116 | + </div> | |
117 | + </div> | |
118 | + <div class="modal__reg-item form-group"> | |
119 | + <label class="form-group__label">Подтвердить пароль</label> | |
120 | + <div class="form-group__item"> | |
121 | + <input type="password" class="input" placeholder="**********" required> | |
122 | + <button type="button" class="eye"> | |
123 | + <svg class="js-password-show"> | |
124 | + <use xlink:href="images/sprite.svg#eye"></use> | |
125 | + </svg> | |
126 | + <svg class="js-password-hide"> | |
127 | + <use xlink:href="images/sprite.svg#eye-2"></use> | |
128 | + </svg> | |
129 | + </button> | |
130 | + </div> | |
131 | + </div> | |
132 | + <div class="modal__reg-item form-group"> | |
133 | + <label class="form-group__label">Номер телефона</label> | |
134 | + <div class="form-group__item"> | |
135 | + <input type="tel" class="input" placeholder="+7 (___) ___-__-__" required> | |
136 | + </div> | |
137 | + </div> | |
138 | + <div class="modal__reg-item form-group"> | |
139 | + <label class="form-group__label">Название судоходной компании</label> | |
140 | + <div class="form-group__item"> | |
141 | + <input type="text" class="input" placeholder="ООО Река Море" required> | |
142 | + </div> | |
143 | + </div> | |
144 | + <div class="modal__reg-item"> | |
145 | + <img src="images/catpcha.jpg" alt="" class="captcha"> | |
146 | + </div> | |
147 | + <div class="modal__reg-item"> | |
148 | + <label class="checkbox"> | |
149 | + <input type="checkbox" class="checkbox__input" required> | |
150 | + <span class="checkbox__icon"> | |
151 | + <svg> | |
152 | + <use xlink:href="images/sprite.svg#v"></use> | |
153 | + </svg> | |
154 | + </span> | |
155 | + <span class="checkbox__text"> | |
156 | + <span> | |
157 | + Я согласен(на) с <a href="#">Политикой конфиденциальности</a> | |
158 | + </span> | |
159 | + </span> | |
160 | + </label> | |
161 | + </div> | |
162 | + <button type="submit" class="button">Зарегистрироваться</button> | |
163 | + </form> | |
164 | + <div class="modal__text"> | |
165 | + <span>Вспомнили пароль?</span> | |
166 | + | |
167 | + <a href="#">Войти</a> | |
168 | + </div> | |
169 | + </div> | |
170 | +</div> |
resources/views/modals/reset_password.blade.php
... | ... | @@ -0,0 +1,19 @@ |
1 | +<div id="reset" class="modal"> | |
2 | + <div class="modal__body"> | |
3 | + <div class="modal__title left">Сбросить пароль</div> | |
4 | + <div class="modal__text left">Пожалуйста, введите имя пользователя или адрес электронной почты</div> | |
5 | + <form class="modal__sign"> | |
6 | + <div class="modal__sign-item"> | |
7 | + <input type="text" class="input" placeholder="Имя пользователя или email адрес" required> | |
8 | + </div> | |
9 | + <div class="modal__sign-item"> | |
10 | + <button type="submit" class="button">Получить новый пароль</button> | |
11 | + </div> | |
12 | + </form> | |
13 | + <div class="modal__text"> | |
14 | + <span>Вспомнили пароль?</span> | |
15 | + | |
16 | + <a href="#">Войти</a> | |
17 | + </div> | |
18 | + </div> | |
19 | +</div> |
resources/views/modals/send_message_noaut.blade.php
... | ... | @@ -0,0 +1,10 @@ |
1 | +<div id="question" class="modal modal_bg"> | |
2 | + <div class="modal__body"> | |
3 | + <div class="modal__title">Отправить сообщение "Наяда"</div> | |
4 | + <div class="modal__text">Вы должны быть авторизованы, чтобы отправить личное сообщение</div> | |
5 | + <div class="modal__buttons"> | |
6 | + <a href="#" class="button">Войти</a> | |
7 | + <a href="#" class="button button_light">Зарегистрироваться</a> | |
8 | + </div> | |
9 | + </div> | |
10 | +</div> |
resources/views/modals/thank_you_send_employer.blade.php
... | ... | @@ -0,0 +1,7 @@ |
1 | +<div id="thanks" class="modal modal_bg"> | |
2 | + <div class="modal__body"> | |
3 | + <div class="modal__title">Спасибо!</div> | |
4 | + <div class="modal__text">Ваша сообщение успешно отправлена работодателю <a href="#">"Наяда"</a></div> | |
5 | + <a href="#" class="button button_light modal__button">На главную</a> | |
6 | + </div> | |
7 | +</div> |
resources/views/modals/thank_you_send_manager.blade.php
... | ... | @@ -0,0 +1,8 @@ |
1 | +<div id="thanks-2" class="modal modal_bg"> | |
2 | + <div class="modal__body"> | |
3 | + <div class="modal__title">Спасибо!</div> | |
4 | + <div class="modal__text">Ваша заявка успешно отправлена</div> | |
5 | + <div class="modal__text"><span>В ближайшее время с вами свяжется наш менеджер для уточнения необходимой информации</span></div> | |
6 | + <a href="#" class="button button_light modal__button">На главную</a> | |
7 | + </div> | |
8 | +</div> |