diff --git a/app/Console/Commands/clientAssetGenerator.php b/app/Console/Commands/clientAssetGenerator.php index f32e44c..bc6eecc 100644 --- a/app/Console/Commands/clientAssetGenerator.php +++ b/app/Console/Commands/clientAssetGenerator.php @@ -72,7 +72,7 @@ class clientAssetGenerator extends Command } // add parts scss & js - foreach (Part::all() as $part) { + foreach (Part::distinct()->get() as $part) { $variables .= '@import "../views/segments/' . $part->segment . '/' . $part->part . '/' . $part->part . '";' . PHP_EOL; $js .= 'import "../views/segments/' . $part->segment . '/' diff --git a/database/seeders/PartSeeder.php b/database/seeders/PartSeeder.php index 3939600..fa7b561 100644 --- a/database/seeders/PartSeeder.php +++ b/database/seeders/PartSeeder.php @@ -38,32 +38,39 @@ class PartSeeder extends Seeder $part->sort = 1; $part->save(); + $part = new Part(); + $part->segment = 'products'; + $part->part = 'LatestProducts'; + $part->area_id = Area::where('name', 'index')->first()->id; + $part->sort = 2; + $part->save(); + $part = new Part(); $part->segment = 'posts'; $part->part = 'PostsIconSimple'; $part->area_id = Area::where('name', 'index')->first()->id; - $part->sort = 2; + $part->sort = 3; $part->save(); $part = new Part(); $part->segment = 'index'; $part->part = 'CounterGrid'; $part->area_id = Area::where('name', 'index')->first()->id; - $part->sort = 3; + $part->sort = 4; $part->save(); $part = new Part(); $part->segment = 'categories'; $part->part = 'CategoriesFavImageLinks'; $part->area_id = Area::where('name', 'index')->first()->id; - $part->sort = 4; + $part->sort = 5; $part->save(); $part = new Part(); $part->segment = 'posts'; $part->part = 'PostIndexImage'; $part->area_id = Area::where('name', 'index')->first()->id; - $part->sort = 5; + $part->sort = 6; $part->save(); @@ -71,7 +78,7 @@ class PartSeeder extends Seeder $part->segment = 'footer'; $part->part = 'WaveFooter'; $part->area_id = Area::where('name', 'index')->first()->id; - $part->sort = 6; + $part->sort = 7; $part->save(); diff --git a/resources/js/client.js b/resources/js/client.js index 0eacb4b..082c06e 100644 --- a/resources/js/client.js +++ b/resources/js/client.js @@ -6,11 +6,32 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; import "./client-custom/assetsNode.js"; import "./client-custom/confirm.js"; +import "./client-custom/customerActions.js"; +import "./client-custom/login.js"; import "./client-custom/safeForm.js"; +import "./client-custom/tabControll.js"; import "./client-custom/windowLoader.js"; import "../views/segments/preloader/PreloaderCircle/PreloaderCircle.js"; -import "../views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin.js"; -import "../views/segments/group/SubGroupsGrid/SubGroupsGrid.js"; -import "../views/segments/posts_page/SimplePostList/SimplePostList.js"; -import "../views/segments/gallery/GallaryGrid/GallaryGrid.js"; -import "../views/segments/galleries/GridGallery/GridGallery.js"; +import "../views/segments/menu/RecetMenu/RecetMenu.js"; +import "../views/segments/slider/SliderSimple/SliderSimple.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/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/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"; diff --git a/resources/sass/client.scss b/resources/sass/client.scss index 0af7213..a56f232 100644 --- a/resources/sass/client.scss +++ b/resources/sass/client.scss @@ -1,17 +1,19 @@ // PLEASE DO NOT EDIT THIS FILE, // IF YOU WANT ADD ANY CODE CREATE NEW SCSS INTO client-custom $xshop-background:#eeeeee; -$xshop-primary:#6e0000; +$xshop-primary:#03b2b5; $xshop-diff:#ffffff; -$xshop-secondary:#ff0000; +$xshop-diff2:#ffffff; +$xshop-secondary:#0064c2; $xshop-text:#111111; $xshop-border-radius:7px; $xshop-shadow:2px 2px 4px #777777; :root{ --xshop-background:#eeeeee; ---xshop-primary:#6e0000; +--xshop-primary:#03b2b5; --xshop-diff:#ffffff; ---xshop-secondary:#ff0000; +--xshop-diff2:#ffffff; +--xshop-secondary:#0064c2; --xshop-text:#111111; --xshop-border-radius:7px; --xshop-shadow:2px 2px 4px #777777; @@ -21,8 +23,26 @@ $xshop-shadow:2px 2px 4px #777777; @import "client-custom/general"; @import "client-custom/zfix"; @import "../views/segments/preloader/PreloaderCircle/PreloaderCircle"; -@import "../views/segments/header/ParallaxHeaderPin/ParallaxHeaderPin"; -@import "../views/segments/group/SubGroupsGrid/SubGroupsGrid"; -@import "../views/segments/posts_page/SimplePostList/SimplePostList"; -@import "../views/segments/gallery/GallaryGrid/GallaryGrid"; -@import "../views/segments/galleries/GridGallery/GridGallery"; +@import "../views/segments/menu/RecetMenu/RecetMenu"; +@import "../views/segments/slider/SliderSimple/SliderSimple"; +@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/header/SimpleHeader/SimpleHeader"; +@import "../views/segments/card/NsCard/NsCard"; +@import "../views/segments/footer/WaveFooter/WaveFooter"; +@import "../views/segments/header/SimpleHeader/SimpleHeader"; +@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"; diff --git a/resources/views/segments/header/SimpleHeader/SimpleHeader.scss b/resources/views/segments/header/SimpleHeader/SimpleHeader.scss index c721bb0..a859f21 100644 --- a/resources/views/segments/header/SimpleHeader/SimpleHeader.scss +++ b/resources/views/segments/header/SimpleHeader/SimpleHeader.scss @@ -20,6 +20,8 @@ top: 35%; inset-inline-end: 10%; font-weight: 300; + overflow: hidden; + width: 50%; } } diff --git a/resources/views/segments/menu/RecetMenu/RecetMenu.js b/resources/views/segments/menu/RecetMenu/RecetMenu.js index 499b4a1..08918ed 100644 --- a/resources/views/segments/menu/RecetMenu/RecetMenu.js +++ b/resources/views/segments/menu/RecetMenu/RecetMenu.js @@ -1,4 +1,6 @@ -document.querySelector('#rect-toggle').addEventListener('click',function (e) { - e.preventDefault(); - document.querySelector('#RecetMenu').classList.toggle('show-menu'); +document.addEventListener('DOMContentLoaded',function () { + document.querySelector('#rect-toggle')?.addEventListener('click',function (e) { + e.preventDefault(); + document.querySelector('#RecetMenu').classList.toggle('show-menu'); + }); }) diff --git a/resources/views/segments/products/LatestProducts/LatestProducts.blade.php b/resources/views/segments/products/LatestProducts/LatestProducts.blade.php new file mode 100644 index 0000000..03e3772 --- /dev/null +++ b/resources/views/segments/products/LatestProducts/LatestProducts.blade.php @@ -0,0 +1,56 @@ +
+
+

+ {{__("Latest products")}} +

+
+ @foreach(\App\Models\Product::where('status',1)->limit(4)->get() as $product) +
+
+ + + + + + + + + {{$product->name}} +

+ {{$product->name}} +

+
+ @if($product->hasDiscount()) + + {{$product->oldPrice()}} + + @endif + + {{$product->getPrice()}} + +
+
+ + + {{__("Add to card")}} + +
+ +
+
+ @endforeach +
+
+ + {{__("All products")}} + +
+
+
diff --git a/resources/views/segments/products/LatestProducts/LatestProducts.js b/resources/views/segments/products/LatestProducts/LatestProducts.js new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/segments/products/LatestProducts/LatestProducts.json b/resources/views/segments/products/LatestProducts/LatestProducts.json new file mode 100644 index 0000000..b4f0cfe --- /dev/null +++ b/resources/views/segments/products/LatestProducts/LatestProducts.json @@ -0,0 +1,10 @@ +{ + "name": "LatestProducts", + "version": "1.0", + "author": "xStack", + "email": "xshop@xstack.ir", + "license": "GPL-3.0-or-later", + "url": "https:\/\/xstack.ir", + "author_url": "https:\/\/4xmen.ir", + "packages": [] +} \ No newline at end of file diff --git a/resources/views/segments/products/LatestProducts/LatestProducts.php b/resources/views/segments/products/LatestProducts/LatestProducts.php new file mode 100644 index 0000000..102478b --- /dev/null +++ b/resources/views/segments/products/LatestProducts/LatestProducts.php @@ -0,0 +1,21 @@ +