Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 167036533c | |||
| fd18ee6079 | |||
| 6f5f88573a | |||
| 370c3746f7 | |||
| aa811f4277 | |||
| 112c9d58da |
5 changed files with 110 additions and 45 deletions
|
|
@ -190,11 +190,9 @@ export default function Form() {
|
||||||
[save],
|
[save],
|
||||||
);
|
);
|
||||||
|
|
||||||
const isTauriEnv = isTauri();
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex md:flex-row flex-col gap-15">
|
<div className="flex md:flex-row flex-col gap-15">
|
||||||
{isTauriEnv ? (
|
{isTauri() ? (
|
||||||
<>
|
<>
|
||||||
<QrCodeScanner
|
<QrCodeScanner
|
||||||
onData={async (data) => {
|
onData={async (data) => {
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ function QrCodeLogin() {
|
||||||
const [qrCodeBase64, setQrCodeBase64] = useState<string | undefined>(
|
const [qrCodeBase64, setQrCodeBase64] = useState<string | undefined>(
|
||||||
undefined,
|
undefined,
|
||||||
);
|
);
|
||||||
|
const [connectionString, setConnectionString] = useState<string | null>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
load("private_key").then((value) => {
|
load("private_key").then((value) => {
|
||||||
|
|
@ -58,15 +59,25 @@ function QrCodeLogin() {
|
||||||
setUserId(value);
|
setUserId(value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
load("ttp_url")
|
||||||
|
.then((value) => {
|
||||||
|
if (value) {
|
||||||
|
const url = new URL(value);
|
||||||
|
setConnectionString(`@${url.host}`);
|
||||||
|
} else {
|
||||||
|
setConnectionString("");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => setConnectionString(""));
|
||||||
}, [load]);
|
}, [load]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (userId && privateKey) {
|
if (userId && privateKey && connectionString !== null) {
|
||||||
generateQR(`tensamin://tu::${userId}::${privateKey}`).then(
|
generateQR(
|
||||||
setQrCodeBase64,
|
`tensamin://tu::${userId}${connectionString}::${privateKey}`,
|
||||||
);
|
).then(setQrCodeBase64);
|
||||||
}
|
}
|
||||||
}, [userId, privateKey]);
|
}, [userId, privateKey, connectionString]);
|
||||||
|
|
||||||
const [qrCodeVisible, setQrCodeVisible] = useState(false);
|
const [qrCodeVisible, setQrCodeVisible] = useState(false);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,45 +3,72 @@ import type { RawMessage } from "../values";
|
||||||
import Text from "@tensamin/markdown/text";
|
import Text from "@tensamin/markdown/text";
|
||||||
import { AlertTriangle } from "lucide-react";
|
import { AlertTriangle } from "lucide-react";
|
||||||
|
|
||||||
import { cn, Tooltip, TooltipContent, TooltipTrigger } from "@tensamin/ui";
|
import {
|
||||||
import { useIsMobile } from "@tensamin/ui";
|
Avatar,
|
||||||
|
AvatarFallback,
|
||||||
|
AvatarImage,
|
||||||
|
cn,
|
||||||
|
Tooltip,
|
||||||
|
TooltipContent,
|
||||||
|
TooltipTrigger,
|
||||||
|
} from "@tensamin/ui";
|
||||||
import {
|
import {
|
||||||
ContextMenu,
|
ContextMenu,
|
||||||
ContextMenuContent,
|
ContextMenuContent,
|
||||||
ContextMenuItem,
|
ContextMenuItem,
|
||||||
ContextMenuTrigger,
|
ContextMenuTrigger,
|
||||||
} from "@tensamin/ui";
|
} from "@tensamin/ui";
|
||||||
|
import Wrapper from "@tensamin/user/wrapper";
|
||||||
|
import { useChat } from "../context";
|
||||||
|
|
||||||
function MessageComponent({
|
function MessageComponent({
|
||||||
|
grouped,
|
||||||
message,
|
message,
|
||||||
}: {
|
}: {
|
||||||
|
grouped: boolean;
|
||||||
message: RawMessage & {
|
message: RawMessage & {
|
||||||
failed?: boolean;
|
failed?: boolean;
|
||||||
};
|
};
|
||||||
}) {
|
}) {
|
||||||
const isMobile = useIsMobile();
|
const { userId } = useChat();
|
||||||
const actuallyFailed = message.failed && message.message_state === "awaiting";
|
const actuallyFailed = message.failed && message.message_state === "awaiting";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={`w-full flex justify-start transition-opacity duration-150 ${actuallyFailed || message.message_state === "awaiting" ? "opacity-50" : ""}`}
|
className={`${grouped ? "" : "pt-3"} w-full flex justify-start transition-opacity duration-150 ${actuallyFailed || message.message_state === "awaiting" ? "opacity-50" : ""}`}
|
||||||
>
|
>
|
||||||
<ContextMenu>
|
<ContextMenu>
|
||||||
<ContextMenuTrigger
|
<ContextMenuTrigger
|
||||||
render={
|
render={
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"selection-foreground flex gap-1 items-center justify-center max-w-[80%] rounded-lg px-2 py-px whitespace-pre-wrap break-all",
|
"group hover:bg-muted/50 select-text! justify-start flex gap-1 items-center w-full px-2 whitespace-pre-wrap break-all",
|
||||||
{
|
{
|
||||||
"bg-(--destructive)/75 text-destructive-foreground":
|
"bg-(--destructive)/15 text-destructive-foreground":
|
||||||
actuallyFailed,
|
actuallyFailed,
|
||||||
"bg-primary text-primary-foreground":
|
|
||||||
!actuallyFailed && message.sent_by_self,
|
|
||||||
"bg-muted": !message.sent_by_self,
|
|
||||||
"select-none": isMobile,
|
|
||||||
},
|
},
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
|
<Wrapper
|
||||||
|
loading={"State not achievable"}
|
||||||
|
userId={message.sent_by_self ? "own" : userId}
|
||||||
|
component={(user) => (
|
||||||
|
<>
|
||||||
|
{grouped ? (
|
||||||
|
<p className="w-9 text-xs group-hover:visible invisible text-muted-foreground">
|
||||||
|
{new Date(message.send_time).toLocaleString([], {
|
||||||
|
hour: "2-digit",
|
||||||
|
minute: "2-digit",
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
|
) : (
|
||||||
|
<Avatar className="mr-1 mb-auto mt-1 w-10">
|
||||||
|
<AvatarImage src={user.avatar} />
|
||||||
|
<AvatarFallback>
|
||||||
|
{user.display.slice(0, 2).toUpperCase()}
|
||||||
|
</AvatarFallback>
|
||||||
|
</Avatar>
|
||||||
|
)}
|
||||||
{message.failed && message.message_state === "awaiting" && (
|
{message.failed && message.message_state === "awaiting" && (
|
||||||
<Tooltip>
|
<Tooltip>
|
||||||
<TooltipContent>
|
<TooltipContent>
|
||||||
|
|
@ -50,8 +77,24 @@ function MessageComponent({
|
||||||
<TooltipTrigger render={<AlertTriangle size={17} />} />
|
<TooltipTrigger render={<AlertTriangle size={17} />} />
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
|
<div className="flex flex-col">
|
||||||
|
{!grouped && (
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<p className="font-medium">{user.display}</p>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
{new Date(message.send_time).toLocaleString([], {
|
||||||
|
hour: "2-digit",
|
||||||
|
minute: "2-digit",
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<Text value={message.content} />
|
<Text value={message.content} />
|
||||||
</div>
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<ContextMenuContent>
|
<ContextMenuContent>
|
||||||
|
|
|
||||||
|
|
@ -435,7 +435,7 @@ export default function Screen() {
|
||||||
<div
|
<div
|
||||||
ref={scrollRef}
|
ref={scrollRef}
|
||||||
id="chat_container"
|
id="chat_container"
|
||||||
className="min-h-0 flex-1 overflow-y-auto px-2.5"
|
className="min-h-0 flex-1 overflow-y-auto"
|
||||||
style={{
|
style={{
|
||||||
overflowAnchor: "none",
|
overflowAnchor: "none",
|
||||||
paddingBottom: "8px",
|
paddingBottom: "8px",
|
||||||
|
|
@ -465,8 +465,8 @@ export default function Screen() {
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div className="w-full flex justify-start">
|
<div className="w-full flex justify-start">
|
||||||
<div className="max-w-[80%] rounded-lg bg-muted px-2 py-px text-sm text-foreground/55 whitespace-pre-wrap break-all">
|
<div className="text-sm text-foreground/55 px-2.5">
|
||||||
This is the start of your conversation with{" "}
|
Conversation start
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -481,6 +481,13 @@ export default function Screen() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const lastMessage = messages[messageIndex - 1];
|
||||||
|
const isGrouped =
|
||||||
|
lastMessage &&
|
||||||
|
lastMessage.sent_by_self === message.sent_by_self &&
|
||||||
|
Math.round(lastMessage.send_time / 10000) ===
|
||||||
|
Math.round(message.send_time / 10000);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={message.send_time}
|
key={message.send_time}
|
||||||
|
|
@ -492,10 +499,9 @@ export default function Screen() {
|
||||||
left: 0,
|
left: 0,
|
||||||
width: "100%",
|
width: "100%",
|
||||||
transform: `translateY(${virtualRow.start + verticalOffset}px)`,
|
transform: `translateY(${virtualRow.start + verticalOffset}px)`,
|
||||||
padding: "4px 0",
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Message message={message} />
|
<Message grouped={isGrouped} message={message} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|
@ -509,17 +515,25 @@ export default function Screen() {
|
||||||
className="pointer-events-none absolute left-0 top-0 -z-10 overflow-hidden opacity-0"
|
className="pointer-events-none absolute left-0 top-0 -z-10 overflow-hidden opacity-0"
|
||||||
style={{ width: scrollWidth > 0 ? `${scrollWidth}px` : "100%" }}
|
style={{ width: scrollWidth > 0 ? `${scrollWidth}px` : "100%" }}
|
||||||
>
|
>
|
||||||
{messages.map((message) => (
|
{messages.map((message, messageIndex) => {
|
||||||
|
const lastMessage = messages[messageIndex - 1];
|
||||||
|
const isGrouped =
|
||||||
|
lastMessage &&
|
||||||
|
lastMessage.sent_by_self === message.sent_by_self &&
|
||||||
|
Math.round(lastMessage.send_time / 10000) ===
|
||||||
|
Math.round(message.send_time / 10000);
|
||||||
|
|
||||||
|
return (
|
||||||
<div
|
<div
|
||||||
key={`measure-${message.send_time}`}
|
key={`measure-${message.send_time}`}
|
||||||
ref={(element) => {
|
ref={(element) => {
|
||||||
setMeasurementRef(message.send_time, element);
|
setMeasurementRef(message.send_time, element);
|
||||||
}}
|
}}
|
||||||
style={{ padding: "4px 0" }}
|
|
||||||
>
|
>
|
||||||
<Message message={message} />
|
<Message grouped={isGrouped} message={message} />
|
||||||
</div>
|
</div>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -560,7 +560,7 @@ export function renderBlocks(blocks: MarkdownBlock[]): React.ReactElement {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<p key={blockIndex} className="tm-md-p">
|
<p key={blockIndex}>
|
||||||
{block.text.split("\n").map((line, lineIndex) => (
|
{block.text.split("\n").map((line, lineIndex) => (
|
||||||
<React.Fragment key={lineIndex}>
|
<React.Fragment key={lineIndex}>
|
||||||
{lineIndex > 0 ? <br /> : null}
|
{lineIndex > 0 ? <br /> : null}
|
||||||
|
|
@ -645,7 +645,6 @@ export const markdownStyles = `
|
||||||
.tm-md-h4 { font-size: 1.1rem; }
|
.tm-md-h4 { font-size: 1.1rem; }
|
||||||
.tm-md-h5 { font-size: 1rem; }
|
.tm-md-h5 { font-size: 1rem; }
|
||||||
.tm-md-h6 { font-size: 0.95rem; opacity: 0.9; }
|
.tm-md-h6 { font-size: 0.95rem; opacity: 0.9; }
|
||||||
.tm-md-p { margin: 0.25rem 0; }
|
|
||||||
.tm-md-blockquote { margin: 0.45rem 0; padding-left: 0.75rem; opacity: 0.95; }
|
.tm-md-blockquote { margin: 0.45rem 0; padding-left: 0.75rem; opacity: 0.95; }
|
||||||
.tm-md-blockquote p { margin: 0.2rem 0; }
|
.tm-md-blockquote p { margin: 0.2rem 0; }
|
||||||
.tm-md-pre { margin: 0.45rem 0; padding: 0.65rem 0.75rem; border-radius: 0.5rem; background: hsl(var(--muted)); overflow-x: auto; }
|
.tm-md-pre { margin: 0.45rem 0; padding: 0.65rem 0.75rem; border-radius: 0.5rem; background: hsl(var(--muted)); overflow-x: auto; }
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue