Remove admin panel and clean up unused code

client/src/components/PageContainer.tsx

@@ -1,7 +1,7 @@
-import { ReactNode, useContext, useState } from "react";
+import { ReactNode, useContext } from "react";
 
 // components
-import { AdminView, AdminIconButton, Loading } from "@/components";
+import { Loading } from "@/components";
 
 // context
 import { GlobalStateContext } from "@context/GlobalContext";
@@ -15,29 +15,19 @@ export const PageContainer = ({
   isLoading: boolean;
   headerText?: string;
 }) => {
-  const { error, isAdmin } = useContext(GlobalStateContext);
-  const [showSettings, setShowSettings] = useState(false);
+  const { error } = useContext(GlobalStateContext);
 
   if (isLoading) return <Loading />;
 
   return (
     <div className="p-4 mb-28">
-      {isAdmin && (
-        <AdminIconButton setShowSettings={() => setShowSettings(!showSettings)} showSettings={showSettings} />
-      )}
       {headerText && (
         <div className="pb-6">
           <h2>{headerText}</h2>
         </div>
       )}
-      {showSettings ? (
-        <AdminView />
-      ) : (
-        <>
-          {children}
-          {error && <p className="p3 pt-10 text-center text-error">{error}</p>}
-        </>
-      )}
+      {children}
+      {error && <p className="p3 pt-10 text-center text-error">{error}</p>}
     </div>
   );
 };

client/src/components/index.ts

@@ -1,7 +1,5 @@
 export * from "./ActionIcon.js";
 export * from "./ActionIconsContainer.js";
-export * from "./AdminView.js";
-export * from "./AdminIconButton.js";
 export * from "./ConfirmationModal.js";
 export * from "./CreatePet.js";
 export * from "./PetColors.js";

client/src/context/constants.ts

@@ -2,7 +2,6 @@ import { defaultPetStatus } from "@/constants";
 
 export const initialState = {
   error: "",
-  isAdmin: false,
   isPetOwner: false,
   petStatus: defaultPetStatus,
   hasInteractiveParams: false,

client/src/context/reducer.ts

@@ -6,7 +6,6 @@ import {
   SET_HAS_SETUP_BACKEND,
   SET_INTERACTIVE_PARAMS,
   SET_KEY_ASSET_ID,
-  SET_IS_ADMIN,
   SET_SELECTED_PET,
 } from "./types";
 
@@ -24,12 +23,6 @@ const globalReducer = (state: InitialStateType, action: ActionType) => {
         ...payload,
         hasSetupBackend: true,
       };
-    case SET_IS_ADMIN:
-      return {
-        ...state,
-        isAdmin: action.payload.isAdmin,
-        error: "",
-      };
     case SET_GAME_STATE:
       return {
         ...state,

client/src/context/types.ts

@@ -2,7 +2,6 @@ import { BadgesType, PetStatusType, VisitorInventoryType } from "../../../shared
 
 export const SET_HAS_SETUP_BACKEND = "SET_HAS_SETUP_BACKEND";
 export const SET_INTERACTIVE_PARAMS = "SET_INTERACTIVE_PARAMS";
-export const SET_IS_ADMIN = "SET_IS_ADMIN";
 export const SET_GAME_STATE = "SET_GAME_STATE";
 export const SET_ERROR = "SET_ERROR";
 export const SET_KEY_ASSET_ID = "SET_KEY_ASSET_ID";
@@ -24,7 +23,6 @@ export type InteractiveParams = {
 
 export interface InitialStateType {
   keyAssetId?: string;
-  isAdmin?: boolean;
   isPetOwner?: boolean;
   petStatus?: PetStatusType;
   error?: string;

client/src/pages/Home.tsx

@@ -9,7 +9,6 @@ import { GlobalDispatchContext, GlobalStateContext } from "@/context/GlobalConte
 
 // utils
 import { backendAPI, setErrorMessage, setGameState } from "@/utils";
-import { SET_IS_ADMIN } from "@/context/types";
 
 const Home = ({ isSpawnedDroppedAsset }: { isSpawnedDroppedAsset: boolean }) => {
   const dispatch = useContext(GlobalDispatchContext);
@@ -31,12 +30,6 @@ const Home = ({ isSpawnedDroppedAsset }: { isSpawnedDroppedAsset: boolean }) =>
           response = await backendAPI.get("/pet");
         }
         setGameState(dispatch, response.data);
-        dispatch!({
-          type: SET_IS_ADMIN,
-          payload: {
-            isAdmin: response.data.isAdmin,
-          },
-        });
       } catch (error) {
         if (error instanceof Error) {
           setErrorMessage(dispatch, error.message);

client/src/utils/setGameState.ts

@@ -4,7 +4,7 @@ import { PetStatusType } from "../../../shared/types.js";
 
 export const setGameState = (
   dispatch: Dispatch<ActionType> | null,
-  gameState: { isPetOwner: boolean; petStatus: PetStatusType; isAdmin: boolean },
+  gameState: { isPetOwner: boolean; petStatus: PetStatusType },
 ) => {
   if (!dispatch || !setGameState) return;
 

client/tsconfig.json

@@ -7,7 +7,7 @@
     "skipLibCheck": true,
 
     /* Bundler mode */
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
@@ -21,14 +21,13 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
 
-    "baseUrl": ".", // Required for path mapping
     "paths": {
-      "@/*": ["src/*"],
-      "@assets/*": ["src/assets/*"],
-      "@components/*": ["src/components/*"],
-      "@context/*": ["src/context/*"],
-      "@pages/*": ["src/pages/*"],
-      "@utils/*": ["src/utils/*"],
+      "@/*": ["./src/*"],
+      "@assets/*": ["./src/assets/*"],
+      "@components/*": ["./src/components/*"],
+      "@context/*": ["./src/context/*"],
+      "@pages/*": ["./src/pages/*"],
+      "@utils/*": ["./src/utils/*"],
       "@shared/*": ["../shared/*"]
     }
   },

server/controllers/handleGetGameState.ts

@@ -1,11 +1,5 @@
 import { Request, Response } from "express";
-import {
-  errorHandler,
-  getCachedInventoryItems,
-  getCredentials,
-  getVisitorAndPetStatus,
-  removeDroppedAssets,
-} from "../utils/index.js";
+import { errorHandler, getCachedInventoryItems, getCredentials, getVisitorAndPetStatus } from "../utils/index.js";
 import { BadgesType } from "../../shared/types.js";
 
 export const handleGetGameState = async (req: Request, res: Response) => {
@@ -34,8 +28,6 @@ export const handleGetGameState = async (req: Request, res: Response) => {
       }
     }
 
-    await removeDroppedAssets(credentials);
-
     return res.json({
       isAdmin,
       pets,

server/controllers/handleGetPet.ts

@@ -5,7 +5,6 @@ import {
   errorHandler,
   getCredentials,
   getVisitorAndPetStatus,
-  removeDroppedAssets,
   spawnPetNpc,
   User,
 } from "../utils/index.js";
@@ -67,8 +66,6 @@ export const handleGetPet = async (req: Request, res: Response): Promise<Record<
       }
     }
 
-    await removeDroppedAssets(credentials, `petSystem-${credentials.username}`);
-
     return res.json({
       petStatus,
       isPetOwner,

server/controllers/handleTradePet.ts

@@ -14,7 +14,9 @@ export const handleTradePet = async (req: Request, res: Response): Promise<Recor
     const petStatus = pets ? pets[selectedPetId] : null;
     if (!petStatus) throw new Error("No pet status found for visitor");
 
-    await visitor.deleteNpc();
+    // Only despawn the in-world NPC if the pet being traded is the one currently spawned.
+    // Otherwise we'd kick out an unrelated pet (e.g. trading Pet B while Pet A is in world).
+    if (petStatus.isPetInWorld) await visitor.deleteNpc();
 
     delete pets[selectedPetId];
 

server/controllers/index.ts

@@ -1,10 +1,8 @@
 export * from "./handleCreatePet.js";
 export * from "./handleExecuteAction.js";
 export * from "./handleGetGameState.js";
-export * from "./handleGetKeyAsset.js";
 export * from "./handleGetPet.js";
 export * from "./handlePickupPet.js";
 export * from "./handleSpawnPet.js";
 export * from "./handleTradePet.js";
 export * from "./handleUpdatePet.js";
-export * from "./handleRemoveAllPets.js";

server/routes.ts

@@ -3,10 +3,8 @@ import {
   handleCreatePet,
   handleExecuteAction,
   handleGetGameState,
-  handleGetKeyAsset,
   handleGetPet,
   handlePickupPet,
-  handleRemoveAllPets,
   handleSpawnPet,
   handleTradePet,
   handleUpdatePet,
@@ -34,7 +32,6 @@ router.get("/system/health", (req, res) => {
   });
 });
 
-router.get("/key-asset", handleGetKeyAsset);
 router.get("/game-state", handleGetGameState);
 router.get("/pet", handleGetPet);
 router.post("/create-pet", handleCreatePet);
@@ -43,6 +40,5 @@ router.post("/trade-pet", handleTradePet);
 router.post("/spawn-pet", handleSpawnPet);
 router.post("/pickup-pet", handlePickupPet);
 router.post("/execute-action", handleExecuteAction);
-router.post("/remove-dropped-assets", handleRemoveAllPets);
 
 export default router;

server/tsconfig.json

@@ -27,7 +27,7 @@
     /* Modules */
     "module": "ESNext" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "Node" /* Specify how TypeScript looks up a file from a given module specifier. */,
+    "moduleResolution": "bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
@@ -56,6 +56,8 @@
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
     "outDir": "./dist" /* Specify an output folder for all emitted files. */,
+    "rootDir": ".." /* Explicitly set the root directory to resolve common source directory error. */,
+
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */