diff --git a/bun.lock b/bun.lock index 83542e56d..60e4dd794 100644 --- a/bun.lock +++ b/bun.lock @@ -3,6 +3,9 @@ "workspaces": { "": { "name": "inline", + "dependencies": { + "zustand": "^5.0.9", + }, "devDependencies": { "oxlint": "^0.16.0", }, @@ -1975,6 +1978,8 @@ "zod": ["zod@3.25.23", "", {}, "sha512-Od2bdMosahjSrSgJtakrwjMDb1zM1A3VIHCPGveZt/3/wlrTWBya2lmEh2OYe4OIu8mPTmmr0gnLHIWQXdtWBg=="], + "zustand": ["zustand@5.0.9", "", { "peerDependencies": { "@types/react": ">=18.0.0", "immer": ">=9.0.6", "react": ">=18.0.0", "use-sync-external-store": ">=1.2.0" }, "optionalPeers": ["@types/react", "immer", "react", "use-sync-external-store"] }, "sha512-ALBtUj0AfjJt3uNRQoL1tL2tMvj6Gp/6e39dnfT6uzpelGru8v1tPOGBzayOWbPJvujM8JojDk3E1LxeFisBNg=="], + "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="], "@anthropic-ai/sdk/@types/node": ["@types/node@18.19.76", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-yvR7Q9LdPz2vGpmpJX5LolrgRdWvB67MJKDPSgIIzpFbaf9a1j/f5DnLp5VDyHGMR0QZHlTr1afsD87QCXFHKw=="], diff --git a/desktop/bun.lock b/desktop/bun.lock index 945c2f02a..cb72b8724 100644 --- a/desktop/bun.lock +++ b/desktop/bun.lock @@ -4,7 +4,7 @@ "": { "name": "@inline-chat/desktop", "dependencies": { - "electron": "^38.2.2", + "electron": "^39.2.6", }, }, }, @@ -49,7 +49,7 @@ "detect-node": ["detect-node@2.1.0", "", {}, "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="], - "electron": ["electron@38.2.2", "", { "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^22.7.7", "extract-zip": "^2.0.1" }, "bin": { "electron": "cli.js" } }, "sha512-OXSaVNXDlonXDjMRsFNQo1j5tzTKwKXh5/m46IjAFccBcZJZMISI+EjSI07oexIuhvKM8AZLuFuihVn4YjWWrA=="], + "electron": ["electron@39.2.6", "", { "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^22.7.7", "extract-zip": "^2.0.1" }, "bin": { "electron": "cli.js" } }, "sha512-dHBgTodWBZd+tL1Dt0PSh/CFLHeDkFCTKCTXu1dgPhlE9Z3k2zzlBQ9B2oW55CFsKanBDHiUomHJNw0XaSdQpA=="], "end-of-stream": ["end-of-stream@1.4.5", "", { "dependencies": { "once": "^1.4.0" } }, "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg=="], diff --git a/desktop/package.json b/desktop/package.json index 63796038f..d1dcea158 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -7,7 +7,7 @@ "dev": "bun scripts/dev.ts" }, "dependencies": { - "electron": "^38.2.2" + "electron": "^39.2.6" }, "devDependencies": {} } diff --git a/desktop/src/index.ts b/desktop/src/index.ts index 32f5475a5..70a5888da 100644 --- a/desktop/src/index.ts +++ b/desktop/src/index.ts @@ -6,8 +6,8 @@ app.whenReady().then(() => { height: 600, transparent: true, trafficLightPosition: { - x: 18, - y: 18, + x: 14, + y: 14, }, frame: true, @@ -17,5 +17,5 @@ app.whenReady().then(() => { titleBarStyle: "hidden", vibrancy: "popover", }); - mainWindow.loadURL("http://localhost:8001"); + mainWindow.loadURL("http://localhost:8001/app"); }); diff --git a/package.json b/package.json index 755fe6b1b..455855bcf 100644 --- a/package.json +++ b/package.json @@ -17,5 +17,8 @@ }, "devDependencies": { "oxlint": "^0.16.0" + }, + "dependencies": { + "zustand": "^5.0.9" } } diff --git a/server/package.json b/server/package.json index 6659e0f52..854754e7d 100644 --- a/server/package.json +++ b/server/package.json @@ -10,7 +10,6 @@ "test": "bun test", "typecheck": "tsc --build", "db:migrate": "bun scripts/migrate.ts", - "eval:setup": "bun scripts/setup-willdo-eval-env.ts", "db:dangerously-reset-db": "bun scripts/reset-db.ts", "db:generate": "drizzle-kit generate --schema src/db/schema/index.ts --out drizzle --dialect postgresql --name", "db:push": "drizzle-kit push --schema src/db/schema/index.ts --dialect postgresql", diff --git a/web/public/fonts/DaysOne-Regular.ttf b/web/public/fonts/DaysOne-Regular.ttf new file mode 100644 index 000000000..2b5c966d3 Binary files /dev/null and b/web/public/fonts/DaysOne-Regular.ttf differ diff --git a/web/public/fonts/DaysOne-Regular.woff2 b/web/public/fonts/DaysOne-Regular.woff2 new file mode 100644 index 000000000..f8af574b4 Binary files /dev/null and b/web/public/fonts/DaysOne-Regular.woff2 differ diff --git a/web/src/components/largeButton/LargeButton.tsx b/web/src/components/largeButton/LargeButton.tsx new file mode 100644 index 000000000..430de4f5f --- /dev/null +++ b/web/src/components/largeButton/LargeButton.tsx @@ -0,0 +1,40 @@ +import * as stylex from "@stylexjs/stylex" +import { colors } from "~/theme/tokens.stylex" +import { FileRouteTypes } from "~/routeTree.gen" +import { Link } from "@tanstack/react-router" + +type LargeButtonProps = + | ({ to: React.ComponentProps["to"] } & Omit, "to">) // link variant + | React.ButtonHTMLAttributes // button variant + +export const LargeButton = (props: LargeButtonProps) => { + if ("to" in props) { + return + } + + return