diff --git a/client/css/catalog.css b/client/css/catalog.css index aa0ff07d9378d4d7d146177186d5533027546599..7e0c8d66b9f8184ddf1df074e5a0f8cf7a6bcfe9 100644 --- a/client/css/catalog.css +++ b/client/css/catalog.css @@ -68,15 +68,14 @@ height: 35vh; background-color: #e9e9e9; border-radius: 10px; - border: ridge; + border: none; text-align: center; cursor: pointer; } .showItem img{ - border: ridge; width: 90%; - height: auto; + height: 50%; margin-bottom: 5px; text-align: center; } @@ -105,4 +104,9 @@ width: 40%; height: 35%; } + + .showItem p{ + text-align: left; + margin: 5px; + } } \ No newline at end of file diff --git a/client/js/catalog.js b/client/js/catalog.js index 1f1fccd959ab355e4c39d25325e8fa9ae153d8c0..97cfb10cb2100acad49b4ba9f53517d9f2d72876 100644 --- a/client/js/catalog.js +++ b/client/js/catalog.js @@ -79,7 +79,7 @@ function changePage(page){ //XMLHttpRequest const formdata = new FormData(); - var row = (page)*10; + var row = (page-1)*10; formdata.append('rows', row); formdata.append('search', document.getElementById("Searchinput").value); console.log(document.getElementById("Searchinput").value); diff --git a/server/controllers/catalog.php b/server/controllers/catalog.php index 709371cf7dae57d692d8d228a64073e00d4dd716..de70248340e0c55c97591ab18cce572cbb3fd4ee 100644 --- a/server/controllers/catalog.php +++ b/server/controllers/catalog.php @@ -7,7 +7,14 @@ $conn = connect_database(); - $query = "SELECT * FROM `item` WHERE `name` LIKE '%$search%' ORDER BY if (SUBSTRING(name, 1, length('$search'))='$search', 0, 1), name LIMIT $page , 10"; + $query = "SELECT * + ,(CASE WHEN name LIKE '%$search%' THEN 1 ELSE 0 END) + + (CASE WHEN `Seller_username` LIKE '%$search%' THEN 1 ELSE 0 END) AS priority + FROM item + WHERE name LIKE '%$search%' + OR Seller_username LIKE '%$search%' + ORDER BY priority DESC + LIMIT $page, 10"; $stmt = $conn->prepare($query); if (!$stmt){ @@ -33,7 +40,7 @@ $conn = connect_database(); - $query = "SELECT COUNT(item_id) FROM `item` WHERE name LIKE '%$search%'"; + $query = "SELECT COUNT(item_id) FROM `item` WHERE name LIKE '%$search%' OR Seller_username LIKE '%$search%'"; $stmt = $conn->prepare($query); if (!$stmt){