diff --git a/app/Models/Log.php b/app/Models/Log.php index 58518ae..ce1ec70 100644 --- a/app/Models/Log.php +++ b/app/Models/Log.php @@ -2,6 +2,7 @@ namespace App\Models; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -18,4 +19,17 @@ class Log extends Model 'ip', 'email', ]; + + public static function deleteLogsFromDB() { + $cutoff = Carbon::now('UTC')->subMonths(3)->toDateTimeString(); + $count = count(self::where('created_at', '<', $cutoff) + ->orderBy('created_at', 'desc') + ->get()); + + if ($count > 0) { + self::where('created_at', '<', $cutoff)->delete(); + return "$count old log(s) deleted from the database."; + } + return "No logs older than 3 months found."; + } } diff --git a/resources/css/boil.css b/resources/css/boil.css index 5529522..919f863 100644 --- a/resources/css/boil.css +++ b/resources/css/boil.css @@ -62,3 +62,6 @@ .mailbox-min-height { min-height: 60vh; } +.magic-box { + scrollbar-width: none; +} diff --git a/resources/js/boil.js b/resources/js/boil.js index d1e765d..6b1d5b6 100644 --- a/resources/js/boil.js +++ b/resources/js/boil.js @@ -129,3 +129,29 @@ window.addEventListener("printFile", function (event) { printWindow.print(); printWindow.close(); }); + +(function detectAdBlockReal() { + const bait = document.createElement('div'); + bait.className = 'adsbygoogle ad-banner ad-unit'; + bait.style.cssText = 'width: 1px; height: 1px; position: absolute; left: -9999px;'; + document.body.appendChild(bait); + + setTimeout(() => { + const baitBlocked = + !bait || + bait.offsetParent === null || + bait.offsetHeight === 0 || + window.getComputedStyle(bait).getPropertyValue('display') === 'none' || + window.getComputedStyle(bait).getPropertyValue('visibility') === 'hidden'; + + if (baitBlocked) { + const elementShow = document.getElementById('sidebar-magic'); + elementShow.classList.remove('hidden'); + window.adBlockDetected = true; + } else { + window.adBlockDetected = false; + } + + bait.remove(); + }, 100); +})(); diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php index d71a92d..4745430 100644 --- a/resources/views/components/layouts/app.blade.php +++ b/resources/views/components/layouts/app.blade.php @@ -28,14 +28,13 @@ - + logo {{ __('Inbox') }} -{{-- Refresh--}} - sideAds + +
+ {!! json_decode(config('app.settings.ads_settings'))->one !!} +
@if(config('app.menus')) @@ -59,7 +63,7 @@ @endif -

© {{ config('app.settings.app_name') }}

+

© {{ config('app.settings.app_name') }}

 @@ -69,7 +73,6 @@ - @@ -84,7 +87,10 @@ - + + + + diff --git a/resources/views/livewire/blog.blade.php b/resources/views/livewire/blog.blade.php index d44bbff..cd243f4 100644 --- a/resources/views/livewire/blog.blade.php +++ b/resources/views/livewire/blog.blade.php @@ -19,7 +19,10 @@ {{ $postDetail->post }} -
+
+ {!! json_decode(config('app.settings.ads_settings'))->two !!} +
+
{!! $postDetail->content !!}
diff --git a/resources/views/livewire/frontend/mailbox.blade.php b/resources/views/livewire/frontend/mailbox.blade.php index e2adc8e..f18ca7f 100644 --- a/resources/views/livewire/frontend/mailbox.blade.php +++ b/resources/views/livewire/frontend/mailbox.blade.php @@ -4,7 +4,12 @@
Inbox
- @foreach(array_reverse($messages) as $message) + @foreach(array_reverse($messages) as $i => $message) + @if($i % 5 == 0 && json_decode(config('app.settings.ads_settings'))->five) +
+ {!! json_decode(config('app.settings.ads_settings'))->five !!} +
+ @endif
@@ -112,11 +117,16 @@
+
+ {!! json_decode(config('app.settings.ads_settings'))->three !!} +
- +
+ {!! json_decode(config('app.settings.ads_settings'))->four !!} +
@if (count($message['attachments']) > 0)
@foreach ($message['attachments'] as $attachment) @@ -144,7 +154,6 @@ @else Inbox
-
@@ -160,6 +169,8 @@
- +
+ {!! json_decode(config('app.settings.ads_settings'))->two !!} +
@endif
diff --git a/resources/views/livewire/home.blade.php b/resources/views/livewire/home.blade.php index 6cc1d8b..4991d4a 100644 --- a/resources/views/livewire/home.blade.php +++ b/resources/views/livewire/home.blade.php @@ -83,14 +83,14 @@
@foreach(config('app.blogs') as $blog) - +

- {{ $blog->slug }} + {{ $blog->slug }}

{{ $blog->post }}

diff --git a/resources/views/livewire/page.blade.php b/resources/views/livewire/page.blade.php index ea2ebec..d8fabbf 100644 --- a/resources/views/livewire/page.blade.php +++ b/resources/views/livewire/page.blade.php @@ -28,4 +28,7 @@ {!! $page->content !!}
+
+ {!! json_decode(config('app.settings.ads_settings'))->two !!} +
diff --git a/routes/console.php b/routes/console.php index 634914e..37c0b43 100644 --- a/routes/console.php +++ b/routes/console.php @@ -22,4 +22,10 @@ Schedule::call(function () { Schedule::call(function () { Email::deleteMessagesFromDB(); -})->everyMinute(); +})->everyTwoHours(); + +Schedule::call(function () { + \App\Models\Log::deleteLogsFromDB(); +})->everyThreeHours(); + +