From 78d8a90e7bdaa2a8891ce214a3bae42a8cf8100f Mon Sep 17 00:00:00 2001 From: A1Gard Date: Tue, 20 Aug 2024 05:52:28 +0330 Subject: [PATCH] added default header optimized area and part seeder --- app/Http/Controllers/Admin/AreaController.php | 7 + .../2024_07_04_050212_create_areas_table.php | 1 + database/seeders/AreaSeeder.php | 33 +++- database/seeders/PartSeeder.php | 157 ++++++++++++------ resources/js/client.js | 22 +-- resources/sass/client.scss | 22 +-- .../views/admin/areas/area-design.blade.php | 10 ++ resources/views/client/category.blade.php | 20 ++- resources/views/client/default-list.blade.php | 20 ++- resources/views/client/gallery.blade.php | 20 ++- resources/views/client/group.blade.php | 20 ++- resources/views/client/post.blade.php | 16 +- resources/views/client/welcome.blade.php | 20 ++- .../segments/menu/RecetMenu/RecetMenu.scss | 1 - .../GridPostList/GridPostList.blade.php | 2 + .../GridPostListSidebar.blade.php | 2 + .../SimplePostList/SimplePostList.blade.php | 2 + .../SimplePostListSideBar.blade.php | 36 ++-- .../ParallaxSlider/ParallaxSlider.blade.php | 4 +- .../slider/ParallaxSlider/ParallaxSlider.scss | 5 + 20 files changed, 300 insertions(+), 120 deletions(-) diff --git a/app/Http/Controllers/Admin/AreaController.php b/app/Http/Controllers/Admin/AreaController.php index ec3a3c5..6d7ba1e 100644 --- a/app/Http/Controllers/Admin/AreaController.php +++ b/app/Http/Controllers/Admin/AreaController.php @@ -20,6 +20,8 @@ class AreaController extends Controller public function desgin(Area $area) { + + $valids = []; foreach ($area->segment as $seg) { if (File::exists(resource_path() . '/views/segments/' . $seg)) { @@ -80,6 +82,11 @@ class AreaController extends Controller logAdmin(__METHOD__, __CLASS__, $area->id); + if ($request->has('use_default')){ + $area->use_default = 1; + $area->save(); + } + return redirect()->back()->with(['message' => __('area :NAME of website updated', ['NAME' => $area->name])]); } diff --git a/database/migrations/2024_07_04_050212_create_areas_table.php b/database/migrations/2024_07_04_050212_create_areas_table.php index 2677a58..161657d 100644 --- a/database/migrations/2024_07_04_050212_create_areas_table.php +++ b/database/migrations/2024_07_04_050212_create_areas_table.php @@ -18,6 +18,7 @@ return new class extends Migration $table->string('icon')->nullable(); $table->json('valid_segments'); $table->string('preview')->nullable(); + $table->boolean('use_default')->default(true); $table->timestamps(); }); } diff --git a/database/seeders/AreaSeeder.php b/database/seeders/AreaSeeder.php index 4c2fa01..12c0013 100644 --- a/database/seeders/AreaSeeder.php +++ b/database/seeders/AreaSeeder.php @@ -33,6 +33,24 @@ class AreaSeeder extends Seeder 'preview' => null, 'icon' => 'ri-ai-generate', ], + [ + 'name' => 'default_header', + 'valid_segments' => json_encode( + ["top", "header", "other", "ads", "menu"] + ), + 'max' => 2, + 'preview' => null, + 'icon' => 'ri-window-line', + ], + [ + 'name' => 'default_footer', + 'valid_segments' => json_encode( + ["footer", "other", "ads" , "groups"] + ), + 'max' => 2, + 'preview' => null, + 'icon' => 'ri-window-line rotate-180', + ], [ 'name' => 'index', 'valid_segments' => json_encode( @@ -71,7 +89,7 @@ class AreaSeeder extends Seeder "parallax", "other", "clip", "comments", "ads", "attachments"] ), 'max' => 6, - 'preview' => null, + 'preview' => null, 'icon' => 'ri-video-line', ], [ @@ -91,7 +109,7 @@ class AreaSeeder extends Seeder "parallax", "other", "gallery", "comments", "ads", "attachments"] ), 'max' => 6, - 'preview' => null, + 'preview' => null, 'icon' => 'ri-image-line', ], [ @@ -111,7 +129,7 @@ class AreaSeeder extends Seeder "parallax", "other", "product", "comments", "ads", "attachments"] ), 'max' => 6, - 'preview' => null, + 'preview' => null, 'icon' => 'ri-vip-diamond-line', ], [ @@ -131,7 +149,7 @@ class AreaSeeder extends Seeder "parallax", "other", "attachment", "comments", "ads"] ), 'max' => 6, - 'preview' => null, + 'preview' => null, 'icon' => 'ri-attachment-line', ], [ @@ -171,7 +189,7 @@ class AreaSeeder extends Seeder "parallax", "other", "group", "ads", 'posts_page', "attachments"] ), 'max' => 6, - 'preview' => null, + 'preview' => null, 'icon' => 'ri-book-shelf-line', ], // [ @@ -201,7 +219,7 @@ class AreaSeeder extends Seeder "parallax", "other", "login", "ads"] ), 'max' => 6, - 'preview' => 'client.login', + 'preview' => 'client.sign-in', 'icon' => 'ri-login-circle-line', ], [ @@ -252,6 +270,9 @@ class AreaSeeder extends Seeder $a->valid_segments = $area['valid_segments']; $a->icon = $area['icon']; $a->preview = $area['preview']; + if ($area['name'] == 'index'){ + $a->use_default = false; + } $a->save(); } } diff --git a/database/seeders/PartSeeder.php b/database/seeders/PartSeeder.php index fa7b561..364aa7e 100644 --- a/database/seeders/PartSeeder.php +++ b/database/seeders/PartSeeder.php @@ -83,37 +83,43 @@ class PartSeeder extends Seeder // ------------------------------------------------------------- - + // default header and footer $part = new Part(); - $part->segment = 'header'; - $part->part = 'SimpleHeader'; - $part->area_id = Area::where('name', 'card')->first()->id; + $part->segment = 'menu'; + $part->part = 'AplMenu'; + $part->area_id = Area::where('name', 'index')->first()->id; $part->sort = 0; $part->save(); + $part = new Part(); - $part->segment = 'card'; - $part->part = 'NsCard'; - $part->area_id = Area::where('name', 'card')->first()->id; - $part->sort = 1; + $part->segment = 'header'; + $part->part = 'SimpleHeader'; + $part->area_id = Area::where('name', 'default_header')->first()->id; + $part->sort = 0; $part->save(); $part = new Part(); $part->segment = 'footer'; $part->part = 'WaveFooter'; - $part->area_id = Area::where('name', 'card')->first()->id; + $part->area_id = Area::where('name', 'default_footer')->first()->id; $part->sort = 2; $part->save(); // ------------------------------------------------------------- $part = new Part(); - $part->segment = 'header'; - $part->part = 'SimpleHeader'; - $part->area_id = Area::where('name', 'products-list')->first()->id; - $part->sort = 0; + $part->segment = 'card'; + $part->part = 'NsCard'; + $part->area_id = Area::where('name', 'card')->first()->id; + $part->sort = 1; $part->save(); + // ------------------------------------------------------------- + + + + $part = new Part(); $part->segment = 'products_page'; $part->part = 'ProductGridSidebar'; @@ -121,23 +127,12 @@ class PartSeeder extends Seeder $part->sort = 1; $part->save(); - $part = new Part(); - $part->segment = 'footer'; - $part->part = 'WaveFooter'; - $part->area_id = Area::where('name', 'products-list')->first()->id; - $part->sort = 2; - $part->save(); + // ------------------------------------------------------------- - $part = new Part(); - $part->segment = 'header'; - $part->part = 'SimpleHeader'; - $part->area_id = Area::where('name', 'product')->first()->id; - $part->sort = 0; - $part->save(); $part = new Part(); $part->segment = 'product'; @@ -146,60 +141,120 @@ class PartSeeder extends Seeder $part->sort = 1; $part->save(); + + + // ------------------------------------------------------------- + + + $part = new Part(); - $part->segment = 'footer'; - $part->part = 'WaveFooter'; - $part->area_id = Area::where('name', 'product')->first()->id; - $part->sort = 2; + $part->segment = 'posts_page'; + $part->part = 'GridPostListSidebar'; + $part->area_id = Area::where('name', 'posts-list')->first()->id; + $part->sort = 1; $part->save(); + // ------------------------------------------------------------- + + $part = new Part(); - $part->segment = 'header'; - $part->part = 'SimpleHeader'; - $part->area_id = Area::where('name', 'posts-list')->first()->id; - $part->sort = 0; + $part->segment = 'post'; + $part->part = 'PostSidebar'; + $part->area_id = Area::where('name', 'post')->first()->id; + $part->sort = 1; $part->save(); + + + // ------------------------------------------------------------- + + $part = new Part(); - $part->segment = 'posts_page'; - $part->part = 'GridPostListSidebar'; - $part->area_id = Area::where('name', 'posts-list')->first()->id; + $part->segment = 'clips_page'; + $part->part = 'ClipListGrid'; + $part->area_id = Area::where('name', 'clips-list')->first()->id; $part->sort = 1; $part->save(); + // ------------------------------------------------------------- + $part = new Part(); - $part->segment = 'footer'; - $part->part = 'WaveFooter'; - $part->area_id = Area::where('name', 'posts-list')->first()->id; - $part->sort = 2; + $part->segment = 'clip'; + $part->part = 'DorClip'; + $part->area_id = Area::where('name', 'clip')->first()->id; + $part->sort = 1; $part->save(); // ------------------------------------------------------------- + $part = new Part(); + $part->segment = 'galleries_page'; + $part->part = 'GalleriesList'; + $part->area_id = Area::where('name', 'galleries-list')->first()->id; + $part->sort = 1; + $part->save(); + + + + // ------------------------------------------------------------- $part = new Part(); - $part->segment = 'header'; - $part->part = 'SimpleHeader'; - $part->area_id = Area::where('name', 'post')->first()->id; - $part->sort = 0; + $part->segment = 'gallery'; + $part->part = 'GallaryGrid'; + $part->area_id = Area::where('name', 'gallery')->first()->id; + $part->sort = 1; $part->save(); + + + // ------------------------------------------------------------- + $part = new Part(); - $part->segment = 'post'; - $part->part = 'PostSidebar'; - $part->area_id = Area::where('name', 'post')->first()->id; + $part->segment = 'compare'; + $part->part = 'CompareProducts'; + $part->area_id = Area::where('name', 'compare')->first()->id; $part->sort = 1; $part->save(); + + // ------------------------------------------------------------- + $part = new Part(); - $part->segment = 'footer'; - $part->part = 'WaveFooter'; - $part->area_id = Area::where('name', 'post')->first()->id; - $part->sort = 2; + $part->segment = 'login'; + $part->part = 'LoginPatternBg'; + $part->area_id = Area::where('name', 'login')->first()->id; + $part->sort = 1; + $part->save(); + + // ------------------------------------------------------------- + + $part = new Part(); + $part->segment = 'customer'; + $part->part = 'AvisaCustomer'; + $part->area_id = Area::where('name', 'customer')->first()->id; + $part->sort = 1; + $part->save(); + + // ------------------------------------------------------------- + + $part = new Part(); + $part->segment = 'attachments_page'; + $part->part = 'DenaAttachList'; + $part->area_id = Area::where('name', 'attachments-list')->first()->id; + $part->sort = 1; + $part->save(); + + // ------------------------------------------------------------- + + $part = new Part(); + $part->segment = 'attachment'; + $part->part = 'AttachmentWithPreview'; + $part->area_id = Area::where('name', 'attachment')->first()->id; + $part->sort = 1; $part->save(); diff --git a/resources/js/client.js b/resources/js/client.js index 082c06e..cbdbc41 100644 --- a/resources/js/client.js +++ b/resources/js/client.js @@ -14,24 +14,26 @@ import "./client-custom/windowLoader.js"; import "../views/segments/preloader/PreloaderCircle/PreloaderCircle.js"; import "../views/segments/menu/RecetMenu/RecetMenu.js"; import "../views/segments/slider/SliderSimple/SliderSimple.js"; +import "../views/segments/products/LatestProducts/LatestProducts.js"; import "../views/segments/posts/PostsIconSimple/PostsIconSimple.js"; import "../views/segments/index/CounterGrid/CounterGrid.js"; import "../views/segments/categories/CategoriesFavImageLinks/CategoriesFavImageLinks.js"; import "../views/segments/posts/PostIndexImage/PostIndexImage.js"; import "../views/segments/footer/WaveFooter/WaveFooter.js"; +import "../views/segments/menu/AplMenu/AplMenu.js"; import "../views/segments/header/SimpleHeader/SimpleHeader.js"; -import "../views/segments/card/NsCard/NsCard.js"; import "../views/segments/footer/WaveFooter/WaveFooter.js"; -import "../views/segments/header/SimpleHeader/SimpleHeader.js"; +import "../views/segments/card/NsCard/NsCard.js"; import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar.js"; -import "../views/segments/footer/WaveFooter/WaveFooter.js"; -import "../views/segments/header/SimpleHeader/SimpleHeader.js"; import "../views/segments/product/ProductKaren/ProductKaren.js"; -import "../views/segments/footer/WaveFooter/WaveFooter.js"; -import "../views/segments/header/SimpleHeader/SimpleHeader.js"; import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js"; -import "../views/segments/footer/WaveFooter/WaveFooter.js"; -import "../views/segments/header/SimpleHeader/SimpleHeader.js"; import "../views/segments/post/PostSidebar/PostSidebar.js"; -import "../views/segments/footer/WaveFooter/WaveFooter.js"; -import "../views/segments/products/LatestProducts/LatestProducts.js"; +import "../views/segments/clips_page/ClipListGrid/ClipListGrid.js"; +import "../views/segments/clip/DorClip/DorClip.js"; +import "../views/segments/galleries_page/GalleriesList/GalleriesList.js"; +import "../views/segments/gallery/GallaryGrid/GallaryGrid.js"; +import "../views/segments/compare/CompareProducts/CompareProducts.js"; +import "../views/segments/login/LoginPatternBg/LoginPatternBg.js"; +import "../views/segments/customer/AvisaCustomer/AvisaCustomer.js"; +import "../views/segments/attachments_page/DenaAttachList/DenaAttachList.js"; +import "../views/segments/attachment/AttachmentWithPreview/AttachmentWithPreview.js"; diff --git a/resources/sass/client.scss b/resources/sass/client.scss index a56f232..ed562ca 100644 --- a/resources/sass/client.scss +++ b/resources/sass/client.scss @@ -25,24 +25,26 @@ $xshop-shadow:2px 2px 4px #777777; @import "../views/segments/preloader/PreloaderCircle/PreloaderCircle"; @import "../views/segments/menu/RecetMenu/RecetMenu"; @import "../views/segments/slider/SliderSimple/SliderSimple"; +@import "../views/segments/products/LatestProducts/LatestProducts"; @import "../views/segments/posts/PostsIconSimple/PostsIconSimple"; @import "../views/segments/index/CounterGrid/CounterGrid"; @import "../views/segments/categories/CategoriesFavImageLinks/CategoriesFavImageLinks"; @import "../views/segments/posts/PostIndexImage/PostIndexImage"; @import "../views/segments/footer/WaveFooter/WaveFooter"; +@import "../views/segments/menu/AplMenu/AplMenu"; @import "../views/segments/header/SimpleHeader/SimpleHeader"; -@import "../views/segments/card/NsCard/NsCard"; @import "../views/segments/footer/WaveFooter/WaveFooter"; -@import "../views/segments/header/SimpleHeader/SimpleHeader"; +@import "../views/segments/card/NsCard/NsCard"; @import "../views/segments/products_page/ProductGridSidebar/ProductGridSidebar"; -@import "../views/segments/footer/WaveFooter/WaveFooter"; -@import "../views/segments/header/SimpleHeader/SimpleHeader"; @import "../views/segments/product/ProductKaren/ProductKaren"; -@import "../views/segments/footer/WaveFooter/WaveFooter"; -@import "../views/segments/header/SimpleHeader/SimpleHeader"; @import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar"; -@import "../views/segments/footer/WaveFooter/WaveFooter"; -@import "../views/segments/header/SimpleHeader/SimpleHeader"; @import "../views/segments/post/PostSidebar/PostSidebar"; -@import "../views/segments/footer/WaveFooter/WaveFooter"; -@import "../views/segments/products/LatestProducts/LatestProducts"; +@import "../views/segments/clips_page/ClipListGrid/ClipListGrid"; +@import "../views/segments/clip/DorClip/DorClip"; +@import "../views/segments/galleries_page/GalleriesList/GalleriesList"; +@import "../views/segments/gallery/GallaryGrid/GallaryGrid"; +@import "../views/segments/compare/CompareProducts/CompareProducts"; +@import "../views/segments/login/LoginPatternBg/LoginPatternBg"; +@import "../views/segments/customer/AvisaCustomer/AvisaCustomer"; +@import "../views/segments/attachments_page/DenaAttachList/DenaAttachList"; +@import "../views/segments/attachment/AttachmentWithPreview/AttachmentWithPreview"; diff --git a/resources/views/admin/areas/area-design.blade.php b/resources/views/admin/areas/area-design.blade.php index 2e34936..71e3347 100644 --- a/resources/views/admin/areas/area-design.blade.php +++ b/resources/views/admin/areas/area-design.blade.php @@ -14,6 +14,16 @@ {{__("Design :AREA",['AREA' => $area->name])}} + @if(strpos($area->name,'default') !== 0 ) + +
+ +
+ use_default) checked @endif type="checkbox" id="use_default"> + +
+
+ @endif get())' diff --git a/resources/views/client/category.blade.php b/resources/views/client/category.blade.php index 458e0d4..c19c860 100644 --- a/resources/views/client/category.blade.php +++ b/resources/views/client/category.blade.php @@ -10,9 +10,21 @@ if ($category->bg != null){ @endphp @section('content')
- @foreach(getParts($area) as $part) - @php($p = $part->getBladeWithData()) - @include($p['blade'],['data' => $p['data']]) - @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_header') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif + @foreach(getParts($area) as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_footer') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif
@endsection diff --git a/resources/views/client/default-list.blade.php b/resources/views/client/default-list.blade.php index e31f1c2..887eea9 100644 --- a/resources/views/client/default-list.blade.php +++ b/resources/views/client/default-list.blade.php @@ -5,9 +5,21 @@ @endsection @section('content')
- @foreach(getParts($area) as $part) - @php($p = $part->getBladeWithData()) - @include($p['blade'],['data' => $p['data']]) - @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_header') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif + @foreach(getParts($area) as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_footer') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif
@endsection diff --git a/resources/views/client/gallery.blade.php b/resources/views/client/gallery.blade.php index b5536e2..610fc06 100644 --- a/resources/views/client/gallery.blade.php +++ b/resources/views/client/gallery.blade.php @@ -5,9 +5,21 @@ @endsection @section('content')
- @foreach(getParts($area) as $part) - @php($p = $part->getBladeWithData($gallery)) - @include($p['blade'],['data' => $p['data']]) - @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_header') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif + @foreach(getParts($area) as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_footer') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif
@endsection diff --git a/resources/views/client/group.blade.php b/resources/views/client/group.blade.php index a181eb5..52a42d8 100644 --- a/resources/views/client/group.blade.php +++ b/resources/views/client/group.blade.php @@ -10,9 +10,21 @@ if ($group->bg != null){ @endphp @section('content')
- @foreach(getParts($area) as $part) - @php($p = $part->getBladeWithData()) - @include($p['blade'],['data' => $p['data']]) - @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_header') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif + @foreach(getParts($area) as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_footer') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif
@endsection diff --git a/resources/views/client/post.blade.php b/resources/views/client/post.blade.php index 81b78e0..7f1e2bc 100644 --- a/resources/views/client/post.blade.php +++ b/resources/views/client/post.blade.php @@ -5,10 +5,20 @@ {{$post->title}} - {{config('app.name')}} @endsection @section('content') -
+ @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_header') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif @foreach(getParts($area) as $part) - @php($p = $part->getBladeWithData($post)) + @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach -
+ @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_footer') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif @endsection diff --git a/resources/views/client/welcome.blade.php b/resources/views/client/welcome.blade.php index d35ed59..376aa96 100644 --- a/resources/views/client/welcome.blade.php +++ b/resources/views/client/welcome.blade.php @@ -5,9 +5,21 @@ @endsection @section('content')
- @foreach(getParts($area) as $part) - @php($p = $part->getBladeWithData()) - @include($p['blade'],['data' => $p['data']]) - @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_header') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif + @foreach(getParts($area) as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @if(\App\Models\Area::where('name',$area)->first()->use_default) + @foreach(getParts('default_footer') as $part) + @php($p = $part->getBladeWithData()) + @include($p['blade'],['data' => $p['data']]) + @endforeach + @endif
@endsection diff --git a/resources/views/segments/menu/RecetMenu/RecetMenu.scss b/resources/views/segments/menu/RecetMenu/RecetMenu.scss index 93f18ed..58dc2a8 100644 --- a/resources/views/segments/menu/RecetMenu/RecetMenu.scss +++ b/resources/views/segments/menu/RecetMenu/RecetMenu.scss @@ -1,5 +1,4 @@ #RecetMenu { - // scss position: fixed; inset-inline-start: 1rem; inset-inline-end: 1rem; diff --git a/resources/views/segments/posts_page/GridPostList/GridPostList.blade.php b/resources/views/segments/posts_page/GridPostList/GridPostList.blade.php index 71bba0d..52a5775 100644 --- a/resources/views/segments/posts_page/GridPostList/GridPostList.blade.php +++ b/resources/views/segments/posts_page/GridPostList/GridPostList.blade.php @@ -1,5 +1,6 @@
+ @if(\App\Models\Post::where('status',1)->where('is_pinned',1)->count() < 0 )
@foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post)
@@ -24,6 +25,7 @@ @endforeach

+ @endif
diff --git a/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.blade.php b/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.blade.php index 75b5861..49c79e2 100644 --- a/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.blade.php +++ b/resources/views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.blade.php @@ -1,5 +1,6 @@
+ @if(\App\Models\Post::where('status',1)->where('is_pinned',1)->count() < 0 )
@foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post)
@@ -24,6 +25,7 @@ @endforeach

+ @endif
@if(!getSetting($data->area->name.'_'.$data->part.'_invert'))
diff --git a/resources/views/segments/posts_page/SimplePostList/SimplePostList.blade.php b/resources/views/segments/posts_page/SimplePostList/SimplePostList.blade.php index f3c4093..c4b0ec3 100644 --- a/resources/views/segments/posts_page/SimplePostList/SimplePostList.blade.php +++ b/resources/views/segments/posts_page/SimplePostList/SimplePostList.blade.php @@ -1,5 +1,6 @@
+ @if(\App\Models\Post::where('status',1)->where('is_pinned',1)->count() < 0 )
@foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post)
@@ -24,6 +25,7 @@ @endforeach

+ @endif @foreach($posts as $post)
{{$post->title}} diff --git a/resources/views/segments/posts_page/SimplePostListSideBar/SimplePostListSideBar.blade.php b/resources/views/segments/posts_page/SimplePostListSideBar/SimplePostListSideBar.blade.php index cc2f27c..de47d18 100644 --- a/resources/views/segments/posts_page/SimplePostListSideBar/SimplePostListSideBar.blade.php +++ b/resources/views/segments/posts_page/SimplePostListSideBar/SimplePostListSideBar.blade.php @@ -1,27 +1,29 @@
- @foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post) -
-
-
- {{$post->mainGroup->name}} -
- - {{$post->title}} - -
-

- {{$post->title}} -

- + @if(\App\Models\Post::where('status',1)->where('is_pinned',1)->count() < 0 ) + @foreach(\App\Models\Post::where('status',1)->where('is_pinned',1)->limit(2)->get() as $post) +
+
+
+ {{$post->mainGroup->name}} +
+ + {{$post->title}} + +
+

+ {{$post->title}} +

+ {{$post->created_at->ldate('Y/m/d l')}} +
-
- @endforeach + @endforeach + @endif

diff --git a/resources/views/segments/slider/ParallaxSlider/ParallaxSlider.blade.php b/resources/views/segments/slider/ParallaxSlider/ParallaxSlider.blade.php index c115265..a3a311d 100644 --- a/resources/views/segments/slider/ParallaxSlider/ParallaxSlider.blade.php +++ b/resources/views/segments/slider/ParallaxSlider/ParallaxSlider.blade.php @@ -4,14 +4,14 @@
-
+
{!! $slider->body !!}

{{$slider->dataz['index_ParallaxSlider_subtitle']}}
+ href="{{fixUrlLang($slider->dataz['index_ParallaxSlider_link'])}}"> {{$slider->dataz['index_ParallaxSlider_btn']}}

diff --git a/resources/views/segments/slider/ParallaxSlider/ParallaxSlider.scss b/resources/views/segments/slider/ParallaxSlider/ParallaxSlider.scss index ae64ba6..dd0211d 100644 --- a/resources/views/segments/slider/ParallaxSlider/ParallaxSlider.scss +++ b/resources/views/segments/slider/ParallaxSlider/ParallaxSlider.scss @@ -1,5 +1,10 @@ #ParallaxSlider { + .tns-inner{ + direction: ltr; + } + + #ParallaxSliderTns > div{ position: relative; overflow: hidden;