From b8ad1ca5253cd7e603863f126b198e917ee061b2 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 9 Feb 2024 12:15:39 +0700 Subject: [PATCH] more layout fixes and full screen mobile modal --- .../src/components/common/Modal/Modal.scss | 4 +- .../providers/ModalProvider/ModalProvider.tsx | 49 ++++++----- .../EngineCompositor/EngineCompositor.scss | 17 ++-- .../EngineCompositor/EngineCompositor.tsx | 81 ++++++++++++------- 4 files changed, 88 insertions(+), 63 deletions(-) diff --git a/packages/fakeyou.com/src/components/common/Modal/Modal.scss b/packages/fakeyou.com/src/components/common/Modal/Modal.scss index 2f8ee68c7a..926704db75 100644 --- a/packages/fakeyou.com/src/components/common/Modal/Modal.scss +++ b/packages/fakeyou.com/src/components/common/Modal/Modal.scss @@ -66,8 +66,8 @@ .fy-core-modal { .modal-content { - width: 85vw; - height: 85vh; + // width: 85vw; + min-height: 70vh; padding: 1rem; } } diff --git a/packages/fakeyou.com/src/components/providers/ModalProvider/ModalProvider.tsx b/packages/fakeyou.com/src/components/providers/ModalProvider/ModalProvider.tsx index e003c45a34..711a329dfa 100644 --- a/packages/fakeyou.com/src/components/providers/ModalProvider/ModalProvider.tsx +++ b/packages/fakeyou.com/src/components/providers/ModalProvider/ModalProvider.tsx @@ -3,33 +3,38 @@ import { ModalContext } from "context"; import { Modal } from "components/common"; interface Props { - children?: any, + children?: any; } interface ModalConfig { - component: React.ElementType, - props?: any + component: React.ElementType; + props?: any; } export default function ModalProvider({ children }: Props) { - const [modalState,modalStateSet] = useState(null); - const open = (cfg: ModalConfig) => modalStateSet(cfg); + const [modalState, modalStateSet] = useState(null); + const open = (cfg: ModalConfig) => modalStateSet(cfg); const close = () => modalStateSet(null); - return - { children } - { - - } - -}; \ No newline at end of file + return ( + + {children} + { + + } + + ); +} diff --git a/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.scss b/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.scss index c10af58fbc..118cafde26 100644 --- a/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.scss +++ b/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.scss @@ -1,9 +1,5 @@ .fy-engine-compositor { - padding: 1rem; - .engine-compositor-container { - padding: 1rem; - header { margin-bottom: 1.5rem; display: flex; @@ -12,12 +8,17 @@ width: 100%; } - h2, .fy-temp-select, .fy-input { margin-bottom: 0; } + h2, + .fy-temp-select, + .fy-input { + margin-bottom: 0; + } } .compositor-content { display: flex; - gap: 1rem; - > * { width: 100%; } + > * { + width: 100%; + } } -} \ No newline at end of file +} diff --git a/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.tsx b/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.tsx index 58486236aa..d21b42f4d9 100644 --- a/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.tsx @@ -1,14 +1,16 @@ import React, { useState } from "react"; -import { Button } from "components/common"; +import { Button, Container, Panel } from "components/common"; import { EntityInput } from "components/entities"; import { useInferenceJobs } from "hooks"; import InferenceJobsList from "components/layout/InferenceJobsList"; import { EnqueueEngineCompositing } from "@storyteller/components/src/api/engine_compositor/EnqueueEngineCompositing"; import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; import { v4 as uuidv4 } from "uuid"; -import "./EngineCompositor.scss" +import "./EngineCompositor.scss"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { StudioNotAvailable } from "v2/view/_common/StudioNotAvailable"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faTransporter } from "@fortawesome/pro-solid-svg-icons"; interface Props { value?: any; @@ -16,21 +18,22 @@ interface Props { } export default function EngineCompositor({ value, sessionWrapper }: Props) { - const [mediaToken,mediaTokenSet] = useState(); + const [mediaToken, mediaTokenSet] = useState(); const onChange = ({ target }: any) => mediaTokenSet(target.value); - const inferenceJobs = useInferenceJobs(FrontendInferenceJobType.EngineComposition); + const inferenceJobs = useInferenceJobs( + FrontendInferenceJobType.EngineComposition + ); const onClick = () => { - EnqueueEngineCompositing("",{ - uuid_idempotency_token: uuidv4(), - video_source: mediaToken || "", - }) - .then((res: any) => { - if (res && res.success) { - inferenceJobs.enqueue(res.inference_job_token); - } - }); - } + EnqueueEngineCompositing("", { + uuid_idempotency_token: uuidv4(), + video_source: mediaToken || "", + }).then((res: any) => { + if (res && res.success) { + inferenceJobs.enqueue(res.inference_job_token); + } + }); + }; const failures = (fail = "") => { switch (fail) { @@ -40,22 +43,38 @@ export default function EngineCompositor({ value, sessionWrapper }: Props) { }; if (!sessionWrapper.canAccessStudio()) { - return + return ; } - return
-
-
-

Engine Compositor

-
- -
- -
; -}; \ No newline at end of file + return ( + + +
+
+
+

+ + Engine Compositor +

+
+ +
+ +
+
+
+ ); +}