From a8483db8dad83d338774c1390102eca820082b10 Mon Sep 17 00:00:00 2001
From: momijizukamori <momijizukamori>
Date: Wed, 12 Jun 2024 15:06:44 -0400
Subject: [PATCH] Minor visual tweaks

- Show product number on item cards, and give brand and categories more space
- Don't show items without images or tagged partial or sensitive content on home page
---
 app/Http/Controllers/HomeController.php |  7 ++++++-
 resources/sass/app.scss                 |  4 ++++
 resources/views/items/card.blade.php    | 27 ++++++++++++++-----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index ab535699..7f16f977 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Builder;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Item;
@@ -28,8 +29,12 @@ public function homepage()
         $brands = Brand::all();
         $categories = Category::all();
         $recent = Item::with(Item::PARTIAL_LOAD)
-            ->drafts(false)
+            ->whereNotNull('published_at')
             ->orderBy('published_at', 'desc')
+            ->whereNotNull('image')
+            ->whereDoesntHave('tags', function (Builder $query) {
+                $query->whereIn('slug', ['partial', 'sensitive-content']);
+            })
             ->take(15)
             ->get();
 
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 2aa2c26a..68bdf91c 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -44,4 +44,8 @@
 .card .category:not(:last-child)::after {
   content: ", ";
   margin-left: -.25em;
+}
+
+.itemnum {
+  font-size: 0.7em;
 }
\ No newline at end of file
diff --git a/resources/views/items/card.blade.php b/resources/views/items/card.blade.php
index 147c9112..13bb445b 100644
--- a/resources/views/items/card.blade.php
+++ b/resources/views/items/card.blade.php
@@ -5,7 +5,7 @@
             style="white-space: nowrap; overflow-x: hidden; text-overflow: ellipsis;">
             {{ $item->english_name }}
         </p>
-        <p class="text-muted small"
+        <p class="text-muted small mb-0"
             title="{{ $item->foreign_name }}"
             style="white-space: nowrap; overflow-x: hidden; text-overflow: ellipsis;">
             @if ($item->foreign_name)
@@ -14,6 +14,15 @@
                 &nbsp;
             @endif
         </p>
+        <p class="text-muted itemnum mb-0"
+            title="{{ $item->product_number }}"
+            style="white-space: nowrap; overflow-x: hidden; text-overflow: ellipsis;">
+            @if ($item->product_number)
+                {{ $item->product_number }}
+            @else
+                &nbsp;
+            @endif
+        </p>
 
         <div style="height: {{ ($type ?? null) === 'small' ? '7rem' : '14rem' }}" class="text-center">
             <a href="{{ $item->url }}">
@@ -24,22 +33,16 @@
     </div>
     <ul class="list-group list-group-flush">
         <li class="list-group-item py-1 px-3">
-            <div class="row small text-muted">
-                <p class="col m-0 text-left">
-                    {{ __('ui.item.brand') }}
-                </p>
-                <p class="col m-0 text-right">
-                    {{ __('ui.item.category') }}
-                </p>
-            </div>
             <div class="d-flex small">
-                <p class="p-0 m-0 text-left flex-fill" style="white-space: nowrap; overflow-x: ellipsis;">
+                <p class="p-0 m-0 text-center font-weight-bolder flex-fill" style="white-space: nowrap; overflow-x: ellipsis;">
                     <a href="{{ $item->brand->url }}" title="{{ $item->brand->name }}">
-                        {{ Str::limit($item->brand->name, 21) }}
+                        {{$item->brand->name}}
                         {{-- deliberately chose 21 as the cutoff since lots of brand names fit on word boundaries. --}}
                     </a>
                 </p>
-                <p class="p-0 m-0 text-right flex-fill" style="white-space: nowrap; overflow-x: hidden">
+            </div>
+                <div class="d-flex small">
+                <p class="p-0 m-0 text-center flex-fill" style="white-space: nowrap; overflow-x: hidden">
                 @foreach($item->categories as $category)
                     <a href="{{ $category->url }}" class="category">
                         {{ $category->name }}