From aad52db138830de8b473ada5525f33164c65abab Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Mon, 27 Oct 2025 20:57:34 -0700 Subject: move loading display to root of components folder --- frontend/package.json | 1 + frontend/pnpm-lock.yaml | 22 ++++++++++++++++++++++ frontend/src/components/LoadingDisplay.tsx | 17 +++++++++++++++++ .../src/components/displays/LoadingDisplay.tsx | 17 ----------------- frontend/src/pages/AllScores.tsx | 2 +- frontend/src/pages/Chart.tsx | 2 +- frontend/src/pages/Home.tsx | 2 +- frontend/src/pages/Import.tsx | 2 +- frontend/src/pages/Profile.tsx | 2 +- frontend/src/pages/Score.tsx | 2 +- 10 files changed, 46 insertions(+), 23 deletions(-) create mode 100644 frontend/src/components/LoadingDisplay.tsx delete mode 100644 frontend/src/components/displays/LoadingDisplay.tsx (limited to 'frontend') diff --git a/frontend/package.json b/frontend/package.json index a6b2e93..af7efd0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@tailwindcss/vite": "^4.1.13", + "@uiw/react-heat-map": "^2.3.3", "crypto-js": "^4.2.0", "react": "^19.1.1", "react-dom": "^19.1.1", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 1d8e617..80bdfb1 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@tailwindcss/vite': specifier: ^4.1.13 version: 4.1.13(vite@7.1.7(jiti@2.6.0)(lightningcss@1.30.1)) + '@uiw/react-heat-map': + specifier: ^2.3.3 + version: 2.3.3(@babel/runtime@7.28.4)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) crypto-js: specifier: ^4.2.0 version: 4.2.0 @@ -137,6 +140,10 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@babel/runtime@7.28.4': + resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==} + engines: {node: '>=6.9.0'} + '@babel/template@7.27.2': resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} engines: {node: '>=6.9.0'} @@ -682,6 +689,13 @@ packages: resolution: {integrity: sha512-576+u0QD+Jp3tZzvfRfxon0EA2lzcDt3lhUbsC6Lgzy9x2VR4E+JUiNyGHi5T8vk0TV+fpJ5GLG1JsJuWCaKhw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@uiw/react-heat-map@2.3.3': + resolution: {integrity: sha512-PMQ2v7am2yWCXNJcNz6OpbJmb3m6zNxf8NaRvPdCiRtF1NU58JJoGfkmEgXSjopNuu5eg8sBYX/VPC1Of8C0QQ==} + peerDependencies: + '@babel/runtime': '>=7.10.0' + react: '>=16.9.0' + react-dom: '>=16.9.0' + '@vitejs/plugin-react@5.0.3': resolution: {integrity: sha512-PFVHhosKkofGH0Yzrw1BipSedTH68BFF8ZWy1kfUpCtJcouXXY0+racG8sExw7hw0HoX36813ga5o3LTWZ4FUg==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1447,6 +1461,8 @@ snapshots: '@babel/core': 7.28.4 '@babel/helper-plugin-utils': 7.27.1 + '@babel/runtime@7.28.4': {} + '@babel/template@7.27.2': dependencies: '@babel/code-frame': 7.27.1 @@ -1905,6 +1921,12 @@ snapshots: '@typescript-eslint/types': 8.44.1 eslint-visitor-keys: 4.2.1 + '@uiw/react-heat-map@2.3.3(@babel/runtime@7.28.4)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': + dependencies: + '@babel/runtime': 7.28.4 + react: 19.1.1 + react-dom: 19.1.1(react@19.1.1) + '@vitejs/plugin-react@5.0.3(vite@7.1.7(jiti@2.6.0)(lightningcss@1.30.1))': dependencies: '@babel/core': 7.28.4 diff --git a/frontend/src/components/LoadingDisplay.tsx b/frontend/src/components/LoadingDisplay.tsx new file mode 100644 index 0000000..ea6de54 --- /dev/null +++ b/frontend/src/components/LoadingDisplay.tsx @@ -0,0 +1,17 @@ + +interface LoadingDisplayProps { + message?: string; +} + +const LoadingDisplay = ({ message }: LoadingDisplayProps) => { + return( +
+
+
+

{message || 'Loading...'}

+
+
+ ) +} + +export default LoadingDisplay; diff --git a/frontend/src/components/displays/LoadingDisplay.tsx b/frontend/src/components/displays/LoadingDisplay.tsx deleted file mode 100644 index ea6de54..0000000 --- a/frontend/src/components/displays/LoadingDisplay.tsx +++ /dev/null @@ -1,17 +0,0 @@ - -interface LoadingDisplayProps { - message?: string; -} - -const LoadingDisplay = ({ message }: LoadingDisplayProps) => { - return( -
-
-
-

{message || 'Loading...'}

-
-
- ) -} - -export default LoadingDisplay; diff --git a/frontend/src/pages/AllScores.tsx b/frontend/src/pages/AllScores.tsx index c967ff0..a831891 100644 --- a/frontend/src/pages/AllScores.tsx +++ b/frontend/src/pages/AllScores.tsx @@ -1,5 +1,5 @@ import { useEffect, useState, useCallback } from "react"; -import LoadingDisplay from "../components/displays/LoadingDisplay"; +import LoadingDisplay from "../components/LoadingDisplay"; import { useAuth } from "../contexts/AuthContext"; import { useNavigate } from "react-router"; import { NavBar } from "../components/NavBar"; diff --git a/frontend/src/pages/Chart.tsx b/frontend/src/pages/Chart.tsx index a84ae74..7b486d6 100644 --- a/frontend/src/pages/Chart.tsx +++ b/frontend/src/pages/Chart.tsx @@ -1,5 +1,5 @@ import { useEffect, useState, useCallback } from "react"; -import LoadingDisplay from "../components/displays/LoadingDisplay"; +import LoadingDisplay from "../components/LoadingDisplay"; import { useAuth } from "../contexts/AuthContext"; import { useNavigate } from "react-router"; import { NavBar } from "../components/NavBar"; diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx index 3fcb5cc..0f4dff9 100644 --- a/frontend/src/pages/Home.tsx +++ b/frontend/src/pages/Home.tsx @@ -1,5 +1,5 @@ import { useNavigate } from "react-router"; -import LoadingDisplay from "../components/displays/LoadingDisplay"; +import LoadingDisplay from "../components/LoadingDisplay"; import { NavBar } from "../components/NavBar"; import { useAuth } from "../contexts/AuthContext"; import type { SupportedGame } from "../types/game"; diff --git a/frontend/src/pages/Import.tsx b/frontend/src/pages/Import.tsx index 4061613..5b48c5d 100644 --- a/frontend/src/pages/Import.tsx +++ b/frontend/src/pages/Import.tsx @@ -1,6 +1,6 @@ import { useState, useEffect, Suspense, lazy } from "react"; import { useNavigate } from "react-router"; -import LoadingDisplay from "../components/displays/LoadingDisplay"; +import LoadingDisplay from "../components/LoadingDisplay"; import { useAuth } from "../contexts/AuthContext"; import SessionExpiredPopup from "../components/SessionExpiredPopup"; import type { SupportedGame } from "../types/game"; diff --git a/frontend/src/pages/Profile.tsx b/frontend/src/pages/Profile.tsx index 03fef48..184681d 100644 --- a/frontend/src/pages/Profile.tsx +++ b/frontend/src/pages/Profile.tsx @@ -1,5 +1,5 @@ import { useNavigate } from 'react-router'; -import LoadingDisplay from "../components/displays/LoadingDisplay"; +import LoadingDisplay from "../components/LoadingDisplay"; import SessionExpiredPopup from "../components/SessionExpiredPopup"; import { NavBar } from '../components/NavBar'; import { useAuth } from "../contexts/AuthContext"; diff --git a/frontend/src/pages/Score.tsx b/frontend/src/pages/Score.tsx index e7140ab..cf2b09c 100644 --- a/frontend/src/pages/Score.tsx +++ b/frontend/src/pages/Score.tsx @@ -1,5 +1,5 @@ import { useEffect, useState, useCallback } from "react"; -import LoadingDisplay from "../components/displays/LoadingDisplay"; +import LoadingDisplay from "../components/LoadingDisplay"; import { useAuth } from "../contexts/AuthContext"; import { useNavigate } from "react-router"; import { NavBar } from "../components/NavBar"; -- cgit v1.2.3