Merge pull request #467 from TaloDev/develop

Release 0.69.0

Author: tudddorrr

CLAUDE.md

@@ -131,7 +131,6 @@ Located in [src/utils/](src/utils/):
 - `useNodeGraph` - Graph visualization for save data (using @xyflow/react)
 - `buildError` - Normalize error objects
 - `canPerformAction` / `canViewPage` - Permission checking
-- `getEventColour` - Consistent color assignment for events
 
 ## Important Patterns
 

package-lock.json

@@ -18,6 +18,7 @@
     "@tippyjs/react": "^4.2.5",
     "@xyflow/react": "^12.2.1",
     "axios": "^1.13.5",
+    "chroma-js": "^3.2.0",
     "clsx": "^2.0.0",
     "dagre": "^0.8.5",
     "date-fns": "^2.29.3",
@@ -47,6 +48,7 @@
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^15.0.4",
     "@testing-library/user-event": "^14.5.2",
+    "@types/chroma-js": "^3.1.2",
     "@types/dagre": "^0.7.52",
     "@types/lodash-es": "^4.17.12",
     "@types/randomcolor": "^0.5.9",
@@ -79,7 +81,7 @@
   "lint-staged": {
     "*.{ts,js,tsx,jsx}": "eslint --fix"
   },
-  "version": "0.68.0",
+  "version": "0.69.0",
   "engines": {
     "node": "24.x"
   },

package.json

@@ -39,6 +39,7 @@ const PlayerProfile = lazy(() => import(/* webpackChunkName: 'player-profile' */
 const PlayerLeaderboardEntries = lazy(() => import(/* webpackChunkName: 'player-leaderboard-entries' */ './pages/PlayerLeaderboardEntries'))
 const ForgotPassword = lazy(() => import(/* webpackChunkName: 'forgot-password' */ './pages/ForgotPassword'))
 const ResetPassword = lazy(() => import(/* webpackChunkName: 'reset-password' */ './pages/ResetPassword'))
+const PlayerAuthActivities = lazy(() => import(/* webpackChunkName: 'player-auth-activities' */ './pages/PlayerAuthActivities'))
 const PlayerSaves = lazy(() => import(/* webpackChunkName: 'player-saves' */ './pages/PlayerSaves'))
 const PlayerSaveContent = lazy(() => import(/* webpackChunkName: 'player-save-content' */ './pages/PlayerSaveContent'))
 const NotFound = lazy(() => import(/* webpackChunkName: 'not-found' */ './pages/NotFound'))
@@ -112,6 +113,7 @@ function Router({
                   <Route path={routes.playerProfile} element={<PlayerProfile />} />
                   <Route path={routes.playerLeaderboardEntries} element={<PlayerLeaderboardEntries />} />
                   <Route path={routes.playerSaveContent} element={<PlayerSaveContent />} />
+                  <Route path={routes.playerAuthActivities} element={<PlayerAuthActivities />} />
                   <Route path={routes.playerSaves} element={<PlayerSaves />} />
                   <Route path={routes.feedback} element={<Feedback />} />
                   {canViewPage(user, routes.feedbackCategories) && <Route path={routes.feedbackCategories} element={<FeedbackCategories />} />}

src/Router.tsx

@@ -5,22 +5,32 @@ import makeValidatedGetRequest from './makeValidatedGetRequest'
 import { z } from 'zod'
 import { gameActivitySchema } from '../entities/gameActivity'
 
-export default function useGameActivities(activeGame: Game) {
-  const fetcher = async ([url]: [string]) => {
-    const res = await makeValidatedGetRequest(url, z.object({
-      activities: z.array(gameActivitySchema)
+export default function useGameActivities(activeGame: Game, page: number) {
+  const fetcher = async ([url, page]: [string, number]) => {
+    const qs = new URLSearchParams({
+      page: String(page)
+    }).toString()
+
+    const res = await makeValidatedGetRequest(`${url}?${qs}`, z.object({
+      activities: z.array(gameActivitySchema),
+      count: z.number(),
+      itemsPerPage: z.number(),
+      isLastPage: z.boolean()
     }))
 
     return res
   }
 
   const { data, error } = useSWR(
-    [`/games/${activeGame.id}/game-activities`],
+    [`/games/${activeGame.id}/game-activities`, page],
     fetcher
   )
 
   return {
     activities: data?.activities ?? [],
+    count: data?.count,
+    itemsPerPage: data?.itemsPerPage,
+    isLastPage: data?.isLastPage,
     loading: !data && !error,
     error: error && buildError(error)
   }

src/api/useGameActivities.ts

@@ -0,0 +1,40 @@
+import useSWR from 'swr'
+import buildError from '../utils/buildError'
+import { Game } from '../entities/game'
+import makeValidatedGetRequest from './makeValidatedGetRequest'
+import { z } from 'zod'
+import { convertDateToUTC } from '../utils/convertDateToUTC'
+
+export const newLeaderboardEntriesChartSchema = z.object({
+  date: z.number(),
+  leaderboards: z.record(z.number()),
+  change: z.record(z.number())
+})
+
+export function useNewLeaderboardEntriesChart(activeGame: Game, startDate: string, endDate: string) {
+  const fetcher = async ([url]: [string]) => {
+    const qs = new URLSearchParams({
+      startDate: convertDateToUTC(startDate),
+      endDate: convertDateToUTC(endDate)
+    }).toString()
+
+    const res = await makeValidatedGetRequest(`${url}?${qs}`, z.object({
+      data: z.array(newLeaderboardEntriesChartSchema),
+      leaderboardNames: z.array(z.string())
+    }))
+
+    return res
+  }
+
+  const { data, error } = useSWR(
+    activeGame && startDate && endDate ? [`/games/${activeGame.id}/charts/new-leaderboard-entries`, startDate, endDate] : null,
+    fetcher
+  )
+
+  return {
+    leaderboards: data?.data ?? [],
+    leaderboardNames: data?.leaderboardNames ?? [],
+    loading: !data && !error,
+    error: error && buildError(error)
+  }
+}

src/api/useNewLeaderboardEntriesChart.ts

@@ -0,0 +1,38 @@
+import useSWR from 'swr'
+import buildError from '../utils/buildError'
+import { Game } from '../entities/game'
+import makeValidatedGetRequest from './makeValidatedGetRequest'
+import { z } from 'zod'
+import { convertDateToUTC } from '../utils/convertDateToUTC'
+
+export const playersChartPayloadSchema = z.object({
+  date: z.number(),
+  count: z.number(),
+  change: z.number()
+})
+
+export function useNewPlayersChart(activeGame: Game, startDate: string, endDate: string) {
+  const fetcher = async ([url]: [string]) => {
+    const qs = new URLSearchParams({
+      startDate: convertDateToUTC(startDate),
+      endDate: convertDateToUTC(endDate)
+    }).toString()
+
+    const res = await makeValidatedGetRequest(`${url}?${qs}`, z.object({
+      data: z.array(playersChartPayloadSchema)
+    }))
+
+    return res
+  }
+
+  const { data, error } = useSWR(
+    activeGame && startDate && endDate ? [`/games/${activeGame.id}/charts/new-players`, startDate, endDate] : null,
+    fetcher
+  )
+
+  return {
+    players: data?.data ?? [],
+    loading: !data && !error,
+    error: error && buildError(error)
+  }
+}

src/api/useNewPlayersChart.ts

@@ -7,24 +7,34 @@ import { playerAuthActivitySchema } from '../entities/playerAuthActivity'
 import canPerformAction, { PermissionBasedAction } from '../utils/canPerformAction'
 import { AuthedUser } from '../state/userState'
 
-export default function usePlayerAuthActivities(activeGame: Game, user: AuthedUser, playerId?: string) {
-  const fetcher = async ([url]: [string]) => {
-    const res = await makeValidatedGetRequest(url, z.object({
-      activities: z.array(playerAuthActivitySchema)
+export default function usePlayerAuthActivities(activeGame: Game, user: AuthedUser, playerId: string | undefined, page: number) {
+  const fetcher = async ([url, page]: [string, number]) => {
+    const qs = new URLSearchParams({
+      page: String(page)
+    }).toString()
+
+    const res = await makeValidatedGetRequest(`${url}?${qs}`, z.object({
+      activities: z.array(playerAuthActivitySchema),
+      count: z.number(),
+      itemsPerPage: z.number(),
+      isLastPage: z.boolean()
     }))
 
     return res
   }
 
   const { data, error } = useSWR(
     canPerformAction(user, PermissionBasedAction.VIEW_PLAYER_AUTH_ACTIVITIES) && playerId
-      ? [`/games/${activeGame.id}/players/${playerId}/auth-activities`]
+      ? [`/games/${activeGame.id}/players/${playerId}/auth-activities`, page]
       : null,
     fetcher
   )
 
   return {
     activities: data?.activities ?? [],
+    count: data?.count,
+    itemsPerPage: data?.itemsPerPage,
+    isLastPage: data?.isLastPage,
     loading: !data && !error,
     error: error && buildError(error)
   }

src/api/usePlayerAuthActivities.ts

@@ -0,0 +1,38 @@
+import useSWR from 'swr'
+import buildError from '../utils/buildError'
+import { Game } from '../entities/game'
+import makeValidatedGetRequest from './makeValidatedGetRequest'
+import { z } from 'zod'
+import { convertDateToUTC } from '../utils/convertDateToUTC'
+
+export const statGlobalValueChartSchema = z.object({
+  date: z.number(),
+  value: z.number(),
+  change: z.number()
+})
+
+export function useStatGlobalValueChart(activeGame: Game, internalName: string, startDate: string, endDate: string) {
+  const fetcher = async ([url]: [string]) => {
+    const qs = new URLSearchParams({
+      startDate: convertDateToUTC(startDate),
+      endDate: convertDateToUTC(endDate)
+    }).toString()
+
+    const res = await makeValidatedGetRequest(`${url}?${qs}`, z.object({
+      data: z.array(statGlobalValueChartSchema)
+    }))
+
+    return res
+  }
+
+  const { data, error } = useSWR(
+    activeGame && internalName && startDate && endDate ? [`/games/${activeGame.id}/charts/global-stats/${internalName}`, startDate, endDate] : null,
+    fetcher
+  )
+
+  return {
+    dataPoints: data?.data ?? [],
+    loading: !data && !error,
+    error: error && buildError(error)
+  }
+}

src/api/useStatGlobalValueChart.ts

@@ -0,0 +1,40 @@
+import useSWR from 'swr'
+import buildError from '../utils/buildError'
+import { Game } from '../entities/game'
+import makeValidatedGetRequest from './makeValidatedGetRequest'
+import { z } from 'zod'
+import { convertDateToUTC } from '../utils/convertDateToUTC'
+
+export const statsActivityChartSchema = z.object({
+  date: z.number(),
+  stats: z.record(z.number()),
+  change: z.record(z.number())
+})
+
+export function useStatsActivityChart(activeGame: Game, startDate: string, endDate: string) {
+  const fetcher = async ([url]: [string]) => {
+    const qs = new URLSearchParams({
+      startDate: convertDateToUTC(startDate),
+      endDate: convertDateToUTC(endDate)
+    }).toString()
+
+    const res = await makeValidatedGetRequest(`${url}?${qs}`, z.object({
+      data: z.array(statsActivityChartSchema),
+      statNames: z.array(z.string())
+    }))
+
+    return res
+  }
+
+  const { data, error } = useSWR(
+    activeGame && startDate && endDate ? [`/games/${activeGame.id}/charts/stats-activity`, startDate, endDate] : null,
+    fetcher
+  )
+
+  return {
+    stats: data?.data ?? [],
+    statNames: data?.statNames ?? [],
+    loading: !data && !error,
+    error: error && buildError(error)
+  }
+}