From 6c2dec5220a9e28faf69a0ceda8bf113c8b2d6d2 Mon Sep 17 00:00:00 2001 From: an-lee Date: Wed, 20 Nov 2024 10:02:38 +0800 Subject: [PATCH] Fix layout (#1191) * fix layout * fix layout --- enjoy/src/renderer/components/chats/chat-session.tsx | 4 ++-- enjoy/src/renderer/components/copilots/copilot-session.tsx | 2 +- enjoy/src/renderer/components/layouts/layout.tsx | 6 +++--- enjoy/src/renderer/components/layouts/sidebar.tsx | 2 +- enjoy/src/renderer/components/layouts/title-bar.tsx | 7 ++----- enjoy/src/renderer/components/login/bandu-login-form.tsx | 2 +- enjoy/src/renderer/components/login/github-login-form.tsx | 2 +- enjoy/src/renderer/components/login/mixin-login-form.tsx | 2 +- .../medias/media-bottom-panel/media-current-recording.tsx | 2 +- .../media-left-panel/media-transcription-read-button.tsx | 2 +- .../src/renderer/components/messages/assistant-message.tsx | 4 ++-- enjoy/src/renderer/components/ui/toast.tsx | 2 +- enjoy/src/renderer/context/chat-session-provider.tsx | 6 +++--- enjoy/src/renderer/context/course-provider.tsx | 6 +++--- enjoy/src/renderer/pages/audio.tsx | 2 +- enjoy/src/renderer/pages/chats.tsx | 2 +- enjoy/src/renderer/pages/conversation.tsx | 6 +++--- enjoy/src/renderer/pages/conversations.tsx | 6 +++--- enjoy/src/renderer/pages/courses/chapter.tsx | 4 ++-- enjoy/src/renderer/pages/document.tsx | 4 ++-- enjoy/src/renderer/pages/error-page.tsx | 2 +- .../src/renderer/pages/pronunciation-assessments/index.tsx | 2 +- enjoy/src/renderer/pages/story-preview.tsx | 2 +- enjoy/src/renderer/pages/story.tsx | 2 +- enjoy/src/renderer/pages/video.tsx | 2 +- enjoy/tailwind.config.js | 3 +++ 26 files changed, 43 insertions(+), 43 deletions(-) diff --git a/enjoy/src/renderer/components/chats/chat-session.tsx b/enjoy/src/renderer/components/chats/chat-session.tsx index bef2c947..6622b1e7 100644 --- a/enjoy/src/renderer/components/chats/chat-session.tsx +++ b/enjoy/src/renderer/components/chats/chat-session.tsx @@ -12,14 +12,14 @@ export const ChatSession = (props: { if (!chatId) { return ( -
+
{t("noChatSelected")}
); } return ( - + { const { currentChat } = useContext(CopilotProviderContext); return ( - + {currentChat?.id ? ( diff --git a/enjoy/src/renderer/components/layouts/layout.tsx b/enjoy/src/renderer/components/layouts/layout.tsx index ece45090..9d624542 100644 --- a/enjoy/src/renderer/components/layouts/layout.tsx +++ b/enjoy/src/renderer/components/layouts/layout.tsx @@ -27,7 +27,7 @@ export const Layout = () => {
-
+
@@ -44,7 +44,7 @@ export const Layout = () => { minSize={15} onCollapse={() => setActive(false)} > -
+
@@ -57,7 +57,7 @@ export const Layout = () => { return (
-
+
diff --git a/enjoy/src/renderer/components/layouts/sidebar.tsx b/enjoy/src/renderer/components/layouts/sidebar.tsx index 73465207..60cb8daf 100644 --- a/enjoy/src/renderer/components/layouts/sidebar.tsx +++ b/enjoy/src/renderer/components/layouts/sidebar.tsx @@ -76,7 +76,7 @@ export const Sidebar = () => { return (
{ }, []); return ( -
+
{platform === "darwin" && !isFullScreen &&
} @@ -150,9 +149,7 @@ export const TitleBar = () => { - - {t("feedback")} - + {t("feedback")} diff --git a/enjoy/src/renderer/components/login/bandu-login-form.tsx b/enjoy/src/renderer/components/login/bandu-login-form.tsx index e9e9e56b..5ef03cd1 100644 --- a/enjoy/src/renderer/components/login/bandu-login-form.tsx +++ b/enjoy/src/renderer/components/login/bandu-login-form.tsx @@ -41,7 +41,7 @@ export const BanduLoginButton = () => { diff --git a/enjoy/src/renderer/components/login/github-login-form.tsx b/enjoy/src/renderer/components/login/github-login-form.tsx index 1b6e432b..bab05473 100644 --- a/enjoy/src/renderer/components/login/github-login-form.tsx +++ b/enjoy/src/renderer/components/login/github-login-form.tsx @@ -33,7 +33,7 @@ export const GithubLoginButton = () => {
diff --git a/enjoy/src/renderer/components/login/mixin-login-form.tsx b/enjoy/src/renderer/components/login/mixin-login-form.tsx index 3f9af432..c3dfd68e 100644 --- a/enjoy/src/renderer/components/login/mixin-login-form.tsx +++ b/enjoy/src/renderer/components/login/mixin-login-form.tsx @@ -42,7 +42,7 @@ export const MixinLoginButton = () => { diff --git a/enjoy/src/renderer/components/medias/media-bottom-panel/media-current-recording.tsx b/enjoy/src/renderer/components/medias/media-bottom-panel/media-current-recording.tsx index b1d022e3..41193745 100644 --- a/enjoy/src/renderer/components/medias/media-bottom-panel/media-current-recording.tsx +++ b/enjoy/src/renderer/components/medias/media-bottom-panel/media-current-recording.tsx @@ -686,7 +686,7 @@ export const MediaCurrentRecording = () => { diff --git a/enjoy/src/renderer/components/medias/media-left-panel/media-transcription-read-button.tsx b/enjoy/src/renderer/components/medias/media-left-panel/media-transcription-read-button.tsx index 650a17af..229b6291 100644 --- a/enjoy/src/renderer/components/medias/media-left-panel/media-transcription-read-button.tsx +++ b/enjoy/src/renderer/components/medias/media-left-panel/media-transcription-read-button.tsx @@ -233,7 +233,7 @@ const TranscriptionRecordingsList = () => { diff --git a/enjoy/src/renderer/components/messages/assistant-message.tsx b/enjoy/src/renderer/components/messages/assistant-message.tsx index 107e87f1..e8286d06 100644 --- a/enjoy/src/renderer/components/messages/assistant-message.tsx +++ b/enjoy/src/renderer/components/messages/assistant-message.tsx @@ -297,12 +297,12 @@ export const AssistantMessageComponent = (props: { event.preventDefault()} onInteractOutside={(event) => event.preventDefault()} > - + {t("shadow")} diff --git a/enjoy/src/renderer/components/ui/toast.tsx b/enjoy/src/renderer/components/ui/toast.tsx index a04b2131..5791c4ee 100644 --- a/enjoy/src/renderer/components/ui/toast.tsx +++ b/enjoy/src/renderer/components/ui/toast.tsx @@ -14,7 +14,7 @@ const ToastViewport = React.forwardRef< event.preventDefault()} onInteractOutside={(event) => event.preventDefault()} > - + Shadow @@ -508,7 +508,7 @@ export const ChatSessionProvider = ({ diff --git a/enjoy/src/renderer/context/course-provider.tsx b/enjoy/src/renderer/context/course-provider.tsx index ec4cb5d1..8a10f9d3 100644 --- a/enjoy/src/renderer/context/course-provider.tsx +++ b/enjoy/src/renderer/context/course-provider.tsx @@ -72,12 +72,12 @@ export const CourseProvider = ({ > event.preventDefault()} onInteractOutside={(event) => event.preventDefault()} > - + Shadow @@ -85,7 +85,7 @@ export const CourseProvider = ({ - + {shadowing && } diff --git a/enjoy/src/renderer/pages/audio.tsx b/enjoy/src/renderer/pages/audio.tsx index 0a1e0fa7..163c7427 100644 --- a/enjoy/src/renderer/pages/audio.tsx +++ b/enjoy/src/renderer/pages/audio.tsx @@ -25,7 +25,7 @@ export default () => { const navigate = useNavigate(); return ( -
+
diff --git a/enjoy/src/renderer/pages/chats.tsx b/enjoy/src/renderer/pages/chats.tsx index d71e691e..0de4d04b 100644 --- a/enjoy/src/renderer/pages/chats.tsx +++ b/enjoy/src/renderer/pages/chats.tsx @@ -38,7 +38,7 @@ export default function Chats() { }, [currentChat]); return ( - + {!sidePanelCollapsed && ( <> { return (
@@ -249,13 +249,13 @@ export default () => {
- + {t("editConversation")} -
+
{ diff --git a/enjoy/src/renderer/pages/conversations.tsx b/enjoy/src/renderer/pages/conversations.tsx index 1f93b1d7..cc314cf2 100644 --- a/enjoy/src/renderer/pages/conversations.tsx +++ b/enjoy/src/renderer/pages/conversations.tsx @@ -15,7 +15,7 @@ import { } from "@renderer/components/ui"; import { ConversationCard, ConversationForm } from "@renderer/components"; import { useState, useEffect, useContext, useReducer } from "react"; -import { ChevronLeftIcon, LoaderIcon } from "lucide-react"; +import { LoaderIcon } from "lucide-react"; import { Link, useNavigate, useSearchParams } from "react-router-dom"; import { DbProviderContext, @@ -292,13 +292,13 @@ export default () => { setCreating(value)}> - + {t("startConversation")} -
+
setCreating(false)} diff --git a/enjoy/src/renderer/pages/courses/chapter.tsx b/enjoy/src/renderer/pages/courses/chapter.tsx index a2fe1584..50dcb95b 100644 --- a/enjoy/src/renderer/pages/courses/chapter.tsx +++ b/enjoy/src/renderer/pages/courses/chapter.tsx @@ -42,7 +42,7 @@ export default () => { return ( -
+
@@ -58,7 +58,7 @@ export default () => { {chapter?.title || sequence} -
+
diff --git a/enjoy/src/renderer/pages/document.tsx b/enjoy/src/renderer/pages/document.tsx index e8b1b7c5..2dc9983f 100644 --- a/enjoy/src/renderer/pages/document.tsx +++ b/enjoy/src/renderer/pages/document.tsx @@ -36,14 +36,14 @@ const DocumentComponent = () => { if (!document) { return ( -
+
); } return ( -
+
diff --git a/enjoy/src/renderer/pages/error-page.tsx b/enjoy/src/renderer/pages/error-page.tsx index b65d56d2..1568d364 100644 --- a/enjoy/src/renderer/pages/error-page.tsx +++ b/enjoy/src/renderer/pages/error-page.tsx @@ -7,7 +7,7 @@ export default () => { console.error(error); return ( -
+
{ diff --git a/enjoy/src/renderer/pages/story-preview.tsx b/enjoy/src/renderer/pages/story-preview.tsx index 96721424..f1ca0699 100644 --- a/enjoy/src/renderer/pages/story-preview.tsx +++ b/enjoy/src/renderer/pages/story-preview.tsx @@ -206,7 +206,7 @@ export default () => { }, [readable, loading]); return ( -
+
{(loading || !readable) && (