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

Download as
Browse Code »

Commit 051ca2ef2eab1e64f11f95524b7eb20112d9237a

Authored by Андрей Ларионов
2 parents 6dc3be29cc d62e4b4e75
Exists in master

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

Showing 8 changed files Side-by-side Diff

app/Http/Controllers/CompanyController.php
Diff comments   View file @ 051ca2e
... ... @@ -54,9 +54,12 @@ class CompanyController extends Controller
54 54  
55 55 $title = $company[0]->name_company;
56 56  
57   - $ads = Ad_employer::query()->with('jobs')->with('jobs_code')->
58   - OrderByDesc('id')->
59   - where('employer_id', '=', $company[0]->id)->paginate(50);
  57 + $ads = Ad_employer::query()->with('jobs')->with('jobs_code')
  58 + ->where('employer_id', '=', $company[0]->id)
  59 + ->where('is_remove', '=', '0')
  60 + ->OrderByDesc('id')
  61 + ->paginate(50)
  62 + ;
60 63  
61 64 return view('info_company_new', compact('company', 'user_id', 'title', 'ads'));
62 65 }
app/Http/Controllers/EmployerController.php
Diff comments   View file @ 051ca2e
... ... @@ -213,6 +213,7 @@ class EmployerController extends Controller
213 213 ->with('jobs_code')
214 214 ->where('employer_id', $Employer->id)
215 215 ->where('is_remove', 0)
  216 + ->orderbyDesc('updated_at')
216 217 ;
217 218  
218 219 if (($request->has('search')) && (!empty($request->get('search')))) {
... ... @@ -223,14 +224,9 @@ class EmployerController extends Controller
223 224 if ($request->get('sort')) {
224 225 $sort = $request->get('sort');
225 226 switch ($sort) {
226   - case 'name_up': $vacancy_list = $vacancy_list->orderBy('name')->orderBy('id'); break;
227   - case 'name_down': $vacancy_list = $vacancy_list->orderByDesc('name')->orderby('id'); break;
228   - case 'nopublic': $vacancy_list->where('active_is', '=', 0)->orderBy('id');break;
229   - case 'public':$vacancy_list->where('active_is', '=', 1)->orderBy('id');break;
230   - case 'created_at_up': $vacancy_list = $vacancy_list->OrderBy('created_at')->orderBy('id'); break;
231   - case 'created_at_down': $vacancy_list = $vacancy_list->orderByDesc('created_at')->orderBy('id'); break;
232   - case 'default': $vacancy_list = $vacancy_list->orderbyDesc('updated_at')->orderBy('name'); break;
233   - default: $vacancy_list = $vacancy_list->orderByDesc('id')->orderbyDesc('updated_at'); break;
  227 + case 'nopublic': $vacancy_list->where('active_is', '=', 0);break;
  228 + case 'public':$vacancy_list->where('active_is', '=', 1);break;
  229 + default: $vacancy_list = $vacancy_list->orderByDesc('id'); break;
234 230 }
235 231 } else {
236 232 $vacancy_list = $vacancy_list->orderByDesc('updated_at')->orderBy('id');
public/css/style_may2024.css
Diff comments   View file @ 051ca2e
... ... @@ -2345,10 +2345,22 @@ h1 {
2345 2345 }
2346 2346 .header__menu {
2347 2347 display: none;
2348   - -webkit-box-align: center;
2349   - -ms-flex-align: center;
2350   - align-items: center;
2351   - gap: 20px;
  2348 +}
  2349 +.header.active-menu{
  2350 + position: unset;
  2351 +}
  2352 +.header.active-menu .header__menu{
  2353 + position: absolute;
  2354 + display: flex;
  2355 + flex-direction: column;
  2356 + z-index: 999;
  2357 + top: 48px;
  2358 + background: #fff;
  2359 + -webkit-box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.2);
  2360 + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.2);
  2361 + left: 0;
  2362 + border: 1px solid #e9e9e9;
  2363 + width: 100%;
2352 2364 }
2353 2365 @media (min-width: 768px) {
2354 2366 .header__menu {
... ... @@ -2357,6 +2369,12 @@ h1 {
2357 2369 display: flex;
2358 2370 }
2359 2371 }
  2372 +.header__menu-item{
  2373 + padding: 5px 10px;
  2374 +}
  2375 +.header__menu-item:hover, .header__menu-item:active{
  2376 + border: 1px solid #cfcfcf;
  2377 +}
2360 2378 .header__menu-item:hover {
2361 2379 color: #377d87;
2362 2380 }
... ... @@ -7260,7 +7278,7 @@ main + .news {
7260 7278 text-align: right;
7261 7279 }
7262 7280 .chatbox__bottom {
7263   - background: #4d88d9;
  7281 + background: #377d87;
7264 7282 padding: 10px;
7265 7283 border-radius: 8px;
7266 7284 display: -webkit-box;
... ... @@ -7308,11 +7326,7 @@ main + .news {
7308 7326 .chatbox__bottom-file svg {
7309 7327 width: 50%;
7310 7328 aspect-ratio: 1/1;
7311   -}
7312   -@media (min-width: 768px) {
7313   - .chatbox__bottom-file svg {
7314   - width: 40%;
7315   - }
  7329 + stroke-width: 1.5px;
7316 7330 }
7317 7331 .chatbox__bottom-text {
7318 7332 width: calc(100% - 60px);
... ... @@ -8,6 +8,21 @@ $(function(){
8 8 "close"
9 9 ]
10 10 });
  11 +
  12 + $('.header .header__burger').click(function(){
  13 + var this_btn = $(this);
  14 + var wrap = this_btn.closest('.header');
  15 +
  16 + wrap.toggleClass('active-menu');
  17 + });
  18 +
  19 + $('body').click(function(e){
  20 + var target = $(e.target);
  21 +
  22 + if (!target.hasClass('.header__burger') && target.closest('.header__burger').length === 0){
  23 + $('header.header').removeClass('active-menu');
  24 + }
  25 + });
11 26 });
12 27  
13 28  
... ... @@ -28,3 +43,5 @@ var cl = function(obj){
28 43 }
29 44  
30 45  
  46 +
  47 +
resources/views/admin/users/form.blade.php
Diff comments   View file @ 051ca2e
... ... @@ -14,7 +14,7 @@
14 14 @isset($list_job_titles)
15 15 @foreach($list_job_titles as $job_title)
16 16 <option value="{{ $job_title->id }}"
17   - @if (in_array($job_title->id , $user->workers[0]->positions_work))
  17 + @if (isset($user) && in_array($job_title->id , $user->workers[0]->positions_work))
18 18 selected
19 19 @endif
20 20 >
resources/views/employers/menu.blade.php
Diff comments   View file @ 051ca2e
1 1 <div class="cabinet__side-item">
2 2 <div class="cabinet__menu">
3 3 <button type="button" class="cabinet__menu-toper js-toggle">
4   - <span class="cabinet__menu-toper-text">
5   - <i>
6   - <svg>
7   - <use xlink:href="{{ asset('images/sprite.svg#cabinet-1') }}"></use>
8   - </svg>
9   - </i>
10   - <span>Профиль</span>
11   - </span>
  4 + <span class="cabinet__menu-toper-text"></span>
12 5 <i class="cabinet__menu-toper-arrow">
13 6 <svg>
14 7 <use xlink:href="{{ asset('images/sprite.svg#arrow') }}"></use>
... ... @@ -60,14 +53,6 @@
60 53 </i>
61 54 <span>Мои вакансии</span>
62 55 </a>
63   - <!-- <a href="{ route('employer.answers', ['employer' => $id_employer]) }}" class="cabinet__menu-item if ($item==4) active endif">
64   - <i>
65   - <svg>
66   - <use xlink:href="{ asset('images/sprite.svg#cabinet-4') }}"></use>
67   - </svg>
68   - </i>
69   - <span>Отклики на вакансию</span>
70   - </a>-->
71 56 <a href="{{ route('employer.messages', ['type_message' => 'input']) }}" class="cabinet__menu-item @if ($item==5) active @endif">
72 57 <i>
73 58 <svg>
... ... @@ -157,3 +142,12 @@
157 142 </div>
158 143 </div>
159 144 </div>
  145 +
  146 +<script>
  147 + $(function(){
  148 + var active_menu = $('.cabinet__menu-item.active');
  149 + if (active_menu.length === 1){
  150 + $('.cabinet__menu-toper-text').html(active_menu.html());
  151 + }
  152 + });
  153 +</script>
resources/views/index.blade.php
Diff comments   View file @ 051ca2e
... ... @@ -39,7 +39,7 @@
39 39 </select>
40 40 </div>
41 41  
42   - <button type="submit" class="button button_light" style="height: 50px;">Посмотреть&nbsp;вакансии</button>
  42 + <button type="submit" class="button button_light" style="height: auto;">Посмотреть&nbsp;вакансии</button>
43 43 </form>
44 44 @guest
45 45 <a data-fancybox data-src="#question2" data-options='{"touch":false,"autoFocus":false}' class="button work__search">Я ищу сотрудника</a>
resources/views/workers/menu.blade.php
Diff comments   View file @ 051ca2e
1 1 <div class="cabinet__side-item">
2 2 <div class="cabinet__menu">
3 3 <button type="button" class="cabinet__menu-toper js-toggle">
4   - <span class="cabinet__menu-toper-text">
5   - <i>
6   - <svg>
7   - <use xlink:href="{{ asset('images/sprite.svg#cabinet-1') }}"></use>
8   - </svg>
9   - </i>
10   - <span>Моя анкета</span>
11   - </span>
  4 + <span class="cabinet__menu-toper-text"></span>
12 5 <i class="cabinet__menu-toper-arrow">
13 6 <svg>
14 7 <use xlink:href="{{ asset('images/sprite.svg#arrow') }}"></use>
... ... @@ -64,3 +57,12 @@
64 57 </div>
65 58 </div>
66 59 </div>
  60 +
  61 +<script>
  62 + $(function(){
  63 + var active_menu = $('.cabinet__menu-item.active');
  64 + if (active_menu.length === 1){
  65 + $('.cabinet__menu-toper-text').html(active_menu.html());
  66 + }
  67 + });
  68 +</script>