From eef929c0657d8913d56a4dc093912c42fa3106bd Mon Sep 17 00:00:00 2001 From: bflatastic Date: Wed, 7 May 2025 14:23:45 +0700 Subject: [PATCH] improved upload --- .../reusable/UploadModal3D/UploadModal3D.tsx | 118 ++++++++++-------- .../app/src/pages/PageEnigma/PageEditor.tsx | 4 +- .../PageEnigma/comps/AssetMenu/AssetModal.tsx | 108 ++++++++++++---- .../comps/Controls3D/Controls3D.tsx | 2 +- 4 files changed, 155 insertions(+), 77 deletions(-) diff --git a/frontend/apps/editor3d/app/src/components/reusable/UploadModal3D/UploadModal3D.tsx b/frontend/apps/editor3d/app/src/components/reusable/UploadModal3D/UploadModal3D.tsx index f3658dc39b..f2deb77346 100644 --- a/frontend/apps/editor3d/app/src/components/reusable/UploadModal3D/UploadModal3D.tsx +++ b/frontend/apps/editor3d/app/src/components/reusable/UploadModal3D/UploadModal3D.tsx @@ -1,12 +1,7 @@ import { useEffect, useState } from "react"; - -import { - TransitionDialogue, - LoadingDots, - Label, - CloseButton, -} from "~/components"; - +import { LoadingDots } from "~/components"; +import { Modal } from "@storyteller/ui-modal"; +import { Label } from "@storyteller/ui-label"; import { UploadAssetError } from "../UploadModal/UploadAssetError"; import { UploadSuccess } from "../UploadModal/UploadSuccess"; import { UploadFiles3D } from "./UploadFiles3D"; @@ -20,17 +15,21 @@ import { IMAGEPLANE_FILE_TYPE, } from "~/enums"; import { assetModalVisible } from "~/pages/PageEnigma/signals"; +import { IconDefinition } from "@fortawesome/fontawesome-svg-core"; interface Props { onClose: () => void; onSuccess: () => void; isOpen: boolean; title: string; + titleIcon: IconDefinition; options?: { fileSubtypes?: { [key: string]: string }[]; hasLength?: boolean; hasThumbnailUpload?: boolean; }; + preselectedCategory?: FilterEngineCategories; + isSelectVisible: boolean; } // Map categories to their allowed file types @@ -82,12 +81,19 @@ export function UploadModal3D({ onClose, onSuccess, title, + titleIcon, options, -}: Props) { + preselectedCategory, + isSelectVisible, +}: Props & { preselectedCategory?: FilterEngineCategories }) { const [uploaderState, setUploaderState] = useState(initialUploaderState); const [selectedCategory, setSelectedCategory] = - useState(FilterEngineCategories.OBJECT); + useState( + preselectedCategory !== undefined + ? preselectedCategory + : FilterEngineCategories.OBJECT, + ); const updateUploaderState = (newState: UploaderState) => { setUploaderState(newState); @@ -103,30 +109,43 @@ export function UploadModal3D({ } }, [isOpen]); + useEffect(() => { + if (preselectedCategory !== undefined) { + setSelectedCategory(preselectedCategory); + } + }, [preselectedCategory]); + + useEffect(() => { + console.log("Preselected category:", preselectedCategory); + console.log("Initial selected category:", selectedCategory); + }, [preselectedCategory, selectedCategory]); + const UploaderModalContent = () => { switch (uploaderState.status) { case UploaderStates.ready: return (
-
- - { + if ( + typeof value === "string" && + Object.values(FilterEngineCategories).includes( + value as FilterEngineCategories, + ) + ) { + setSelectedCategory(value as FilterEngineCategories); + } + }} + placeholder="Select a category" + /> +
+ )} Uploading...
); - case UploaderStates.success: + case UploaderStates.success: { + // Store the selected category and tab in sessionStorage + const assetTab = categoryToAssetTab[selectedCategory]; + if (assetTab) { + sessionStorage.setItem("lastUploadedCategory", selectedCategory); + sessionStorage.setItem("lastUploadedTab", assetTab); + // Reopen the asset modal + assetModalVisible.value = true; + } else { + // Clear any existing stored values if we don't have a valid tab + sessionStorage.removeItem("lastUploadedCategory"); + sessionStorage.removeItem("lastUploadedTab"); + } + onSuccess(); + onClose(); return ( { - onSuccess(); onClose(); - // Store the selected category and tab in sessionStorage - const assetTab = categoryToAssetTab[selectedCategory]; - if (assetTab) { - sessionStorage.setItem( - "lastUploadedCategory", - selectedCategory, - ); - sessionStorage.setItem("lastUploadedTab", assetTab); - // Reopen the asset modal - assetModalVisible.value = true; - } else { - // Clear any existing stored values if we don't have a valid tab - sessionStorage.removeItem("lastUploadedCategory"); - sessionStorage.removeItem("lastUploadedTab"); - } }} /> ); + } case UploaderStates.assetError: return ( - - + ); } diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx index b0959b6c31..53a8fad8eb 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEditor.tsx @@ -171,12 +171,12 @@ export const PageEditor = () => { }} /> */} - {}} videoSrc2D="/resources/videos/artcraft-canvas-demo.mp4" videoSrc3D="/resources/videos/artcraft-3d-demo.mp4" openAiLogo="/resources/images/openai-logo.png" - /> + /> */} ); }; diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/AssetMenu/AssetModal.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/AssetMenu/AssetModal.tsx index 4cc07614b5..66fad4d576 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/AssetMenu/AssetModal.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/AssetMenu/AssetModal.tsx @@ -1,7 +1,6 @@ import { Modal } from "@storyteller/ui-modal"; import { UploadModal3D } from "~/components/reusable/UploadModal3D"; import { - faPlus, faSearch, faChevronLeft, faLayerGroup, @@ -12,9 +11,9 @@ import { faMountainCity, faDog, faImage, + faUpFromLine, } from "@fortawesome/pro-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { Tooltip } from "@storyteller/ui-tooltip"; import { Button } from "@storyteller/ui-button"; import { CloseButton } from "@storyteller/ui-close-button"; import { Input } from "@storyteller/ui-input"; @@ -45,6 +44,7 @@ import { isAnyStatusFetching } from "../SidePanelTabs/utilities"; type AssetTab = { id: string; label: string; + labelSingle?: string; icon: typeof faLayerGroup; engineCategory?: FilterEngineCategories; items: MediaItem[]; @@ -88,6 +88,9 @@ export const AssetModal = () => { const [searchTerm, setSearchTerm] = useState(""); const [isUploadModalOpen, setIsUploadModalOpen] = useState(false); const searchInputRef = useRef(null); + const [selectedCategory, setSelectedCategory] = + useState(null); + const [isSelectVisible, setIsSelectVisible] = useState(true); const handleReopenChange = (e: React.ChangeEvent) => { const newValue = e.target.checked; @@ -232,7 +235,8 @@ export const AssetModal = () => { { id: "all", label: "All", icon: faLayerGroup, items: [] }, { id: "character", - label: "Character", + label: "Characters", + labelSingle: "Character", icon: faUser, engineCategory: FilterEngineCategories.CHARACTER, items: @@ -243,6 +247,7 @@ export const AssetModal = () => { { id: "objects", label: "Objects", + labelSingle: "Object", icon: faCube, engineCategory: FilterEngineCategories.OBJECT, items: @@ -253,6 +258,7 @@ export const AssetModal = () => { { id: "sets", label: "Sets", + labelSingle: "Set", icon: faMountainCity, engineCategory: FilterEngineCategories.LOCATION, items: @@ -263,6 +269,7 @@ export const AssetModal = () => { { id: "creatures", label: "Creatures", + labelSingle: "Creature", icon: faDog, engineCategory: FilterEngineCategories.CREATURE, items: @@ -273,12 +280,14 @@ export const AssetModal = () => { { id: "skybox", label: "Skybox", + labelSingle: "Skybox", icon: faSun, items: activeLibraryTab === "library" ? demoSkyboxItems.value : [], }, { id: "image-planes", label: "Image Planes", + labelSingle: "Image Plane", icon: faImage, engineCategory: FilterEngineCategories.IMAGE_PLANE, items: @@ -399,6 +408,16 @@ export const AssetModal = () => { const handleAddAsset = () => { assetModalVisible.value = false; setIsUploadModalOpen(true); + setSelectedCategory(null); + setIsSelectVisible(true); + }; + + const handleAddSpecificAsset = (category: FilterEngineCategories) => { + console.log("Selected category:", category); + assetModalVisible.value = false; + setIsUploadModalOpen(true); + setSelectedCategory(category); + setIsSelectVisible(false); }; const handleUploadSuccess = () => { @@ -414,6 +433,11 @@ export const AssetModal = () => { const clearSearch = () => setSearchTerm(""); + const getArticle = (word: string | undefined) => { + if (!word) return "a"; + return /^[aeiou]/i.test(word) ? "an" : "a"; + }; + return ( <> {

3D Assets

- + {/* - + */}
-
+
+ {assetTabs.map((tab) => ( - {currentTab.label} +
+
+ + {currentTab.label} +
+ {activeAssetTab !== "skybox" && ( + + )}
)} {renderContent()} @@ -551,10 +606,15 @@ export const AssetModal = () => {
setIsUploadModalOpen(false)} + onClose={() => { + setIsUploadModalOpen(false); + }} onSuccess={handleUploadSuccess} isOpen={isUploadModalOpen} - title="Upload 3D Asset" + title={`Upload ${selectedCategory ? (selectedCategory.toLowerCase().replace(/_/g, " ") === "location" ? "sets" : selectedCategory.toLowerCase().replace(/_/g, " ")) : "3D Asset"}`} + titleIcon={!isSelectVisible ? currentTab.icon : faUpFromLine} + preselectedCategory={selectedCategory || FilterEngineCategories.OBJECT} + isSelectVisible={isSelectVisible} /> ); diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/Controls3D/Controls3D.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/Controls3D/Controls3D.tsx index 6366d680a1..4515d10b7b 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/Controls3D/Controls3D.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/Controls3D/Controls3D.tsx @@ -121,7 +121,7 @@ export const Controls3D = () => {