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

Download as
Browse Code »

Commit 05d007af967868159e86e2fae31a099a557379f0

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

Сетевые пути доступа к картинкам

Showing 17 changed files with 34 additions and 54 deletions Side-by-side Diff

resources/views/about.blade.php
Diff comments   View file @ 05d007a
... ... @@ -74,7 +74,7 @@
74 74 <div class="swiper-slide">
75 75 <div class="partners__inner">
76 76 @foreach ($partners as $partner)
77   - <div class="partners-item"><img src="{{ $partner->foto }}" alt="{{ $partner->name }}" loading="lazy"></div>
  77 + <div class="partners-item"><img src="/storage/app/public/{{$partner->foto}}" alt="{{ $partner->name }}" loading="lazy"></div>
78 78 @endforeach
79 79 <!--<div class="partners-item"><img src="images/partners/partners-item-img-3.png" alt="Лого партнера" loading="lazy"></div>
80 80 <div class="partners-item"><img src="images/partners/partners-item-img-3.png" alt="Лого партнера" loading="lazy"></div>
resources/views/admin/area/edit.blade.php
Diff comments   View file @ 05d007a
... ... @@ -35,7 +35,7 @@
35 35 @foreach($area->fotos as $img)
36 36 <tr>
37 37 <td><?=$img->id?></td>
38   - <td><img src="<?=asset(Storage::url($img->foto))?>" width="100px"/></td>
  38 + <td><img src="/storage/app/public/<?=$img->foto;//=asset(Storage::url($img->foto))?>" width="100px"/></td>
39 39 <td><a href="{{ route('admin.img.del.area', ['id'=> $img->id, 'area' => $area->id]) }}">Удалить</a></td>
40 40 </tr>
41 41 @endforeach
resources/views/admin/area/form.blade.php
Diff comments   View file @ 05d007a
... ... @@ -18,12 +18,12 @@
18 18 <textarea class="form-control_ txtarea ckeditor" name="description" placeholder="Описание" required
19 19 rows="10" style="width: 80%">{{ old('description') ?? $area->description ?? '' }}</textarea><br>
20 20  
21   -<label for="coord_X">Коорд. X: </label>
22   -<input type="text" class="form-control_ txt" name="coord_X" placeholder="Координаты X"
  21 +<label for="coord_x">Коорд. X: </label>
  22 +<input type="text" class="form-control_ txt" name="coord_x" placeholder="Координаты X"
23 23 required maxlength="100" value="{{ old('coord_x') ?? $area->coord_x ?? '' }}"><br>
24 24  
25   -<label for="coord_Y">Коорд. Y: </label>
26   -<input type="text" class="form-control_ txt" name="coord_Y" placeholder="Координаты Y"
  25 +<label for="coord_y">Коорд. Y: </label>
  26 +<input type="text" class="form-control_ txt" name="coord_y" placeholder="Координаты Y"
27 27 required maxlength="100" value="{{ old('coord_y') ?? $area->coord_y ?? '' }}"><br>
28 28  
29 29  
... ... @@ -32,7 +32,7 @@
32 32  
33 33 @isset($area->foto_main)
34 34 <div class="form-group form-check">
35   - <img src="<?=asset(Storage::url($area->foto_main))?>" width="100px"/>
  35 + <img src="/storage/app/public/<?=$area->foto_main;//=asset(Storage::url($area->foto_main))?>" width="100px"/>
36 36 <input type="checkbox" class="form-check-input" name="remove" id="remove">
37 37 <label class="form-check-label" for="remove">
38 38 Удалить загруженное изображение
resources/views/admin/area/index.blade.php
Diff comments   View file @ 05d007a
... ... @@ -34,7 +34,7 @@
34 34 @if ($areas->count())
35 35 @foreach($areas as $area)
36 36 <tr>
37   - <td><? if (empty($area->foto_main)) {?>Нет фото<?} else {?><img src="<?=asset(Storage::url($area->foto_main))?>" width="100px"/><?}?></td>
  37 + <td><? if (empty($area->foto_main)) {?>Нет фото<?} else {?><img src="/storage/app/public/<?=$area->foto_main; //=asset(Storage::url($area->foto_main))?>" width="100px"/><?}?></td>
38 38 <td>{{ $area->id }}</td>
39 39 <td>{{ $area->name_area }}</td>
40 40 <td>{{ $area->coord_x }}</td>
resources/views/admin/area/view.blade.php
Diff comments   View file @ 05d007a
... ... @@ -25,18 +25,18 @@
25 25 rows="10" style="width: 80%">{{ old('description') ?? $area->description ?? '' }}</textarea><br><br>
26 26  
27 27 <label for="coord_X">Коорд. X: </label><br>
28   - <input type="text" class="form-control_ txt" name="coord_X" placeholder="Координаты X"
  28 + <input type="text" class="form-control_ txt" name="coord_x" placeholder="Координаты X"
29 29 required maxlength="100" value="{{ old('coord_x') ?? $area->coord_x ?? '' }}"><br><br>
30 30  
31 31 <label for="coord_Y">Коорд. Y: </label><br>
32   - <input type="text" class="form-control_ txt" name="coord_Y" placeholder="Координаты Y"
  32 + <input type="text" class="form-control_ txt" name="coord_y" placeholder="Координаты Y"
33 33 required maxlength="100" value="{{ old('coord_y') ?? $area->coord_y ?? '' }}"><br><br>
34 34  
35 35  
36 36 <label for="foto_main">Файл-картинка:</label><br>
37 37 @isset($area->foto_main)
38 38 <div class="form-group form-check">
39   - <img src="<?=asset(Storage::url($area->foto_main))?>" width="100px"/>
  39 + <img src="/storage/app/public/<?=$area->foto_main//=asset(Storage::url($area->foto_main))?>" width="100px"/>
40 40 </div>
41 41 @endisset
42 42 <br>
resources/views/admin/company/view.blade.php
Diff comments   View file @ 05d007a
... ... @@ -64,7 +64,7 @@
64 64 <div class="swiper-slide">
65 65 <div class="partners__inner">
66 66 @foreach ($partners as $partner)
67   - <div class="partners-item"><img src="{{ asset(Storage::url($partner->foto)) }}" alt="{{ $partner->name }}" loading="lazy">
  67 + <div class="partners-item"><img src="/storage/app/public/<?=$partner->foto; //asset(Storage::url($partner->foto)) ?>" alt="{{ $partner->name }}" loading="lazy">
68 68 <a href="{{ route('admin.delete.partner', ['partner' => $partner->id]) }}">Удалить партнера</a>
69 69 </div>
70 70 @endforeach
resources/views/admin/houses/form.blade.php
Diff comments   View file @ 05d007a
... ... @@ -113,7 +113,7 @@
113 113  
114 114 @isset($house->foto_main)
115 115 <div class="form-group form-check">
116   - <img src="<?=asset(Storage::url($house->foto_main))?>" width="100px"/>
  116 + <img src="/storage/app/public/<?=$house->foto_main;//=asset(Storage::url($house->foto_main))?>" width="100px"/>
117 117 <input type="checkbox" class="form-check-input" name="remove" id="remove">
118 118 <label class="form-check-label" for="remove">
119 119 Удалить загруженное изображение
... ... @@ -225,7 +225,7 @@
225 225  
226 226 @isset($house->object_plan)
227 227 <div class="form-group form-check">
228   - <img src="<?=asset(Storage::url($house->object_plan))?>" width="100px"/>
  228 + <img src="/storage/app/public/<?=$house->object_plan;//=asset(Storage::url($house->object_plan))?>" width="100px"/>
229 229 </div>
230 230 @endisset
231 231 <br><br>
... ... @@ -235,7 +235,7 @@
235 235  
236 236 @isset($house->floor_plan)
237 237 <div class="form-group form-check">
238   - <img src="<?=asset(Storage::url($house->floor_plan))?>" width="100px"/>
  238 + <img src="/storage/app/public/<?=$house->floor_plan;//=asset(Storage::url($house->floor_plan))?>" width="100px"/>
239 239 </div>
240 240 @endisset
241 241 <br><br>
resources/views/admin/houses/index.blade.php
Diff comments   View file @ 05d007a
... ... @@ -34,7 +34,7 @@
34 34 @if ($houses->count())
35 35 @foreach($houses as $house)
36 36 <tr>
37   - <td><? if (empty($house->foto_main)) {?>Нет фото<?} else {?><img src="<?=asset(Storage::url($house->foto_main))?>" width="100px"/><?}?></td>
  37 + <td><? if (empty($house->foto_main)) {?>Нет фото<?} else {?><img src="/storage/app/public/<?=$house->foto_main;//=asset(Storage::url($house->foto_main))?>" width="100px"/><?}?></td>
38 38 <td>{{ $house->id }}</td>
39 39 <td>{{ $house->title }}</td>
40 40 <td>{{ $house->areas->name_area }}</td>
resources/views/admin/houses/view_img.blade.php
Diff comments   View file @ 05d007a
... ... @@ -33,7 +33,7 @@
33 33 @foreach($house->fotohouse as $img)
34 34 <tr>
35 35 <td><?=$img->id?></td>
36   - <td><img src="<?=asset(Storage::url($img->foto))?>" width="100px"/></td>
  36 + <td><img src="/storage/app/public/<?=$img->foto;//=asset(Storage::url($img->foto))?>" width="100px"/></td>
37 37 <td><a href="{{ route('admin.del.images.houses', ['id'=> $img->id, 'house' => $house->id]) }}">Удалить</a></td>
38 38 </tr>
39 39 @endforeach
resources/views/admin/news/form.blade.php
Diff comments   View file @ 05d007a
... ... @@ -23,7 +23,7 @@
23 23  
24 24 @isset($news->foto)
25 25 <div class="form-group form-check">
26   - <img src="<?=asset(Storage::url($news->foto))?>" width="100px"/>
  26 + <img src="/storage/app/public/<?=$news->foto;//=asset(Storage::url($news->foto))?>" width="100px"/>
27 27 <input type="checkbox" class="form-check-input" name="remove" id="remove">
28 28 <label class="form-check-label" for="remove">
29 29 Удалить загруженное изображение
resources/views/admin/news/index.blade.php
Diff comments   View file @ 05d007a
... ... @@ -32,7 +32,7 @@
32 32 @if ($news->count())
33 33 @foreach($news as $new)
34 34 <tr>
35   - <td><? if (empty($new->foto)) {?>Нет фото<?} else {?><img src="<?=asset(Storage::url($new->foto))?>" width="100px"/><?}?></td>
  35 + <td><? if (empty($new->foto)) {?>Нет фото<?} else {?><img src="/storage/app/public/<?=$new->foto;//=asset(Storage::url($new->foto))?>" width="100px"/><?}?></td>
36 36 <td>{{ $new->id }}</td>
37 37 <td>{{ $new->title }}</td>
38 38 <td>{{ $new->created_at }}</td>
resources/views/admin/news/view.blade.php
Diff comments   View file @ 05d007a
... ... @@ -27,7 +27,7 @@
27 27 <label for="foto">Файл-картинка:</label>
28 28 @isset($news->foto)
29 29 <div class="form-group form-check">
30   - <img src="<?=asset(Storage::url($news->foto))?>" width="100px"/>
  30 + <img src="/storage/app/public/<?=$news->foto;//=asset(Storage::url($news->foto))?>" width="100px"/>
31 31 </div>
32 32 @endisset
33 33 <br><br>
resources/views/catalogs/elemhouse.blade.php
Diff comments   View file @ 05d007a
... ... @@ -4,7 +4,7 @@
4 4 @if (empty($house->foto_main))
5 5  
6 6 @else
7   - <img src="{{ asset(Storage::url($house->foto_main)) }}" alt="{{ $house->title }}" loading="lazy"/>
  7 + <img src="/storage/app/public/<?=$house->foto_main; //asset(Storage::url($house->foto_main)) ?>" alt="{{ $house->title }}" loading="lazy"/>
8 8 @endif;
9 9  
10 10 <h3 class="card__title">{{$house->typearea->name_type }}</h3>
resources/views/catalogs/house_mini.blade.php
Diff comments   View file @ 05d007a
... ... @@ -3,7 +3,7 @@
3 3 @if (empty($house->foto_main))
4 4  
5 5 @else
6   - <img src="{{ asset(Storage::url($house->foto_main)) }}" alt="{{ $house->title }}" loading="lazy"/>
  6 + <img src="/storage/app/public/<?=$house->foto_main; //asset(Storage::url($house->foto_main)) ?>" alt="{{ $house->title }}" loading="lazy"/>
7 7 @endif;
8 8  
9 9 <h3 class="card__title">{{$house->typearea->name_type }}</h3>
resources/views/catalogs/new.blade.php
Diff comments   View file @ 05d007a
... ... @@ -4,7 +4,7 @@
4 4 <? if (empty($new->foto)) {?>
5 5  
6 6 <?} else {?>
7   - <img src="{{ asset(Storage::url($new->foto)) }}" alt="{{ $new->title }}" loading="lazy">
  7 + <img src="/storage/app/public/<?=$new->foto; //asset(Storage::url($new->foto)) ?>" alt="{{ $new->title }}" loading="lazy">
8 8 <? } ?>
9 9 <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>
10 10 </div>
resources/views/house/post.blade.php
Diff comments   View file @ 05d007a
... ... @@ -49,8 +49,8 @@
49 49 <?if (!empty($house->foto_main)) {?>
50 50 <div class="swiper-slide">
51 51 <div class="intro-item">
52   - <div class="intro-item__img"><img src="{{ asset(Storage::url($house->foto_main)) }}" alt=""></div>
53   - <a class="intro-item__btn js_intro_item_btn" href="{{asset(Storage::url($house->foto_main))}}" data-caption="{{ $house->title }}">
  52 + <div class="intro-item__img"><img src="/storage/app/public/<?=$house->foto_main; // asset(Storage::url($house->foto_main)) ?>" alt=""></div>
  53 + <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 }}">
54 54 <svg width="16" height="16">
55 55 <use xlink:href="{{ asset('images/sprite.svg#intro-item-btn') }}"></use>
56 56 </svg></a>
... ... @@ -60,8 +60,8 @@
60 60 @foreach($house->fotohouse as $foto)
61 61 <div class="swiper-slide">
62 62 <div class="intro-item">
63   - <div class="intro-item__img"><img src="{{ asset(Storage::url($foto->foto)) }}" alt=""></div>
64   - <a class="intro-item__btn js_intro_item_btn" href="{{ asset(Storage::url($foto->foto)) }}" data-caption="Фото {{ $foto->id }}">
  63 + <div class="intro-item__img"><img src="/storage/app/public/<?=$foto->foto; //asset(Storage::url($foto->foto)) ?>" alt=""></div>
  64 + <a class="intro-item__btn js_intro_item_btn" href="/storage/app/public/<?=$foto->foto; //asset(Storage::url($foto->foto)) ?>" data-caption="Фото {{ $foto->id }}">
65 65 <svg width="16" height="16">
66 66 <use xlink:href="{{ asset('images/sprite.svg#intro-item-btn') }}"></use>
67 67 </svg></a>
... ... @@ -99,7 +99,7 @@
99 99 <div class="offer-side-item js_offer_side_item active" data-item="1">
100 100 <div class="offer-side-item__img">
101 101 <? if (!empty($house->object_plan)) {?>
102   - <img src="{{ asset(Storage::url($house->object_plan)) }}" alt="План объекта">
  102 + <img src="/storage/app/public/<?=$house->object_plan; //asset(Storage::url($house->object_plan)) ?>" alt="План объекта">
103 103 <? } ?>
104 104 </div>
105 105 <a class="offer-side-item__btn js_offer_side_item_btn" href="#" data-btn="offer-side-popup">
... ... @@ -110,7 +110,7 @@
110 110 <div class="offer-side-item js_offer_side_item" data-item="2">
111 111 <div class="offer-side-item__img">
112 112 <? if (!empty($house->floor_plan)) { ?>
113   - <img src="{{ asset(Storage::url($house->floor_plan)) }}" alt="План этажа">
  113 + <img src="/storage/app/public/<?=$house->floor_plan; //asset(Storage::url($house->floor_plan)) ?>" alt="План этажа">
114 114 <? }?>
115 115 </div>
116 116 <a class="offer-side-item__btn js_offer_side_item_btn" href="#" data-btn="offer-side-popup">
... ... @@ -131,12 +131,12 @@
131 131 <div class="offer-side-popup__cnt">
132 132 <div class="offer-side-popup__item js_offer_side_popup_item active" data-item="1">
133 133 <? if (!empty($house->object_plan)) {?>
134   - <img src="{{ asset(Storage::url($house->object_plan)) }}" alt="План объекта">
  134 + <img src="/storage/app/public/<?=$house->object_plan; //asset(Storage::url($house->object_plan)) ?>" alt="План объекта">
135 135 <? } ?>
136 136 </div>
137 137 <div class="offer-side-popup__item js_offer_side_popup_item" data-item="2">
138 138 <? if (!empty($house->floor_plan)) { ?>
139   - <img src="{{ asset(Storage::url($house->floor_plan)) }}" alt="План этажа">
  139 + <img src="/storage/app/public/<?=$house->floor_plan; //asset(Storage::url($house->floor_plan)) ?>" alt="План этажа">
140 140 <? }?>
141 141 </div>
142 142 </div>
... ... @@ -170,7 +170,7 @@
170 170 </svg></span></a><a class="offer-side__btn btn btn--main" href="tel:{{ $items_contact[0]->telephone }}"><span>Позвонить
171 171 <svg width="22" height="22">
172 172 <use xlink:href="{{ asset('images/sprite.svg#intro-link-phone') }}"></use>
173   - </svg></span></a></div><a class="offer-side__download" href="{{ $house->present }}" download><span>Скачать презентацию
  173 + </svg></span></a></div><a class="offer-side__download" href="/storage/app/public/{{ $house->present }}" download><span>Скачать презентацию
174 174 <svg width="60" height="60">
175 175 <use xlink:href="{{ asset('images/sprite.svg#offer-side-download') }}"></use>
176 176 </svg></span></a>
resources/views/layout/admin.blade.php
Diff comments   View file @ 05d007a
... ... @@ -387,28 +387,8 @@
387 387 <div class="contact-us-social__name">WhatsApp</div></a></div>
388 388 </div>
389 389 </div>
390   -<div class="offer-side-popup" data-popup="offer-side-popup">
391   - <div class="offer-side-popup__wrap">
392   - <button class="offer-side-popup__close js_popup_close" type="button">
393   - <svg width="20" height="20">
394   - <use xlink:href="{{ asset('images/sprite.svg#popup-close')}}"></use>
395   - </svg>
396   - </button>
397   - <div class="offer-side-popup__cnt">
398   - <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>
399   - <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>
400   - </div>
401   - <div class="offer-side-popup__tabs">
402   - <button class="offer-side-popup__tab js_offer_side_popup_tab active" type="button" data-tab="1">План объекта</button>
403   - <button class="offer-side-popup__tab js_offer_side_popup_tab" type="button" data-tab="2">План этажа</button>
404   - </div>
405   - <button class="offer-side-popup__sizeoff js_popup_close" type="button">
406   - <svg width="18" height="18">
407   - <use xlink:href="{{ asset('images/sprite.svg#popup-sizeoff')}}"></use>
408   - </svg>
409   - </button>
410   - </div>
411   -</div>
  390 +
  391 +
412 392 <div class="img-viewer js_img_viewer">
413 393 <div class="img-viewer__wrap">
414 394 <button class="img-viewer__close js_img_viewer_close" type="button">