diff --git a/app/Http/Controllers/WebsiteController.php b/app/Http/Controllers/WebsiteController.php index dcc85bf..b534ef1 100755 --- a/app/Http/Controllers/WebsiteController.php +++ b/app/Http/Controllers/WebsiteController.php @@ -62,9 +62,14 @@ class WebsiteController extends Controller } $cats = Cat::whereNull('parent_id')->limit(6)->get(); $sliders = Slider::whereActive(true)->limit(5)->get(); - $vid = Clip::latest()->where('active', 1)->first(); +// $vid = Clip::latest()->where('active', 1)->first(); - return view('website.index', compact('cats', 'sliders', 'vid')); + $discount = Discount::whereNotNull('expire') + ->where('expire', '>', \DB::raw('NOW()')) + ->whereNotNull('product_id')->pluck('product_id')->toArray(); + $disPros = Product::whereIn('id', $discount)->get(); + + return view('website.index', compact('cats', 'sliders', 'disPros')); } public function cat(Cat $cat, Request $request) diff --git a/resources/theme/js/back-top.js b/resources/theme/js/back-top.js index c04c36f..3ce2803 100644 --- a/resources/theme/js/back-top.js +++ b/resources/theme/js/back-top.js @@ -1,11 +1,9 @@ // back to top btn -$('.backtop-btn').click(function(){ - $('html, body').animate({ scrollTop: 0 }, 'slow'); +$('.backtop-btn').click(function () { + $('html, body').animate({scrollTop: 0}, 'slow'); return false; }); /* pre loader */ -$(window).on('load', function () { - $('#preloader').delay(350).fadeOut('slow'); - $('body').delay(350).css({ 'overflow': 'visible' }); -}) +$('#preloader').delay(450).fadeOut('slow'); +$('body').delay(450).css({'overflow': 'visible'}); diff --git a/resources/theme/scss/_mega-menu.scss b/resources/theme/scss/_mega-menu.scss index 8f4c810..1591789 100644 --- a/resources/theme/scss/_mega-menu.scss +++ b/resources/theme/scss/_mega-menu.scss @@ -1,11 +1,11 @@ .up-nav{ width: 100%; - height: 85px; + height: 115px; background-color: $bg2; img{ width: 110px; - height: 85px; + height: 115px; display: block; margin: auto; } diff --git a/resources/views/website/component/navbar.blade.php b/resources/views/website/component/navbar.blade.php index 0ba7d00..dc8cae1 100644 --- a/resources/views/website/component/navbar.blade.php +++ b/resources/views/website/component/navbar.blade.php @@ -1,64 +1,49 @@ - -
+ diff --git a/resources/views/website/index.blade.php b/resources/views/website/index.blade.php index 46e2e99..a03701b 100755 --- a/resources/views/website/index.blade.php +++ b/resources/views/website/index.blade.php @@ -1,163 +1,317 @@ @extends('website.layout.layout') @section('content') -
-
-
-
-
-

- {{\App\Helpers\getSetting('top1text')}} -

-
-