From 93eb78da91405bfa3467516be155b847e99c545e Mon Sep 17 00:00:00 2001 From: ArEnSc <6252325+ArEnSc@users.noreply.github.com> Date: Thu, 1 May 2025 22:32:55 -0400 Subject: [PATCH] =?UTF-8?q?When=20the=20desktop=20app=20is=20running,=20th?= =?UTF-8?q?e=20profile=20dropdown=20should=20not=20be=20w=E2=80=A6=20(#575?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …hite. Co-authored-by: Michael Chung --- frontend/apps/editor2d/src/components/PromptBox.tsx | 8 ++++---- .../features/ToolbarUserProfile/ProfileDropdown.tsx | 13 +++++++------ script/desktop/run_desktop_3d.sh | 2 -- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/frontend/apps/editor2d/src/components/PromptBox.tsx b/frontend/apps/editor2d/src/components/PromptBox.tsx index 76d329364a..1a1d344f1a 100644 --- a/frontend/apps/editor2d/src/components/PromptBox.tsx +++ b/frontend/apps/editor2d/src/components/PromptBox.tsx @@ -28,11 +28,11 @@ import { getCanvasRenderBitmap } from "~/signal/canvasRenderBitmap"; import { EncodeImageBitmapToBase64 } from "~/utilities/EncodeImageBitmapToBase64"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { PopoverItem } from "~/components/reusable/Popover"; -import { Api } from "~/KonvaApp/Api"; + import { useJobContext } from "~/components/JobContext"; import { IsDesktopApp } from "@storyteller/tauri-utils"; import { GalleryItem, GalleryModal } from "@storyteller/ui-gallery-modal"; - +import { PromptsApi } from "@storyteller/api"; interface ReferenceImage { id: string; url: string; @@ -215,7 +215,7 @@ export const PromptBox = () => { }; const handleTauriEnqueue = async () => { - const api = new Api(); + const api = new PromptsApi(); let image = getCanvasRenderBitmap(); if (image === undefined) { return; @@ -261,7 +261,7 @@ export const PromptBox = () => { }; const handleWebEnqueue = async () => { - const api = new Api(); + const api = new PromptsApi(); let image = getCanvasRenderBitmap(); if (image === undefined) { toast.error( diff --git a/frontend/apps/editor2d/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx b/frontend/apps/editor2d/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx index 844cc36863..10d6169f33 100644 --- a/frontend/apps/editor2d/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx +++ b/frontend/apps/editor2d/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx @@ -1,4 +1,5 @@ import { twMerge } from "tailwind-merge"; +import { Fragment } from "react"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faChevronDown, @@ -65,18 +66,18 @@ export function ProfileDropdown() { )} > - - My Profile + + My Profile {menuOptions.map((option, index) => ( @@ -85,7 +86,7 @@ export function ProfileDropdown() { as="button" className={twMerge( "flex w-full items-center gap-3 rounded-lg px-3 py-2", - "text-md font-medium text-gray-700 hover:bg-gray-100", + "text-md font-medium text-white hover:bg-gray-100 hover:text-gray-700", "transition-colors duration-150", )} onClick={(e) => { @@ -94,7 +95,7 @@ export function ProfileDropdown() { option.onClick(); }} > - + {option.label} ))} diff --git a/script/desktop/run_desktop_3d.sh b/script/desktop/run_desktop_3d.sh index 07657e7b15..07119ec56f 100755 --- a/script/desktop/run_desktop_3d.sh +++ b/script/desktop/run_desktop_3d.sh @@ -2,5 +2,3 @@ set -euxo pipefail # calls these ./script/desktop/launch_rust_only_3d_for_michael.sh - -echo "All scripts completed!" \ No newline at end of file