Commit 971031d9c2bd0433d862b9d281b2aac82119fbb6

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

Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su

Showing 3 changed files Side-by-side Diff

app/Http/Controllers/WorkerController.php
... ... @@ -464,7 +464,7 @@ class WorkerController extends Controller
464 464 $use->save();
465 465 $worker->job_titles()->sync($job_title_id);
466 466  
467   - return redirect()->route('worker.basic_information')->with('success', 'Данные были успешно сохранены');
  467 + return redirect()->route('worker.cabinet')->with('success', 'Данные были успешно сохранены');
468 468 }
469 469 }
470 470  
resources/views/admin/employer_main/index.blade.php
... ... @@ -85,7 +85,7 @@
85 85 </tr>
86 86 </thead>
87 87 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
88   - <? foreach($employers as $emp) {?>
  88 + @foreach($employers as $emp)
89 89 <tr class="text-gray-700 dark:text-gray-400">
90 90 <td class="px-4 py-3">
91 91 {{$emp->id}}
... ... @@ -127,7 +127,7 @@
127 127 </select>
128 128 </td>
129 129 </tr>
130   - <? } ?>
  130 + @endforeach
131 131 </tbody>
132 132 </table>
133 133 </div>
resources/views/index.blade.php
... ... @@ -79,29 +79,6 @@
79 79 </section>
80 80 @endif
81 81  
82   -<!--<section class="vacancies">
83   - <div class="container">
84   - <div class="title"><h4>Новые вакансии</h4></div>
85   - <div class="vacancies__body">
86   - <a class="vacancies__more button button_light js-parent-toggle" href="{{ route('vacancies') }}">Все должности</a>
87   - <div class="vacancies__list">
88   - _if ($categories->count())
89   - _foreach ($categories as $cat)
90   - <a href=" route('list-vacancies', ['categories' => $cat->id]) }}" class="vacancies__item">
91   - <span style="border-color:#F4C4C2">
92   - <b> $cat->name }}</b>
93   - <i>Вакансий: <span> $cat->cnt }}</span></i>
94   - </span>
95   - </a>
96   - _endforeach
97   - _else
98   - Тут пока нет никаких вакансий
99   - _endif
100   - </div>
101   - </div>
102   - </div>
103   -</section>-->
104   -
105 82 <main class="main">
106 83 <div class="container">
107 84 <div class="main__vacancies">
... ... @@ -123,201 +100,29 @@
123 100 <section class="employer">
124 101 <div class="container">
125 102 <div class="title"><h4>Работодатели</h4></div>
126   - <!--<div class="swiper js-employer-swiper">
127   - <div class="swiper-wrapper">
128   - <div class="swiper-slide">
129   - <div class="employer__item">
130   - <a href="#">
131   - <img src="images/logos/1.jpg" alt="">
132   - </a>
133   - <a href="#">
134   - <img src="images/logos/5.jpg" alt="">
135   - </a>
136   - <a href="#">
137   - <img src="images/logos/9.jpg" alt="">
138   - </a>
139   - <a href="#">
140   - <img src="images/logos/13.jpg" alt="">
141   - </a>
142   - <a href="#">
143   - <img src="images/logos/17.jpg" alt="">
144   - </a>
145   - </div>
146   - </div>
147   - <div class="swiper-slide">
148   - <div class="employer__item">
149   - <a href="#">
150   - <img src="images/logos/2.jpg" alt="">
151   - </a>
152   - <a href="#">
153   - <img src="images/logos/6.jpg" alt="">
154   - </a>
155   - <a href="#">
156   - <img src="images/logos/10.jpg" alt="">
157   - </a>
158   - <a href="#">
159   - <img src="images/logos/14.jpg" alt="">
160   - </a>
161   - <a href="#">
162   - <img src="images/logos/18.jpg" alt="">
163   - </a>
164   - </div>
165   - </div>
166   - <div class="swiper-slide">
167   - <div class="employer__item">
168   - <a href="#">
169   - <img src="images/logos/3.jpg" alt="">
170   - </a>
171   - <a href="#">
172   - <img src="images/logos/7.jpg" alt="">
173   - </a>
174   - <a href="#">
175   - <img src="images/logos/11.jpg" alt="">
176   - </a>
177   - <a href="#">
178   - <img src="images/logos/15.jpg" alt="">
179   - </a>
180   - <a href="#">
181   - <img src="images/logos/19.jpg" alt="">
182   - </a>
183   - </div>
184   - </div>
185   - <div class="swiper-slide">
186   - <div class="employer__item">
187   - <a href="#">
188   - <img src="images/logos/4.jpg" alt="">
189   - </a>
190   - <a href="#">
191   - <img src="images/logos/8.jpg" alt="">
192   - </a>
193   - <a href="#">
194   - <img src="images/logos/12.jpg" alt="">
195   - </a>
196   - <a href="#">
197   - <img src="images/logos/16.jpg" alt="">
198   - </a>
199   - <a href="#">
200   - <img src="images/logos/20.jpg" alt="">
201   - </a>
202   - </div>
203   - </div>
204   - </div>
205   - </div>-->
206   - <!--<div class="employer__body">
207   - <a href="#">
208   - <img src="images/logos/1.jpg" alt="">
209   - </a>
210   - <a href="#">
211   - <img src="images/logos/2.jpg" alt="">
212   - </a>
213   - <a href="#">
214   - <img src="images/logos/3.jpg" alt="">
215   - </a>
216   - <a href="#">
217   - <img src="images/logos/4.jpg" alt="">
218   - </a>
219   - <a href="#">
220   - <img src="images/logos/5.jpg" alt="">
221   - </a>
222   - <a href="#">
223   - <img src="images/logos/6.jpg" alt="">
224   - </a>
225   - <a href="#">
226   - <img src="images/logos/7.jpg" alt="">
227   - </a>
228   - <a href="#">
229   - <img src="images/logos/8.jpg" alt="">
230   - </a>
231   - <a href="#">
232   - <img src="images/logos/9.jpg" alt="">
233   - </a>
234   - <a href="#">
235   - <img src="images/logos/10.jpg" alt="">
236   - </a>
237   - <a href="#">
238   - <img src="images/logos/11.jpg" alt="">
239   - </a>
240   - <a href="#">
241   - <img src="images/logos/12.jpg" alt="">
242   - </a>
243   - <a href="#">
244   - <img src="images/logos/13.jpg" alt="">
245   - </a>
246   - <a href="#">
247   - <img src="images/logos/14.jpg" alt="">
248   - </a>
249   - <a href="#">
250   - <img src="images/logos/15.jpg" alt="">
251   - </a>
252   - <a href="#">
253   - <img src="images/logos/16.jpg" alt="">
254   - </a>
255   - <a href="#">
256   - <img src="images/logos/17.jpg" alt="">
257   - </a>
258   - <a href="#">
259   - <img src="images/logos/18.jpg" alt="">
260   - </a>
261   - <a href="#">
262   - <img src="images/logos/19.jpg" alt="">
263   - </a>
264   - <a href="#">
265   - <img src="images/logos/20.jpg" alt="">
266   - </a>
267   - </div>-->
268 103  
269 104 <div class="employer__body">
270 105 @if ($employers->count())
271 106 @foreach($employers as $emp)
272   - @if (!empty($emp->employer->logo))
273   - <a href="{{ route('info_company', ['company' => $emp->employer->id]) }}">
274   - <img src="{{ asset(Storage::url($emp->employer->logo)) }}" alt="{{ $emp->employer->name_company }}">
275   - </a>
276   - @else
277   - <a href="{{ route('info_company', ['company' => $emp->employer->id]) }}">
278   - <img src="{{ asset('images/logo_emp.png') }}" alt="{{ $emp->employer->name_company }}">
279   - </a>
280   - @endif
  107 + @if (!empty($emp->employer->logo))
  108 + <a href="{{ route('info_company', ['company' => $emp->employer->id]) }}">
  109 + <img src="{{ asset(Storage::url($emp->employer->logo)) }}" alt="{{ $emp->employer->name_company }}">
  110 + </a>
  111 + @else
  112 + <a href="{{ route('info_company', ['company' => $emp->employer->id]) }}">
  113 + <img src="{{ asset('images/logo_emp.png') }}" alt="{{ $emp->employer->name_company }}">
  114 + </a>
  115 + @endif
281 116 @endforeach
282 117 @else
283 118 <h5>Тут нет никаких записей</h5>
284 119 @endif
285 120 </div>
286   - <!--if ($employers->count())
287   - php
288   - $rec = 0;
289   - $count = $employers->count();
290   -
291   - endphp
292 121  
293   - foreach($employers as $emp)
294   - php $rec++ endphp
295   - if (($rec==1) || ($rec==5) || ($rec==9) || ($rec==13) || ($rec==17))
296   - <div class="swiper-slide">
297   - <div class="employer__item">
298   - endif
299   - if (!empty($emp->employer->logo))
300   - <a href=" route('ad-employer', ['ad_employer' => $emp->employer->id]) }}">
301   - <img src=" asset(Storage::url($emp->employer->logo)) }}" alt=" $emp->employer->name_company }}">
302   - </a>
303   - else
304   - <a href=" route('ad-employer', ['ad_employer' => $emp->employer->id]) }}">
305   - <img src=" asset('images/logo_emp.png') }}" alt=" $emp->employer->name_company }}">
306   - </a>
307   - endif
308   - if (($rec==4) || ($rec==8) || ($rec==12) || ($rec==16) || ($rec==20) || ($rec == $count))
309   - </div>
310   - </div>
311   - endif
312   - endforeach
313   - else
314   - <h5>Тут нет никаких записей</h5>
315   - endif-->
316   - </div>
317   - <div class="swiper-pagination"></div>
318   - </div>
319   - <a href="{{ route('shipping_companies') }}" class="employer__more button button_light">Все работодатели</a>
  122 + <div class="swiper-pagination"></div>
320 123 </div>
  124 + <a href="{{ route('shipping_companies') }}" class="employer__more button button_light">Все работодатели</a>
  125 +
321 126 </section>
322 127 <section class="about">
323 128 <div class="container">