Merge branch 'master' into Fix-up-statcards

This commit is contained in:
2024-12-24 11:44:31 -05:00
27 changed files with 13 additions and 1152 deletions

12
.gitignore vendored
View File

@@ -25,4 +25,14 @@ dist-ssr
.env .env
dashboard/build/** dashboard/build/**
dashboard-server/frontend/build/** dashboard-server/frontend/build/**
._* **/build/**
# Build directories
build/
*/build/
**/build/
**/dist/
dashboard/build/
dashboard-server/frontend/build/
dashboard-server/build/
**/assets/build/

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><rect width="7" height="9" x="3" y="3" rx="1"/><rect width="7" height="5" x="14" y="3" rx="1"/><rect width="7" height="9" x="14" y="12" rx="1"/><rect width="7" height="5" x="3" y="16" rx="1"/></g></svg>

Before

Width:  |  Height:  |  Size: 363 B

View File

@@ -1,15 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/dashboard.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Dashboard</title>
<script type="module" crossorigin src="/assets/index-ClSvHF_l.js"></script>
<link rel="modulepreload" crossorigin href="/assets/vendor-zehgRTIA.js">
<link rel="stylesheet" crossorigin href="/assets/index-T9y3LwG-.css">
</head>
<body>
<div id="root"></div>
</body>
</html>

View File

@@ -1,4 +0,0 @@
node_modules/
.env
logs/
*.log

25
dashboard/.gitignore vendored
View File

@@ -1,25 +0,0 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
.env

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><rect width="7" height="9" x="3" y="3" rx="1"/><rect width="7" height="5" x="14" y="3" rx="1"/><rect width="7" height="9" x="14" y="12" rx="1"/><rect width="7" height="5" x="3" y="16" rx="1"/></g></svg>

Before

Width:  |  Height:  |  Size: 363 B

View File

@@ -1,15 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/dashboard.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Dashboard</title>
<script type="module" crossorigin src="/assets/index-ClSvHF_l.js"></script>
<link rel="modulepreload" crossorigin href="/assets/vendor-zehgRTIA.js">
<link rel="stylesheet" crossorigin href="/assets/index-T9y3LwG-.css">
</head>
<body>
<div id="root"></div>
</body>
</html>

View File

@@ -252,7 +252,7 @@ const ProductGrid = ({
<table className="w-full"> <table className="w-full">
<thead> <thead>
<tr className="hover:bg-transparent"> <tr className="hover:bg-transparent">
<th className="p-1 text-left font-medium sticky top-0 bg-white dark:bg-background z-10 w-[50px] min-w-[35px] border-b" /> <th className="p-1 text-left font-medium sticky top-0 bg-white dark:bg-background z-10 h-[50px] min-h-[50px] w-[50px] min-w-[35px] border-b" />
<th className="p-1 text-left font-medium sticky top-0 bg-white dark:bg-background z-10 border-b"> <th className="p-1 text-left font-medium sticky top-0 bg-white dark:bg-background z-10 border-b">
<Button <Button
variant={sorting.column === "name" ? "default" : "ghost"} variant={sorting.column === "name" ? "default" : "ghost"}
@@ -304,7 +304,7 @@ const ProductGrid = ({
alt="" alt=""
width={50} width={50}
height={50} height={50}
className="rounded bg-muted" className="rounded bg-muted w-[50px] h-[50px] object-contain"
onError={(e) => (e.target.style.display = "none")} onError={(e) => (e.target.style.display = "none")}
/> />
)} )}