From 0de66aa3c5a50606a4c4396eda2e297bd0836c89 Mon Sep 17 00:00:00 2001
From: A1Gard <a1gard@4xmen.ir>
Date: Wed, 4 Sep 2024 08:43:44 +0330
Subject: [PATCH] fixed some bug ui/ux & translate mistakes

---
 database/seeders/AreaSeeder.php                             | 4 ++--
 database/seeders/PartSeeder.php                             | 6 +++---
 resources/js/client.js                                      | 2 +-
 resources/lang/fa.json                                      | 4 ++--
 resources/sass/client.scss                                  | 2 +-
 resources/views/client/category.blade.php                   | 4 ++--
 resources/views/client/default-list.blade.php               | 4 ++--
 resources/views/client/gallery.blade.php                    | 4 ++--
 resources/views/client/group.blade.php                      | 4 ++--
 resources/views/client/invoice.blade.php                    | 4 ++--
 resources/views/client/post.blade.php                       | 4 ++--
 resources/views/client/tag.blade.php                        | 4 ++--
 resources/views/client/welcome.blade.php                    | 4 ++--
 .../segments/header/ParallaxHeader/ParallaxHeader.blade.php | 2 +-
 .../views/segments/header/ParallaxHeader/ParallaxHeader.php | 2 +-
 .../header/ParallaxHeaderPin/ParallaxHeaderPin.blade.php    | 2 +-
 16 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/database/seeders/AreaSeeder.php b/database/seeders/AreaSeeder.php
index 9e193ad..60ca89d 100644
--- a/database/seeders/AreaSeeder.php
+++ b/database/seeders/AreaSeeder.php
@@ -34,7 +34,7 @@ class AreaSeeder extends Seeder
                 'icon' => 'ri-ai-generate',
             ],
             [
-                'name' => 'default_header',
+                'name' => 'defaultHeader',
                 'valid_segments' => json_encode(
                     ["top", "header", "other", "ads", "menu"]
                 ),
@@ -43,7 +43,7 @@ class AreaSeeder extends Seeder
                 '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 fad5cfd..04dbe7a 100644
--- a/database/seeders/PartSeeder.php
+++ b/database/seeders/PartSeeder.php
@@ -87,7 +87,7 @@ class PartSeeder extends Seeder
         $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 @@ class PartSeeder extends Seeder
         $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 819f865..d09fc3a 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 c232007..ad891ee 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 cfbb424..ad0632a 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 c19c860..4acce89 100644
--- a/resources/views/client/category.blade.php
+++ b/resources/views/client/category.blade.php
@@ -11,7 +11,7 @@ if ($category->bg != null){
 @section('content')
     <main>
         @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 @@ if ($category->bg != null){
             @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 887eea9..b14a7b8 100644
--- a/resources/views/client/default-list.blade.php
+++ b/resources/views/client/default-list.blade.php
@@ -6,7 +6,7 @@
 @section('content')
     <main>
         @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 610fc06..5e07c27 100644
--- a/resources/views/client/gallery.blade.php
+++ b/resources/views/client/gallery.blade.php
@@ -6,7 +6,7 @@
 @section('content')
     <main>
         @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 52a42d8..e6a270b 100644
--- a/resources/views/client/group.blade.php
+++ b/resources/views/client/group.blade.php
@@ -11,7 +11,7 @@ if ($group->bg != null){
 @section('content')
     <main>
         @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 @@ if ($group->bg != null){
             @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 a746481..e7984c4 100644
--- a/resources/views/client/invoice.blade.php
+++ b/resources/views/client/invoice.blade.php
@@ -7,7 +7,7 @@
     <main>
         <div class="no-print">
             @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
         <div class="no-print">
             @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 7f1e2bc..c528bb5 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 deceed2..4aecd10 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 @@
             </div>
         </div>
     </div>
-    @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 376aa96..8d8cf1d 100644
--- a/resources/views/client/welcome.blade.php
+++ b/resources/views/client/welcome.blade.php
@@ -6,7 +6,7 @@
 @section('content')
     <main>
         @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 72e0ff2..1c7fe3c 100644
--- a/resources/views/segments/header/ParallaxHeader/ParallaxHeader.blade.php
+++ b/resources/views/segments/header/ParallaxHeader/ParallaxHeader.blade.php
@@ -1,4 +1,4 @@
-<header class='ParallaxHeader' style="background-image: url('{{$bg??asset('upload/images/'.$data->area->name.'.'.$data->part.'.jpg')}}')">
+<header class='ParallaxHeader' style="background-image: url('{{$bg??asset('upload/images/'.$part->area->name . '.' . $part->part.'.jpg')}}')">
     <div class="{{gfx()['container']}}">
         <h1>
             {{$title}}
diff --git a/resources/views/segments/header/ParallaxHeader/ParallaxHeader.php b/resources/views/segments/header/ParallaxHeader/ParallaxHeader.php
index 0704e9e..a7987bb 100644
--- a/resources/views/segments/header/ParallaxHeader/ParallaxHeader.php
+++ b/resources/views/segments/header/ParallaxHeader/ParallaxHeader.php
@@ -20,7 +20,7 @@ class ParallaxHeader
         $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 d03f66c..82ac854 100644
--- a/resources/views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin.blade.php
+++ b/resources/views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin.blade.php
@@ -1,4 +1,4 @@
-<header class='ParallaxHeaderPin' style="background-image: url('{{$bg??asset('upload/images/'.$data->area->name.'.'.$data->part.'.jpg')}}')">
+<header class='ParallaxHeaderPin' style="background-image: url('{{$bg??asset('upload/images/'.$part->area->name . '.' . $part->part.'.jpg')}}')">
     <div class="{{gfx()['container']}}">
         <h1>
             {{$title}}