Server changes
This commit is contained in:
Binary file not shown.
Binary file not shown.
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
"name": "pantryhub",
|
"name": "pantryhub",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"description": "PantryHub - Realtime boodschappenapp",
|
"description": "PantryHub - Realtime boodschappenapp",
|
||||||
"private": true,
|
"private": false,
|
||||||
"main": "app.js",
|
"main": "app.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "node app.js",
|
"start": "node app.js",
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ class ShoppingListRepository {
|
|||||||
WHERE shopping_list_items.list_id = ?
|
WHERE shopping_list_items.list_id = ?
|
||||||
AND products.household_id = ?
|
AND products.household_id = ?
|
||||||
ORDER BY shopping_list_items.checked ASC,
|
ORDER BY shopping_list_items.checked ASC,
|
||||||
shopping_list_items.sort_order ASC,
|
categories.name ASC,
|
||||||
|
products.name ASC,
|
||||||
|
shopping_list_items.sort_order ASC,
|
||||||
shopping_list_items.created_at ASC
|
shopping_list_items.created_at ASC
|
||||||
`).all(listId, householdId);
|
`).all(listId, householdId);
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@@ -30,7 +30,7 @@
|
|||||||
<strong<% if (item.checked) { %> style="text-decoration: line-through"<% } %>>
|
<strong<% if (item.checked) { %> style="text-decoration: line-through"<% } %>>
|
||||||
<%= item.product_name %>
|
<%= item.product_name %>
|
||||||
</strong>
|
</strong>
|
||||||
<% if (item.amount !== 1) { %><span class="badge bg-info"><%= item.amount %></span><% } %>
|
<% if (item.amount !== 1) { %><span class="badge bg-info text-white"><%= item.amount %></span><% } %>
|
||||||
<div class="small text-secondary"><%= item.category_icon || "" %> <%= item.category_name || "Geen categorie" %></div>
|
<div class="small text-secondary"><%= item.category_icon || "" %> <%= item.category_name || "Geen categorie" %></div>
|
||||||
</div>
|
</div>
|
||||||
<form class="delete-item-form" method="post" action="/lists/<%= list.id %>/items/<%= item.id %>">
|
<form class="delete-item-form" method="post" action="/lists/<%= list.id %>/items/<%= item.id %>">
|
||||||
|
|||||||
Reference in New Issue
Block a user