From 524feee54d248c4ac0cdef71899b60096195b809 Mon Sep 17 00:00:00 2001 From: grey Date: Wed, 17 May 2023 22:07:36 +0200 Subject: [PATCH] - added toggel for dark/auto/white mode - added color --- allowedStaticPaths.json | 1 - src/frontend/dashboard.eta.html | 11 ++++++- src/frontend/items.eta.html | 9 ++++++ src/frontend/partials/controls.eta.html | 43 +++++++++++++++++++++++++ src/frontend/publicInfoPage.eta.html | 10 ++++++ src/routes/frontend/:id.ts | 1 + 6 files changed, 73 insertions(+), 2 deletions(-) diff --git a/allowedStaticPaths.json b/allowedStaticPaths.json index f538aee..c299d03 100644 --- a/allowedStaticPaths.json +++ b/allowedStaticPaths.json @@ -4,7 +4,6 @@ "/bootstrap/dist/css/bootstrap.min.css", "/bootstrap/dist/js/bootstrap.bundle.min.js", "/jquery/dist/jquery.min.js", - "/darkreader/darkreader.js", "/bootstrap-icons/font/fonts/bootstrap-icons.woff2", "/bootstrap/dist/css/bootstrap.min.css.map", "/@popperjs/core/dist/umd/popper.min.js", diff --git a/src/frontend/dashboard.eta.html b/src/frontend/dashboard.eta.html index 5c1f446..da5ecf3 100644 --- a/src/frontend/dashboard.eta.html +++ b/src/frontend/dashboard.eta.html @@ -42,7 +42,16 @@ <%= user.SKU %> <%= user.name %> - <%= user.status %> + <% if(user.status == "normal") { %> + + <%= user.status %> + <% } else if(user.status == "stolen") { %> + <%= user.status %> + <% } else if(user.status == "lost") { %> + <%= user.status %> + <% } else if(user.status == "borrowed") { %> + <%= user.status %> + <% } %> <% }) %> diff --git a/src/frontend/items.eta.html b/src/frontend/items.eta.html index 3e76a42..8d04c74 100644 --- a/src/frontend/items.eta.html +++ b/src/frontend/items.eta.html @@ -24,7 +24,16 @@ <%= user.SKU %> <%= user.name %> + <% if(user.status == "normal") { %> + <%= user.status %> + <% } else if(user.status == "stolen") { %> + <%= user.status %> + <% } else if(user.status == "lost") { %> + <%= user.status %> + <% } else if(user.status == "borrowed") { %> + <%= user.status %> + <% } %> Edit <% }) %> diff --git a/src/frontend/partials/controls.eta.html b/src/frontend/partials/controls.eta.html index 94ac86a..68e032c 100644 --- a/src/frontend/partials/controls.eta.html +++ b/src/frontend/partials/controls.eta.html @@ -159,7 +159,50 @@ JSON Import + + + + + +
diff --git a/src/frontend/publicInfoPage.eta.html b/src/frontend/publicInfoPage.eta.html index 56dad3f..8e41c53 100644 --- a/src/frontend/publicInfoPage.eta.html +++ b/src/frontend/publicInfoPage.eta.html @@ -6,6 +6,16 @@

Category: <%= it.category.name %>

Amount: <%= it.amount %>

SKU: <%= it.SKU %>

+

Status: <% if(it.status == "normal") { %> + +<%= it.status %> + <% } else if(it.status == "stolen") { %> + <%= it.status %> + <% } else if(it.status == "lost") { %> + <%= it.status %> + <% } else if(it.status == "borrowed") { %> + <%= it.status %> + <% } %>

diff --git a/src/routes/frontend/:id.ts b/src/routes/frontend/:id.ts index b245228..0299404 100644 --- a/src/routes/frontend/:id.ts +++ b/src/routes/frontend/:id.ts @@ -14,6 +14,7 @@ function get(req: Request, res: Response) { name: true, comment: true, amount: true, + status: true, // Get category name from relation. category: { select: {