diff --git a/bun.lock b/bun.lock index 688140d..ad59a91 100644 --- a/bun.lock +++ b/bun.lock @@ -37,6 +37,7 @@ "name": "@issue/frontend", "version": "0.1.0", "dependencies": { + "@iconify/react": "^6.0.2", "@issue/shared": "workspace:*", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-dropdown-menu": "^2.1.16", @@ -187,6 +188,10 @@ "@floating-ui/utils": ["@floating-ui/utils@0.2.10", "", {}, "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="], + "@iconify/react": ["@iconify/react@6.0.2", "", { "dependencies": { "@iconify/types": "^2.0.0" }, "peerDependencies": { "react": ">=16" } }, "sha512-SMmC2sactfpJD427WJEDN6PMyznTFMhByK9yLW0gOTtnjzzbsi/Ke/XqsumsavFPwNiXs8jSiYeZTmLCLwO+Fg=="], + + "@iconify/types": ["@iconify/types@2.0.0", "", {}, "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg=="], + "@img/colour": ["@img/colour@1.0.0", "", {}, "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw=="], "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.2.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w=="], diff --git a/package.json b/package.json index c9755e3..229b6c8 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,11 @@ { "name": "issue-monorepo", - "private": true, "version": "0.1.0", - "workspaces": [ - "packages/*" - ], "devDependencies": { "typescript": "~5.8.3", "concurrently": "^9.1.0" }, + "private": true, "scripts": { "dev:frontend": "bun --filter @issue/frontend dev", "dev:frontend:tauri": "bun --filter @issue/frontend tauri", @@ -16,5 +13,8 @@ "dev": "concurrently -n FRONTEND,BACKEND -c blue,green \"bun dev:frontend\" \"bun dev:backend\"", "dev:desktop": "concurrently -n TAURI,BACKEND -c magenta,green \"bun dev:frontend:tauri\" \"bun dev:backend\"", "reset-and-seed": "bun --filter @issue/backend db:reset && bun --filter @issue/backend db:seed" - } + }, + "workspaces": [ + "packages/*" + ] } diff --git a/packages/frontend/package.json b/packages/frontend/package.json index f820895..c90b6d7 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -9,6 +9,7 @@ "tauri": "export __NV_DISABLE_EXPLICIT_SYNC=1 && tauri dev" }, "dependencies": { + "@iconify/react": "^6.0.2", "@issue/shared": "workspace:*", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-dropdown-menu": "^2.1.16", diff --git a/packages/frontend/src/components/ui/confirm-dialog.tsx b/packages/frontend/src/components/ui/confirm-dialog.tsx index 6aa1bd8..7579f59 100644 --- a/packages/frontend/src/components/ui/confirm-dialog.tsx +++ b/packages/frontend/src/components/ui/confirm-dialog.tsx @@ -1,6 +1,6 @@ import { useState } from "react"; -import { Button } from "./button"; -import { Dialog, DialogClose, DialogContent, DialogHeader, DialogTitle } from "./dialog"; +import { Button } from "@/components/ui/button"; +import { Dialog, DialogClose, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog"; export function ConfirmDialog({ open, diff --git a/packages/frontend/src/components/upload-avatar.tsx b/packages/frontend/src/components/upload-avatar.tsx index 3805eee..fdc6301 100644 --- a/packages/frontend/src/components/upload-avatar.tsx +++ b/packages/frontend/src/components/upload-avatar.tsx @@ -1,10 +1,10 @@ import { Edit } from "lucide-react"; import { useRef, useState } from "react"; +import Avatar from "@/components/avatar"; import { Button } from "@/components/ui/button"; import { Label } from "@/components/ui/label"; import { user } from "@/lib/server"; import { cn } from "@/lib/utils"; -import Avatar from "./avatar"; export function UploadAvatar({ name, diff --git a/packages/frontend/src/pages/Landing.tsx b/packages/frontend/src/pages/Landing.tsx index ef896fd..7a09ac6 100644 --- a/packages/frontend/src/pages/Landing.tsx +++ b/packages/frontend/src/pages/Landing.tsx @@ -1,3 +1,4 @@ +import { Icon } from "@iconify/react"; import { Link } from "react-router-dom"; import { useSession } from "@/components/session-provider"; import { Button } from "@/components/ui/button"; @@ -42,7 +43,7 @@ export default function Landing() {

-
+
{!isLoading && user ? ( )} + + + + GitHub +