Added a way to get the character id and globally attach it to the gam…

…e data provider
AdamKyle · Dec 31, 2024 · a05aa99 · a05aa99
1 parent 2c7ddf3
commit a05aa99
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/resources/js/game-data/components/game-data-provider.tsx b/resources/js/game-data/components/game-data-provider.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { GameDataContext } from '../game-data-context';
 import GameDataProviderProps from './types/game-data-provider-props';
@@ -7,8 +7,18 @@ import GameDataDefinition from '../deffinitions/game-data-definition';
 const GameDataProvider = (props: GameDataProviderProps): React.ReactNode => {
   const [gameData, setGameData] = useState<GameDataDefinition | null>(null);
 
+  const [characterId, setCharacterId] = useState<number>(0);
+
+  useEffect(() => {
+    const playerIdMeta = document.querySelector('meta[name="player"]');
+    const characterIdContent = playerIdMeta?.getAttribute('content');
+    if (characterIdContent) {
+      setCharacterId(parseInt(characterIdContent, 10) || 0);
+    }
+  }, []);
+  console.log(characterId);
   return (
-    <GameDataContext.Provider value={{ gameData, setGameData }}>
+    <GameDataContext.Provider value={{ gameData, setGameData, characterId }}>
       {props.children}
     </GameDataContext.Provider>
   );

diff --git a/resources/js/game-data/deffinitions/game-data-context-definition.ts b/resources/js/game-data/deffinitions/game-data-context-definition.ts
@@ -5,4 +5,5 @@ import GameDataDefinition from './game-data-definition';
 export default interface GameDataContextDefinition {
   gameData: GameDataDefinition | null;
   setGameData: React.Dispatch<React.SetStateAction<GameDataDefinition | null>>;
+  characterId: number;
 }
diff --git a/resources/js/game/components/game-loader/hooks/use-game-loader.ts b/resources/js/game/components/game-loader/hooks/use-game-loader.ts
@@ -7,18 +7,22 @@ import { GameLoaderApiUrls } from '../api/enums/game-loader-api-urls';
 import { useCharacterSheetApi } from '../api/hooks/use-character-sheet-api';
 import { useMonsterApi } from '../api/hooks/use-monster-api';
 
+import { useGameData } from 'game-data/hooks/use-game-data';
+
 export const useGameLoader = (): UseGameLoaderDefinition => {
+  const { characterId } = useGameData();
+
   const { fetchCharacterData } = useCharacterSheetApi({
     url: GameLoaderApiUrls.CHARACTER_SHEET,
     urlParams: {
-      character: 1,
+      character: characterId,
     },
   });
 
   const { fetchMonstersData } = useMonsterApi({
     url: GameLoaderApiUrls.MONSTERS,
     urlParams: {
-      character: 1,
+      character: characterId,
     },
   });
 
@@ -37,10 +41,10 @@ export const useGameLoader = (): UseGameLoaderDefinition => {
     ]);
 
   useEffect(() => {
-    if (loading) {
+    if (characterId !== 0 && loading) {
       executeBatchApiCalls();
     }
-  }, [executeBatchApiCalls, loading]);
+  }, [executeBatchApiCalls, loading, characterId]);
 
   return {
     loading,

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -12,7 +12,7 @@
 
     @guest
     @else
-        <meta name="player" content="{{ auth()->user()->id }}">
+        <meta name="player" content="{{ auth()->user()->character->id }}">
 
         @if (!auth()->user()->hasRole('Admin'))
             <meta name="character" content="{{ auth()->user()->character->id}}">