Merge pull request #868 from the-hideout/player-profiles

the-hideout · Mar 11, 2024 · d7a376c · d7a376c
2 parents ec52aa3 + 1ee5888
commit d7a376c
Show file tree

Hide file tree

Showing 9 changed files with 765 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,6 +32,7 @@
     "@mdi/react": "^1.6.1",
     "@mui/lab": "^5.0.0-alpha.166",
     "@mui/material": "^5.15.11",
+    "@mui/x-tree-view": "^6.17.0",
     "@reduxjs/toolkit": "^2.2.1",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",

diff --git a/src/App.js b/src/App.js
@@ -76,6 +76,8 @@ const ItemTracker = React.lazy(() => import('./pages/item-tracker/index.js'));
 const Hideout = React.lazy(() => import('./pages/hideout/index.js'));
 const WipeLength = React.lazy(() => import('./pages/wipe-length/index.js'));
 const Achievements = React.lazy(() => import('./pages/achievements/index.js'));
+const Players = React.lazy(() => import('./pages/players/index.js'));
+const Player = React.lazy(() => import('./pages/player/index.js'));
 const About = React.lazy(() => import('./pages/about/index.js'));
 
 const APIDocs = React.lazy(() => import('./pages/api-docs/index.js'));
@@ -871,6 +873,26 @@ function App() {
                             remoteControlSessionElement,
                         ]}
                     />
+                    <Route
+                        path={'/players'}
+                        key="players-route"
+                        element={[
+                            <Suspense fallback={<Loading />} key="suspense-players-wrapper">
+                                <Players key="players-wrapper" />
+                            </Suspense>,
+                            remoteControlSessionElement,
+                        ]}
+                    />
+                    <Route
+                        path="/player/:accountId"
+                        key="player-route"
+                        element={[
+                            <Suspense fallback={<Loading />} key="suspense-player-wrapper">
+                                <Player />
+                            </Suspense>,
+                            remoteControlSessionElement,
+                        ]}
+                    />
                     <Route
                         path="*"
                         element={[

diff --git a/src/components/menu/index.js b/src/components/menu/index.js
@@ -317,6 +317,14 @@ const Menu = () => {
                             {t('Achievements')}
                         </Link>
                     </li>
+                    <li className="submenu-wrapper submenu-items overflow-member" key="menu-players" data-targetid="players">
+                        <Link
+                            to="/players"
+                            //onClick={setIsOpen.bind(this, false)}
+                        >
+                            {t('Players')}
+                        </Link>
+                    </li>
                     <li className="submenu-wrapper submenu-items overflow-member" key="menu-api" data-targetid="api">
                         <Link
                             to="/api/"

diff --git a/src/features/meta/do-fetch-meta.mjs b/src/features/meta/do-fetch-meta.mjs
@@ -32,6 +32,10 @@ class MetaQuery extends APIQuery {
                     id
                 }
             }
+            playerLevels {
+                level
+                exp
+            }
         }`;
 
         const metaData = await this.graphqlRequest(query);
@@ -61,13 +65,14 @@ class MetaQuery extends APIQuery {
                 prebuild || !metaData.data || 
                 !metaData.data.fleaMarket || 
                 !metaData.data.armorMaterials || !metaData.data.armorMaterials.length || 
-                !metaData.data.itemCategories || !metaData.data.itemCategories.length
+                !metaData.data.itemCategories || !metaData.data.itemCategories.length ||
+                !metaData.data.playerLevels 
             ) {
                 return Promise.reject(new Error(metaData.errors[0].message));
             }
         }
 
-        return {flea: metaData.data.fleaMarket, armor: metaData.data.armorMaterials, categories: metaData.data.itemCategories};
+        return {flea: metaData.data.fleaMarket, armor: metaData.data.armorMaterials, categories: metaData.data.itemCategories, playerLevels: metaData.data.playerLevels};
     }
 }
 

diff --git a/src/pages/player/index.css b/src/pages/player/index.css
@@ -0,0 +1,4 @@
+.MuiTreeItem-iconContainer {
+    width: auto !important;
+    justify-content: normal !important;
+}