diff --git a/api/src/tablo.ts b/api/src/tablo.ts index 351c5dc..496aa14 100644 --- a/api/src/tablo.ts +++ b/api/src/tablo.ts @@ -451,8 +451,12 @@ tabloRouter.post("/join", async (c) => { await supabase.from("tablo_invites").delete().eq("id", invite_id); - const channel = streamServerClient.channel("messaging", tablo_id); - await channel.addMembers([joiner.id]); + try { + const channel = streamServerClient.channel("messaging", tablo_id); + await channel.addMembers([joiner.id]); + } catch (error) { + console.error("error adding member to channel", error); + } return c.json({ message: "Tablo joined successfully" }); }); diff --git a/ui/index.html b/ui/index.html index b4ea48d..e0981a4 100644 --- a/ui/index.html +++ b/ui/index.html @@ -4,7 +4,6 @@ - XTablo diff --git a/ui/src/components/EventTypeCard.tsx b/ui/src/components/EventTypeCard.tsx index f6c0ba6..373a42e 100644 --- a/ui/src/components/EventTypeCard.tsx +++ b/ui/src/components/EventTypeCard.tsx @@ -36,7 +36,10 @@ export function EventTypeCard({ return publicUrl; }; return ( - + {eventType.name} diff --git a/ui/src/components/WebcalModal.tsx b/ui/src/components/WebcalModal.tsx index 3c02dac..1cef2d3 100644 --- a/ui/src/components/WebcalModal.tsx +++ b/ui/src/components/WebcalModal.tsx @@ -15,12 +15,11 @@ import { import { useTablosList } from "@ui/hooks/tablos"; import { useGenerateWebcalToken } from "@ui/hooks/webcal"; import { toast } from "@ui/lib/toast"; -import { CopyIcon } from "@ui/ui-library/icons"; import { useState } from "react"; import { Button } from "./ui/button"; import { Input } from "./ui/input"; import { Label } from "./ui/label"; - +import { CopyIcon } from "lucide-react"; interface WebcalModalProps { open: boolean; onOpenChange: (open: boolean) => void; diff --git a/ui/src/pages/join.tsx b/ui/src/pages/join.tsx index 3439062..02970bf 100644 --- a/ui/src/pages/join.tsx +++ b/ui/src/pages/join.tsx @@ -1,6 +1,9 @@ +import { Button } from "@ui/components/ui/button"; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@ui/components/ui/card"; import { useJoinTablo } from "@ui/hooks/invite"; import { toast } from "@ui/lib/toast"; import { useUser } from "@ui/providers/UserStoreProvider"; +import { CheckCircle2Icon, XCircleIcon } from "lucide-react"; import { useNavigate, useParams, useSearchParams } from "react-router-dom"; export const JoinPage = () => { @@ -12,39 +15,35 @@ export const JoinPage = () => { const [searchParams] = useSearchParams(); const token = searchParams.get("token"); - if (!tablo_name || !token) { - toast.add( - { - title: "Invitation invalide", - description: "Veuillez vérifier le lien d'invitation", - type: "error", - }, - { - timeout: 2000, - } - ); - navigate("/"); - } - return ( -
+
-

+

Rejoindre le tablo "{tablo_name}"

-
-
-

{tablo_name}

-

Vous avez été invité(e) à rejoindre ce tablo

-
+ + + {tablo_name} + Vous avez été invité(e) à rejoindre ce tablo + -
- + - -
-
+ + +
); diff --git a/ui/src/pages/login.tsx b/ui/src/pages/login.tsx index 3e14e2c..ef90555 100644 --- a/ui/src/pages/login.tsx +++ b/ui/src/pages/login.tsx @@ -28,6 +28,7 @@ export function LoginPage() { // 3D Parallax effect const cardRef = useRef(null); const [transform, setTransform] = useState(""); + const [isHovered, setIsHovered] = useState(false); const handleMouseMove = (e: React.MouseEvent) => { if (!cardRef.current) return; @@ -46,10 +47,12 @@ export function LoginPage() { setTransform( `perspective(1000px) rotateX(${rotateX}deg) rotateY(${rotateY}deg) scale3d(1.01, 1.01, 1.01)` ); + setIsHovered(true); }; const handleMouseLeave = () => { setTransform(""); + setIsHovered(false); }; // Theme @@ -92,8 +95,7 @@ export function LoginPage() {
e.stopPropagation()} > -
+ {/* Glow effect behind the card */} +
+ +
(null); const [transform, setTransform] = useState(""); + const [isHovered, setIsHovered] = useState(false); const handleMouseMove = (e: React.MouseEvent) => { if (!cardRef.current) return; @@ -50,10 +51,12 @@ export function SignUpPage() { setTransform( `perspective(1000px) rotateX(${rotateX}deg) rotateY(${rotateY}deg) scale3d(1.01, 1.01, 1.01)` ); + setIsHovered(true); }; const handleMouseLeave = () => { setTransform(""); + setIsHovered(false); }; // Theme @@ -138,8 +141,7 @@ export function SignUpPage() {