diff --git a/apps/tauri/logo.png b/apps/tauri/logo.png new file mode 100644 index 0000000..7cb66f6 Binary files /dev/null and b/apps/tauri/logo.png differ diff --git a/apps/tauri/logo.svg b/apps/tauri/logo.svg deleted file mode 100644 index e40aa0f..0000000 --- a/apps/tauri/logo.svg +++ /dev/null @@ -1,237 +0,0 @@ - - - - diff --git a/apps/tauri/package.json b/apps/tauri/package.json index edde704..a34dd3c 100644 --- a/apps/tauri/package.json +++ b/apps/tauri/package.json @@ -30,7 +30,7 @@ "build:desktop:raw": "tauri build", "dev:desktop": "if command -v nix >/dev/null 2>&1; then nix develop --command bun dev:desktop:raw; else bun dev:desktop:raw; fi", "build:desktop": "if command -v nix >/dev/null 2>&1; then nix develop --command bun build:desktop:raw; else bun build:desktop:raw; fi", - "gen-icons": "tauri icon ./logo.svg", + "gen-icons": "tauri icon ./logo.png", "format": "bunx prettier --write .", "lint": "eslint src" }, diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 7ca92f2..6de2c44 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 95921b1..c6da8ae 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 6f6acb3..c42517c 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index e3ccebc..1d61eb2 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index cfed569..eceb132 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index f237a2f..be24593 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index fba4b45..5aeb1dc 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 96a1203..cebe007 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 3a1dd10..1b7aa3d 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 75883bf..14abb66 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 0310c75..a918033 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 0f39640..5bd12fa 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 5cc280f..4583924 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index f8eeb11..f480384 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 1a556d3..17279d6 100644 Binary files a/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/apps/tauri/src-tauri/icons/128x128.png b/apps/tauri/src-tauri/icons/128x128.png index 425ffb4..2e64037 100644 Binary files a/apps/tauri/src-tauri/icons/128x128.png and b/apps/tauri/src-tauri/icons/128x128.png differ diff --git a/apps/tauri/src-tauri/icons/128x128@2x.png b/apps/tauri/src-tauri/icons/128x128@2x.png index 9fe4117..d379bfa 100644 Binary files a/apps/tauri/src-tauri/icons/128x128@2x.png and b/apps/tauri/src-tauri/icons/128x128@2x.png differ diff --git a/apps/tauri/src-tauri/icons/32x32.png b/apps/tauri/src-tauri/icons/32x32.png index 3c9a880..c98f4e9 100644 Binary files a/apps/tauri/src-tauri/icons/32x32.png and b/apps/tauri/src-tauri/icons/32x32.png differ diff --git a/apps/tauri/src-tauri/icons/64x64.png b/apps/tauri/src-tauri/icons/64x64.png index 0f9e690..e579c32 100644 Binary files a/apps/tauri/src-tauri/icons/64x64.png and b/apps/tauri/src-tauri/icons/64x64.png differ diff --git a/apps/tauri/src-tauri/icons/Square107x107Logo.png b/apps/tauri/src-tauri/icons/Square107x107Logo.png index 1ec3cb3..32c273f 100644 Binary files a/apps/tauri/src-tauri/icons/Square107x107Logo.png and b/apps/tauri/src-tauri/icons/Square107x107Logo.png differ diff --git a/apps/tauri/src-tauri/icons/Square142x142Logo.png b/apps/tauri/src-tauri/icons/Square142x142Logo.png index 5b92228..b344198 100644 Binary files a/apps/tauri/src-tauri/icons/Square142x142Logo.png and b/apps/tauri/src-tauri/icons/Square142x142Logo.png differ diff --git a/apps/tauri/src-tauri/icons/Square150x150Logo.png b/apps/tauri/src-tauri/icons/Square150x150Logo.png index e1c1b1b..a055b76 100644 Binary files a/apps/tauri/src-tauri/icons/Square150x150Logo.png and b/apps/tauri/src-tauri/icons/Square150x150Logo.png differ diff --git a/apps/tauri/src-tauri/icons/Square284x284Logo.png b/apps/tauri/src-tauri/icons/Square284x284Logo.png index 2d33951..322f113 100644 Binary files a/apps/tauri/src-tauri/icons/Square284x284Logo.png and b/apps/tauri/src-tauri/icons/Square284x284Logo.png differ diff --git a/apps/tauri/src-tauri/icons/Square30x30Logo.png b/apps/tauri/src-tauri/icons/Square30x30Logo.png index 686bcb7..563a719 100644 Binary files a/apps/tauri/src-tauri/icons/Square30x30Logo.png and b/apps/tauri/src-tauri/icons/Square30x30Logo.png differ diff --git a/apps/tauri/src-tauri/icons/Square310x310Logo.png b/apps/tauri/src-tauri/icons/Square310x310Logo.png index 20207a5..2c05099 100644 Binary files a/apps/tauri/src-tauri/icons/Square310x310Logo.png and b/apps/tauri/src-tauri/icons/Square310x310Logo.png differ diff --git a/apps/tauri/src-tauri/icons/Square44x44Logo.png b/apps/tauri/src-tauri/icons/Square44x44Logo.png index 7fcb138..9e7d8cb 100644 Binary files a/apps/tauri/src-tauri/icons/Square44x44Logo.png and b/apps/tauri/src-tauri/icons/Square44x44Logo.png differ diff --git a/apps/tauri/src-tauri/icons/Square71x71Logo.png b/apps/tauri/src-tauri/icons/Square71x71Logo.png index 6be9a53..949270a 100644 Binary files a/apps/tauri/src-tauri/icons/Square71x71Logo.png and b/apps/tauri/src-tauri/icons/Square71x71Logo.png differ diff --git a/apps/tauri/src-tauri/icons/Square89x89Logo.png b/apps/tauri/src-tauri/icons/Square89x89Logo.png index 84bab9e..2e7bf91 100644 Binary files a/apps/tauri/src-tauri/icons/Square89x89Logo.png and b/apps/tauri/src-tauri/icons/Square89x89Logo.png differ diff --git a/apps/tauri/src-tauri/icons/StoreLogo.png b/apps/tauri/src-tauri/icons/StoreLogo.png index df2463e..4b82c14 100644 Binary files a/apps/tauri/src-tauri/icons/StoreLogo.png and b/apps/tauri/src-tauri/icons/StoreLogo.png differ diff --git a/apps/tauri/src-tauri/icons/icon.icns b/apps/tauri/src-tauri/icons/icon.icns index b1ecd70..dbdc5e3 100644 Binary files a/apps/tauri/src-tauri/icons/icon.icns and b/apps/tauri/src-tauri/icons/icon.icns differ diff --git a/apps/tauri/src-tauri/icons/icon.ico b/apps/tauri/src-tauri/icons/icon.ico index fc67bfb..7b2783e 100644 Binary files a/apps/tauri/src-tauri/icons/icon.ico and b/apps/tauri/src-tauri/icons/icon.ico differ diff --git a/apps/tauri/src-tauri/icons/icon.png b/apps/tauri/src-tauri/icons/icon.png index 8e56359..33853b3 100644 Binary files a/apps/tauri/src-tauri/icons/icon.png and b/apps/tauri/src-tauri/icons/icon.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@1x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@1x.png index d7880c7..294193c 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@1x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@1x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x-1.png index a447149..02a5874 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x-1.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x-1.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x.png index a447149..02a5874 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@3x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@3x.png index 3524382..3453672 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@3x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@3x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@1x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@1x.png index 5aa9fac..10af386 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@1x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@1x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x-1.png index 36d8549..a13e395 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x-1.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x-1.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x.png index 36d8549..a13e395 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@3x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@3x.png index 4ece183..f4f2ccf 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@3x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@3x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@1x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@1x.png index a447149..02a5874 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@1x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@1x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x-1.png index 8b4aaa8..5414b1d 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x-1.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x-1.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x.png index 8b4aaa8..5414b1d 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@3x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@3x.png index dd1ff43..aa8cbd8 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@3x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@3x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-512@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-512@2x.png index 25d9e54..1beaa86 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-512@2x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-512@2x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@2x.png index dd1ff43..aa8cbd8 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@2x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@2x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@3x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@3x.png index e46366a..17aa19b 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@3x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@3x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@1x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@1x.png index c732ee4..67faaf8 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@1x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@1x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@2x.png index 52368fe..c00d463 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@2x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@2x.png differ diff --git a/apps/tauri/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png index d328f97..f3ca0dd 100644 Binary files a/apps/tauri/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png and b/apps/tauri/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png differ diff --git a/apps/web/public/favicon.ico b/apps/web/public/favicon.ico index 30de873..278aa2e 100644 Binary files a/apps/web/public/favicon.ico and b/apps/web/public/favicon.ico differ diff --git a/apps/web/src/components/navbar.tsx b/apps/web/src/components/navbar.tsx index 9e3ec9d..1c9e3a7 100644 --- a/apps/web/src/components/navbar.tsx +++ b/apps/web/src/components/navbar.tsx @@ -1,12 +1,5 @@ import { Button } from "@tensamin/ui"; -import { - ArrowLeft, - ChevronDown, - House, - Phone, - Settings, - User, -} from "lucide-react"; +import { ArrowLeft, House, Phone, Settings, User } from "lucide-react"; import { useLocation, useNavigate, useSearch } from "@tanstack/react-router"; import { joinCall, useCall } from "@tensamin/call/store"; import Wrapper from "@tensamin/user/wrapper"; @@ -69,16 +62,7 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) { ( - +

{user?.display}

)} loading={} /> diff --git a/apps/web/src/components/screens/login/form.tsx b/apps/web/src/components/screens/login/form.tsx index f275840..c66d5e6 100644 --- a/apps/web/src/components/screens/login/form.tsx +++ b/apps/web/src/components/screens/login/form.tsx @@ -1,4 +1,4 @@ -import { Button, cn } from "@tensamin/ui"; +import { Button } from "@tensamin/ui"; import { Input } from "@tensamin/ui"; import { Label } from "@tensamin/ui"; import { useStorage } from "@tensamin/storage/context"; @@ -83,18 +83,25 @@ function parseTuFileContent(rawFileContent: string): { return { userId, privateKey, domain }; } +/** + * Renders the login form for file upload and manual credential login. + * @returns Login form JSX. + */ export default function Form() { const uploadRef = React.useRef(null); - const [isDragging, setIsDragging] = React.useState(false); const { save } = useStorage(); - // Process dropped files - const processDroppedFile = React.useCallback( - async (file: globalThis.File): Promise => { + /** + * Handles uploaded .tu files and stores resolved credentials. + * @param event Change event from the hidden file input. + * @returns Promise that resolves when processing has finished. + */ + const handleFileInputChange = React.useCallback( + async (event: React.ChangeEvent): Promise => { try { - if (!file.name.endsWith(".tu")) { - toast("error", "Please upload a .tu file"); - return; + const file = event.currentTarget.files?.[0]; + if (!file) { + throw new Error("No file selected"); } const raw = await file.text(); @@ -116,94 +123,13 @@ export default function Form() { [save], ); - // Handle .tu files - const handleFileInputChange = React.useCallback( - async (event: React.ChangeEvent): Promise => { - const file = event.currentTarget.files?.[0]; - - if (!file) { - toast("error", "No file selected"); - return; - } - - await processDroppedFile(file); - }, - [processDroppedFile], - ); - - // Drag and drop listener - React.useEffect(() => { - let dragCounter = 0; - - const handleDragEnter = (event: DragEvent) => { - event.preventDefault(); - event.stopPropagation(); - - dragCounter++; - - if (event.dataTransfer?.items?.length) { - setIsDragging(true); - } - }; - - const handleDragLeave = (event: DragEvent) => { - event.preventDefault(); - event.stopPropagation(); - - dragCounter--; - - if (dragCounter <= 0) { - setIsDragging(false); - } - }; - - const handleDragOver = (event: DragEvent) => { - event.preventDefault(); - event.stopPropagation(); - - if (event.dataTransfer) { - event.dataTransfer.dropEffect = "copy"; - } - }; - - const handleDrop = async (event: DragEvent) => { - event.preventDefault(); - event.stopPropagation(); - - dragCounter = 0; - - setIsDragging(false); - - const file = event.dataTransfer?.files?.[0]; - - if (!file) { - toast("error", "No file dropped"); - return; - } - - await processDroppedFile(file); - }; - - window.addEventListener("dragenter", handleDragEnter); - window.addEventListener("dragleave", handleDragLeave); - window.addEventListener("dragover", handleDragOver); - window.addEventListener("drop", handleDrop); - - return () => { - window.removeEventListener("dragenter", handleDragEnter); - window.removeEventListener("dragleave", handleDragLeave); - window.removeEventListener("dragover", handleDragOver); - window.removeEventListener("drop", handleDrop); - }; - }, [processDroppedFile]); - /** * Handles username and private key login submission. * @param event Form submit event. * @returns Promise that resolves after login processing. */ const handleCredentialsSubmit = React.useCallback( - async (event: React.FormEvent): Promise => { + async (event: React.SubmitEvent): Promise => { event.preventDefault(); const formData = new FormData(event.currentTarget); @@ -265,7 +191,7 @@ export default function Form() { ); return ( -
+
{isTauri() ? ( <> @@ -303,30 +226,10 @@ export default function Form() { ) : (
uploadRef.current?.click()} - className={cn( - "flex flex-col gap-3 cursor-pointer w-55 aspect-square", - "border-3 items-center justify-center rounded-lg", - "transition-all duration-300 ease-in-out", - "border-input", - "bg-input/13 hover:bg-input/30", - isDragging ? "animate-wiggle" : "", - )} + className="flex flex-col gap-3 cursor-pointer w-55 aspect-square bg-input/13 hover:bg-input/30 transition-all duration-300 ease-in-out border-3 items-center justify-center rounded-lg" > - - -

- Select .tu file -

+ +

Select .tu file

)} +
- Change Enter behavior to Shift +{" "} - Enter -

- } + label="Reverse Enter Key Behavior" id="settings.reverse_enter_behavior" /> - - -
); } diff --git a/package.json b/package.json index d408353..b0dfc08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tensamin", - "version": "0.0.3", + "version": "0.0.2", "private": true, "workspaces": [ "packages/*", diff --git a/packages/call/src/components/sidebarBox.tsx b/packages/call/src/components/sidebarBox.tsx index ac715e9..6a850f0 100644 --- a/packages/call/src/components/sidebarBox.tsx +++ b/packages/call/src/components/sidebarBox.tsx @@ -1,5 +1,5 @@ import { Lock, LockOpen } from "lucide-react"; -import { openCallPage, useCall, getRoom } from "../store"; +import { openCallPage, useCall } from "../store"; import { Button, Card, @@ -78,7 +78,7 @@ function ConnectionBar() { } export function TinyPingGraph() { - const room = getRoom(); + const room = useCall((store) => store.room); const [mapData, setMapData] = useState>(() => new Map()); diff --git a/packages/call/src/components/top.tsx b/packages/call/src/components/top.tsx index 610493a..62e8bfc 100644 --- a/packages/call/src/components/top.tsx +++ b/packages/call/src/components/top.tsx @@ -1,5 +1,5 @@ import { useUser, type User } from "@tensamin/user/context"; -import { useCall, getRoom } from "../store"; +import { useCall } from "../store"; import { useEffect, useState } from "react"; import { useStorage } from "@tensamin/storage/context"; import { @@ -14,7 +14,7 @@ import { export default function TopBar() { const { get } = useUser(); const { load } = useStorage(); - const room = getRoom(); + const room = useCall((state) => state.room); const screenRef = useCall((state) => state.screenRef); const [portalContainer, setPortalContainer] = useState(); diff --git a/packages/call/src/components/videoViewer.tsx b/packages/call/src/components/videoViewer.tsx index 1268b22..40cf6ac 100644 --- a/packages/call/src/components/videoViewer.tsx +++ b/packages/call/src/components/videoViewer.tsx @@ -1,6 +1,6 @@ import { VideoTrack, useParticipantTracks } from "@livekit/components-react"; import { TrackPublication } from "livekit-client"; -import { getRoom } from "../store"; +import { useCall } from "../store"; import { cn } from "@tensamin/ui"; import { Loader2 } from "lucide-react"; @@ -17,7 +17,7 @@ export default function VideoViewer({ publication: TrackPublication; participantId: string; }) { - const room = getRoom(); + const room = useCall((state) => state.room); const tracks = useParticipantTracks([publication.source], { participantIdentity: participantId, room, diff --git a/packages/call/src/store.tsx b/packages/call/src/store.tsx index 5b49603..3d63963 100644 --- a/packages/call/src/store.tsx +++ b/packages/call/src/store.tsx @@ -101,46 +101,27 @@ type CallStore = { callIsPopout: boolean; layoutVersion: number; screenRef: React.RefObject | null; + room: Room; + keyProvider: ExternalE2EEKeyProvider; + e2eeWorker: Worker; runtime: Runtime | null; speakingParticipantIds: Set; micGated: boolean; }; -let _keyProvider: ExternalE2EEKeyProvider | null = null; -let _e2eeWorker: Worker | null = null; -let _room: Room | null = null; - -function getKeyProvider(): ExternalE2EEKeyProvider { - if (!_keyProvider) { - _keyProvider = new ExternalE2EEKeyProvider(); - } - return _keyProvider; -} - -function getE2EEWorker(): Worker { - if (!_e2eeWorker) { - _e2eeWorker = new Worker( - new URL("livekit-client/e2ee-worker", import.meta.url), - ); - } - return _e2eeWorker; -} - -export function getRoom(): Room { - if (!_room) { - _room = new Room({ - dynacast: true, - adaptiveStream: true, - loggerName: "tensamin", - encryption: { - keyProvider: getKeyProvider(), - worker: getE2EEWorker(), - }, - }); - } - return _room; -} - +const keyProvider = new ExternalE2EEKeyProvider(); +const e2eeWorker = new Worker( + new URL("livekit-client/e2ee-worker", import.meta.url), +); +const room = new Room({ + dynacast: true, + adaptiveStream: true, + loggerName: "tensamin", + encryption: { + keyProvider, + worker: e2eeWorker, + }, +}); const remoteAudioElements = new Map(); const SCREEN_SHARE_PREVIEW_MAX_WIDTH = 320; @@ -189,7 +170,6 @@ export function getParticipantId(identity: string | undefined): number | null { } function getAllParticipants(): Participant[] { - const room = getRoom(); return [...room.remoteParticipants.values(), room.localParticipant]; } @@ -207,7 +187,7 @@ function getTrackPublicationBySource( } function getRemoteParticipant(participantId: number) { - return [...getRoom().remoteParticipants.values()].find( + return [...room.remoteParticipants.values()].find( (participant) => getParticipantId(participant.identity) === participantId, ); } @@ -235,7 +215,7 @@ function syncRemoteParticipantTrackSubscriptions(participantId: number) { } function syncAllRemoteTrackSubscriptions() { - for (const participant of getRoom().remoteParticipants.values()) { + for (const participant of room.remoteParticipants.values()) { const participantId = getParticipantId(participant.identity); if (participantId != null) { @@ -276,7 +256,7 @@ function hasParticipant(participantId: number) { function getLocalScreenShareTrack(): MediaStreamTrack | null { const track = getTrackPublicationBySource( - getRoom().localParticipant, + room.localParticipant, Track.Source.ScreenShare, )?.track; @@ -295,7 +275,7 @@ async function updateLocalParticipantAttributes( screenSharePreviewLength: attributes.screenSharePreview?.length ?? 0, }); - await getRoom().localParticipant.setAttributes(attributes).catch((error) => { + await room.localParticipant.setAttributes(attributes).catch((error) => { log(1, "call", "red", "Failed to update local participant attributes", { attributes: Object.keys(attributes), error, @@ -507,7 +487,7 @@ function requireRuntime(runtime: Runtime | null): Runtime { } export function getRoomMetadata() { - const roomMetadata = getRoom().metadata; + const roomMetadata = room.metadata; try { const data = JSON.parse(roomMetadata || '{"admins": []}'); return data as { admins: number[] }; @@ -518,8 +498,7 @@ export function getRoomMetadata() { // Sync local participant flags and screen-share derived state for the active call UI. export function syncParticipantState() { - const { screenShareSession } = useCall.getState(); - const room = getRoom(); + const { room, screenShareSession } = useCall.getState(); useCall.setState({ micEnabled: room.localParticipant.isMicrophoneEnabled, @@ -742,7 +721,7 @@ let screenShareController: ReturnType< function getScreenShareController() { if (!screenShareController) { screenShareController = createScreenShareController({ - room: getRoom(), + room, getState: () => ({ screenShareSession: useCall.getState().screenShareSession, }), @@ -754,7 +733,7 @@ function getScreenShareController() { ); }, getLocalParticipantId: () => - getParticipantId(getRoom().localParticipant.identity), + getParticipantId(room.localParticipant.identity), startWatching: startWatchingStream, stopWatching: stopWatchingStream, syncParticipantState, @@ -779,7 +758,7 @@ export async function connect(callId: string) { callSecret: useCall.getState().callSecret, }); - await getRoom() + await room .connect("wss://call.tensamin.net", token, { autoSubscribe: false, }) @@ -795,7 +774,7 @@ export async function connect(callId: string) { syncAllRemoteTrackSubscriptions(); - await getRoom().localParticipant.setMicrophoneEnabled(true).catch((error) => { + await room.localParticipant.setMicrophoneEnabled(true).catch((error) => { log(1, "call", "red", "Failed to enable microphone", error); toast("error", "Failed to enable microphone."); throw error; @@ -840,12 +819,12 @@ export async function disconnect() { micGated: false, }); - getRoom().remoteParticipants.forEach((participant) => { + room.remoteParticipants.forEach((participant) => { participant.setVolume(1); }); try { - await getRoom().disconnect(); + await room.disconnect(); } catch (error) { log(1, "call", "red", "Failed to disconnect from room", error); } finally { @@ -888,8 +867,8 @@ export async function joinCall( callSecret, ); - await getKeyProvider().setKey(decryptedSecret); - await getRoom().setE2EEEnabled(true); + await keyProvider.setKey(decryptedSecret); + await room.setE2EEEnabled(true); useCall.setState({ callSecret: decryptedSecret }); } catch (err) { log(1, "call", "red", "Failed getting call secret", err); @@ -899,8 +878,8 @@ export async function joinCall( } else { const random = crypto.randomUUID(); - await getKeyProvider().setKey(random); - await getRoom().setE2EEEnabled(true); + await keyProvider.setKey(random); + await room.setE2EEEnabled(true); useCall.setState({ callSecret: random }); } @@ -919,11 +898,11 @@ export async function joinCall( export async function toggleDeaf() { const nextDeaf = !useCall.getState().deaf; - getRoom().remoteParticipants.forEach((participant) => { + room.remoteParticipants.forEach((participant) => { participant.setVolume(nextDeaf ? 0 : 1); }); - if (nextDeaf && getRoom().localParticipant.isMicrophoneEnabled) { + if (nextDeaf && room.localParticipant.isMicrophoneEnabled) { await toggleMute(); } @@ -943,7 +922,7 @@ export async function toggleMute() { await toggleDeaf(); } - await getRoom().localParticipant.setMicrophoneEnabled(!micEnabled); + await room.localParticipant.setMicrophoneEnabled(!micEnabled); syncParticipantState(); } @@ -1007,7 +986,7 @@ export function resetCallState() { async function ensureNoiseFilter( noiseFilter: DeepFilterNoiseFilterProcessor, ): Promise { - const microphoneTrack = getRoom().localParticipant.getTrackPublication( + const microphoneTrack = room.localParticipant.getTrackPublication( Track.Source.Microphone, )?.track; @@ -1022,7 +1001,7 @@ async function ensureNoiseFilter( log(1, "call", "red", "Failed to enable noise filter", err); }); - const participantId = getParticipantId(getRoom().localParticipant.identity); + const participantId = getParticipantId(room.localParticipant.identity); if (participantId != null) { const processedTrack = microphoneTrack.mediaStreamTrack; getSpeakingDetector().addTrack( @@ -1042,8 +1021,8 @@ export const useCall = create(() => ({ livekitToken: null, currentCallData: null, deaf: false, - micEnabled: false, - screenShareEnabled: false, + micEnabled: room.localParticipant.isMicrophoneEnabled, + screenShareEnabled: room.localParticipant.isScreenShareEnabled, screenShareSession: null, focusedParticipantId: null, focusedParticipantType: null, @@ -1051,11 +1030,15 @@ export const useCall = create(() => ({ watchedStreamParticipantIds: [], pendingWatchedParticipantIds: [], activeScreenShareParticipantIds: [], - isEncrypted: false, + isEncrypted: + room.localParticipant.isE2EEEnabled && room.localParticipant.isEncrypted, callIsFullscreen: false, callIsPopout: false, layoutVersion: 0, screenRef: null, + room, + keyProvider, + e2eeWorker, runtime: null, speakingParticipantIds: new Set(), micGated: false, @@ -1401,7 +1384,6 @@ export function useInitializeCall() { syncParticipantState(); }; - const room = getRoom(); room.on(RoomEvent.Connected, onConnected); room.on(RoomEvent.Reconnected, onConnected); room.on(RoomEvent.Disconnected, onDisconnected); @@ -1442,7 +1424,7 @@ export function useInitializeCall() { clearRemoteAudio(); listenersRegistered.current = false; room.disconnect(); - if (_e2eeWorker) _e2eeWorker.terminate(); + e2eeWorker.terminate(); }; }, [noiseFilter, load]); diff --git a/packages/call/src/views/main/focused.tsx b/packages/call/src/views/main/focused.tsx index f8239c5..78d1740 100644 --- a/packages/call/src/views/main/focused.tsx +++ b/packages/call/src/views/main/focused.tsx @@ -1,13 +1,13 @@ import { RoomEvent } from "livekit-client"; import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "react"; -import { useCall, getRoom } from "../../store"; +import { useCall } from "../../store"; import Base from "../../components/modals/base"; const SECONDARY_ROW_HEIGHT_PX = 180; const STACK_GAP_PX = 12; export default function View() { - const room = getRoom(); + const room = useCall((state) => state.room); const layoutVersion = useCall((state) => state.layoutVersion); const usersInFocusedViewHidden = useCall( diff --git a/packages/call/src/views/main/grid.tsx b/packages/call/src/views/main/grid.tsx index 956842d..833d7b5 100644 --- a/packages/call/src/views/main/grid.tsx +++ b/packages/call/src/views/main/grid.tsx @@ -1,6 +1,6 @@ import { RoomEvent } from "livekit-client"; import { useEffect, useMemo, useRef, useState } from "react"; -import { useCall, getRoom } from "../../store"; +import { useCall } from "../../store"; import Base from "../../components/modals/base"; const TILE_ASPECT_RATIO = 16 / 9; @@ -82,7 +82,7 @@ function calculateOptimalGridLayout( } export default function View() { - const room = getRoom(); + const room = useCall((state) => state.room); const layoutVersion = useCall((state) => state.layoutVersion); const activeScreenShareParticipantIds = useCall( (state) => state.activeScreenShareParticipantIds, diff --git a/packages/chat/src/components/message.tsx b/packages/chat/src/components/message.tsx index 18cf792..1bb0b43 100644 --- a/packages/chat/src/components/message.tsx +++ b/packages/chat/src/components/message.tsx @@ -35,7 +35,6 @@ function MessageComponent({ return (
diff --git a/packages/chat/src/screen.tsx b/packages/chat/src/screen.tsx index 30344a5..fe69542 100644 --- a/packages/chat/src/screen.tsx +++ b/packages/chat/src/screen.tsx @@ -438,7 +438,7 @@ export default function Screen() { className="min-h-0 flex-1 overflow-y-auto" style={{ overflowAnchor: "none", - paddingBottom: "22px", + paddingBottom: "8px", }} onScroll={handleContainerScroll} > @@ -461,6 +461,7 @@ export default function Screen() { left: 0, width: "100%", transform: `translateY(${virtualRow.start + verticalOffset}px)`, + padding: "4px 0", }} >
diff --git a/packages/notifications/src/context.tsx b/packages/notifications/src/context.tsx index 653aa07..4e433a3 100644 --- a/packages/notifications/src/context.tsx +++ b/packages/notifications/src/context.tsx @@ -23,7 +23,7 @@ function reduceDisplay(display: string) { } export default function Provider(props: { children: React.ReactNode }) { - const { subscribePush, send } = useTTP(); + const { subscribePush } = useTTP(); const { load } = useStorage(); const { get } = useUser(); const { decryptText, getSharedSecret } = useCrypto(); @@ -49,32 +49,7 @@ export default function Provider(props: { children: React.ReactNode }) { message.content, ); - // Update message state - if ( - (await load("settings.read_confirmations")) && - userId === sender_id - ) { - await send( - "message_state", - { - message_state: "read", - }, - { - id: ttpMessage.id, - }, - ); - } else { - await send( - "message_state", - { - message_state: "received", - }, - { - id: ttpMessage.id, - }, - ); - } - + console.log(userId, sender_id, userId === sender_id); if (userId === sender_id) { addLiveMessage({ ...message, @@ -85,7 +60,7 @@ export default function Provider(props: { children: React.ReactNode }) { return; } - // todo: add notification symbol to conversation cards (incl. message start) + // add notification symbol to conversation cards moveUserIdToTop(sender_id); @@ -116,7 +91,6 @@ export default function Provider(props: { children: React.ReactNode }) { addLiveMessage, userId, moveUserIdToTop, - send, ]); return ( diff --git a/packages/shared/src/data.ts b/packages/shared/src/data.ts index 2210192..58851ce 100644 --- a/packages/shared/src/data.ts +++ b/packages/shared/src/data.ts @@ -167,17 +167,11 @@ export const ttp = { response: z.object({}), }, message_state: { - request: z - .object({ - chat_partner_id: z.number(), - send_time: z.number(), - message_state: message.shape.message_state, - }) - .or( - z.object({ - message_state: message.shape.message_state, - }), - ), + request: z.object({ + chat_partner_id: z.number(), + send_time: z.number(), + message_state: message.shape.message_state, + }), response: z.object({ chat_partner_id: z.number(), message_state: message.shape.message_state, diff --git a/packages/shared/src/settings.ts b/packages/shared/src/settings.ts index aacc162..0099f64 100644 --- a/packages/shared/src/settings.ts +++ b/packages/shared/src/settings.ts @@ -28,21 +28,6 @@ const settings = { type: "boolean", default: false, }, - read_confirmations: { - display: "Enable Read Confirmations", - type: "boolean", - default: true, - }, - receive_confirmations: { - display: "Enable Receive Confirmations", - type: "boolean", - default: true, - }, - show_start_of_last_message_in_sidebar: { - display: "Show Start of Last Message in Sidebar", - type: "boolean", - default: true, - }, }, }, application: { @@ -50,7 +35,6 @@ const settings = { }, } as const satisfies SettingsSchema; -// Assemble storage defaults export default settings; type BooleanSettingNames = {