refactor: clear naming and query params

kleros · Sep 15, 2023 · 5127f0f · 5127f0f
1 parent 28547bb
commit 5127f0f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/web/src/hooks/queries/useCounter.ts b/web/src/hooks/queries/useCounter.ts
@@ -6,9 +6,15 @@ import { graphqlQueryFnHelper } from "utils/graphqlQueryFnHelper";
 const counterQuery = graphql(`
   query Counter {
     counter(id: "0") {
+      id
       cases
       casesRuled
+      casesVoting
       casesAppealing
+      stakedPNK
+      redistributedPNK
+      paidETH
+      activeJurors
     }
   }
 `);

diff --git a/web/src/pages/Cases/index.tsx b/web/src/pages/Cases/index.tsx
@@ -26,28 +26,28 @@ export const calculatePages = (
     return 0;
   }
 
-  let totalPages = 0;
+  let totalCases = 0;
 
   switch (status) {
     case 1:
-      totalPages =
+      totalCases =
         "counter" in data
           ? data?.counter?.cases - data?.counter?.casesRuled
           : (data as CourtDetailsQuery).court?.numberDisputes - (data as CourtDetailsQuery).court?.numberClosedDisputes;
       break;
     case 2:
-      totalPages =
+      totalCases =
         "counter" in data ? data?.counter?.casesRuled : (data as CourtDetailsQuery).court?.numberClosedDisputes;
       break;
     case 3:
-      totalPages =
+      totalCases =
         "counter" in data ? data?.counter?.casesAppealing : (data as CourtDetailsQuery).court?.numberAppealingDisputes;
       break;
     default:
-      totalPages = "counter" in data ? numberDisputes ?? 0 : (data as CourtDetailsQuery).court?.numberDisputes;
+      totalCases = "counter" in data ? numberDisputes ?? 0 : (data as CourtDetailsQuery).court?.numberDisputes;
   }
 
-  return totalPages / casesPerPage;
+  return totalCases / casesPerPage;
 };
 
 const Cases: React.FC = () => {

diff --git a/web/src/pages/Dashboard/index.tsx b/web/src/pages/Dashboard/index.tsx
@@ -35,23 +35,23 @@ const calculatePages = (status: number, data: UserQuery | undefined, casesPerPag
     return 0;
   }
 
-  let totalPages = 0;
+  let totalCases = 0;
 
   switch (status) {
     case 1:
-      totalPages = data.user?.totalDisputes - data.user?.totalResolvedDisputes;
+      totalCases = data.user?.totalDisputes - data.user?.totalResolvedDisputes;
       break;
     case 2:
-      totalPages = data.user?.totalResolvedDisputes ?? 0;
+      totalCases = data.user?.totalResolvedDisputes ?? 0;
       break;
     case 3:
-      totalPages = myAppeals ?? 0;
+      totalCases = myAppeals ?? 0;
       break;
     default:
-      totalPages = data.user?.totalDisputes ?? 0;
+      totalCases = data.user?.totalDisputes ?? 0;
   }
 
-  return totalPages / casesPerPage;
+  return totalCases / casesPerPage;
 };
 
 const Dashboard: React.FC = () => {

diff --git a/web/src/styles/global-style.ts b/web/src/styles/global-style.ts
@@ -10,8 +10,8 @@ export const GlobalStyle = createGlobalStyle`
 
   .react-loading-skeleton {
     z-index: 0;
-    --base-color: ${({ theme }) => theme.lightGrey};
-    --highlight-color: ${({ theme }) => theme.stroke};
+    --base-color: ${({ theme }) => theme.skeletonBackground};
+    --highlight-color: ${({ theme }) => theme.skeletonHighlight};
   }
 
   body {
@@ -105,8 +105,4 @@ export const GlobalStyle = createGlobalStyle`
     }
   }
 
-  .react-loading-skeleton {
-    --base-color: ${({ theme }) => theme.skeletonBackground};
-    --highlight-color: ${({ theme }) => theme.skeletonHighlight};
-  }
 `;