diff --git a/database/seeders/AreaSeeder.php b/database/seeders/AreaSeeder.php index 9e193adf..60ca89d6 100644 --- a/database/seeders/AreaSeeder.php +++ b/database/seeders/AreaSeeder.php @@ -34,7 +34,7 @@ public function run(): void 'icon' => 'ri-ai-generate', ], [ - 'name' => 'default_header', + 'name' => 'defaultHeader', 'valid_segments' => json_encode( ["top", "header", "other", "ads", "menu"] ), @@ -43,7 +43,7 @@ public function run(): void 'icon' => 'ri-window-line', ], [ - 'name' => 'default_footer', + 'name' => 'defaultFooter', 'valid_segments' => json_encode( ["footer", "other", "ads", "groups"] ), diff --git a/database/seeders/PartSeeder.php b/database/seeders/PartSeeder.php index fad5cfdd..04dbe7a8 100644 --- a/database/seeders/PartSeeder.php +++ b/database/seeders/PartSeeder.php @@ -87,7 +87,7 @@ public function run(): void $part = new Part(); $part->segment = 'menu'; $part->part = 'AplMenu'; - $part->area_id = Area::where('name', 'default_header')->first()->id; + $part->area_id = Area::where('name', 'defaultHeader')->first()->id; $part->sort = 0; $part->save(); @@ -95,14 +95,14 @@ public function run(): void $part = new Part(); $part->segment = 'header'; $part->part = 'SimpleHeader'; - $part->area_id = Area::where('name', 'default_header')->first()->id; + $part->area_id = Area::where('name', 'defaultHeader')->first()->id; $part->sort = 0; $part->save(); $part = new Part(); $part->segment = 'footer'; $part->part = 'WaveFooter'; - $part->area_id = Area::where('name', 'default_footer')->first()->id; + $part->area_id = Area::where('name', 'defaultFooter')->first()->id; $part->sort = 2; $part->save(); diff --git a/resources/js/client.js b/resources/js/client.js index 819f865d..d09fc3a0 100644 --- a/resources/js/client.js +++ b/resources/js/client.js @@ -29,6 +29,7 @@ import "../views/segments/product/ProductKaren/ProductKaren.js"; import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js"; import "../views/segments/post/PostSidebar/PostSidebar.js"; import "../views/segments/clips_page/ClipListGrid/ClipListGrid.js"; +import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js"; import "../views/segments/invoice/LianaInvoice/LianaInvoice.js"; import "../views/segments/clip/DorClip/DorClip.js"; import "../views/segments/galleries_page/GalleriesList/GalleriesList.js"; @@ -39,4 +40,3 @@ import "../views/segments/customer/AvisaCustomer/AvisaCustomer.js"; import "../views/segments/attachments_page/DenaAttachList/DenaAttachList.js"; import "../views/segments/attachment/AttachmentWithPreview/AttachmentWithPreview.js"; import "../views/segments/contact/MeloContact/MeloContact.js"; -import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar.js"; diff --git a/resources/lang/fa.json b/resources/lang/fa.json index c2320076..ad891eef 100644 --- a/resources/lang/fa.json +++ b/resources/lang/fa.json @@ -145,8 +145,8 @@ "Datetime": "تاریخ و زمان", "Deattach": "عدم پیوست", "Default": "پیش‌فرض", - "Default footer": "هدر پیش‌فرض", - "Default header": "فوتر پیش‌فرض", + "DefaultFooter": "فوتر پیش‌فرض", + "DefaultHeader": "هدر پیش‌فرض", "Description": "توضیحات", "Description Table": "جدول توضیحات", "Description Text": "نوشته توضیحات", diff --git a/resources/sass/client.scss b/resources/sass/client.scss index cfbb4246..ad0632ad 100644 --- a/resources/sass/client.scss +++ b/resources/sass/client.scss @@ -40,6 +40,7 @@ $xshop-shadow:2px 2px 4px #777777; @import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar"; @import "../views/segments/post/PostSidebar/PostSidebar"; @import "../views/segments/clips_page/ClipListGrid/ClipListGrid"; +@import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar"; @import "../views/segments/invoice/LianaInvoice/LianaInvoice"; @import "../views/segments/clip/DorClip/DorClip"; @import "../views/segments/galleries_page/GalleriesList/GalleriesList"; @@ -50,4 +51,3 @@ $xshop-shadow:2px 2px 4px #777777; @import "../views/segments/attachments_page/DenaAttachList/DenaAttachList"; @import "../views/segments/attachment/AttachmentWithPreview/AttachmentWithPreview"; @import "../views/segments/contact/MeloContact/MeloContact"; -@import "../views/segments/posts_page/GridPostListSidebar/GridPostListSidebar"; diff --git a/resources/views/client/category.blade.php b/resources/views/client/category.blade.php index c19c8603..4acce892 100644 --- a/resources/views/client/category.blade.php +++ b/resources/views/client/category.blade.php @@ -11,7 +11,7 @@ @section('content')
@if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_header') as $part) + @foreach(getParts('defaultHeader') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach @@ -21,7 +21,7 @@ @include($p['blade'],['data' => $p['data']]) @endforeach @if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_footer') as $part) + @foreach(getParts('defaultFooter') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach diff --git a/resources/views/client/default-list.blade.php b/resources/views/client/default-list.blade.php index 887eea9d..b14a7b8a 100644 --- a/resources/views/client/default-list.blade.php +++ b/resources/views/client/default-list.blade.php @@ -6,7 +6,7 @@ @section('content')
@if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_header') as $part) + @foreach(getParts('defaultHeader') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach @@ -16,7 +16,7 @@ @include($p['blade'],['data' => $p['data']]) @endforeach @if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_footer') as $part) + @foreach(getParts('defaultFooter') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach diff --git a/resources/views/client/gallery.blade.php b/resources/views/client/gallery.blade.php index 610fc065..5e07c271 100644 --- a/resources/views/client/gallery.blade.php +++ b/resources/views/client/gallery.blade.php @@ -6,7 +6,7 @@ @section('content')
@if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_header') as $part) + @foreach(getParts('defaultHeader') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach @@ -16,7 +16,7 @@ @include($p['blade'],['data' => $p['data']]) @endforeach @if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_footer') as $part) + @foreach(getParts('defaultFooter') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach diff --git a/resources/views/client/group.blade.php b/resources/views/client/group.blade.php index 52a42d8b..e6a270be 100644 --- a/resources/views/client/group.blade.php +++ b/resources/views/client/group.blade.php @@ -11,7 +11,7 @@ @section('content')
@if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_header') as $part) + @foreach(getParts('defaultHeader') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach @@ -21,7 +21,7 @@ @include($p['blade'],['data' => $p['data']]) @endforeach @if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_footer') as $part) + @foreach(getParts('defaultFooter') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach diff --git a/resources/views/client/invoice.blade.php b/resources/views/client/invoice.blade.php index a7464813..e7984c43 100644 --- a/resources/views/client/invoice.blade.php +++ b/resources/views/client/invoice.blade.php @@ -7,7 +7,7 @@
@if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_header') as $part) + @foreach(getParts('defaultHeader') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach @@ -19,7 +19,7 @@ @endforeach
@if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_footer') as $part) + @foreach(getParts('defaultFooter') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach diff --git a/resources/views/client/post.blade.php b/resources/views/client/post.blade.php index 7f1e2bc7..c528bb50 100644 --- a/resources/views/client/post.blade.php +++ b/resources/views/client/post.blade.php @@ -6,7 +6,7 @@ @endsection @section('content') @if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_header') as $part) + @foreach(getParts('defaultHeader') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach @@ -16,7 +16,7 @@ @include($p['blade'],['data' => $p['data']]) @endforeach @if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_footer') as $part) + @foreach(getParts('defaultFooter') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach diff --git a/resources/views/client/tag.blade.php b/resources/views/client/tag.blade.php index deceed24..4aecd104 100644 --- a/resources/views/client/tag.blade.php +++ b/resources/views/client/tag.blade.php @@ -4,7 +4,7 @@ {{$title}} - {{config('app.name')}} @endsection @section('content') - @foreach(getParts('default_header') as $part) + @foreach(getParts('defaultHeader') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach @@ -94,7 +94,7 @@
- @foreach(getParts('default_footer') as $part) + @foreach(getParts('defaultFooter') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach diff --git a/resources/views/client/welcome.blade.php b/resources/views/client/welcome.blade.php index 376aa961..8d8cf1d8 100644 --- a/resources/views/client/welcome.blade.php +++ b/resources/views/client/welcome.blade.php @@ -6,7 +6,7 @@ @section('content')
@if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_header') as $part) + @foreach(getParts('defaultHeader') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach @@ -16,7 +16,7 @@ @include($p['blade'],['data' => $p['data']]) @endforeach @if(\App\Models\Area::where('name',$area)->first()->use_default) - @foreach(getParts('default_footer') as $part) + @foreach(getParts('defaultFooter') as $part) @php($p = $part->getBladeWithData()) @include($p['blade'],['data' => $p['data']]) @endforeach diff --git a/resources/views/segments/header/ParallaxHeader/ParallaxHeader.blade.php b/resources/views/segments/header/ParallaxHeader/ParallaxHeader.blade.php index 72e0ff24..1c7fe3ce 100644 --- a/resources/views/segments/header/ParallaxHeader/ParallaxHeader.blade.php +++ b/resources/views/segments/header/ParallaxHeader/ParallaxHeader.blade.php @@ -1,4 +1,4 @@ -
+

{{$title}} diff --git a/resources/views/segments/header/ParallaxHeader/ParallaxHeader.php b/resources/views/segments/header/ParallaxHeader/ParallaxHeader.php index 0704e9e4..a7987bbe 100644 --- a/resources/views/segments/header/ParallaxHeader/ParallaxHeader.php +++ b/resources/views/segments/header/ParallaxHeader/ParallaxHeader.php @@ -20,7 +20,7 @@ public static function onAdd(Part $part = null) $setting->title = $part->area->name . ' ' . $part->part.' default image'; $setting->save(); - File::copy(__DIR__.'/../../default-assets/bg.jpg',public_path('upload/images/').$part->area->name . '.' . $part->part.'.jpg'); + File::copy(__DIR__.'/../../default-assets/bg.jpg',public_path('upload/images/').$part->area->name . '_' . $part->part.'.jpg'); } public static function onRemove(Part $part = null) { diff --git a/resources/views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin.blade.php b/resources/views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin.blade.php index d03f66c9..82ac8541 100644 --- a/resources/views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin.blade.php +++ b/resources/views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin.blade.php @@ -1,4 +1,4 @@ -
+

{{$title}}