From 19daedefa0aabadfd4baf1dd6a8b15637587beaa Mon Sep 17 00:00:00 2001 From: wil Date: Tue, 6 Feb 2024 10:29:30 -0500 Subject: [PATCH] namespace and route change --- .../InferenceJobsList/InferenceJobsList.tsx | 3 -- .../src/components/layout/SideNav/SideNav.tsx | 47 ++++++++++--------- .../fakeyou.com/src/v2/view/PageContainer.tsx | 6 +-- .../view/pages/storyteller_filter/index.tsx | 1 - .../VideoWorkflow.tsx} | 4 +- .../components/pageJobList.tsx | 8 ++-- .../components/pageVideoProvision.tsx | 9 ++-- .../components/pageWorkflowControls.tsx} | 2 +- .../components/tabContentLibrary.tsx | 20 ++++---- .../components/tabContentUpload.tsx | 2 +- .../v2/view/pages/video_workflow/index.tsx | 1 + .../videoWorkflowReducer.tsx} | 0 .../videoWorkflowRoutes.tsx} | 15 +++--- 13 files changed, 62 insertions(+), 56 deletions(-) delete mode 100644 packages/fakeyou.com/src/v2/view/pages/storyteller_filter/index.tsx rename packages/fakeyou.com/src/v2/view/pages/{storyteller_filter/StorytellerFilter.tsx => video_workflow/VideoWorkflow.tsx} (93%) rename packages/fakeyou.com/src/v2/view/pages/{storyteller_filter => video_workflow}/components/pageJobList.tsx (88%) rename packages/fakeyou.com/src/v2/view/pages/{storyteller_filter => video_workflow}/components/pageVideoProvision.tsx (84%) rename packages/fakeyou.com/src/v2/view/pages/{storyteller_filter/components/pageFilterControls.tsx => video_workflow/components/pageWorkflowControls.tsx} (99%) rename packages/fakeyou.com/src/v2/view/pages/{storyteller_filter => video_workflow}/components/tabContentLibrary.tsx (71%) rename packages/fakeyou.com/src/v2/view/pages/{storyteller_filter => video_workflow}/components/tabContentUpload.tsx (97%) create mode 100644 packages/fakeyou.com/src/v2/view/pages/video_workflow/index.tsx rename packages/fakeyou.com/src/v2/view/pages/{storyteller_filter/storytellerFilterReducer.tsx => video_workflow/videoWorkflowReducer.tsx} (100%) rename packages/fakeyou.com/src/v2/view/pages/{storyteller_filter/storytellerFilterRoutes.tsx => video_workflow/videoWorkflowRoutes.tsx} (66%) diff --git a/packages/fakeyou.com/src/components/layout/InferenceJobsList/InferenceJobsList.tsx b/packages/fakeyou.com/src/components/layout/InferenceJobsList/InferenceJobsList.tsx index 5a8ec52d02..a6fd9aafd1 100644 --- a/packages/fakeyou.com/src/components/layout/InferenceJobsList/InferenceJobsList.tsx +++ b/packages/fakeyou.com/src/components/layout/InferenceJobsList/InferenceJobsList.tsx @@ -24,9 +24,6 @@ export default function InferenceJobsList({ useInferenceJobs(jobType); const { t } = useLocalize("InferenceJobs"); - // let height = 0; - // const transitions = useTransition(inferenceJobs,{ not right now }); - if (inferenceJobs.length) { return ( diff --git a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx index fc37d2824c..70a9edb258 100644 --- a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx +++ b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx @@ -1,25 +1,26 @@ -import { faDiscord } from "@fortawesome/free-brands-svg-icons"; -import { - faBookOpen, - faMessageDots, - faTrophy, - faWaveformLines, - faStar, - faFaceViewfinder, - faCloudUpload, - faWandMagicSparkles, - faHome, - faCompass, - faUser, - faSignOutAlt, - faCameraMovie, - faPersonRays, - faMessageImage, - faPhotoFilm, -} from "@fortawesome/pro-solid-svg-icons"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import React, { useEffect, useState } from "react"; import { NavLink, useHistory } from "react-router-dom"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faDiscord } from "@fortawesome/free-brands-svg-icons"; +import { + faArrowsTurnToDots, + faBookOpen, + faCameraMovie, + faCompass, + faCloudUpload, + faFaceViewfinder, + faHome, + faMessageDots, + faMessageImage, + faPersonRays, + faSignOutAlt, + faStar, + faTrophy, + faUser, + faWandMagicSparkles, + faWaveformLines, +} from "@fortawesome/pro-solid-svg-icons"; + import { GetQueueStats, GetQueueStatsIsOk, @@ -374,15 +375,15 @@ export default function SideNav({
  • - {t("storytellerFilter")} + {t("videoWorkflow")}
    • diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index de6d34f15e..04270e9ae7 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -108,7 +108,7 @@ import UploadSdWeightPage from "./pages/upload/UploadSdWeightPage"; import { FooterNav } from "./nav/FooterNav"; import FbxToGltfPage from "./pages/fbx_to_gltf/FbxToGltfPage"; import UploadLoraWeightPage from "./pages/upload/UploadLoraWeightPage"; -import StorytellerFilterPage from "./pages/storyteller_filter/StorytellerFilter"; +import VideoWorkflowPage from "./pages/video_workflow"; import ScrollToTop from "./_common/ScrollToTop"; import TextToImagePage from "./pages/text_to_image/TextToImagePage"; @@ -828,8 +828,8 @@ class PageContainer extends React.Component< /> - - + ); -} \ No newline at end of file +}); \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/pageVideoProvision.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageVideoProvision.tsx similarity index 84% rename from packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/pageVideoProvision.tsx rename to packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageVideoProvision.tsx index 78105ce4d1..4ba67418c6 100644 --- a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/pageVideoProvision.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageVideoProvision.tsx @@ -2,14 +2,15 @@ import React from "react"; import { BasicVideo, Panel, Tabs } from "components/common"; -import { State, Action } from "../storytellerFilterReducer"; +import { State, Action } from "../videoWorkflowReducer"; import TabContentUpload from "./tabContentUpload"; import TabContentLibrary from "./tabContentLibrary"; export default function PageVideoProvision({ - debug=false, t, pageState, dispatchPageState + debug=false, parentPath, t, pageState, dispatchPageState }: { debug?: boolean; + parentPath: string; t: Function; pageState: State; dispatchPageState: (action: Action) => void; @@ -21,7 +22,7 @@ export default function PageVideoProvision({ content: , - to: "/storyteller-filter/upload", + to: `${parentPath}/upload`, padding: true, }, { @@ -29,7 +30,7 @@ export default function PageVideoProvision({ content: , - to: "/storyteller-filter/select-media", + to: `${parentPath}/select-media`, padding: true, }, ]; diff --git a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/pageFilterControls.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls.tsx similarity index 99% rename from packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/pageFilterControls.tsx rename to packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls.tsx index 4cfe63598c..530c893674 100644 --- a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/pageFilterControls.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls.tsx @@ -7,7 +7,7 @@ import { useMedia } from "hooks"; import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; import { EnqueueStorytellerFilter } from "@storyteller/components/src/api/storyteller_filter"; -import { states, Action, State } from "../storytellerFilterReducer"; +import { states, Action, State } from "../videoWorkflowReducer"; import { Accordion, Button, diff --git a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/tabContentLibrary.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/tabContentLibrary.tsx similarity index 71% rename from packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/tabContentLibrary.tsx rename to packages/fakeyou.com/src/v2/view/pages/video_workflow/components/tabContentLibrary.tsx index d9b321c56a..3e22277607 100644 --- a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/tabContentLibrary.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/tabContentLibrary.tsx @@ -1,6 +1,6 @@ import React from "react"; import { NavLink } from "react-router-dom"; -import { states, Action, State } from "../storytellerFilterReducer"; +import { states, Action, State } from "../videoWorkflowReducer"; import { Button } from "components/common"; import SelectModal from "components/common/SelectModal/SelectModal"; @@ -21,7 +21,8 @@ export default function TabContentLibrary({ }); }; return ( -
    +
    +
    +
    {pageState.status === states.FILE_SELECTED && - -
    }
    ); diff --git a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/tabContentUpload.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/tabContentUpload.tsx similarity index 97% rename from packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/tabContentUpload.tsx rename to packages/fakeyou.com/src/v2/view/pages/video_workflow/components/tabContentUpload.tsx index 10fb07c3ac..e066601429 100644 --- a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/components/tabContentUpload.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/tabContentUpload.tsx @@ -5,7 +5,7 @@ import { v4 as uuidv4 } from "uuid"; import { UploadMedia } from "@storyteller/components/src/api/media_files/UploadMedia"; import { useFile } from "hooks"; import { ErrorMessage, VideoInput, Spinner } from "components/common"; -import { states, Action, State } from "../storytellerFilterReducer"; +import { states, Action, State } from "../videoWorkflowReducer"; export default function TabContentUpload({ debug=false, t, pageState, dispatchPageState diff --git a/packages/fakeyou.com/src/v2/view/pages/video_workflow/index.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/index.tsx new file mode 100644 index 0000000000..98bac22c56 --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/index.tsx @@ -0,0 +1 @@ +export { default } from './VideoWorkflow'; \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/storytellerFilterReducer.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/videoWorkflowReducer.tsx similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/storyteller_filter/storytellerFilterReducer.tsx rename to packages/fakeyou.com/src/v2/view/pages/video_workflow/videoWorkflowReducer.tsx diff --git a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/storytellerFilterRoutes.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/videoWorkflowRoutes.tsx similarity index 66% rename from packages/fakeyou.com/src/v2/view/pages/storyteller_filter/storytellerFilterRoutes.tsx rename to packages/fakeyou.com/src/v2/view/pages/video_workflow/videoWorkflowRoutes.tsx index cc4f7c516b..36862a705e 100644 --- a/packages/fakeyou.com/src/v2/view/pages/storyteller_filter/storytellerFilterRoutes.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/videoWorkflowRoutes.tsx @@ -1,9 +1,9 @@ import React from "react"; import {Switch, Route, useRouteMatch, Redirect} from "react-router-dom"; -import PageFilterControls from "./components/pageFilterControls"; +import PageWorkflowControls from "./components/pageWorkflowControls"; import PageVideoProvision from "./components/pageVideoProvision"; import PageJobList from "./components/pageJobList"; -import {State,Action} from "./storytellerFilterReducer"; +import {State,Action} from "./videoWorkflowReducer"; export default function SubRoutes ({ debug, t, pageState, dispatchPageState @@ -14,20 +14,23 @@ export default function SubRoutes ({ dispatchPageState: (action: Action) => void }){ const { path } = useRouteMatch(); + const commonPageProps = { + debug, parentPath: path, t, pageState, dispatchPageState + }; return( - + - + - + - +