From 357df98e451691610e9a6b3ebbe628f7a35aa5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Fri, 17 Mar 2023 13:56:38 +0700 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3=20=D1=81=20=D0=BA=D0=B0=D1=82=D0?= =?UTF-8?q?=B0=D0=BB=D0=BE=D0=B3=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2023_03_01_072712_create_areas_table.php | 4 +- public/js/main.js | 6 +- resources/views/catalogs/elemhouse.blade -copy.php | 52 +++++++ .../views/catalogs/house_mini.blade - copy.php | 48 ++++++ resources/views/house/post.blade.php | 4 +- resources/views/mapsobj.blade.php | 155 -------------------- 6 files changed, 107 insertions(+), 162 deletions(-) create mode 100644 resources/views/catalogs/elemhouse.blade -copy.php create mode 100644 resources/views/catalogs/house_mini.blade - copy.php diff --git a/database/migrations/2023_03_01_072712_create_areas_table.php b/database/migrations/2023_03_01_072712_create_areas_table.php index 5d1d5de..dbd3bae 100644 --- a/database/migrations/2023_03_01_072712_create_areas_table.php +++ b/database/migrations/2023_03_01_072712_create_areas_table.php @@ -19,8 +19,8 @@ return new class extends Migration //$table->string('slug', 255)->unique()->nullable(); $table->text('description')->nullable(); $table->string('map_coord')->default(''); - $table->integer('coord_x')->default(0); - $table->integer('coord_y')->default(0); + $table->float('coord_x')->default(0); + $table->float('coord_y')->default(0); $table->string('foto_main', 255)->nullable(); $table->timestamps(); }); diff --git a/public/js/main.js b/public/js/main.js index 25fc888..f5be49d 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -29,7 +29,7 @@ class App { this.sendForm('.js_popup_sending_form_', '[data-popup="success"]'); //this.sendOffer(); //отправка предложения по e-mail; - //this.setGeneralMap(); // карта на странице карт; + this.setGeneralMap(); // карта на странице карт; this.setComplexMap('complex-map', [55.726591050908745, 37.57244549999999], 'ЖК Садовые кварталы'); // карта на странице 'ЖК'; this.setComplexMap('offer-map', [55.70851106903402, 37.65864349999999], 'Аренда торгового помещения 321,6 м2'); // карта на странице 'Предложение'; this.setCatalogSorts(); // сортировка на странице 'каталог'; @@ -1206,7 +1206,7 @@ class App { // карта на странице карт; setGeneralMap() { -/* + if (document.querySelector('#general-map')) { ymaps.ready(init); // Дождёмся загрузки API и готовности DOM; @@ -1358,7 +1358,7 @@ class App { } }; -*/ + // аккордеон в футере setFooterSpoilers() { diff --git a/resources/views/catalogs/elemhouse.blade -copy.php b/resources/views/catalogs/elemhouse.blade -copy.php new file mode 100644 index 0000000..b54b779 --- /dev/null +++ b/resources/views/catalogs/elemhouse.blade -copy.php @@ -0,0 +1,52 @@ +
+
+
+ @if (empty($house->foto_main)) + + @else + {{ $house->title }} + @endif; + +

{{$house->typearea->name_type }}

+
+ + + + + + + + + + + +
+
+
+
+
{{ $house->areas->name_area }}
+
{{$house->metro}} ({{$house->description_metro }})
+
{{$house->address }}
+
Площадь: {{$house->area}} м2
+
Цена за м2: {{ $house->price_m2 }}₽
+
+ format_house) { + case 'Аренда': + $comment = "в месяц"; + break; + case 'Продажа': + $comment = ""; + break; + case 'Бизнес': + $comment= "в месяц"; + break; + case 'Арендованные': + $comment = "в месяц"; + break; + } + ?> +
{{ $house->price }} ₽ +
Подробнее +
+
+
diff --git a/resources/views/catalogs/house_mini.blade - copy.php b/resources/views/catalogs/house_mini.blade - copy.php new file mode 100644 index 0000000..4ca1cd8 --- /dev/null +++ b/resources/views/catalogs/house_mini.blade - copy.php @@ -0,0 +1,48 @@ +
+
+ @if (empty($house->foto_main)) + + @else + {{ $house->title }} + @endif; + +

{{$house->typearea->name_type }}

+
+ + + + + + + + +
+
+
+
+
{{ $house->areas->name_area }}
+
{{$house->metro}} ({{$house->description_metro }})
+
{{$house->address }}
+
Площадь: {{$house->area}} м2
+
Цена за м2: {{ $house->price_m2 }}₽
+
+ format_house) { + case 'Аренда': + $comment = "в месяц"; + break; + case 'Продажа': + $comment = ""; + break; + case 'Бизнес': + $comment= "в месяц"; + break; + case 'Арендованные': + $comment = "в месяц"; + break; + } + ?> +
{{ $house->price }} ₽ +
Подробнее +
+
+ diff --git a/resources/views/house/post.blade.php b/resources/views/house/post.blade.php index 4ae480f..ad569f4 100644 --- a/resources/views/house/post.blade.php +++ b/resources/views/house/post.blade.php @@ -113,7 +113,7 @@ - +
- +
Аренда в год за м2{{ $house->rent_in_year }} ₽
Аренда в месяц{{ $house->rent_in_month }} ₽
diff --git a/resources/views/mapsobj.blade.php b/resources/views/mapsobj.blade.php index fecb78c..b0a5256 100644 --- a/resources/views/mapsobj.blade.php +++ b/resources/views/mapsobj.blade.php @@ -6,161 +6,6 @@ @section('custom_js') @include('js.filter_value') - @endsection @section('content') -- 1.7.10.4