Merge pull request #7 from metaversecloud-com/dev

LinaBell · web-flow · commit 8843e8c8464e · 2025-08-14T22:05:34.000-07:00
Non-admin functionality
diff --git a/.github/workflows/aws_dev_release.yml b/.github/workflows/aws_dev_release.yml
@@ -62,8 +62,6 @@ jobs:
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
-        with:
-          mask-password: 'false'
 
       - name: Image Metadata
         id: metadata
diff --git a/.github/workflows/aws_prod_release.yml b/.github/workflows/aws_prod_release.yml
@@ -66,8 +66,6 @@ jobs:
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
-        with:
-          mask-password: 'false'
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/client/src/components/PageFooter.tsx b/client/src/components/PageFooter.tsx
@@ -6,8 +6,8 @@ export const PageFooter = ({ children }: { children: ReactNode }) => {
       style={{
         position: "fixed",
         bottom: 0,
-        width: "90%",
-        padding: 20,
+        padding: "10px 0 20px",
+        minWidth: "90%",
       }}
     >
       {children}
diff --git a/client/src/pages/Home.tsx b/client/src/pages/Home.tsx
@@ -17,19 +17,25 @@ const Home = () => {
   const [isLoading, setIsLoading] = useState(true);
   const [areButtonsDisabled, setAreButtonsDisabled] = useState(false);
   const [isAdmin, setIsAdmin] = useState(false);
+  const [canSwapScenes, setCanSwapScenes] = useState<boolean>(false);
   const [scenes, setScenes] = useState<{ id: string; name: string; description: string; previewImgUrl: string }[]>([]);
   const [selectedSceneId, setSelectedSceneId] = useState("");
-  const [title, setTitle] = useState("Scene Swapper");
-  const [description, setDescription] = useState();
-  const [showConfirmationModal, setShowConfirmationModal] = useState(false);
+  const [title, setTitle] = useState<string>("Scene Swapper");
+  const [description, setDescription] = useState<string>("");
+  const [allowNonAdmins, setAllowNonAdmins] = useState<boolean>(false);
+  const [message, setMessage] = useState<string>("");
+  const [showConfirmationModal, setShowConfirmationModal] = useState<boolean>(false);
 
   useEffect(() => {
     if (hasSetupBackend) {
       backendAPI
         .get("/game-state")
         .then((response) => {
-          const { isAdmin, scenes, selectedSceneId, title, description } = response.data;
+          const { allowNonAdmins, isAdmin, lastSwappedDate, scenes, selectedSceneId, title, description } =
+            response.data;
+          updateLastSwappedDate(lastSwappedDate);
           setIsAdmin(isAdmin);
+          setAllowNonAdmins(allowNonAdmins);
           setScenes(scenes);
           setSelectedSceneId(selectedSceneId);
           if (title) setTitle(title);
@@ -46,13 +52,42 @@ const Home = () => {
     setAreButtonsDisabled(true);
     backendAPI
       .post("/replace-scene", { selectedSceneId })
-      .then(() => {})
+      .then(() => {
+        updateLastSwappedDate(new Date());
+      })
       .catch((error) => setErrorMessage(dispatch, error))
       .finally(() => {
         setAreButtonsDisabled(false);
       });
   };
 
+  const updateAllowNonAdmins = (value: boolean) => {
+    setAllowNonAdmins(value);
+    backendAPI
+      .post("/allow-non-admins", { allowNonAdmins: value })
+      .then(() => {})
+      .catch((error) => setErrorMessage(dispatch, error));
+  };
+
+  const updateLastSwappedDate = (lastSwappedDate?: Date) => {
+    if (!isAdmin && lastSwappedDate) {
+      const lastSwappedDateObj = new Date(lastSwappedDate);
+      const currentDate = new Date();
+      const timeDifference = currentDate.getTime() - lastSwappedDateObj.getTime();
+      const minutesDifference = Math.floor(timeDifference / (1000 * 60));
+      if (minutesDifference >= 30) {
+        setCanSwapScenes(true);
+        setMessage("");
+      } else {
+        setCanSwapScenes(false);
+        setMessage("Hang tight! Scenes can only be updated every 30 minutes. Please try again soon.");
+        // setMessage(`Scene recently swapped. Please wait ${30 - minutesDifference} minutes before swapping again.`);
+      }
+    } else {
+      setCanSwapScenes(true);
+    }
+  };
+
   if (!hasSetupBackend) return <div />;
 
   return (
@@ -63,16 +98,16 @@ const Home = () => {
 
       <PageContainer isLoading={isLoading}>
         <>
-          {isAdmin ? (
+          {isAdmin || allowNonAdmins ? (
             <>
               {title && <h1 className="h2">{title}</h1>}
               {description && <p>{description}</p>}
-              <div className="mt-4">
+              <div className="mt-4 mb-10">
                 {scenes?.map((scene) => (
                   <div key={scene.id} className="mb-2" onClick={() => setSelectedSceneId(scene.id)}>
                     <div className={`card small ${selectedSceneId === scene.id ? "success" : ""}`}>
-                      <div className="card-image" style={{ height: "auto" }}>
-                        <img src={scene.previewImgUrl} alt={scene.name} />
+                      <div className="card-image">
+                        <img src={scene.previewImgUrl} alt={scene.name} style={{ maxHeight: "100%" }} />
                       </div>
                       <div className="card-details">
                         <h4 className="card-title h4">{scene.name}</h4>
@@ -81,19 +116,42 @@ const Home = () => {
                     </div>
                   </div>
                 ))}
+                {message && <p className="text-danger py-4">{message}</p>}
               </div>
 
               <PageFooter>
-                <button className="btn mb-2" disabled={areButtonsDisabled || !selectedSceneId} onClick={replaceScene}>
-                  Update Scene
-                </button>
+                {isAdmin && (
+                  <label className="label text-center mb-4">
+                    <input
+                      checked={allowNonAdmins}
+                      className="input-checkbox mr-2"
+                      type="checkbox"
+                      onChange={(event) => updateAllowNonAdmins(event.target.checked)}
+                    />
+                    Allow all users to swap scenes?
+                  </label>
+                )}
                 <button
-                  className="btn btn-danger"
-                  disabled={areButtonsDisabled}
-                  onClick={() => setShowConfirmationModal(true)}
+                  className="btn mb-2"
+                  disabled={areButtonsDisabled || !selectedSceneId || !canSwapScenes}
+                  onClick={replaceScene}
                 >
-                  Clear Current Scene
+                  <div className={!canSwapScenes ? "tooltip" : ""} style={{ width: "100%" }}>
+                    <div className="tooltip-content" style={{ width: "100%", top: "-60px" }}>
+                      {message}
+                    </div>
+                    Update Scene
+                  </div>
                 </button>
+                {isAdmin && (
+                  <button
+                    className="btn btn-danger"
+                    disabled={areButtonsDisabled}
+                    onClick={() => setShowConfirmationModal(true)}
+                  >
+                    Clear Current Scene
+                  </button>
+                )}
               </PageFooter>
             </>
           ) : (
diff --git a/server/controllers/handleGetGameState.ts b/server/controllers/handleGetGameState.ts
@@ -12,10 +12,19 @@ export const handleGetGameState = async (req: Request, res: Response) => {
     const visitor: VisitorInterface = await Visitor.get(visitorId, urlSlug, { credentials });
     const { isAdmin } = visitor;
 
-    if (!isAdmin) return res.json({ isAdmin, success: true });
-
     const droppedAsset = await DroppedAsset.get(assetId, urlSlug, { credentials });
-    const { currentSceneIndex, droppableSceneIds, title, description } = droppedAsset.dataObject as DataObjectType;
+    if (!droppedAsset.dataObject || Object.keys(droppedAsset.dataObject).length === 0) {
+      throw "Dropped asset data object not found.";
+    }
+
+    const {
+      allowNonAdmins = false,
+      currentSceneIndex,
+      droppableSceneIds,
+      lastSwappedDate,
+      title,
+      description,
+    } = droppedAsset.dataObject as DataObjectType;
 
     const results = await Promise.allSettled(droppableSceneIds.map((sceneId) => Scene.get(sceneId, { credentials })));
 
@@ -37,7 +46,9 @@ export const handleGetGameState = async (req: Request, res: Response) => {
       });
 
     return res.json({
-      isAdmin: true,
+      allowNonAdmins,
+      isAdmin,
+      lastSwappedDate,
       scenes,
       selectedSceneId: droppableSceneIds[currentSceneIndex],
       title,
diff --git a/server/controllers/handleReplaceScene.ts b/server/controllers/handleReplaceScene.ts
@@ -10,6 +10,8 @@ export const handleReplaceScene = async (req: Request, res: Response) => {
 
     await swapScene(credentials, droppedAsset, selectedSceneId);
 
+    await droppedAsset.updateDataObject({ lastSwappedDate: new Date() });
+
     return res.json({ success: true });
   } catch (error) {
     return errorHandler({
diff --git a/server/controllers/handleUpdateAllowNonAdmins.ts b/server/controllers/handleUpdateAllowNonAdmins.ts
@@ -0,0 +1,29 @@
+import { Request, Response } from "express";
+import { DroppedAsset } from "../topiaInit.js";
+import { errorHandler, getCredentials } from "../utils/index.js";
+
+export const handleUpdateAllowNonAdmins = async (req: Request, res: Response) => {
+  try {
+    const { allowNonAdmins } = req.body;
+    const credentials = getCredentials(req.query);
+    const { assetId, urlSlug } = credentials;
+
+    const droppedAsset = await DroppedAsset.get(assetId, urlSlug, { credentials });
+    if (!droppedAsset.dataObject || Object.keys(droppedAsset.dataObject).length === 0)
+      throw "Dropped asset data object not found.";
+
+    await droppedAsset.updateDataObject({ allowNonAdmins });
+
+    return res.json({
+      success: true,
+    });
+  } catch (error) {
+    return errorHandler({
+      error,
+      functionName: "handleUpdateAllowNonAdmins",
+      message: "Error updating dropped asset data object.",
+      req,
+      res,
+    });
+  }
+};
diff --git a/server/controllers/index.ts b/server/controllers/index.ts
@@ -2,3 +2,4 @@ export * from "./handleGetGameState.js";
 export * from "./handleReplaceScene.js";
 export * from "./handleRemoveScene.js";
 export * from "./handleSwapScene.js";
+export * from "./handleUpdateAllowNonAdmins.js";
diff --git a/server/routes.ts b/server/routes.ts
@@ -1,6 +1,12 @@
 import express from "express";
 import { getVersion } from "./utils/getVersion.js";
-import { handleGetGameState, handleRemoveScene, handleReplaceScene, handleSwapScene } from "./controllers/index.js";
+import {
+  handleGetGameState,
+  handleRemoveScene,
+  handleReplaceScene,
+  handleSwapScene,
+  handleUpdateAllowNonAdmins,
+} from "./controllers/index.js";
 
 const router = express.Router();
 
@@ -26,6 +32,7 @@ router.get("/system/health", (req, res) => {
 router.get("/game-state", handleGetGameState);
 router.post("/replace-scene", handleReplaceScene);
 router.post("/remove-scene", handleRemoveScene);
+router.post("/allow-non-admins", handleUpdateAllowNonAdmins);
 
 // webhooks
 router.post("/swap", handleSwapScene);
diff --git a/server/types.ts b/server/types.ts
@@ -13,8 +13,10 @@ export interface Credentials {
 }
 
 export type DataObjectType = {
+  allowNonAdmins: boolean;
   currentSceneIndex: number;
   droppableSceneIds: string[];
+  lastSwappedDate: Date;
   persistentDroppedAssets: string[];
   positionOffset: {
     x: number;
