Fixar för händelsebaren

bonny · Apr 23, 2024 · 2892cfa · 2892cfa
1 parent c207669
commit 2892cfa
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/app/Helper.php b/app/Helper.php
@@ -1104,11 +1104,11 @@ public static function getLatestEvents(int $count = 5) {
         return $events;
     }
 
-    public static function getLatestEventsByPubdate(int $count = 5) {
+    public static function getLatestEventsByParsedDate(int $count = 5) {
         $cacheKey = __METHOD__ . ":{$count}";
 
         $events = Cache::remember($cacheKey, 2 * 60, function () use ($count) {
-            $events = CrimeEvent::orderBy("pubdate_iso8601", "desc")
+            $events = CrimeEvent::orderBy("parsed_date", "desc")
                 ->with('locations')
                 ->limit($count)
                 ->get();

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -40,7 +40,7 @@ public function boot() {
         \View::share('shared_most_viewed_events', \App\Helper::getMostViewedEvents(Carbon::now(), 10));
 
         // Nyaste.
-        \View::share('shared_latest_events', \App\Helper::getLatestEventsByPubdate());
+        \View::share('shared_latest_events', \App\Helper::getLatestEventsByParsedDate(10));
     }
 
     /**

diff --git a/public/css/styles.css b/public/css/styles.css
@@ -1630,11 +1630,11 @@ h2.widget__title {
     border: 0;
 }
 
-.sitebar__mostread {
+.sitebar__Events {
     font-size: var(--font-size-small);
 }
 
-.sitebar__mostreadItems {
+.sitebar__EventsItems {
     list-style-type: none;
     margin: 0;
     padding: 0;
@@ -1643,13 +1643,19 @@ h2.widget__title {
     scroll-snap-type: x proximity;
 }
 
-.sitebar__mostreadItem {
+.sitebar__EventsItem {
     flex: 1 0 80%;
     scroll-snap-align: start;
     overflow: hidden;
 }
 
-.sitebar__mostreadItemLink {
+@media only screen and (min-width: 667px) {
+    .sitebar__EventsItem {
+        flex: 1 0 20%;
+    }
+}
+
+.sitebar__EventsItemLink {
     display: block;
     overflow: hidden;
     white-space: nowrap;

diff --git a/resources/views/layouts/web.blade.php b/resources/views/layouts/web.blade.php
@@ -135,7 +135,7 @@ function gtag() {
 
 <body class="@if ($shared_notification_bar_contents) has-notification-bar @endif {{ $noAdsReason }}">
     @include('parts.notificationbar')
-    @include('parts.bar-mostread')
+    @include('parts.bar-events')
     @include('parts.siteheader')
 
     <div class="container">

diff --git a/resources/views/parts/bar-mostread.blade.php → resources/views/parts/bar-events.blade.php b/resources/views/parts/bar-mostread.blade.php → resources/views/parts/bar-events.blade.php
@@ -1,10 +1,10 @@
-{{-- Visar de mest lästa händelserna i en "slider". --}}
+{{-- Visar en "notification bar" med händelser i en "slider". --}}
 @if ($shared_latest_events->count() > 0)
-    <div class="sitebar__mostread">
-        <ul class="sitebar__mostreadItems">
+    <div class="sitebar__Events">
+        <ul class="sitebar__EventsItems">
             @foreach ($shared_latest_events as $mostViewedItem)
-                <li class="sitebar__mostreadItem">
-                    <a class="sitebar__mostreadItemLink" href="{{ $mostViewedItem->getPermalink() }}">
+                <li class="sitebar__EventsItem">
+                    <a class="sitebar__EventsItemLink" href="{{ $mostViewedItem->getPermalink() }}">
                         {{ $mostViewedItem->getParsedDateInFormat('%H:%M') }}
                         {{ $mostViewedItem->title_alt_1 ? $mostViewedItem->title_alt_1 : $mostViewedItem->getSingleEventTitleShort() }}
                     </a>