Skip to content

unify font #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iceljc merged 1 commit into from
May 26, 2026
+24 −22
Merged

unify font #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/routes/VerticalLayout/Header.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

<header
id="page-topbar"
class="fixed inset-x-0 top-0 z-[1002] h-[var(--header-height)] bg-white shadow-sm dark:bg-gray-800 font-script"
class="fixed inset-x-0 top-0 z-[1002] h-[var(--header-height)] bg-white shadow-sm dark:bg-gray-800"
>
<div class="mx-auto flex h-full items-center justify-between pr-2">
<div class="flex items-center">
Expand Down
2 changes: 1 addition & 1 deletion src/routes/VerticalLayout/Sidebar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
</script>

<div
class="vertical-menu fixed bottom-0 left-0 top-[var(--header-height)] z-[1001] w-[var(--sidebar-width)] bg-[var(--sidebar-bg)] shadow-sm transition-[width,transform] duration-200 dark:bg-gray-800 font-averia"
class="vertical-menu fixed bottom-0 left-0 top-[var(--header-height)] z-[1001] w-[var(--sidebar-width)] bg-[var(--sidebar-bg)] shadow-sm transition-[width,transform] duration-200 dark:bg-gray-800"
>
<div class="h-full" id="vertical-menu">
<!--- Sidemenu -->
Expand Down
42 changes: 22 additions & 20 deletions src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
let isHandlingQueue = $state(false);
let isStopStreamClicked = $state(false);

let isWaiting = $derived(isSendingMsg || isThinking || messageQueue.length > 0);
let isWaiting = $derived(isSendingMsg || isThinking || isStreaming || messageQueue.length > 0);
let loadEditor = true;
let disableAction = $derived(!ADMIN_ROLES.includes(currentUser?.role || '')
&& currentUser?.id !== conversationUser?.id
Expand Down Expand Up @@ -916,7 +916,7 @@
return;
}

if ((e.key === 'Enter' && (!!e.shiftKey || !!e.ctrlKey)) || e.key !== 'Enter' || !_.trim(text) || isSendingMsg || isThinking) {
if ((e.key === 'Enter' && (!!e.shiftKey || !!e.ctrlKey)) || e.key !== 'Enter' || !_.trim(text) || isWaiting) {
return;
}

Expand Down Expand Up @@ -962,7 +962,7 @@
* @param {string} payload
*/
async function confirmSelectedOption(title, payload) {
if (isSendingMsg || isThinking) return;
if (isWaiting) return;

const postback = buildPostbackMessage(dialogs, payload || title, null);;
await sendChatMessage(title, { postback: postback });
Expand Down Expand Up @@ -1137,6 +1137,7 @@
* @param {string} messageId
*/
function deleteMessage(e, messageId) {
if (isWaiting || disableAction) return;
handleDeleteMessage(messageId);
}

Expand All @@ -1153,6 +1154,7 @@
* @param {import('$conversationTypes').ChatResponseModel} message
*/
async function editMessage(message) {
if (isWaiting || disableAction) return;
truncateMsgId = message?.message_id;
editText = message?.text || '';
await tick();
Expand Down Expand Up @@ -1192,7 +1194,7 @@

/** @param {import('$conversationTypes').ChatResponseModel} message */
async function resendMessage(message) {
if (isSendingMsg || isThinking || disableAction) return;
if (isWaiting || disableAction) return;
const msgId = message?.message_id;
const msgText = message?.text || '';
if (!msgId || !msgText) return;
Expand Down Expand Up @@ -1387,6 +1389,7 @@

/** @param {import('$conversationTypes').ChatResponseModel} message */
async function openBotMsgEditor(message) {
if (isWaiting || disableAction) return;
let source = "text";
if (message.rich_content?.message?.text === message.text) {
source = "both";
Expand Down Expand Up @@ -1975,6 +1978,7 @@
data-bs-toggle="tooltip"
data-bs-placement="top"
title="Edit"
aria-disabled={isWaiting || disableAction}
onclick={() => editMessage(message)}
>
<i class="bx bxs-edit cb-text-primary"></i>
Expand All @@ -1988,7 +1992,7 @@
data-bs-toggle="tooltip"
data-bs-placement="top"
title="Resend"
aria-disabled={isSendingMsg || isThinking || disableAction}
aria-disabled={isWaiting || disableAction}
onclick={() => resendMessage(message)}
>
<i class="bx bx-redo cb-text-primary"></i>
Expand Down Expand Up @@ -2021,11 +2025,8 @@
data-bs-toggle="tooltip"
data-bs-placement="top"
title="Delete"
aria-disabled={isSendingMsg || isThinking || disableAction}
onclick={(e) => {
if (isSendingMsg || isThinking || disableAction) return;
deleteMessage(e, message.message_id);
}}
aria-disabled={isWaiting || disableAction}
onclick={(e) => deleteMessage(e, message.message_id)}
>
<i class="bx bx-trash cb-text-danger"></i>
</div>
Expand Down Expand Up @@ -2129,6 +2130,7 @@
data-bs-toggle="tooltip"
data-bs-placement="top"
title="Edit"
aria-disabled={isWaiting || disableAction}
onclick={() => openBotMsgEditor(message)}
>
<i class="bx bxs-edit cb-text-primary"></i>
Expand Down Expand Up @@ -2209,11 +2211,11 @@
{/if}
</ul>

<ChatFileGallery disabled={isSendingMsg || isThinking} />
<ChatFileGallery disabled={isWaiting} />
{#if !!lastBotMsg && !isSendingMsg && !isThinking}
<RichContent
message={lastBotMsg}
disabled={isSendingMsg || isThinking || disableAction}
disabled={isWaiting || disableAction}
onConfirm={(title, payload) => confirmSelectedOption(title, payload)}
/>
{/if}
Expand All @@ -2229,7 +2231,7 @@
class={`cb-btn cb-btn-round ${mode === TRAINING_MODE ? 'cb-btn-danger' : 'cb-btn-primary'} ${isListening ? 'cb-btn-listening' : ''}`}
aria-label="Start/stop listening"
aria-pressed={isListening}
disabled={isSendingMsg || isThinking || disableAction}
disabled={isWaiting || disableAction}
onclick={() => startListen()}
>
<i class="mdi mdi-{isListening ? 'microphone' : 'microphone-off'} cb-md-36"></i>
Expand All @@ -2242,7 +2244,7 @@
id={'chat-textarea'}
className={`${!isLite ? 'cb-textarea-more-util' : ''}`}
maxLength={maxTextLength}
disabled={isSendingMsg || isThinking || disableAction}
disabled={isWaiting || disableAction}
bind:text={text}
bind:loadUtils={loadChatUtils}
bind:options={chatUtilOptions}
Expand All @@ -2254,7 +2256,7 @@
<ChatFileUploader
accept={'.png,.jpg,.jpeg'}
containerClasses={'cb-util-uploader'}
disabled={isSendingMsg || isThinking || disableAction}
disabled={isWaiting || disableAction}
onfiledroped={() => refresh()}
>
<span>
Expand All @@ -2268,7 +2270,7 @@
<ChatFileUploader
accept={'.pdf,.xlsx,.xls,.csv'}
containerClasses={'cb-util-uploader'}
disabled={isSendingMsg || isThinking || disableAction}
disabled={isWaiting || disableAction}
onfiledroped={() => refresh()}
>
<span>
Expand All @@ -2282,7 +2284,7 @@
<ChatFileUploader
accept={'.wav,.mp3'}
containerClasses={'cb-util-uploader'}
disabled={isSendingMsg || isThinking || disableAction}
disabled={isWaiting || disableAction}
onfiledroped={() => refresh()}
>
<span>
Expand All @@ -2296,12 +2298,12 @@
</ChatTextArea>
<div class="cb-util-links">
<ChatBigMessage
disabled={isSendingMsg || isThinking || disableAction}
disabled={isWaiting || disableAction}
onclick={() => toggleBigMessageModal()}
/>
{#if PUBLIC_LIVECHAT_FILES_ENABLED === 'true'}
<ChatUtil
disabled={isSendingMsg || isThinking || disableAction}
disabled={isWaiting || disableAction}
onclick={() => loadChatUtils = true}
/>
{/if}
Expand All @@ -2323,7 +2325,7 @@
<button
type="submit"
class={`cb-btn cb-btn-round cb-btn-send ${mode === TRAINING_MODE ? 'cb-btn-danger' : 'cb-btn-primary'}`}
disabled={!_.trim(text) || isSendingMsg || isThinking || disableAction}
disabled={!_.trim(text) || isWaiting || disableAction}
onclick={() => sentTextMessage()}
>
<span class="cb-send-label">Send</span>
Expand Down
Loading