diff --git a/allowedStaticPaths.json b/allowedStaticPaths.json index ac33778..70d6c5e 100644 --- a/allowedStaticPaths.json +++ b/allowedStaticPaths.json @@ -7,7 +7,7 @@ "/darkreader/darkreader.js", "/bootstrap-icons/font/fonts/bootstrap-icons.woff2", "/bootstrap/dist/css/bootstrap.min.css.map", - "/@popperjs/core/dist/cjs/popper.js" + "/@popperjs/core/dist/umd/popper.min.js" ], - "debugMode": true + "debugMode": false } diff --git a/prisma/schema.prisma b/prisma/schema.prisma index fa19a9d..a9a4177 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -10,14 +10,6 @@ datasource db { url = env("DATABASE_URL") } -enum Category { - Light - Audio - Laptop - Adapter - Other -} - enum Status { normal borrowed @@ -26,22 +18,23 @@ enum Status { } model Item { - id Int @id @default(autoincrement()) - SKU String @unique + id Int @id @default(autoincrement()) + SKU String @unique Amount Int Comment String? name String manufacturer String - category Category + category Category @relation(fields: [categoryId], references: [id]) + categoryId Int status Status StorageLocation StorageLocation? @relation(fields: [storageLocationId], references: [id]) storageLocationId Int? - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt } model StorageLocation { - id Int @id @default(autoincrement()) + id Int @id @default(autoincrement()) name String storageBuilding StorageBuilding? @relation(fields: [storageBuildingId], references: [id]) storageBuildingId Int? @@ -58,3 +51,10 @@ model StorageBuilding { country String StorageLocation StorageLocation[] } + +model Category { + id Int @id @default(autoincrement()) + name String + description String? + Item Item[] +} diff --git a/src/frontend/demopage.eta.html b/src/frontend/demopage.eta.html index 8ce42be..03ecb57 100644 --- a/src/frontend/demopage.eta.html +++ b/src/frontend/demopage.eta.html @@ -1,8 +1,73 @@ -<%~ E.includeFile("head.eta.html", {"title": "Bootstrap Demo Page"}) %> +<%~ E.includeFile("partials/head.eta.html", {"title": "Bootstrap Demo Page"}) %> +<%~ E.includeFile("partials/controls.eta.html", {"active": "Orders"}) %> -
New Stock
+Uncategorized items
+Instance Status
+