Андрей Ларионов / Renttorg_laravel

Download as
Browse Code »

Commit 9a5d84dc0df46d7dc91edbe9e5879c0a5ee34ea3

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

Авторизация и регистрация. Фильтрация и сортировка на странице категории

Showing 14 changed files with 268 additions and 580 deletions Side-by-side Diff

1 1 <IfModule mod_rewrite.c>
2 2 RewriteEngine on
3   - RewriteCond %{REQUEST_URI} !^public
4 3 RewriteRule ^(.*)$ public/$1 [L]
  4 + RewriteCond %{REQUEST_FILENAME} !-d
  5 + RewriteCond %{REQUEST_FILENAME} !-f
  6 + RewriteRule ^ index.php [L]
5 7 </IfModule>
6 8 \ No newline at end of file
app/Http/Controllers/LoginController.php
Diff comments   View file @ 9a5d84d
... ... @@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Auth;
8 8 class LoginController extends Controller
9 9 {
10 10 public function __construct() {
11   - //$this->middleware('guest')->except('logout');
  11 + $this->middleware('guest')->except('logout');
12 12 }
13 13  
14 14 //Форма входа
app/Http/Controllers/MainController.php
Diff comments   View file @ 9a5d84d
... ... @@ -187,6 +187,10 @@ class MainController extends Controller
187 187 return view('favorite');
188 188 }
189 189  
  190 + public function Category_ajax($cat, Request $request) {
  191 + return $cat;
  192 + }
  193 +
190 194 /*
191 195 * Категории каталога Аренда/Продажа/Бизнес
192 196 */
... ... @@ -211,10 +215,67 @@ class MainController extends Controller
211 215 }
212 216  
213 217 $houses = House::with('areas')->
214   - where('format_house', '=', $format_house)->paginate(4)->appends(request()->query());
215   - //->appends(request()->query());
  218 + where('format_house', '=', $format_house);
  219 + //->appends(request()->query());
  220 + /*
  221 + if (!empty($request->area)) {
  222 + $houses = $houses->where('area_id', '=', $request->area);
  223 + }
  224 + // условия поиска по типу недвижимости
  225 + if (!empty($request->type_area)) {
  226 + $houses = $houses->where('type_area_id', '=', $request->type_area);
  227 + }
  228 + // условия поиска по формату недвижимости
  229 + if (!empty($request->format_area)) {
  230 + $houses = $houses->where('format_area_id', '=', $request->format_area);
  231 + }
  232 + // условия поиска по площади - минимальная площадь
  233 + if (!empty($request->area_m2_min)) {
  234 + $houses = $houses->where('area', '>', $request->area_m2_min);
  235 + }
  236 + // условия поиска по площади - максимальная площадь
  237 + if (!empty($request->area_m2_max)) {
  238 + $houses = $houses->where('area', '<', $request->area_m2_max);
  239 + }
  240 + // условия поиска по цене - минимальная цена
  241 + if (!empty($request->price_min)) {
  242 + $houses = $houses->where('price', '>', $request->price_min);
  243 + }
  244 + // условия поиска по цене - максимальная цена
  245 + if (!empty($request->price_max)) {
  246 + $houses = $houses->where('price', '<', $request->price_max);
  247 + }
  248 + // условия поиска по адресу
  249 + if (!empty($request->address)) {
  250 + $houses = $houses->where('address', 'LIKE', "%".$request->address."%");
  251 + }
  252 +
  253 + if (!empty($request->sort_price)) {
  254 + switch ($request->sort_price) {
  255 + case 1: $houses = $houses->orderBy('price');break;
  256 + case 2: $houses = $houses->orderByDesc('price');break;
  257 + }
  258 + switch ($request->sort_new) {
  259 + case 1: $houses = $houses->orderByDesc('created_at');break;
  260 + case 2: $houses = $houses->orderBy('created_at');break;
  261 + }
  262 + switch ($request->sort_area) {
  263 + case 1: $houses = $houses->orderByDesc('area')->get();break;
  264 + case 2: $houses = $houses->orderBy('area')->get();break;
  265 + }
  266 + } else {
  267 + $houses = $houses->orderBy('price')->
  268 + orderByDesc('created_at')->
  269 + orderByDesc('area');
  270 + }
  271 +*/
  272 + $houses = $houses->paginate(4);
  273 +
  274 + if ($request->ajax()) {
  275 + return view('ajax.complex.category', compact('houses'));
  276 + }
216 277  
217   - return view('category_catalog', compact('title', 'houses'));
  278 + return view('category_catalog', compact('title', 'cat', 'houses'));
218 279 }
219 280  
220 281  
app/Http/Controllers/RegisterController.php
Diff comments   View file @ 9a5d84d
... ... @@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Hash;
10 10 class RegisterController extends Controller
11 11 {
12 12 public function __construct() {
13   - //$this->middleware('guest');
  13 + $this->middleware('guest');
14 14 }
15 15  
16 16 // Форма регистрации
app/Http/Middleware/Authenticate.php
Diff comments   View file @ 9a5d84d
... ... @@ -15,7 +15,7 @@ class Authenticate extends Middleware
15 15 protected function redirectTo($request)
16 16 {
17 17 if (! $request->expectsJson()) {
18   - return route('login');
  18 + return route('auth.login');
19 19 }
20 20 }
21 21 }
app/Http/Middleware/RedirectIfAuthenticated.php
Diff comments   View file @ 9a5d84d
... ... @@ -23,7 +23,8 @@ class RedirectIfAuthenticated
23 23  
24 24 foreach ($guards as $guard) {
25 25 if (Auth::guard($guard)->check()) {
26   - return redirect(RouteServiceProvider::HOME);
  26 + //return redirect(RouteServiceProvider::HOME);
  27 + return redirect()->route('user.index');
27 28 }
28 29 }
29 30  
database/migrations/2023_03_01_073202_create_houses_table.php
Diff comments   View file @ 9a5d84d
... ... @@ -48,7 +48,7 @@ return new class extends Migration
48 48 $table->integer('price_m2')->default(0);
49 49 $table->integer('rent_in_year')->default(0);
50 50 $table->integer('rent_in_month')->default(0);
51   - $table->string('scheme_deal')->default('Прямая аренда');
  51 + $table->string('scheme_deal', 255)->default('Прямая аренда');
52 52 $table->string('present', 255)->default('');
53 53 $table->string('object_plan', 255)->default('');
54 54 $table->string('floor_plan', 255)->default('');
resources/views/admin/index.blade.php
Diff comments   View file @ 9a5d84d
1 1 @extends('layout.site', ['title' => 'Личный кабинет'])
2 2  
3 3 @section('content')
4   - <h1>Личный кабинет</h1>
5   - <p>Добрый день {{ auth()->user()->name }}!</p>
6   - <p>Это личный кабинет пользователя сайта.</p>
  4 + <section class="favorites">
  5 + <div class="favorites-top">
  6 + <div class="container">
  7 + <div class="breadcrumbs">
  8 + <ul class="breadcrumbs__list">
  9 + <li class="breadcrumbs__item"><a class="breadcrumbs__link" href="{{ route('index') }}">Главная</a></li>
  10 + <li class="breadcrumbs__item"><span class="breadcrumbs__link">Админка </span></li>
  11 + </ul>
  12 + </div>
  13 + <h1 class="favorites__title title-main">Личный кабинет</h1>
  14 + <p class="favorites__descr">
  15 + Добрый день {{ auth()->user()->name }}!<br>
  16 + Это личный кабинет пользователя сайта.<br>
  17 + <a class="btn btn-success" href="{{ route('auth.logout') }}">Выйти из системы</a><br>
  18 + </p>
  19 + </div>
  20 + </div>
  21 + <div class="favorites-cnt">
  22 + <div class="container">
  23 + <div class="favorites__items">
  24 + <div class="favorites-item">
  25 + <div class="favorites-item__img"><img src="images/favorites/favorites-item-img-1.svg" alt=""></div>
  26 + <p class="favorites-item__descr"><a href="#">Найдите</a> идеальную планировку на сайте Renttorg</p>
  27 + </div>
  28 + <div class="favorites-item">
  29 + <div class="favorites-item__img"><img src="images/favorites/favorites-item-img-2.svg" alt=""></div>
  30 + <p class="favorites-item__descr">Нажмите на <img src="images/favorites-icon-mini.svg" alt=""> для добавления недвижемости в избранное</p>
  31 + </div>
  32 + <div class="favorites-item">
  33 + <div class="favorites-item__img"><img src="images/favorites/favorites-item-img-3.svg" alt=""></div>
  34 + <p class="favorites-item__descr">Перейдите в избранное или сравнение для выбора планировки</p>
  35 + </div>
  36 + </div>
  37 + </div>
  38 + </div>
  39 + </section>
7 40 @endsection
  41 +
resources/views/ajax/complex/category.blade.php
Diff comments   View file @ 9a5d84d
... ... @@ -0,0 +1,14 @@
  1 +<div class="category__grid">
  2 +@if ($houses->count())
  3 + @foreach ($houses as $house1)
  4 + @include('catalogs.house_mini', ['house' => $house1])
  5 + @endforeach
  6 +
  7 +@else
  8 + <h3>Здесь пока что нет предложений</h3>
  9 +@endif
  10 +</div>
  11 +<div class="pagination">
  12 + <?//=$houses->appends($_GET)->links('catalogs.paginate');?>
  13 +</div>
  14 +
resources/views/category_catalog.blade.php
Diff comments   View file @ 9a5d84d
... ... @@ -4,13 +4,117 @@
4 4 @include('part.filter.category', ['title' => $title])
5 5 @endsection
6 6  
  7 +@section('custom_js')
  8 + <script>
  9 + $(window).load(function() {
  10 + var url_str = "<?=url()->full();?>";
  11 + var url = new URL(url_str);
  12 + var searchParams = new URLSearchParams(url.search.substring(1));
  13 +
  14 + var area = searchParams.get("area"),
  15 + type_area = searchParams.get("type_area"),
  16 + format_area= searchParams.get("format_area"),
  17 + address= searchParams.get("address");
  18 +
  19 + var area_name = $('#area_name');
  20 + var type_area_name = $('#type_area_name');
  21 + var format_area_name = $('#format_area_name');
  22 + var address_name = $('#address');
  23 +
  24 + if ((area !== "") || (type_area !== "") || (format_area !== "") || (address !== ""))
  25 + {
  26 + $.ajax({
  27 + type: "GET",
  28 + url: "{{ route('catalog_ajax_filter') }}",
  29 + data: "area=" + area + "&type_area=" + type_area + "&format_area=" + format_area + "&address=" + address + "",
  30 + success: function (data) {
  31 + console.log('Фильтры данных были переданы ');
  32 + data = JSON.parse(data);
  33 + console.log(data);
  34 +
  35 + if (area !== "") {
  36 + area_name.html(data[0]);
  37 + }
  38 + if (type_area !== "") {
  39 + type_area_name.html(data[1]);
  40 + }
  41 + if (format_area !== "") {
  42 + format_area_name.html(data[2]);
  43 + }
  44 + if (address !== "") {
  45 + address_name.html(data[3]);
  46 + }
  47 +
  48 + },
  49 + headers: {
  50 + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
  51 + },
  52 + error: function (data) {
  53 + console.log('Error: ' + data);
  54 + }
  55 + });
  56 + }
  57 + });
  58 +
  59 + $(document).on('click', '.js_sort_group_item', function() {
  60 + var val = $(this).data('val');
  61 + var sort_price_val = '';
  62 + var sort_area_val = '';
  63 + var sort_new_val = '';
  64 +
  65 + $('.sort-price').each(function() {
  66 + var this_ = $(this);
  67 + var v = $(this).data('val');
  68 + if (this_.hasClass('active'))
  69 + sort_price_val = v;
  70 + });
  71 +
  72 + $('.sort-new').each(function() {
  73 + var v = $(this).data('val');
  74 + var this_ = $(this);
  75 + if (this_.hasClass('active'))
  76 + sort_new_val = v;
  77 + });
  78 +
  79 + $('.sort-area').each(function() {
  80 + var v = $(this).data('val');
  81 + var this_ = $(this);
  82 + if (this_.hasClass('active'))
  83 + sort_area_val = v;
  84 +
  85 + });
  86 +
  87 + console.log('-------------------');
  88 + $.ajax({
  89 + type: "GET",
  90 + url: "{{ route('category', ['cat'=>$cat]) }}",
  91 + data: "sort_price="+sort_price_val+"&sort_new="+sort_new_val+"&sort_area="+sort_area_val+""+
  92 + "&area=<?if (isset($_GET['area'])) echo $_GET['area'];?>&type_area=<?if (isset($_GET['type_area'])) echo $_GET['type_area'];?>&format_area=<? if (isset($_GET['format_area'])) echo $_GET['format_area'];?>"+
  93 + "&area_m2_min=<? if (isset($_GET['area_m2_min'])) echo $_GET['area_m2_min'];?>&area_m2_max=<? if (isset($_GET['area_m2_max'])) echo $_GET['area_m2_max'];?>"+
  94 + "&price_min=<? if (isset($_GET['price_min'])) echo $_GET['price_min'];?>&price_max=<? if (isset($_GET['price_max'])) echo $_GET['price_max'];?>&address=<? if (isset($_GET['address'])) echo $_GET['address'];?>",
  95 + success: function(data) {
  96 + console.log('Успешно обновлены данные таблиц '+data);
  97 + $('#block_ajax').html(data);
  98 + },
  99 + headers: {
  100 + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
  101 + },
  102 + error: function(data) {
  103 + console.log('Error: '+ data);
  104 + }
  105 + });
  106 + }
  107 + );
  108 + </script>
  109 +@endsection
  110 +
7 111 @section('content')
8 112 <section class="category">
9 113 <div class="container">
10 114 <div class="category__top top-catalog">
11 115 <div class="top-catalog__inner">
12   - <h2 class="top-catalog__title title">Аренда торговых помещений</h2>
13   - <div class="top-catalog__result">Найдено объектов по Вашему запросу: <span>356</span></div>
  116 + <h2 class="top-catalog__title title">{{ $title }}</h2>
  117 + <div class="top-catalog__result">Найдено объектов по Вашему запросу: <span>{{ $houses->count() }}</span></div>
14 118 </div>
15 119 <form class="top-catalog__sorts">
16 120 <div class="top-catalog__sort-group sort-group js_sort_group">
... ... @@ -39,6 +143,7 @@
39 143 </div>
40 144 </form>
41 145 </div>
  146 + <div id="block_ajax">
42 147 <div class="category__grid">
43 148 @if ($houses->count())
44 149 @foreach ($houses as $house1)
... ... @@ -47,547 +152,11 @@
47 152 @else
48 153 <h3>Здесь пока что нет предложений</h3>
49 154 @endif
50   - <!--<div class="card">
51   - <div class="card__top"><img src="images/card/card-img-1.jpg" alt="Фото недвижимости" loading="lazy">
52   - <h3 class="card__title">Салон красоты</h3>
53   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
54   - <svg width="18" height="18">
55   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
56   - </svg>
57   - <svg width="18" height="18">
58   - <use xlink:href="images/sprite.svg#card-favorites"></use>
59   - </svg></span><a class="card__label card__label-messenger" href="#">
60   - <svg width="25" height="25">
61   - <use xlink:href="images/sprite.svg#card-messenger"></use>
62   - </svg></a></div>
63   - </div>
64   - <div class="card__cnt">
65   - <div class="card__info">
66   - <address class="card__line card__line-complex">ЖК “Новинки 1”</address>
67   - <address class="card__line">Фрунзенская (10 мин., пешком)<span style="background-color: #FFC955;"></span></address>
68   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
69   - <div class="card__line">Площадь: <b>556 м2</b></div>
70   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
71   - </div>
72   - <div class="card__price"><span>1 000 000 ₽</span>
73   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее</a>
74   - </div>
75   - </div>
76   - <div class="card">
77   - <div class="card__top"><img src="images/card/card-img-2.jpg" alt="Фото недвижимости" loading="lazy">
78   - <h3 class="card__title">Барбер-шоп</h3>
79   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
80   - <svg width="18" height="18">
81   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
82   - </svg>
83   - <svg width="18" height="18">
84   - <use xlink:href="images/sprite.svg#card-favorites"></use>
85   - </svg></span><a class="card__label card__label-messenger" href="#">
86   - <svg width="25" height="25">
87   - <use xlink:href="images/sprite.svg#card-messenger"></use>
88   - </svg></a></div>
89   - </div>
90   - <div class="card__cnt">
91   - <div class="card__info">
92   - <address class="card__line card__line-complex">ЖК “Новоарбатский”</address>
93   - <address class="card__line">Арбатская (8 мин., пешком)<span style="background-color: #0000A0;"></span></address>
94   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
95   - <div class="card__line">Площадь: <b>6 556 м2</b></div>
96   - <div class="card__line">Цена за м<sup>2</sup>: <b>5 225 256 ₽</b></div>
97   - </div>
98   - <div class="card__price"><span>15 520 900 ₽</span><span>в месяц</span>
99   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
100   - </div>
101   - </div>
102   - <div class="card">
103   - <div class="card__top"><img src="images/card/card-img-3.jpg" alt="Фото недвижимости" loading="lazy">
104   - <h3 class="card__title">Аптека</h3>
105   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
106   - <svg width="18" height="18">
107   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
108   - </svg>
109   - <svg width="18" height="18">
110   - <use xlink:href="images/sprite.svg#card-favorites"></use>
111   - </svg></span><a class="card__label card__label-messenger" href="#">
112   - <svg width="25" height="25">
113   - <use xlink:href="images/sprite.svg#card-messenger"></use>
114   - </svg></a></div>
115   - </div>
116   - <div class="card__cnt">
117   - <div class="card__info">
118   - <address class="card__line card__line-complex">ЖК “Садовые кварталы”</address>
119   - <address class="card__line">Коломенская (2 мин., пешком)<span style="background-color: #029B55;"></span></address>
120   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
121   - <div class="card__line">Площадь: <b>8 626 м2</b></div>
122   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
123   - </div>
124   - <div class="card__price"><span>5 280 000 ₽</span>
125   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее о продаже</a>
126   - </div>
127   - </div>
128   - <div class="card">
129   - <div class="card__top"><img src="images/card/card-img-4.jpg" alt="Фото недвижимости" loading="lazy">
130   - <h3 class="card__title">Витрина</h3>
131   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
132   - <svg width="18" height="18">
133   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
134   - </svg>
135   - <svg width="18" height="18">
136   - <use xlink:href="images/sprite.svg#card-favorites"></use>
137   - </svg></span><a class="card__label card__label-messenger" href="#">
138   - <svg width="25" height="25">
139   - <use xlink:href="images/sprite.svg#card-messenger"></use>
140   - </svg></a></div>
141   - </div>
142   - <div class="card__cnt">
143   - <div class="card__info">
144   - <address class="card__line card__line-complex">ЖК “Нахимовский проспект, 46”</address>
145   - <address class="card__line">Парк Победы (5 мин., пешком)<span style="background-color: #222964;"></span></address>
146   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
147   - <div class="card__line">Площадь: <b>6 856 м2</b></div>
148   - <div class="card__line">Цена за м<sup>2</sup>: <b>25 256 ₽</b></div>
149   - </div>
150   - <div class="card__price"><span>2 625 520 ₽</span><span>в месяц</span>
151   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
152   - </div>
153   - </div>
154   - <div class="card">
155   - <div class="card__top"><img src="images/card/card-img-1.jpg" alt="Фото недвижимости" loading="lazy">
156   - <h3 class="card__title">Салон красоты</h3>
157   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
158   - <svg width="18" height="18">
159   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
160   - </svg>
161   - <svg width="18" height="18">
162   - <use xlink:href="images/sprite.svg#card-favorites"></use>
163   - </svg></span><a class="card__label card__label-messenger" href="#">
164   - <svg width="25" height="25">
165   - <use xlink:href="images/sprite.svg#card-messenger"></use>
166   - </svg></a></div>
167   - </div>
168   - <div class="card__cnt">
169   - <div class="card__info">
170   - <address class="card__line card__line-complex">ЖК “Новинки 1”</address>
171   - <address class="card__line">Фрунзенская (10 мин., пешком)<span style="background-color: #FFC955;"></span></address>
172   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
173   - <div class="card__line">Площадь: <b>556 м2</b></div>
174   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
175   - </div>
176   - <div class="card__price"><span>1 000 000 ₽</span>
177   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее</a>
178   - </div>
179   - </div>
180   - <div class="card">
181   - <div class="card__top"><img src="images/card/card-img-2.jpg" alt="Фото недвижимости" loading="lazy">
182   - <h3 class="card__title">Барбер-шоп</h3>
183   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
184   - <svg width="18" height="18">
185   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
186   - </svg>
187   - <svg width="18" height="18">
188   - <use xlink:href="images/sprite.svg#card-favorites"></use>
189   - </svg></span><a class="card__label card__label-messenger" href="#">
190   - <svg width="25" height="25">
191   - <use xlink:href="images/sprite.svg#card-messenger"></use>
192   - </svg></a></div>
193   - </div>
194   - <div class="card__cnt">
195   - <div class="card__info">
196   - <address class="card__line card__line-complex">ЖК “Новоарбатский”</address>
197   - <address class="card__line">Арбатская (8 мин., пешком)<span style="background-color: #0000A0;"></span></address>
198   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
199   - <div class="card__line">Площадь: <b>6 556 м2</b></div>
200   - <div class="card__line">Цена за м<sup>2</sup>: <b>5 225 256 ₽</b></div>
201   - </div>
202   - <div class="card__price"><span>15 520 900 ₽</span><span>в месяц</span>
203   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
204   - </div>
205   - </div>
206   - <div class="card">
207   - <div class="card__top"><img src="images/card/card-img-3.jpg" alt="Фото недвижимости" loading="lazy">
208   - <h3 class="card__title">Аптека</h3>
209   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
210   - <svg width="18" height="18">
211   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
212   - </svg>
213   - <svg width="18" height="18">
214   - <use xlink:href="images/sprite.svg#card-favorites"></use>
215   - </svg></span><a class="card__label card__label-messenger" href="#">
216   - <svg width="25" height="25">
217   - <use xlink:href="images/sprite.svg#card-messenger"></use>
218   - </svg></a></div>
219   - </div>
220   - <div class="card__cnt">
221   - <div class="card__info">
222   - <address class="card__line card__line-complex">ЖК “Садовые кварталы”</address>
223   - <address class="card__line">Коломенская (2 мин., пешком)<span style="background-color: #029B55;"></span></address>
224   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
225   - <div class="card__line">Площадь: <b>8 626 м2</b></div>
226   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
227   - </div>
228   - <div class="card__price"><span>5 280 000 ₽</span>
229   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее о продаже</a>
230   - </div>
231   - </div>
232   - <div class="card">
233   - <div class="card__top"><img src="images/card/card-img-4.jpg" alt="Фото недвижимости" loading="lazy">
234   - <h3 class="card__title">Витрина</h3>
235   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
236   - <svg width="18" height="18">
237   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
238   - </svg>
239   - <svg width="18" height="18">
240   - <use xlink:href="images/sprite.svg#card-favorites"></use>
241   - </svg></span><a class="card__label card__label-messenger" href="#">
242   - <svg width="25" height="25">
243   - <use xlink:href="images/sprite.svg#card-messenger"></use>
244   - </svg></a></div>
245   - </div>
246   - <div class="card__cnt">
247   - <div class="card__info">
248   - <address class="card__line card__line-complex">ЖК “Нахимовский проспект, 46”</address>
249   - <address class="card__line">Парк Победы (5 мин., пешком)<span style="background-color: #222964;"></span></address>
250   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
251   - <div class="card__line">Площадь: <b>6 856 м2</b></div>
252   - <div class="card__line">Цена за м<sup>2</sup>: <b>25 256 ₽</b></div>
253   - </div>
254   - <div class="card__price"><span>2 625 520 ₽</span><span>в месяц</span>
255   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
256   - </div>
257   - </div>
258   - <div class="card">
259   - <div class="card__top"><img src="images/card/card-img-1.jpg" alt="Фото недвижимости" loading="lazy">
260   - <h3 class="card__title">Салон красоты</h3>
261   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
262   - <svg width="18" height="18">
263   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
264   - </svg>
265   - <svg width="18" height="18">
266   - <use xlink:href="images/sprite.svg#card-favorites"></use>
267   - </svg></span><a class="card__label card__label-messenger" href="#">
268   - <svg width="25" height="25">
269   - <use xlink:href="images/sprite.svg#card-messenger"></use>
270   - </svg></a></div>
271   - </div>
272   - <div class="card__cnt">
273   - <div class="card__info">
274   - <address class="card__line card__line-complex">ЖК “Новинки 1”</address>
275   - <address class="card__line">Фрунзенская (10 мин., пешком)<span style="background-color: #FFC955;"></span></address>
276   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
277   - <div class="card__line">Площадь: <b>556 м2</b></div>
278   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
279   - </div>
280   - <div class="card__price"><span>1 000 000 ₽</span>
281   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее</a>
282   - </div>
283   - </div>
284   - <div class="card">
285   - <div class="card__top"><img src="images/card/card-img-2.jpg" alt="Фото недвижимости" loading="lazy">
286   - <h3 class="card__title">Барбер-шоп</h3>
287   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
288   - <svg width="18" height="18">
289   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
290   - </svg>
291   - <svg width="18" height="18">
292   - <use xlink:href="images/sprite.svg#card-favorites"></use>
293   - </svg></span><a class="card__label card__label-messenger" href="#">
294   - <svg width="25" height="25">
295   - <use xlink:href="images/sprite.svg#card-messenger"></use>
296   - </svg></a></div>
297   - </div>
298   - <div class="card__cnt">
299   - <div class="card__info">
300   - <address class="card__line card__line-complex">ЖК “Новоарбатский”</address>
301   - <address class="card__line">Арбатская (8 мин., пешком)<span style="background-color: #0000A0;"></span></address>
302   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
303   - <div class="card__line">Площадь: <b>6 556 м2</b></div>
304   - <div class="card__line">Цена за м<sup>2</sup>: <b>5 225 256 ₽</b></div>
305   - </div>
306   - <div class="card__price"><span>15 520 900 ₽</span><span>в месяц</span>
307   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
308   - </div>
309   - </div>
310   - <div class="card">
311   - <div class="card__top"><img src="images/card/card-img-3.jpg" alt="Фото недвижимости" loading="lazy">
312   - <h3 class="card__title">Аптека</h3>
313   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
314   - <svg width="18" height="18">
315   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
316   - </svg>
317   - <svg width="18" height="18">
318   - <use xlink:href="images/sprite.svg#card-favorites"></use>
319   - </svg></span><a class="card__label card__label-messenger" href="#">
320   - <svg width="25" height="25">
321   - <use xlink:href="images/sprite.svg#card-messenger"></use>
322   - </svg></a></div>
323   - </div>
324   - <div class="card__cnt">
325   - <div class="card__info">
326   - <address class="card__line card__line-complex">ЖК “Садовые кварталы”</address>
327   - <address class="card__line">Коломенская (2 мин., пешком)<span style="background-color: #029B55;"></span></address>
328   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
329   - <div class="card__line">Площадь: <b>8 626 м2</b></div>
330   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
331   - </div>
332   - <div class="card__price"><span>5 280 000 ₽</span>
333   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее о продаже</a>
334   - </div>
335   - </div>
336   - <div class="card">
337   - <div class="card__top"><img src="images/card/card-img-4.jpg" alt="Фото недвижимости" loading="lazy">
338   - <h3 class="card__title">Витрина</h3>
339   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
340   - <svg width="18" height="18">
341   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
342   - </svg>
343   - <svg width="18" height="18">
344   - <use xlink:href="images/sprite.svg#card-favorites"></use>
345   - </svg></span><a class="card__label card__label-messenger" href="#">
346   - <svg width="25" height="25">
347   - <use xlink:href="images/sprite.svg#card-messenger"></use>
348   - </svg></a></div>
349   - </div>
350   - <div class="card__cnt">
351   - <div class="card__info">
352   - <address class="card__line card__line-complex">ЖК “Нахимовский проспект, 46”</address>
353   - <address class="card__line">Парк Победы (5 мин., пешком)<span style="background-color: #222964;"></span></address>
354   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
355   - <div class="card__line">Площадь: <b>6 856 м2</b></div>
356   - <div class="card__line">Цена за м<sup>2</sup>: <b>25 256 ₽</b></div>
357   - </div>
358   - <div class="card__price"><span>2 625 520 ₽</span><span>в месяц</span>
359   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
360   - </div>
361   - </div>
362   - <div class="card">
363   - <div class="card__top"><img src="images/card/card-img-1.jpg" alt="Фото недвижимости" loading="lazy">
364   - <h3 class="card__title">Салон красоты</h3>
365   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
366   - <svg width="18" height="18">
367   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
368   - </svg>
369   - <svg width="18" height="18">
370   - <use xlink:href="images/sprite.svg#card-favorites"></use>
371   - </svg></span><a class="card__label card__label-messenger" href="#">
372   - <svg width="25" height="25">
373   - <use xlink:href="images/sprite.svg#card-messenger"></use>
374   - </svg></a></div>
375   - </div>
376   - <div class="card__cnt">
377   - <div class="card__info">
378   - <address class="card__line card__line-complex">ЖК “Новинки 1”</address>
379   - <address class="card__line">Фрунзенская (10 мин., пешком)<span style="background-color: #FFC955;"></span></address>
380   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
381   - <div class="card__line">Площадь: <b>556 м2</b></div>
382   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
383   - </div>
384   - <div class="card__price"><span>1 000 000 ₽</span>
385   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее</a>
386   - </div>
387   - </div>
388   - <div class="card">
389   - <div class="card__top"><img src="images/card/card-img-2.jpg" alt="Фото недвижимости" loading="lazy">
390   - <h3 class="card__title">Барбер-шоп</h3>
391   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
392   - <svg width="18" height="18">
393   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
394   - </svg>
395   - <svg width="18" height="18">
396   - <use xlink:href="images/sprite.svg#card-favorites"></use>
397   - </svg></span><a class="card__label card__label-messenger" href="#">
398   - <svg width="25" height="25">
399   - <use xlink:href="images/sprite.svg#card-messenger"></use>
400   - </svg></a></div>
401   - </div>
402   - <div class="card__cnt">
403   - <div class="card__info">
404   - <address class="card__line card__line-complex">ЖК “Новоарбатский”</address>
405   - <address class="card__line">Арбатская (8 мин., пешком)<span style="background-color: #0000A0;"></span></address>
406   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
407   - <div class="card__line">Площадь: <b>6 556 м2</b></div>
408   - <div class="card__line">Цена за м<sup>2</sup>: <b>5 225 256 ₽</b></div>
409   - </div>
410   - <div class="card__price"><span>15 520 900 ₽</span><span>в месяц</span>
411   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
412   - </div>
413   - </div>
414   - <div class="card">
415   - <div class="card__top"><img src="images/card/card-img-3.jpg" alt="Фото недвижимости" loading="lazy">
416   - <h3 class="card__title">Аптека</h3>
417   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
418   - <svg width="18" height="18">
419   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
420   - </svg>
421   - <svg width="18" height="18">
422   - <use xlink:href="images/sprite.svg#card-favorites"></use>
423   - </svg></span><a class="card__label card__label-messenger" href="#">
424   - <svg width="25" height="25">
425   - <use xlink:href="images/sprite.svg#card-messenger"></use>
426   - </svg></a></div>
427   - </div>
428   - <div class="card__cnt">
429   - <div class="card__info">
430   - <address class="card__line card__line-complex">ЖК “Садовые кварталы”</address>
431   - <address class="card__line">Коломенская (2 мин., пешком)<span style="background-color: #029B55;"></span></address>
432   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
433   - <div class="card__line">Площадь: <b>8 626 м2</b></div>
434   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
435   - </div>
436   - <div class="card__price"><span>5 280 000 ₽</span>
437   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее о продаже</a>
438   - </div>
439   - </div>
440   - <div class="card">
441   - <div class="card__top"><img src="images/card/card-img-4.jpg" alt="Фото недвижимости" loading="lazy">
442   - <h3 class="card__title">Витрина</h3>
443   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
444   - <svg width="18" height="18">
445   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
446   - </svg>
447   - <svg width="18" height="18">
448   - <use xlink:href="images/sprite.svg#card-favorites"></use>
449   - </svg></span><a class="card__label card__label-messenger" href="#">
450   - <svg width="25" height="25">
451   - <use xlink:href="images/sprite.svg#card-messenger"></use>
452   - </svg></a></div>
453   - </div>
454   - <div class="card__cnt">
455   - <div class="card__info">
456   - <address class="card__line card__line-complex">ЖК “Нахимовский проспект, 46”</address>
457   - <address class="card__line">Парк Победы (5 мин., пешком)<span style="background-color: #222964;"></span></address>
458   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
459   - <div class="card__line">Площадь: <b>6 856 м2</b></div>
460   - <div class="card__line">Цена за м<sup>2</sup>: <b>25 256 ₽</b></div>
461   - </div>
462   - <div class="card__price"><span>2 625 520 ₽</span><span>в месяц</span>
463   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
464   - </div>
465   - </div>
466   - <div class="card">
467   - <div class="card__top"><img src="images/card/card-img-1.jpg" alt="Фото недвижимости" loading="lazy">
468   - <h3 class="card__title">Салон красоты</h3>
469   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
470   - <svg width="18" height="18">
471   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
472   - </svg>
473   - <svg width="18" height="18">
474   - <use xlink:href="images/sprite.svg#card-favorites"></use>
475   - </svg></span><a class="card__label card__label-messenger" href="#">
476   - <svg width="25" height="25">
477   - <use xlink:href="images/sprite.svg#card-messenger"></use>
478   - </svg></a></div>
479   - </div>
480   - <div class="card__cnt">
481   - <div class="card__info">
482   - <address class="card__line card__line-complex">ЖК “Новинки 1”</address>
483   - <address class="card__line">Фрунзенская (10 мин., пешком)<span style="background-color: #FFC955;"></span></address>
484   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
485   - <div class="card__line">Площадь: <b>556 м2</b></div>
486   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
487   - </div>
488   - <div class="card__price"><span>1 000 000 ₽</span>
489   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее</a>
490   - </div>
491   - </div>
492   - <div class="card">
493   - <div class="card__top"><img src="images/card/card-img-2.jpg" alt="Фото недвижимости" loading="lazy">
494   - <h3 class="card__title">Барбер-шоп</h3>
495   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
496   - <svg width="18" height="18">
497   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
498   - </svg>
499   - <svg width="18" height="18">
500   - <use xlink:href="images/sprite.svg#card-favorites"></use>
501   - </svg></span><a class="card__label card__label-messenger" href="#">
502   - <svg width="25" height="25">
503   - <use xlink:href="images/sprite.svg#card-messenger"></use>
504   - </svg></a></div>
505   - </div>
506   - <div class="card__cnt">
507   - <div class="card__info">
508   - <address class="card__line card__line-complex">ЖК “Новоарбатский”</address>
509   - <address class="card__line">Арбатская (8 мин., пешком)<span style="background-color: #0000A0;"></span></address>
510   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
511   - <div class="card__line">Площадь: <b>6 556 м2</b></div>
512   - <div class="card__line">Цена за м<sup>2</sup>: <b>5 225 256 ₽</b></div>
513   - </div>
514   - <div class="card__price"><span>15 520 900 ₽</span><span>в месяц</span>
515   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
516   - </div>
517   - </div>
518   - <div class="card">
519   - <div class="card__top"><img src="images/card/card-img-3.jpg" alt="Фото недвижимости" loading="lazy">
520   - <h3 class="card__title">Аптека</h3>
521   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
522   - <svg width="18" height="18">
523   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
524   - </svg>
525   - <svg width="18" height="18">
526   - <use xlink:href="images/sprite.svg#card-favorites"></use>
527   - </svg></span><a class="card__label card__label-messenger" href="#">
528   - <svg width="25" height="25">
529   - <use xlink:href="images/sprite.svg#card-messenger"></use>
530   - </svg></a></div>
531   - </div>
532   - <div class="card__cnt">
533   - <div class="card__info">
534   - <address class="card__line card__line-complex">ЖК “Садовые кварталы”</address>
535   - <address class="card__line">Коломенская (2 мин., пешком)<span style="background-color: #029B55;"></span></address>
536   - <address class="card__line">ул. Ак. Королева, д. 13, стр. 1, этаж 7, пом. 1, к. 69</address>
537   - <div class="card__line">Площадь: <b>8 626 м2</b></div>
538   - <div class="card__line">Цена за м<sup>2</sup>: <b>550 256 ₽</b></div>
539   - </div>
540   - <div class="card__price"><span>5 280 000 ₽</span>
541   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее о продаже</a>
542   - </div>
543   - </div>
544   - <div class="card">
545   - <div class="card__top"><img src="images/card/card-img-4.jpg" alt="Фото недвижимости" loading="lazy">
546   - <h3 class="card__title">Витрина</h3>
547   - <div class="card__labels"><span class="card__label card__label-favorites js_card_favorites">
548   - <svg width="18" height="18">
549   - <use xlink:href="images/sprite.svg#card-favorites-empty"></use>
550   - </svg>
551   - <svg width="18" height="18">
552   - <use xlink:href="images/sprite.svg#card-favorites"></use>
553   - </svg></span><a class="card__label card__label-messenger" href="#">
554   - <svg width="25" height="25">
555   - <use xlink:href="images/sprite.svg#card-messenger"></use>
556   - </svg></a></div>
557   - </div>
558   - <div class="card__cnt">
559   - <div class="card__info">
560   - <address class="card__line card__line-complex">ЖК “Нахимовский проспект, 46”</address>
561   - <address class="card__line">Парк Победы (5 мин., пешком)<span style="background-color: #222964;"></span></address>
562   - <address class="card__line">г. Москва, ул. Дербеневская, д. 1, стр. 6, п. 4, эт. 2, к. 3.1.</address>
563   - <div class="card__line">Площадь: <b>6 856 м2</b></div>
564   - <div class="card__line">Цена за м<sup>2</sup>: <b>25 256 ₽</b></div>
565   - </div>
566   - <div class="card__price"><span>2 625 520 ₽</span><span>в месяц</span>
567   - </div><a class="card__btn btn btn--bordered" href="#">Подробнее об аренде</a>
568   - </div>
569   - </div>-->
570 155 </div>
571 156 <div class="pagination">
572   - <?=$houses->withQueryString()->links('catalogs.paginate'); ?>
573   -
574   -
575   - <!--<div class="pagination__inner"><a class="pagination__btn pagination__btn-prev disabled" href="#">
576   - <svg width="10" height="17">
577   - <use xlink:href="images/sprite.svg#slider-arrow"></use>
578   - </svg></a>
579   - <ul class="pagination__list">
580   - <li class="pagination__item"><a class="pagination__link active" href="#">1</a></li>
581   - <li class="pagination__item"><a class="pagination__link" href="#">2</a></li>
582   - <li class="pagination__item"><a class="pagination__link" href="#">3</a></li>
583   - <li class="pagination__item"><a class="pagination__link more" href="#">...</a></li>
584   - <li class="pagination__item"><a class="pagination__link" href="#">8</a></li>
585   - </ul><a class="pagination__btn pagination__btn-next" href="#">
586   - <svg width="10" height="17">
587   - <use xlink:href="images/sprite.svg#slider-arrow"></use>
588   - </svg></a>
589   - </div>-->
590   -
  157 + <?=$houses->appends($_GET)->links('catalogs.paginate');
  158 + ///=$houses->withQueryString()->links('catalogs.paginate'); ?>
  159 + </div>
591 160 </div>
592 161 </div>
593 162 </section>
resources/views/favorite.blade.php
Diff comments   View file @ 9a5d84d
... ... @@ -6,11 +6,11 @@
6 6 <div class="container">
7 7 <div class="breadcrumbs">
8 8 <ul class="breadcrumbs__list">
9   - <li class="breadcrumbs__item"><a class="breadcrumbs__link" href="#">Главная</a></li>
  9 + <li class="breadcrumbs__item"><a class="breadcrumbs__link" href="{{ route('index') }}">Главная</a></li>
10 10 <li class="breadcrumbs__item"><span class="breadcrumbs__link">Избранное </span></li>
11 11 </ul>
12 12 </div>
13   - <h1 class="favorites__title title-main">Тут пока что ничего нет...</h1><a class="favorites-top__link" href="#">Выберите идеальную недвижимость </a>
  13 + <h1 class="favorites__title title-main">Тут пока что ничего нет...</h1><a class="favorites-top__link" href=" {{ route('catalog') }}">Выберите идеальную недвижимость </a>
14 14 <p class="favorites__descr">Здесь вы можете ознакомиться с недвижимостью которая вам понравилось</p>
15 15 </div>
16 16 </div>
... ... @@ -19,7 +19,7 @@
19 19 <div class="favorites__items">
20 20 <div class="favorites-item">
21 21 <div class="favorites-item__img"><img src="images/favorites/favorites-item-img-1.svg" alt=""></div>
22   - <p class="favorites-item__descr"><a href="#">Найдите</a> идеальную планировку на сайте Renttorg</p>
  22 + <p class="favorites-item__descr"><a href="{{ route('catalog') }}">Найдите</a> идеальную планировку на сайте Renttorg</p>
23 23 </div>
24 24 <div class="favorites-item">
25 25 <div class="favorites-item__img"><img src="images/favorites/favorites-item-img-2.svg" alt=""></div>
resources/views/layout/site.blade.php
Diff comments   View file @ 9a5d84d
... ... @@ -79,31 +79,36 @@
79 79 </div>
80 80 </header>
81 81 <main>
82   - @if ($message = Session::get('success'))
83   - <div class="alert alert-success alert-dismissible mt-0" role="alert">
84   - <button type="button" class="close" data-dismiss="alert" aria-label="Закрыть">
85   - <span aria-hidden="true">&times;</span>
86   - </button>
87   - {{ $message }}
88   - </div>
89   - @endif
90 82  
91   - @if ($errors->any())
92   - <div class="alert alert-danger alert-dismissible mt-4" role="alert">
93   - <button type="button" class="close" data-dismiss="alert" aria-label="Закрыть">
94   - <span aria-hidden="true">&times;</span>
95   - </button>
96   - <ul class="mb-0">
97   - @foreach ($errors->all() as $error)
98   - <li>{{ $error }}</li>
99   - @endforeach
100   - </ul>
101   - </div>
102   - @endif
103 83  
104 84 <!-- Фильтр -->
105 85 @yield('filter')
106 86  
  87 + @if ($message = Session::get('success'))
  88 + <section>
  89 + <div class="alert alert-success alert-dismissible mt-0" role="alert">
  90 + <button type="button" class="close" data-dismiss="alert" aria-label="Закрыть">
  91 + <span aria-hidden="true">&times;</span>
  92 + </button>
  93 + {{ $message }}
  94 + </div>
  95 + </section>
  96 + @endif
  97 +
  98 + @if ($errors->any())
  99 + <section>
  100 + <div class="alert alert-danger alert-dismissible mt-4" role="alert">
  101 + <button type="button" class="close" data-dismiss="alert" aria-label="Закрыть">
  102 + <span aria-hidden="true">&times;</span>
  103 + </button>
  104 + <ul class="mb-0">
  105 + @foreach ($errors->all() as $error)
  106 + <li>{{ $error }}</li>
  107 + @endforeach
  108 + </ul>
  109 + </div>
  110 + </section>
  111 + @endif
107 112 <!-- Основной контент -->
108 113 @yield('content')
109 114  
... ... @@ -123,7 +128,7 @@
123 128 </button>
124 129 </div>
125 130 <!-- Форма обратной связи -->
126   - @yield('form_feedback');
  131 + @yield('form_feedback')
127 132  
128 133 <!-- Сам футер мееню -->
129 134 <div class="footer-middle">
... ... @@ -189,7 +194,6 @@
189 194 </div>
190 195 </div>
191 196  
192   -
193 197 <div class="footer-bottom">
194 198 <div class="container">
195 199 <div class="footer-bottom__wrap">
... ... @@ -397,6 +401,6 @@
397 401 <script src="{{ asset('js/swiper-bundle.min.js') }}"></script>
398 402 <script src="{{ asset('js/main.js') }}"></script>
399 403 <script type="text/javascript" src="{{ asset('js/jquery.min.js') }}"></script>
400   -@yield('custom_js');
  404 +@yield('custom_js')
401 405 </body>
402 406 </html>
resources/views/part/filter/category.blade.php
Diff comments   View file @ 9a5d84d
... ... @@ -20,7 +20,7 @@
20 20 <a class="hero__link {{ (url()->current() == route('category', ['cat'=>'sale']))? 'active' : null }}" href="{{ route('category', ['cat'=>'sale']) }}">Продажа торговых помещений</a>
21 21 <a class="hero__link {{ (url()->current() == route('category', ['cat'=>'bussiness']))? 'active' : null }}" href="{{ route('category', ['cat'=>'bussiness']) }}">Арендый бизнес</a></div>
22 22 </div>
23   - <form class="hero-search" action="{{ url()->current() }}" method="GET">
  23 + <form class="hero-search" action="<?//=url()->current()?>" method="GET">
24 24 <div class="hero-search__control">
25 25 <div class="hero-filter hero-filter--modified1 js_hero_filter">
26 26 <input class="js_hero_filter_input" id="area" name="area" type="hidden">
... ... @@ -58,6 +58,9 @@ Route::get(&#39;catalog_ajax_filter&#39;, [MainController::class, &#39;catalog_ajax_filter&#39;]
58 58 //Категория
59 59 Route::get('category/{cat}', [MainController::class, 'Category'])->name('category');
60 60  
  61 +//Категория ajax
  62 +Route::get('category_ajax/{cat}', [MainController::class, 'category_ajax'])->name('category_ajax');
  63 +
61 64  
62 65 Route::group([
63 66 'as' => 'auth.', // имя маршрута, например auth.index