From f65c71619e0e7008a39258cbc886a7c6c7e580c3 Mon Sep 17 00:00:00 2001
From: Marces Zastrow <mza@bsg.de>
Date: Fri, 17 Jan 2025 08:31:27 +0100
Subject: [PATCH] +

---
 backend/database.db                   | Bin 21491712 -> 21491712 bytes
 frontend/src/pages/gameMasterPage.jsx |  98 +++++++++++++++-----------
 2 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/backend/database.db b/backend/database.db
index 71c46baa609d543f5bbf451f1d32b25f30377bdd..e5224fba8d556956b51ed45e91edbde20b6369e0 100644
GIT binary patch
delta 1410
zcmZ|LXK+<j6hPs7lRy$e@)809A`psnFa(e)EfhgPMC=twY+wgeEFkJqQDGrg5E1MR
z%d__`7DUC~#je=JhHb|g+YisoH*;qHSZB|f^UkscbAm0(7AHyL*-27bog_J}k|b%j
zuv@Rzi<2I+4lgb`KPfC2m1gQ?R%cd}WQ*S`Ij!L(g-Z)YWy?y})X$E~ADfq#`7tfb
zE-9*)Hkdo4AirsOd3thfc6m{Uv{AQ;w%gXutew`jV$AqSBS(*%*g3ndxP4Xq^+{$!
zW_`A7=o^`Z6Y>i4b8^em@e`_Zvm3T+SXrEzljN3cOfnCYY|IRbcRnwfJtU_zY1zCy
zZPFyoNpm_E7p65+ru3}r*S~U7?UB<fs;VbXZ(Mh)Q<JQ!O3oYh*Qxk(Haxd3(Dd&>
z`rkmWNk`0>GWCBG&FUICHSsk=TgD3iY_VwVg6`!tgVTurYhIAn&C{B>Vv0GKi+NZN
z>tj9^U?DcZB5a7oSb`ZW#WHM!<=7aT;3n7<n_+X@6kFhC*b-Y|YplRF*cRJid)yp5
zU`OnPov{mc#ctRgd*BvWi9N9jdtq<vgIi)>?1%kv01m`KxD^h@AvhF=;c%?R5jYY@
z;b`0%$KY7p2Dim=I3Bmd3AjB@#2s)F?ua|#&bSNiio4<NxCicud*R-=4^GB?aSGO8
zE$)Z=;{kXe9)weI8Xk;?;GuXJ9*#%gkvJV^;7mLUkH%wg79NYo;qiC^&c-=-BF@E=
z@MJs%!Bg=xJRRrZ8F(h1h4XO%iVN{<T!iP~xp*F)j~C#DxEPn<MYt3%#$|X3F2@yk
zDPD$`;}v)%UWHfVHFzyvhu7muya8{-oA74L;w^Y9-iEj19e5|+g?HmUcrV_E_u~Wj
zAU=c-<0JSeK8BCuDtrQ;#Ha9ST#e7*8hjR?!{>1=zJM>{OZYOrg0JFh_&UCUZ{l0{
zHok-J;yQc}-^UN|L;MIo#!v85{0!IQ=lBJFiC^K@_zixG-{A)Q9)G|e@hAKlH{vh&
zEB=PR&oiBG8gfEz$P4vC{g59DLSbkSibBIs97;kal!mg<D3piBp-I>zG!4x{^RQ`X
z5jG1gL#xm_RD?F6ZD<$Ths{HW&@prhokN$<HFOKzLyxdUs0=+rRp=FZhdyD;&^Po8
i{lkDTFboP?g~4G+7#fC!;h{Q=2qVL&bfu%yef|I-g-62x

delta 1258
zcmWN~cbpai9LMqJxo$i+pS$W>*SO|&jcf1S)kRc?kev}Ck+L#M@{v%VItfW+W@MZZ
znOPahUKuHy?8x?ey?*b%zTemPH-Gz@y!pYhk`;+W<9Ufhadje*(K?Yxv|HA#Pn#8q
zs=2cY3pOWmQ#HwSR(eZ%ZBc#U&Z0&6D|1(;YU)dhw`SK*$QhrRxu7bQQ@<)dD_OU$
zup+-Qy(ihCX=!P4VM$$Ws;q8a&c^&1)8|Z|HoJWC*eR3iX69C;vh%XzO(Idhqp(Bo
z>|KfU?)0wulJafoWwqI<?2HDDawpbS*YBQG&@(q$$@Hc~dQ;>Z(j`Na=|rm-kIP7A
zR2HV{mM`tTKulr=Ho#2G!fedJ6y{<c=3@aCViBgX7)!7rHp0eOicPR7HpAxF0?V)^
zw!+rf2FtN6w!`+=0Xt$RtiaA#iCwTOcEj#ig*~t*_QKxS2m4|_?2iL*AP&O8I0T2{
zFdU8}a3qex(O8XRa4go~INS^O#__lh?u!#}B2L0u+z<E118_1PhzH@pI0X;EL-8;?
z9FM>w@hF^%N8>SgEFOo`@OV4{PsHhX5}u4R@D!Yhr{ZZi3s1+{I0w(bGx01u8_&VH
zcrKoY=i>!959i~BxBxH0g?KT7m*6726c^)VcsX8yOK>TQ%Wyf?;gz@oufmmhHC}_)
z;wrojSL5}#25-O{aV_42H{&gME8d2;<2t+p@5H<CZd{M|;JtVs-jDV806vHh;lsEA
zAHhd)BR+<Y;}iHKK7~)?CVU2;#pm#Od;vG(i}(`0jIZDpd=<CiYxp|8fp6kl_%^<S
z@8Wy-K7N4P@I(9vKgLgRJAR5ga3_9-pW_$!C4Plp<2U#%euum8d;9@^#GmkI`~`o-
z-S`{+j(hMA{1gAezwsaZ7ynyqa*4^15gLTdkQK5+PDq8^kQeepK`0DGAsvcCNoW`v
zg~p*YGzm>Zv(P-W2xXyVXcbzAHlaMU4edhv&>?gTokB(E94bSX&^2@m-9uIA5qgGR
vp?ByL`i6d?e;5!3hCyL)7!rntVPSX}5k`hlVRWbtW5U=_lU(n(<kbHGhzlav

diff --git a/frontend/src/pages/gameMasterPage.jsx b/frontend/src/pages/gameMasterPage.jsx
index 68d570a..008d659 100644
--- a/frontend/src/pages/gameMasterPage.jsx
+++ b/frontend/src/pages/gameMasterPage.jsx
@@ -23,12 +23,12 @@ const GameMasterPage = () => {
         const pcsResponse = await axios.get(`http://localhost:5000/games/${gameId}/playerchars`);
         const processedPCs = Array.isArray(pcsResponse.data) ? pcsResponse.data : [pcsResponse.data];
         setPlayerCharacters(processedPCs.filter(pc => pc !== null));
-  
+
         // Fetch NPCs with different structure
         const npcsResponse = await axios.get(`http://localhost:5000/games/${gameId}/npcs`);
         const processedNPCs = Array.isArray(npcsResponse.data) ? npcsResponse.data : [npcsResponse.data];
         setNpcs(processedNPCs.filter(npc => npc !== null));
-  
+
         // Fetch Items
         const itemsResponse = await axios.get(`http://localhost:5000/games/${gameId}/items`);
         const processedItems = Array.isArray(itemsResponse.data) ? itemsResponse.data : [itemsResponse.data];
@@ -37,19 +37,20 @@ const GameMasterPage = () => {
         console.error('Error fetching data:', error);
       }
     };
-  
+
     fetchData();
     const interval = setInterval(fetchData, 5000);
     return () => clearInterval(interval);
   }, [gameId]);
 
   const Section = ({ title, items, createPath, createText }) => (
-    <Box sx={{ 
-      mb: 4, 
-      backgroundColor: '#2e2e3f', 
-      p: 2, 
-      borderRadius: '8px', 
-      border: '1px solid #444' 
+    <Box sx={{
+      mb: 4,
+      backgroundColor: '#2e2e3f',
+      p: 2,
+      borderRadius: '8px',
+      border: '1px solid #444',
+      height: '345px'
     }}>
       <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 2 }}>
         <Typography variant="h5" sx={{ color: '#fff' }}>{title}</Typography>
@@ -69,8 +70,8 @@ const GameMasterPage = () => {
       <Grid2 container spacing={2}>
         {items.map((item, index) => (
           <Grid2 item xs={12} sm={6} md={3} key={index}>
-            <Card sx={{ 
-              backgroundColor: '#1e1e2f', 
+            <Card sx={{
+              backgroundColor: '#1e1e2f',
               color: '#fff',
               height: '95%', // Reduced height
               border: '1px solid #444',
@@ -87,15 +88,15 @@ const GameMasterPage = () => {
                   image={item.Img || defaultItemImage}
                   alt={item.ItemName}
                   className={`rarity-${item.Rarity} rarity-image`}
-                  sx={{ 
+                  sx={{
                     objectFit: 'contain',
                     width: '128px'
                   }}
                 />
               </Box>
               <CardContent>
-                <Typography 
-                  variant="h6" 
+                <Typography
+                  variant="h6"
                   component="div"
                   className={`rarity-name-${item.Rarity}`}
                 >
@@ -120,33 +121,34 @@ const GameMasterPage = () => {
 
   return (
     // Update main container Box styling
-    <Box sx={{ 
-      p: 3, 
-      background: 'rgba(30, 30, 47, 0.9)', 
+    <Box sx={{
+      p: 3,
+      background: 'rgba(30, 30, 47, 0.9)',
       borderRadius: '8px',
       width: '1200px',
-      margin: '80px auto 40px auto', // Increased top margin
-      position: 'relative',
-      minHeight: 'calc(100vh - 120px)' // Account for margins
+      margin: '100px auto -600px auto', // Increased top margin
+      position: 'relative'
+      // Removed minHeight calculation
     }}>
       <Typography variant="h4" sx={{ mb: 4, color: '#fff' }}>
         Game Master Dashboard
       </Typography>
 
       {/* Player Characters Section */}
-      <Box sx={{ 
-        mb: 4, 
-        backgroundColor: '#2e2e3f', 
-        p: 2, 
-        borderRadius: '8px', 
-        border: '1px solid #444'
+      <Box sx={{
+        mb: 4,
+        backgroundColor: '#2e2e3f',
+        p: 2,
+        borderRadius: '8px',
+        border: '1px solid #444',
+        height: '345px'
       }}>
         <Typography variant="h5" sx={{ color: '#fff', mb: 2 }}>Player Characters</Typography>
         <Grid2 container spacing={2}>
           {playerCharacters.map((character, index) => (
             <Grid2 item xs={12} sm={6} md={3} key={index}>
-              <Card sx={{ 
-                backgroundColor: '#1e1e2f', 
+              <Card sx={{
+                backgroundColor: '#1e1e2f',
                 color: '#fff',
                 border: '1px solid #444',
                 height: '100%'
@@ -162,7 +164,7 @@ const GameMasterPage = () => {
                     height="140"
                     image={character.Img || defaultCharacterImage}
                     alt={character.CharName}
-                    sx={{ 
+                    sx={{
                       objectFit: 'contain',
                       width: '140px',
                       borderRadius: '3px'
@@ -187,12 +189,13 @@ const GameMasterPage = () => {
       </Box>
 
       {/* NPCs Section */}
-      <Box sx={{ 
-        mb: 4, 
-        backgroundColor: '#2e2e3f', 
-        p: 2, 
-        borderRadius: '8px', 
-        border: '1px solid #444' 
+      <Box sx={{
+        mb: 4,
+        backgroundColor: '#2e2e3f',
+        p: 2,
+        borderRadius: '8px',
+        border: '1px solid #444',
+        height: '345px'
       }}>
         <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 2 }}>
           <Typography variant="h5" sx={{ color: '#fff' }}>NPCs</Typography>
@@ -212,8 +215,8 @@ const GameMasterPage = () => {
         <Grid2 container spacing={2}>
           {npcs.map((npc, index) => (
             <Grid2 item xs={12} sm={6} md={3} key={index}>
-              <Card sx={{ 
-                backgroundColor: '#1e1e2f', 
+              <Card sx={{
+                backgroundColor: '#1e1e2f',
                 color: '#fff',
                 border: '1px solid #444',
                 height: '100%'
@@ -229,7 +232,7 @@ const GameMasterPage = () => {
                     height="140"
                     image={npc.Img || defaultCharacterImage}
                     alt={npc.CharName}
-                    sx={{ 
+                    sx={{
                       objectFit: 'contain',
                       width: '140px',
                       borderRadius: '3px'
@@ -238,13 +241,26 @@ const GameMasterPage = () => {
                 </Box>
                 <CardContent>
                   <Typography variant="h6" component="div">
-                    {npc.CharName}
+                    {npc.Name}
                   </Typography>
                   <Typography variant="body2" sx={{ color: '#bbb' }}>
-                    {npc.Race}
+                    {npc.Race} - Level {npc.Level}
                   </Typography>
                   <Typography variant="body2" sx={{ color: '#bbb' }}>
-                    {npc.Job}
+                    Job: {npc.Job}
+                  </Typography>
+                  <Typography variant="body2" sx={{
+                    color: npc.Allied === 0
+                      ? '#1eff00'
+                      : npc.Allied === 1
+                        ? '#ffd100'
+                        : '#ff0000'
+                  }}>
+                    Status: {npc.Allied === 0
+                      ? 'Allied'
+                      : npc.Allied === 1
+                        ? 'Neutral'
+                        : 'Enemy'}
                   </Typography>
                 </CardContent>
               </Card>