From e76aea2c12fd9aca7ed4e32489f135506b275720 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Thu, 8 May 2025 14:14:54 +0700 Subject: [PATCH] login logic and settings disconnect/connect sora account --- .../app/src/pages/PageEnigma/PageEditor.tsx | 2 +- .../app/src/pages/PageEnigma/PageEnigma.tsx | 6 +- .../libs/components/button/src/lib/button.tsx | 5 +- .../libs/components/input/src/lib/input.tsx | 3 +- .../login-modal/src/lib/login-modal.tsx | 37 ++--- .../src/lib/components/SoraAccountButton.tsx | 112 +++++++++++++++ .../src/lib/panes/AccountSettingsPane.tsx | 130 +++++++++--------- .../components/settings-modal/tsconfig.json | 9 +- .../settings-modal/tsconfig.lib.json | 9 +- frontend/libs/tauri-api/src/index.ts | 9 +- .../src/lib/sora/CheckSoraSession.ts | 12 +- .../src/lib/sora/LogoutSoraSession.ts | 4 + .../src/lib/sora/useSoraLoginListener.ts | 30 ++++ 13 files changed, 260 insertions(+), 108 deletions(-) create mode 100644 frontend/libs/components/settings-modal/src/lib/components/SoraAccountButton.tsx create mode 100644 frontend/libs/tauri-api/src/lib/sora/LogoutSoraSession.ts create mode 100644 frontend/libs/tauri-api/src/lib/sora/useSoraLoginListener.ts diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx index b0959b6c31..3b933889f1 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from "react"; +import React, { useEffect } from "react"; import { useSignals } from "@preact/signals-react/runtime"; import { LoadingDots, TopBar } from "~/components"; import { Controls3D } from "./comps/Controls3D"; diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEnigma.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEnigma.tsx index dc81ac2cc7..84ab4dfab5 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEnigma.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEnigma.tsx @@ -8,7 +8,7 @@ import { ErrorDialog, LoadingDots } from "~/components"; import { GenerateModals } from "~/pages/PageEnigma/comps/GenerateModals/GenerateModals"; import { Toaster } from "@storyteller/ui-toaster"; import { EditorLoadingBar } from "./comps/EditorLoadingBar"; -import { Wizard } from "~/pages/PageEnigma/Wizard/Wizard"; +// import { Wizard } from "~/pages/PageEnigma/Wizard/Wizard"; import { useSignals } from "@preact/signals-react/runtime"; import { useEffect, useState } from "react"; import * as gpu from "detect-gpu"; @@ -91,7 +91,7 @@ export const PageEnigma = ({ sceneToken }: { sceneToken?: string }) => { }); useEffect(() => { - console.log('installing event listeners') + console.log("installing event listeners"); InstallSounds(); InstallImageGenerationSuccess(); InstallImageGenerationFailure(); @@ -117,7 +117,7 @@ export const PageEnigma = ({ sceneToken }: { sceneToken?: string }) => { /> - + {/* */} diff --git a/frontend/libs/components/button/src/lib/button.tsx b/frontend/libs/components/button/src/lib/button.tsx index 61dc6dc2c9..28e10d9321 100644 --- a/frontend/libs/components/button/src/lib/button.tsx +++ b/frontend/libs/components/button/src/lib/button.tsx @@ -14,7 +14,7 @@ export interface ButtonProps extends ButtonHTMLAttributes { iconClassName?: string; iconFlip?: boolean; htmlFor?: string; - variant?: "primary" | "secondary" | "action"; + variant?: "primary" | "secondary" | "action" | "destructive"; loading?: boolean; as?: "button" | "link"; href?: string; @@ -44,6 +44,9 @@ export const Button = ({ case "action": { return "bg-action hover:bg-action-900 text-white focus-visible:outline-action"; } + case "destructive": { + return "bg-red/70 hover:bg-red/50 text-white focus-visible:outline-red"; + } case "primary": default: { return "bg-primary hover:bg-primary-400 text-white focus-visible:outline-primary-600"; diff --git a/frontend/libs/components/input/src/lib/input.tsx b/frontend/libs/components/input/src/lib/input.tsx index 95bebcbbbc..be46659168 100644 --- a/frontend/libs/components/input/src/lib/input.tsx +++ b/frontend/libs/components/input/src/lib/input.tsx @@ -46,7 +46,8 @@ export const Input = React.forwardRef( id={id ? id : label ? label : undefined} className={twMerge( "h-10 w-full rounded-lg bg-[#242424] px-3 py-2.5 text-white placeholder-white/50 outline-none", - "border border-[#363636] transition-all duration-150 ease-in-out hover:border-brand-primary/60 focus:border-brand-primary focus:!outline-none", + "border border-[#363636] transition-all duration-150 ease-in-out hover:border-primary/60 focus:border-primary focus:!outline-none", + "disabled:cursor-not-allowed disabled:opacity-60 disabled:hover:border-[#363636]", icon && "pl-10", isError && "outline-red focus:outline-red", inputClassName diff --git a/frontend/libs/components/login-modal/src/lib/login-modal.tsx b/frontend/libs/components/login-modal/src/lib/login-modal.tsx index 951d89775d..559faf5a33 100644 --- a/frontend/libs/components/login-modal/src/lib/login-modal.tsx +++ b/frontend/libs/components/login-modal/src/lib/login-modal.tsx @@ -8,14 +8,18 @@ import { } from "@fortawesome/pro-solid-svg-icons"; import { faDiscord } from "@fortawesome/free-brands-svg-icons"; import { IsDesktopApp } from "@storyteller/tauri-utils"; -import { CheckSoraSession, SoraSessionState } from "@storyteller/tauri-api"; +import { + CheckSoraSession, + SoraSessionState, + useSoraLoginListener, +} from "@storyteller/tauri-api"; import { invoke } from "@tauri-apps/api/core"; interface LoginModalProps { onClose: () => void; - videoSrc2D: string; - videoSrc3D: string; - openAiLogo: string; + videoSrc2D?: string; + videoSrc3D?: string; + openAiLogo?: string; } export function LoginModal({ @@ -26,11 +30,15 @@ export function LoginModal({ }: LoginModalProps) { const [step, setStep] = useState(1); const [isLoading, setIsLoading] = useState(false); - const [hasSession, setHasSession] = useState(false); const [isOpen, setIsOpen] = useState(false); - const [isLoginClicked, setIsLoginClicked] = useState(false); + const totalSteps = 3; + useSoraLoginListener((payload) => { + console.log("Login success!", payload); + setStep(3); + }); + // Check session on component mount useEffect(() => { const initSession = async () => { @@ -52,14 +60,12 @@ export function LoginModal({ const handleNext = async () => { if (step === 2) { setIsLoading(true); - setIsLoginClicked(true); try { if (IsDesktopApp()) { await invoke("open_sora_login_command"); // Add 3 second delay before setting session to true await new Promise((resolve) => setTimeout(resolve, 3000)); - setHasSession(true); const result = await CheckSoraSession(); const sessionExists = result.state === SoraSessionState.Valid; if (sessionExists) { @@ -69,7 +75,6 @@ export function LoginModal({ alert("Please open the desktop app to login"); // Add 3 second delay before setting session to true await new Promise((resolve) => setTimeout(resolve, 3000)); - setHasSession(true); const sessionExists = true; if (sessionExists) { @@ -169,9 +174,6 @@ export function LoginModal({ alt="OpenAI Logo" className="w-72 h-72 mx-auto grow" /> - {/*
- -
*/} ); case 3: @@ -255,17 +257,6 @@ export function LoginModal({ > {step === 2 ? "Login with OpenAI" : "Continue"} - {step > 1 && step !== 3 ? ( - - ) : null} ) : ( + ); +}; diff --git a/frontend/libs/components/settings-modal/src/lib/panes/AccountSettingsPane.tsx b/frontend/libs/components/settings-modal/src/lib/panes/AccountSettingsPane.tsx index 0a0badc749..ff533d59d9 100644 --- a/frontend/libs/components/settings-modal/src/lib/panes/AccountSettingsPane.tsx +++ b/frontend/libs/components/settings-modal/src/lib/panes/AccountSettingsPane.tsx @@ -1,6 +1,7 @@ import { useState } from "react"; import { Button } from "@storyteller/ui-button"; import { Input } from "@storyteller/ui-input"; +import { SoraAccountButton } from "../components/SoraAccountButton"; interface AccountInfo { username: string; @@ -10,78 +11,81 @@ interface AccountInfo { export const AccountSettingsPane = () => { const [accountInfo] = useState({ - username: "Username [logout]", - subscription: "Pro-tier [change/upgrade]", - credits: 10233, + username: "-", + subscription: "-", + credits: 0, }); const [palApiKey, setPalApiKey] = useState(""); const [klingApiKey, setKlingApiKey] = useState(""); return ( -
-
- ArtCraft Account: - {accountInfo.username} -
-
- ArtCraft Subscription: - {accountInfo.subscription} -
-
- Credits Remaining: - {accountInfo.credits} -
- -
-

- Note: You can optionally log into other accounts and use your credits - at those providers. Some features are only available via 3rd party - accounts, such as OpenAI / Sora GPT 4.0 Images. For other features, - ArtCraft credits are consumed unless you log into your third party - account. -

-
- -
- OpenAI / Sora Account: - -
-
- Google / Veo Account: - -
- + <>
-
- - setPalApiKey((e.target as any).value)} - placeholder="Enter API Key" - /> +
+ ArtCraft Account: + {accountInfo.username}
-
- - setKlingApiKey((e.target as any).value)} - placeholder="Enter API Key" - /> +
+ ArtCraft Subscription: + {accountInfo.subscription} +
+
+ Credits Remaining: + {accountInfo.credits} +
+ +
+

+ Note: You can optionally log into other accounts and use your + credits at those providers. Some features are only available via 3rd + party accounts, such as OpenAI / Sora GPT 4.0 Images. For other + features, ArtCraft credits are consumed unless you log into your + third party account. +

+
+ +
+ OpenAI / Sora Account: + +
+ +
+ Google / Veo Account: + +
+ +
+
+ + setPalApiKey((e.target as any).value)} + placeholder="Enter API Key" + disabled + /> +
+
+ + setKlingApiKey((e.target as any).value)} + placeholder="Enter API Key" + disabled + /> +
-
+ ); }; diff --git a/frontend/libs/components/settings-modal/tsconfig.json b/frontend/libs/components/settings-modal/tsconfig.json index f52e6295e5..4f5c504705 100644 --- a/frontend/libs/components/settings-modal/tsconfig.json +++ b/frontend/libs/components/settings-modal/tsconfig.json @@ -8,21 +8,24 @@ { "path": "../label" }, + { + "path": "../switch" + }, { "path": "../select" }, { "path": "../../tauri-api" }, + { + "path": "../../soundboard" + }, { "path": "../input" }, { "path": "../button" }, - { - "path": "../../soundboard" - }, { "path": "./tsconfig.lib.json" }, diff --git a/frontend/libs/components/settings-modal/tsconfig.lib.json b/frontend/libs/components/settings-modal/tsconfig.lib.json index c1d7aff072..62d1c85923 100644 --- a/frontend/libs/components/settings-modal/tsconfig.lib.json +++ b/frontend/libs/components/settings-modal/tsconfig.lib.json @@ -49,20 +49,23 @@ { "path": "../label/tsconfig.lib.json" }, + { + "path": "../switch/tsconfig.lib.json" + }, { "path": "../select/tsconfig.lib.json" }, { "path": "../../tauri-api/tsconfig.lib.json" }, + { + "path": "../../soundboard/tsconfig.lib.json" + }, { "path": "../input/tsconfig.lib.json" }, { "path": "../button/tsconfig.lib.json" - }, - { - "path": "../../soundboard/tsconfig.lib.json" } ] } diff --git a/frontend/libs/tauri-api/src/index.ts b/frontend/libs/tauri-api/src/index.ts index e8f9c851bd..ff95a96ed2 100644 --- a/frontend/libs/tauri-api/src/index.ts +++ b/frontend/libs/tauri-api/src/index.ts @@ -1,4 +1,5 @@ - -export * from './lib/settings/GetAppPreferences.js'; -export * from './lib/settings/UpdateAppPreference.js'; -export * from './lib/sora/CheckSoraSession.js'; +export * from "./lib/settings/GetAppPreferences.js"; +export * from "./lib/settings/UpdateAppPreference.js"; +export * from "./lib/sora/CheckSoraSession.js"; +export * from "./lib/sora/useSoraLoginListener.js"; +export * from "./lib/sora/LogoutSoraSession.js"; diff --git a/frontend/libs/tauri-api/src/lib/sora/CheckSoraSession.ts b/frontend/libs/tauri-api/src/lib/sora/CheckSoraSession.ts index 8d9b5831d8..69cc587692 100644 --- a/frontend/libs/tauri-api/src/lib/sora/CheckSoraSession.ts +++ b/frontend/libs/tauri-api/src/lib/sora/CheckSoraSession.ts @@ -1,8 +1,8 @@ import { invoke } from "@tauri-apps/api/core"; export interface CheckSoraSessionResult { - state: SoraSessionState, - maybe_account_email?: string, + state: SoraSessionState; + maybe_account_email?: string; } export enum SoraSessionState { @@ -11,8 +11,8 @@ export enum SoraSessionState { Valid = "valid", } -export const CheckSoraSession = async () : Promise => { - let result = await invoke("check_sora_session_command"); +export const CheckSoraSession = async (): Promise => { + const result = await invoke("check_sora_session_command"); console.log(">>> sora result", result); - return (result as CheckSoraSessionResult); -} + return result as CheckSoraSessionResult; +}; diff --git a/frontend/libs/tauri-api/src/lib/sora/LogoutSoraSession.ts b/frontend/libs/tauri-api/src/lib/sora/LogoutSoraSession.ts new file mode 100644 index 0000000000..c52f9ae5d0 --- /dev/null +++ b/frontend/libs/tauri-api/src/lib/sora/LogoutSoraSession.ts @@ -0,0 +1,4 @@ +export const LogoutSoraSession = async (): Promise => { + // Replace with real Tauri command to logout Sora session - BFlat + return new Promise((resolve) => setTimeout(resolve, 500)); +}; diff --git a/frontend/libs/tauri-api/src/lib/sora/useSoraLoginListener.ts b/frontend/libs/tauri-api/src/lib/sora/useSoraLoginListener.ts new file mode 100644 index 0000000000..40cb23a8d0 --- /dev/null +++ b/frontend/libs/tauri-api/src/lib/sora/useSoraLoginListener.ts @@ -0,0 +1,30 @@ +import { useEffect } from "react"; +import { listen } from "@tauri-apps/api/event"; + +type SoraLoginSuccessPayload = { + // TODO +}; + +export function useSoraLoginListener( + onSuccess: (payload: SoraLoginSuccessPayload) => void +) { + useEffect(() => { + let unlisten: () => void; + + const setupListener = async () => { + const stop = await listen( + "sora-login-success", + (event) => { + onSuccess(event.payload); + } + ); + unlisten = stop; + }; + + setupListener(); + + return () => { + if (unlisten) unlisten(); + }; + }, [onSuccess]); +}