diff --git a/.env b/.env index df47ae7..7c2ec79 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PORT=3000 +PORT=3010 NODE_ENV=development @@ -8,4 +8,4 @@ DATABASE=database.sqlite OPENAI_API_KEY=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 -OPENAI_MODEL=gpt-5.4-mini \ No newline at end of file +OPENAI_MODEL=gpt-5.4-mini diff --git a/database.sqlite-shm b/database.sqlite-shm index e94e8ea..1df4bad 100644 Binary files a/database.sqlite-shm and b/database.sqlite-shm differ diff --git a/database.sqlite-wal b/database.sqlite-wal index 7926930..bce7236 100644 Binary files a/database.sqlite-wal and b/database.sqlite-wal differ diff --git a/package.json b/package.json index 5e3602e..5a6c519 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "pantryhub", "version": "1.0.0", "description": "PantryHub - Realtime boodschappenapp", - "private": true, + "private": false, "main": "app.js", "scripts": { "start": "node app.js", diff --git a/repositories/ShoppingListRepository.js b/repositories/ShoppingListRepository.js index 73e1ed3..a6e0b05 100644 --- a/repositories/ShoppingListRepository.js +++ b/repositories/ShoppingListRepository.js @@ -32,7 +32,9 @@ class ShoppingListRepository { WHERE shopping_list_items.list_id = ? AND products.household_id = ? 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 `).all(listId, householdId); } diff --git a/sessions.sqlite b/sessions.sqlite index 60c59e0..31e165b 100644 Binary files a/sessions.sqlite and b/sessions.sqlite differ diff --git a/views/lists/show.ejs b/views/lists/show.ejs index c5cfd34..cbfba20 100644 --- a/views/lists/show.ejs +++ b/views/lists/show.ejs @@ -30,7 +30,7 @@ style="text-decoration: line-through"<% } %>> <%= item.product_name %> - <% if (item.amount !== 1) { %><%= item.amount %><% } %> + <% if (item.amount !== 1) { %><%= item.amount %><% } %>