nilsjohan/recipe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
nilsjohan
2026-04-19 07:21:46 +02:00
parent 49a912fe33 a069d7d3d7
commit 42bd71798d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/seeds/categories_supplement.sql
+1 -1
View File
@@ -296,7 +296,7 @@ INSERT IGNORE INTO `Category` (`name`, `parentId`) VALUES
INSERT IGNORE INTO `Category` (`name`, `parentId`) INSERT IGNORE INTO `Category` (`name`, `parentId`)
SELECT 'Frukt och grönt', id FROM `Category` WHERE name = 'Övrigt' AND parentId IS NULL; SELECT 'Frukt och grönt', id FROM `Category` WHERE name = 'Övrigt' AND parentId IS NULL;
INSERT IGNORE INTO `Category` (`name`, `parentId`) 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`) INSERT IGNORE INTO `Category` (`name`, `parentId`)
SELECT 'Fisk', id FROM `Category` WHERE name = 'Övrigt' AND parentId IS NULL; SELECT 'Fisk', id FROM `Category` WHERE name = 'Övrigt' AND parentId IS NULL;
INSERT IGNORE INTO `Category` (`name`, `parentId`) INSERT IGNORE INTO `Category` (`name`, `parentId`)
frontend/app/Navigation.tsx
+8 -6
View File
@@ -32,13 +32,15 @@ export default async function Navigation() {
<Link href="/" style={linkStyle}>🏠 Hem</Link> <Link href="/" style={linkStyle}>🏠 Hem</Link>
<Link href="/inventory" style={linkStyle}>🛒 Varor</Link> <Link href="/inventory" style={linkStyle}>🛒 Varor</Link>
<Link href="/recipes" style={linkStyle}>📖 Recept</Link> <Link href="/recipes" style={linkStyle}>📖 Recept</Link>
<Link href="/baslager" style={linkStyle}>🏪 Baslager</Link>
<Link href="/admin/products" style={linkStyle}>⚙️ Admin</Link>
{(session?.user as any)?.role === 'admin' && (
<Link href="/profil?tab=anvandare" style={linkStyle}>👥 Användare</Link>
)}
<Link href="/import" style={linkStyle}>📥 Importera</Link>
<Link href="/matplan" style={linkStyle}>📅 Matplan</Link> <Link href="/matplan" style={linkStyle}>📅 Matplan</Link>
<Link href="/import" style={linkStyle}>📥 Importera</Link>
<Link href="/baslager" style={linkStyle}>🏪 Baslager</Link>
{(session?.user as any)?.role === 'admin' && (
<>
<Link href="/admin/products" style={linkStyle}>⚙️ Admin</Link>
<Link href="/profil?tab=anvandare" style={linkStyle}>👥 Användare</Link>
</>
)}
<span style={{ flex: 1 }} /> <span style={{ flex: 1 }} />
{session?.user && ( {session?.user && (
<> <>