From 05d007af967868159e86e2fae31a099a557379f0 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?= <alarionov@nologostudio.ru>
Date: Fri, 24 Mar 2023 20:05:39 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B5=D1=82=D0=B5=D0=B2=D1=8B=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D1=83=D1=82=D0=B8=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0=20?=
 =?UTF-8?q?=D0=BA=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/about.blade.php                 |    2 +-
 resources/views/admin/area/edit.blade.php       |    2 +-
 resources/views/admin/area/form.blade.php       |   10 +++++-----
 resources/views/admin/area/index.blade.php      |    2 +-
 resources/views/admin/area/view.blade.php       |    6 +++---
 resources/views/admin/company/view.blade.php    |    2 +-
 resources/views/admin/houses/form.blade.php     |    6 +++---
 resources/views/admin/houses/index.blade.php    |    2 +-
 resources/views/admin/houses/view_img.blade.php |    2 +-
 resources/views/admin/news/form.blade.php       |    2 +-
 resources/views/admin/news/index.blade.php      |    2 +-
 resources/views/admin/news/view.blade.php       |    2 +-
 resources/views/catalogs/elemhouse.blade.php    |    2 +-
 resources/views/catalogs/house_mini.blade.php   |    2 +-
 resources/views/catalogs/new.blade.php          |    2 +-
 resources/views/house/post.blade.php            |   18 ++++++++---------
 resources/views/layout/admin.blade.php          |   24 ++---------------------
 17 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
index 4e5f99f..f617f3c 100644
--- a/resources/views/about.blade.php
+++ b/resources/views/about.blade.php
@@ -74,7 +74,7 @@
                     <div class="swiper-slide">
                         <div class="partners__inner">
                             @foreach ($partners as $partner)
-                                <div class="partners-item"><img src="{{ $partner->foto }}" alt="{{ $partner->name }}" loading="lazy"></div>
+                                <div class="partners-item"><img src="/storage/app/public/{{$partner->foto}}" alt="{{ $partner->name }}" loading="lazy"></div>
                             @endforeach
                             <!--<div class="partners-item"><img src="images/partners/partners-item-img-3.png" alt="Лого партнера" loading="lazy"></div>
                             <div class="partners-item"><img src="images/partners/partners-item-img-3.png" alt="Лого партнера" loading="lazy"></div>
diff --git a/resources/views/admin/area/edit.blade.php b/resources/views/admin/area/edit.blade.php
index c8cc854..67c1acf 100644
--- a/resources/views/admin/area/edit.blade.php
+++ b/resources/views/admin/area/edit.blade.php
@@ -35,7 +35,7 @@
                         @foreach($area->fotos as $img)
                           <tr>
                               <td><?=$img->id?></td>
-                              <td><img src="<?=asset(Storage::url($img->foto))?>" width="100px"/></td>
+                              <td><img src="/storage/app/public/<?=$img->foto;//=asset(Storage::url($img->foto))?>" width="100px"/></td>
                               <td><a href="{{ route('admin.img.del.area', ['id'=> $img->id, 'area' => $area->id]) }}">Удалить</a></td>
                           </tr>
                         @endforeach
diff --git a/resources/views/admin/area/form.blade.php b/resources/views/admin/area/form.blade.php
index 71f64df..3e4ba5a 100644
--- a/resources/views/admin/area/form.blade.php
+++ b/resources/views/admin/area/form.blade.php
@@ -18,12 +18,12 @@
 <textarea class="form-control_ txtarea ckeditor" name="description" placeholder="Описание" required
               rows="10" style="width: 80%">{{ old('description') ?? $area->description ?? '' }}</textarea><br>
 
-<label for="coord_X">Коорд. X: </label>
-<input type="text" class="form-control_ txt" name="coord_X" placeholder="Координаты X"
+<label for="coord_x">Коорд. X: </label>
+<input type="text" class="form-control_ txt" name="coord_x" placeholder="Координаты X"
            required maxlength="100" value="{{ old('coord_x') ?? $area->coord_x ?? '' }}"><br>
 
-<label for="coord_Y">Коорд. Y: </label>
-<input type="text" class="form-control_ txt" name="coord_Y" placeholder="Координаты Y"
+<label for="coord_y">Коорд. Y: </label>
+<input type="text" class="form-control_ txt" name="coord_y" placeholder="Координаты Y"
            required maxlength="100" value="{{ old('coord_y') ?? $area->coord_y ?? '' }}"><br>
 
 
@@ -32,7 +32,7 @@
 
 @isset($area->foto_main)
     <div class="form-group form-check">
-        <img src="<?=asset(Storage::url($area->foto_main))?>" width="100px"/>
+        <img src="/storage/app/public/<?=$area->foto_main;//=asset(Storage::url($area->foto_main))?>" width="100px"/>
         <input type="checkbox" class="form-check-input" name="remove" id="remove">
         <label class="form-check-label" for="remove">
             Удалить загруженное изображение
diff --git a/resources/views/admin/area/index.blade.php b/resources/views/admin/area/index.blade.php
index b23e39f..3058ea2 100644
--- a/resources/views/admin/area/index.blade.php
+++ b/resources/views/admin/area/index.blade.php
@@ -34,7 +34,7 @@
                     @if ($areas->count())
                     @foreach($areas as $area)
                         <tr>
-                            <td><? if (empty($area->foto_main)) {?>Нет фото<?} else {?><img src="<?=asset(Storage::url($area->foto_main))?>" width="100px"/><?}?></td>
+                            <td><? if (empty($area->foto_main)) {?>Нет фото<?} else {?><img src="/storage/app/public/<?=$area->foto_main; //=asset(Storage::url($area->foto_main))?>" width="100px"/><?}?></td>
                             <td>{{ $area->id }}</td>
                             <td>{{ $area->name_area }}</td>
                             <td>{{ $area->coord_x }}</td>
diff --git a/resources/views/admin/area/view.blade.php b/resources/views/admin/area/view.blade.php
index 5d0217c..51b6b69 100644
--- a/resources/views/admin/area/view.blade.php
+++ b/resources/views/admin/area/view.blade.php
@@ -25,18 +25,18 @@
                           rows="10" style="width: 80%">{{ old('description') ?? $area->description ?? '' }}</textarea><br><br>
 
                 <label for="coord_X">Коорд. X: </label><br>
-                <input type="text" class="form-control_ txt" name="coord_X" placeholder="Координаты X"
+                <input type="text" class="form-control_ txt" name="coord_x" placeholder="Координаты X"
                        required maxlength="100" value="{{ old('coord_x') ?? $area->coord_x ?? '' }}"><br><br>
 
                 <label for="coord_Y">Коорд. Y: </label><br>
-                <input type="text" class="form-control_ txt" name="coord_Y" placeholder="Координаты Y"
+                <input type="text" class="form-control_ txt" name="coord_y" placeholder="Координаты Y"
                        required maxlength="100" value="{{ old('coord_y') ?? $area->coord_y ?? '' }}"><br><br>
 
 
                 <label for="foto_main">Файл-картинка:</label><br>
                 @isset($area->foto_main)
                     <div class="form-group form-check">
-                        <img src="<?=asset(Storage::url($area->foto_main))?>" width="100px"/>
+                        <img src="/storage/app/public/<?=$area->foto_main//=asset(Storage::url($area->foto_main))?>" width="100px"/>
                     </div>
                 @endisset
                 <br>
diff --git a/resources/views/admin/company/view.blade.php b/resources/views/admin/company/view.blade.php
index 08aa86f..429e5f4 100644
--- a/resources/views/admin/company/view.blade.php
+++ b/resources/views/admin/company/view.blade.php
@@ -64,7 +64,7 @@
                         <div class="swiper-slide">
                             <div class="partners__inner">
                                 @foreach ($partners as $partner)
-                                    <div class="partners-item"><img src="{{ asset(Storage::url($partner->foto)) }}" alt="{{ $partner->name }}" loading="lazy">
+                                    <div class="partners-item"><img src="/storage/app/public/<?=$partner->foto; //asset(Storage::url($partner->foto)) ?>" alt="{{ $partner->name }}" loading="lazy">
                                      <a href="{{ route('admin.delete.partner', ['partner' => $partner->id]) }}">Удалить партнера</a>
                                     </div>
                                 @endforeach
diff --git a/resources/views/admin/houses/form.blade.php b/resources/views/admin/houses/form.blade.php
index 1eca5aa..c02d06a 100644
--- a/resources/views/admin/houses/form.blade.php
+++ b/resources/views/admin/houses/form.blade.php
@@ -113,7 +113,7 @@
 
 @isset($house->foto_main)
     <div class="form-group form-check">
-        <img src="<?=asset(Storage::url($house->foto_main))?>" width="100px"/>
+        <img src="/storage/app/public/<?=$house->foto_main;//=asset(Storage::url($house->foto_main))?>" width="100px"/>
         <input type="checkbox" class="form-check-input" name="remove" id="remove">
         <label class="form-check-label" for="remove">
             Удалить загруженное изображение
@@ -225,7 +225,7 @@
 
 @isset($house->object_plan)
     <div class="form-group form-check">
-        <img src="<?=asset(Storage::url($house->object_plan))?>" width="100px"/>
+        <img src="/storage/app/public/<?=$house->object_plan;//=asset(Storage::url($house->object_plan))?>" width="100px"/>
     </div>
 @endisset
 <br><br>
@@ -235,7 +235,7 @@
 
 @isset($house->floor_plan)
     <div class="form-group form-check">
-        <img src="<?=asset(Storage::url($house->floor_plan))?>" width="100px"/>
+        <img src="/storage/app/public/<?=$house->floor_plan;//=asset(Storage::url($house->floor_plan))?>" width="100px"/>
     </div>
 @endisset
 <br><br>
diff --git a/resources/views/admin/houses/index.blade.php b/resources/views/admin/houses/index.blade.php
index b2e09d1..9de13e1 100644
--- a/resources/views/admin/houses/index.blade.php
+++ b/resources/views/admin/houses/index.blade.php
@@ -34,7 +34,7 @@
                     @if ($houses->count())
                         @foreach($houses as $house)
                             <tr>
-                                <td><? if (empty($house->foto_main)) {?>Нет фото<?} else {?><img src="<?=asset(Storage::url($house->foto_main))?>" width="100px"/><?}?></td>
+                                <td><? if (empty($house->foto_main)) {?>Нет фото<?} else {?><img src="/storage/app/public/<?=$house->foto_main;//=asset(Storage::url($house->foto_main))?>" width="100px"/><?}?></td>
                                 <td>{{ $house->id }}</td>
                                 <td>{{ $house->title }}</td>
                                 <td>{{ $house->areas->name_area }}</td>
diff --git a/resources/views/admin/houses/view_img.blade.php b/resources/views/admin/houses/view_img.blade.php
index c4c4a1f..d2672d6 100644
--- a/resources/views/admin/houses/view_img.blade.php
+++ b/resources/views/admin/houses/view_img.blade.php
@@ -33,7 +33,7 @@
                         @foreach($house->fotohouse as $img)
                             <tr>
                                 <td><?=$img->id?></td>
-                                <td><img src="<?=asset(Storage::url($img->foto))?>" width="100px"/></td>
+                                <td><img src="/storage/app/public/<?=$img->foto;//=asset(Storage::url($img->foto))?>" width="100px"/></td>
                                 <td><a href="{{ route('admin.del.images.houses', ['id'=> $img->id, 'house' => $house->id]) }}">Удалить</a></td>
                             </tr>
                         @endforeach
diff --git a/resources/views/admin/news/form.blade.php b/resources/views/admin/news/form.blade.php
index 132d344..e1c44e3 100644
--- a/resources/views/admin/news/form.blade.php
+++ b/resources/views/admin/news/form.blade.php
@@ -23,7 +23,7 @@
 
 @isset($news->foto)
     <div class="form-group form-check">
-        <img src="<?=asset(Storage::url($news->foto))?>" width="100px"/>
+        <img src="/storage/app/public/<?=$news->foto;//=asset(Storage::url($news->foto))?>" width="100px"/>
         <input type="checkbox" class="form-check-input" name="remove" id="remove">
         <label class="form-check-label" for="remove">
             Удалить загруженное изображение
diff --git a/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php
index 8ac169c..6536549 100644
--- a/resources/views/admin/news/index.blade.php
+++ b/resources/views/admin/news/index.blade.php
@@ -32,7 +32,7 @@
                     @if ($news->count())
                         @foreach($news as $new)
                             <tr>
-                                <td><? if (empty($new->foto)) {?>Нет фото<?} else {?><img src="<?=asset(Storage::url($new->foto))?>" width="100px"/><?}?></td>
+                                <td><? if (empty($new->foto)) {?>Нет фото<?} else {?><img src="/storage/app/public/<?=$new->foto;//=asset(Storage::url($new->foto))?>" width="100px"/><?}?></td>
                                 <td>{{ $new->id }}</td>
                                 <td>{{ $new->title }}</td>
                                 <td>{{ $new->created_at }}</td>
diff --git a/resources/views/admin/news/view.blade.php b/resources/views/admin/news/view.blade.php
index 87afccb..3d639a4 100644
--- a/resources/views/admin/news/view.blade.php
+++ b/resources/views/admin/news/view.blade.php
@@ -27,7 +27,7 @@
                 <label for="foto">Файл-картинка:</label>
                 @isset($news->foto)
                     <div class="form-group form-check">
-                        <img src="<?=asset(Storage::url($news->foto))?>" width="100px"/>
+                        <img src="/storage/app/public/<?=$news->foto;//=asset(Storage::url($news->foto))?>" width="100px"/>
                     </div>
                 @endisset
                 <br><br>
diff --git a/resources/views/catalogs/elemhouse.blade.php b/resources/views/catalogs/elemhouse.blade.php
index 25d8100..ca5e706 100644
--- a/resources/views/catalogs/elemhouse.blade.php
+++ b/resources/views/catalogs/elemhouse.blade.php
@@ -4,7 +4,7 @@
                 @if (empty($house->foto_main))
 
                 @else
-                <img src="{{ asset(Storage::url($house->foto_main)) }}"  alt="{{ $house->title }}" loading="lazy"/>
+                <img src="/storage/app/public/<?=$house->foto_main; //asset(Storage::url($house->foto_main)) ?>"  alt="{{ $house->title }}" loading="lazy"/>
                 @endif;
 
                 <h3 class="card__title">{{$house->typearea->name_type }}</h3>
diff --git a/resources/views/catalogs/house_mini.blade.php b/resources/views/catalogs/house_mini.blade.php
index 1a3db82..3bf64b2 100644
--- a/resources/views/catalogs/house_mini.blade.php
+++ b/resources/views/catalogs/house_mini.blade.php
@@ -3,7 +3,7 @@
                 @if (empty($house->foto_main))
 
                 @else
-                <img src="{{ asset(Storage::url($house->foto_main)) }}"  alt="{{ $house->title }}" loading="lazy"/>
+                <img src="/storage/app/public/<?=$house->foto_main; //asset(Storage::url($house->foto_main)) ?>"  alt="{{ $house->title }}" loading="lazy"/>
                 @endif;
 
                 <h3 class="card__title">{{$house->typearea->name_type }}</h3>
diff --git a/resources/views/catalogs/new.blade.php b/resources/views/catalogs/new.blade.php
index d332bdf..3622fa8 100644
--- a/resources/views/catalogs/new.blade.php
+++ b/resources/views/catalogs/new.blade.php
@@ -4,7 +4,7 @@
             <? if (empty($new->foto)) {?>
 
             <?} else {?>
-            <img src="{{ asset(Storage::url($new->foto)) }}" alt="{{ $new->title }}" loading="lazy">
+            <img src="/storage/app/public/<?=$new->foto; //asset(Storage::url($new->foto)) ?>" alt="{{ $new->title }}" loading="lazy">
             <? } ?>
             <div class="card-news__date"><span>{{ $new->created_at->format('d') }}</span><span>{{ \App\Classes\RusDate::russian_month($new->created_at->format('m')) }} {{$new->created_at->format('Y')}}</span></div>
         </div>
diff --git a/resources/views/house/post.blade.php b/resources/views/house/post.blade.php
index 0b0341d..564c884 100644
--- a/resources/views/house/post.blade.php
+++ b/resources/views/house/post.blade.php
@@ -49,8 +49,8 @@
                             <?if (!empty($house->foto_main)) {?>
                             <div class="swiper-slide">
                                 <div class="intro-item">
-                                    <div class="intro-item__img"><img src="{{  asset(Storage::url($house->foto_main)) }}" alt=""></div>
-                                    <a class="intro-item__btn js_intro_item_btn" href="{{asset(Storage::url($house->foto_main))}}" data-caption="{{ $house->title }}">
+                                    <div class="intro-item__img"><img src="/storage/app/public/<?=$house->foto_main; // asset(Storage::url($house->foto_main)) ?>" alt=""></div>
+                                    <a class="intro-item__btn js_intro_item_btn" href="/storage/app/public/<?=$house->foto_main; //asset(Storage::url($house->foto_main))?>" data-caption="{{ $house->title }}">
                                         <svg width="16" height="16">
                                             <use xlink:href="{{ asset('images/sprite.svg#intro-item-btn') }}"></use>
                                         </svg></a>
@@ -60,8 +60,8 @@
                             @foreach($house->fotohouse as $foto)
                                 <div class="swiper-slide">
                                     <div class="intro-item">
-                                        <div class="intro-item__img"><img src="{{ asset(Storage::url($foto->foto)) }}" alt=""></div>
-                                        <a class="intro-item__btn js_intro_item_btn" href="{{ asset(Storage::url($foto->foto)) }}" data-caption="Фото {{ $foto->id }}">
+                                        <div class="intro-item__img"><img src="/storage/app/public/<?=$foto->foto; //asset(Storage::url($foto->foto)) ?>" alt=""></div>
+                                        <a class="intro-item__btn js_intro_item_btn" href="/storage/app/public/<?=$foto->foto; //asset(Storage::url($foto->foto)) ?>" data-caption="Фото {{ $foto->id }}">
                                             <svg width="16" height="16">
                                                 <use xlink:href="{{ asset('images/sprite.svg#intro-item-btn') }}"></use>
                                             </svg></a>
@@ -99,7 +99,7 @@
                             <div class="offer-side-item js_offer_side_item active" data-item="1">
                                 <div class="offer-side-item__img">
                                     <? if (!empty($house->object_plan)) {?>
-                                    <img src="{{ asset(Storage::url($house->object_plan)) }}" alt="План объекта">
+                                    <img src="/storage/app/public/<?=$house->object_plan; //asset(Storage::url($house->object_plan)) ?>" alt="План объекта">
                                     <? } ?>
                                 </div>
                                 <a class="offer-side-item__btn js_offer_side_item_btn" href="#" data-btn="offer-side-popup">
@@ -110,7 +110,7 @@
                             <div class="offer-side-item js_offer_side_item" data-item="2">
                                 <div class="offer-side-item__img">
                                    <? if (!empty($house->floor_plan)) { ?>
-                                    <img src="{{ asset(Storage::url($house->floor_plan)) }}" alt="План этажа">
+                                    <img src="/storage/app/public/<?=$house->floor_plan; //asset(Storage::url($house->floor_plan)) ?>" alt="План этажа">
                                    <? }?>
                                 </div>
                                 <a class="offer-side-item__btn js_offer_side_item_btn" href="#" data-btn="offer-side-popup">
@@ -131,12 +131,12 @@
                                 <div class="offer-side-popup__cnt">
                                     <div class="offer-side-popup__item js_offer_side_popup_item active" data-item="1">
                                         <? if (!empty($house->object_plan)) {?>
-                                        <img src="{{ asset(Storage::url($house->object_plan)) }}" alt="План объекта">
+                                        <img src="/storage/app/public/<?=$house->object_plan; //asset(Storage::url($house->object_plan)) ?>" alt="План объекта">
                                         <? } ?>
                                     </div>
                                     <div class="offer-side-popup__item js_offer_side_popup_item" data-item="2">
                                         <? if (!empty($house->floor_plan)) { ?>
-                                        <img src="{{ asset(Storage::url($house->floor_plan)) }}" alt="План этажа">
+                                        <img src="/storage/app/public/<?=$house->floor_plan; //asset(Storage::url($house->floor_plan)) ?>" alt="План этажа">
                                         <? }?>
                                     </div>
                                 </div>
@@ -170,7 +170,7 @@
                         </svg></span></a><a class="offer-side__btn btn btn--main" href="tel:{{ $items_contact[0]->telephone }}"><span>Позвонить
                         <svg width="22" height="22">
                           <use xlink:href="{{ asset('images/sprite.svg#intro-link-phone') }}"></use>
-                        </svg></span></a></div><a class="offer-side__download" href="{{ $house->present }}" download><span>Скачать презентацию
+                        </svg></span></a></div><a class="offer-side__download" href="/storage/app/public/{{ $house->present }}" download><span>Скачать презентацию
                       <svg width="60" height="60">
                         <use xlink:href="{{  asset('images/sprite.svg#offer-side-download') }}"></use>
                       </svg></span></a>
diff --git a/resources/views/layout/admin.blade.php b/resources/views/layout/admin.blade.php
index dff907f..f8bda25 100644
--- a/resources/views/layout/admin.blade.php
+++ b/resources/views/layout/admin.blade.php
@@ -387,28 +387,8 @@
                 <div class="contact-us-social__name">WhatsApp</div></a></div>
     </div>
 </div>
-<div class="offer-side-popup" data-popup="offer-side-popup">
-    <div class="offer-side-popup__wrap">
-        <button class="offer-side-popup__close js_popup_close" type="button">
-            <svg width="20" height="20">
-                <use xlink:href="{{ asset('images/sprite.svg#popup-close')}}"></use>
-            </svg>
-        </button>
-        <div class="offer-side-popup__cnt">
-            <div class="offer-side-popup__item js_offer_side_popup_item active" data-item="1"><img src="{{ asset('images/offer-side-item-img-1.jpg')}}" alt="План объекта"></div>
-            <div class="offer-side-popup__item js_offer_side_popup_item" data-item="2"><img src="{{ asset('images/offer-side-item-img-2.jpg')}}" alt="План этажа"></div>
-        </div>
-        <div class="offer-side-popup__tabs">
-            <button class="offer-side-popup__tab js_offer_side_popup_tab active" type="button" data-tab="1">План объекта</button>
-            <button class="offer-side-popup__tab js_offer_side_popup_tab" type="button" data-tab="2">План этажа</button>
-        </div>
-        <button class="offer-side-popup__sizeoff js_popup_close" type="button">
-            <svg width="18" height="18">
-                <use xlink:href="{{ asset('images/sprite.svg#popup-sizeoff')}}"></use>
-            </svg>
-        </button>
-    </div>
-</div>
+
+
 <div class="img-viewer js_img_viewer">
     <div class="img-viewer__wrap">
         <button class="img-viewer__close js_img_viewer_close" type="button">
-- 
1.7.10.4