From 34e0c44a4078798eab5c08be2fedb5669cf8e00e Mon Sep 17 00:00:00 2001 From: Nils-Johan Gynther Date: Sat, 18 Apr 2026 15:12:34 +0200 Subject: [PATCH 1/2] fix(navigation): reorder admin and user links in navigation menu --- frontend/app/Navigation.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/app/Navigation.tsx b/frontend/app/Navigation.tsx index c06ac34d..6e9733ac 100644 --- a/frontend/app/Navigation.tsx +++ b/frontend/app/Navigation.tsx @@ -32,13 +32,15 @@ export default async function Navigation() { 🏠 Hem 🛒 Varor 📖 Recept - 🏪 Baslager - ⚙️ Admin - {(session?.user as any)?.role === 'admin' && ( - 👥 Användare - )} - 📥 Importera 📅 Matplan + 📥 Importera + 🏪 Baslager + {(session?.user as any)?.role === 'admin' && ( + <> + ⚙️ Admin + 👥 Användare + + )} {session?.user && ( <> From a069d7d3d78a03c8d1fd0e760ea4d288e731cce7 Mon Sep 17 00:00:00 2001 From: Nils-Johan Gynther Date: Sat, 18 Apr 2026 15:16:02 +0200 Subject: [PATCH 2/2] =?UTF-8?q?fix(categories):=20update=20'K=C3=B6tt'=20c?= =?UTF-8?q?ategory=20name=20to=20'K=C3=B6tt=20och=20f=C3=A5gel'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/seeds/categories_supplement.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds/categories_supplement.sql b/db/seeds/categories_supplement.sql index 55cf8aee..732f4338 100644 --- a/db/seeds/categories_supplement.sql +++ b/db/seeds/categories_supplement.sql @@ -296,7 +296,7 @@ INSERT IGNORE INTO `Category` (`name`, `parentId`) VALUES INSERT IGNORE INTO `Category` (`name`, `parentId`) SELECT 'Frukt och grönt', id FROM `Category` WHERE name = 'Övrigt' AND parentId IS NULL; INSERT IGNORE INTO `Category` (`name`, `parentId`) - SELECT 'Kött', id FROM `Category` WHERE name = 'Övrigt' AND parentId IS NULL; + SELECT 'Kött och fågel', id FROM `Category` WHERE name = 'Övrigt' AND parentId IS NULL; INSERT IGNORE INTO `Category` (`name`, `parentId`) SELECT 'Fisk', id FROM `Category` WHERE name = 'Övrigt' AND parentId IS NULL; INSERT IGNORE INTO `Category` (`name`, `parentId`)