Compare commits

..

No commits in common. "ea879640a2e3581697b91427dd8be271dfb03b96" and "93ca7ea406b8a5751fa277a5ce6c97cff6b87920" have entirely different histories.

12 changed files with 28 additions and 98 deletions

View file

@ -4,19 +4,18 @@
"rsc": false,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"config": "",
"css": "src/App.css",
"baseColor": "slate",
"cssVariables": true,
"prefix": ""
},
"iconLibrary": "lucide",
"aliases": {
"components": "@/components",
"utils": "@/lib/utils",
"ui": "@/components/ui",
"lib": "@/lib",
"hooks": "@/hooks"
"components": "src/components",
"utils": "src/lib/utils",
"ui": "src/components/ui",
"lib": "src/lib",
"hooks": "src/hooks"
},
"registries": {}
"iconLibrary": "lucide"
}

10
package-lock.json generated
View file

@ -32,7 +32,6 @@
"react-konva": "^19.2.1",
"tailwind-merge": "^3.4.0",
"tailwindcss": "^4.1.17",
"tailwindcss-animate": "^1.0.7",
"tw-animate-css": "^1.4.0",
"update-electron-app": "^3.1.2",
"zustand": "^5.0.9"
@ -16686,15 +16685,6 @@
"integrity": "sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==",
"license": "MIT"
},
"node_modules/tailwindcss-animate": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz",
"integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==",
"license": "MIT",
"peerDependencies": {
"tailwindcss": ">=3.0.0 || insiders"
}
},
"node_modules/tapable": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",

View file

@ -45,7 +45,6 @@
"react-konva": "^19.2.1",
"tailwind-merge": "^3.4.0",
"tailwindcss": "^4.1.17",
"tailwindcss-animate": "^1.0.7",
"tw-animate-css": "^1.4.0",
"update-electron-app": "^3.1.2",
"zustand": "^5.0.9"

View file

@ -1,6 +1,4 @@
@import "tailwindcss";
@plugin "tailwindcss-animate";
@import "tw-animate-css";
/* ============================================

View file

@ -256,34 +256,16 @@ export function FileUpload() {
onChange={handleFileChange}
id="file-input"
className="hidden"
disabled={
isLoading ||
patternUploaded ||
isUploading ||
(uploadProgress > 0 && !patternUploaded)
}
disabled={isLoading || patternUploaded || isUploading}
/>
<Button
asChild={
!fileService.hasNativeDialogs() &&
!(
isLoading ||
patternUploaded ||
isUploading ||
(uploadProgress > 0 && !patternUploaded)
)
}
asChild={!fileService.hasNativeDialogs()}
onClick={
fileService.hasNativeDialogs()
? () => handleFileChange()
: undefined
}
disabled={
isLoading ||
patternUploaded ||
isUploading ||
(uploadProgress > 0 && !patternUploaded)
}
disabled={isLoading || patternUploaded || isUploading}
variant="outline"
className="flex-[2]"
>
@ -307,10 +289,7 @@ export function FileUpload() {
)}
</>
) : (
<label
htmlFor="file-input"
className="flex items-center gap-2 cursor-pointer"
>
<label htmlFor="file-input" className="flex items-center gap-2">
{isLoading ? (
<>
<Loader2 className="w-3.5 h-3.5 animate-spin" />
@ -407,8 +386,11 @@ export function FileUpload() {
)}
{pesData && boundsCheck.error && (
<Alert variant="destructive">
<AlertDescription>
<Alert
variant="destructive"
className="bg-danger-100 dark:bg-danger-900/20 border-danger-200 dark:border-danger-800"
>
<AlertDescription className="text-danger-800 dark:text-danger-200 text-sm">
<strong>Pattern too large:</strong> {boundsCheck.error}
</AlertDescription>
</Alert>

View file

@ -117,13 +117,7 @@ export function PatternInfo({
.join(" ");
// Secondary metadata: chart and description
// Only show chart if it's different from catalogNumber
const secondaryMetadata = [
color.chart && color.chart !== color.catalogNumber
? color.chart
: null,
color.description,
]
const secondaryMetadata = [color.chart, color.description]
.filter(Boolean)
.join(" ");

View file

@ -281,13 +281,8 @@ export function ProgressMonitor() {
.join(" ");
// Secondary metadata: chart and description
// Only show chart if it's different from catalogNumber
const secondaryMetadata = [
block.threadChart &&
block.threadChart !==
block.threadCatalogNumber
? block.threadChart
: null,
block.threadChart,
block.threadDescription,
]
.filter(Boolean)

View file

@ -65,33 +65,16 @@ export function PatternCanvasSkeleton() {
export function PatternInfoSkeleton() {
return (
<div className="mb-3">
{/* Three column grid matching PatternInfo stats */}
<div className="grid grid-cols-3 gap-2 text-xs mb-2">
{[1, 2, 3].map((i) => (
<div key={i} className="bg-gray-200 dark:bg-gray-700/50 p-2 rounded">
<SkeletonLoader className="h-3 w-12 mb-1" variant="text" />
<SkeletonLoader className="h-4 w-16" variant="text" />
<div className="mt-4">
<SkeletonLoader className="h-6 w-40 mb-4" variant="text" />
<div className="bg-gray-200 dark:bg-gray-900 p-4 rounded-lg space-y-3">
{[1, 2, 3, 4].map((i) => (
<div key={i} className="flex justify-between">
<SkeletonLoader className="h-4 w-24" variant="text" />
<SkeletonLoader className="h-4 w-32" variant="text" />
</div>
))}
</div>
{/* Separator */}
<div className="h-px bg-gray-200 dark:bg-gray-700 mb-3" />
{/* Color swatches row */}
<div className="flex items-center gap-2 mb-2">
<SkeletonLoader className="h-3 w-12" variant="text" />
<div className="flex gap-1">
{[1, 2, 3, 4, 5].map((i) => (
<SkeletonLoader
key={i}
className="w-3 h-3 rounded-full"
variant="circle"
/>
))}
</div>
</div>
</div>
);
}

View file

@ -10,7 +10,7 @@ const alertVariants = cva(
variant: {
default: "bg-card text-card-foreground",
destructive:
"bg-danger-100 dark:bg-danger-900/20 border-danger-200 dark:border-danger-800 text-danger-900 dark:text-danger-100 [&>svg]:text-current *:data-[slot=alert-description]:text-danger-900 dark:*:data-[slot=alert-description]:text-danger-100",
"text-destructive bg-card [&>svg]:text-current *:data-[slot=alert-description]:text-destructive/90",
},
},
defaultVariants: {

View file

@ -1,4 +1,4 @@
import { clsx, type ClassValue } from "clsx";
import { type ClassValue, clsx } from "clsx";
import { twMerge } from "tailwind-merge";
export function cn(...inputs: ClassValue[]) {

View file

@ -1,10 +1,6 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
},
"module": "commonjs",
"outDir": "dist-electron",
"types": ["node"]

View file

@ -3,11 +3,5 @@
"references": [
{ "path": "./tsconfig.app.json" },
{ "path": "./tsconfig.node.json" }
],
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
}
}
]
}