Merge pull request #72 from Lilypad-Tech/revert-71-revert-70-ben/feat…

…-use-devnet-api Revert "Revert "Ben/feat use devnet api""
Lilypad-Tech · Jul 25, 2024 · 3574157 · 3574157
2 parents 7246221 + 15ffd0a
commit 3574157
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/apps/info-dashboard/src/app/leaderboard/page.tsx b/apps/info-dashboard/src/app/leaderboard/page.tsx
@@ -176,18 +176,18 @@ export default function Leaderboard() {
 									</span>
 									<span className="text-uui-text-primary-900 uui-display-sm font-semibold">
 										{/* Todo add api cumalative Lilybit_rewards earned */}
-										n.a.
+										{ Math.trunc(leaderboardData ? leaderboardData.reduce((total, node) => +node.Points + total, 0) : 0)}
 									</span>
 								</div>
-								<div className="flex-col flex space-y-uui-xs">
+								{/* Todo add api week total Lilybit_rewards earned */}
+								{/* <div className="flex-col flex space-y-uui-xs">
 									<span className="uui-text-sm font-medium text-uui-text-tertiary-600">
 										{m.leaderboard_incentive_program_week_title()}
 									</span>
 									<span className="text-uui-text-primary-900 uui-display-sm font-semibold">
-										{/* Todo add api total Lilybit_rewards earned */}
 										n.a.
 									</span>
-								</div>
+								</div> */}
 							</div>
 						</CardWithBorder>
 						<CardWithBorder

diff --git a/apps/info-dashboard/src/lib/fetchers/leaderboard.ts b/apps/info-dashboard/src/lib/fetchers/leaderboard.ts
@@ -1,6 +1,5 @@
 import { ascending, sort } from "d3";
 import { DateTime } from "luxon";
-import { getTimeDiff } from "../time/time";
 export type LeaderboardReturnType = {
 	Points: string;
 	Rank: string;
@@ -17,8 +16,7 @@ import {
 import { NodesEndpointReturnType } from "./nodes";
 
 export async function fetchLeaderboard() {
-	//const api_host = process.env.NEXT_PUBLIC_API_HOST;
-	const API_HOST = "https://api-testnet.lilypad.tech/";
+	const API_HOST = process.env.NEXT_PUBLIC_API_HOST;
 	const leaderboard_url = `${API_HOST}metrics-dashboard/leaderboard`;
 	const raw = await fetch(leaderboard_url);
 	return (await raw.json()) as LeaderboardReturnType;
@@ -68,7 +66,7 @@ export function toTableData({
 						  } as const);
 				return result;
 			})(),
-			"Reward Points": "n.a.",
+			"Reward Points": Math.round(+Points * 100) / 100,
 
 			Status: (() => {
 				const online = nodesData.find(
@@ -91,7 +89,8 @@ export function toTableData({
 						const start = DateTime.fromMillis(startMillis);
 						const now = DateTime.now();
 						const diff = now.diff(start, "hours");
-						return diff.hours.toFixed(0) + " hours";
+						const hours = diff.hours.toFixed(0);
+						return hours + (hours === "1" ? " hour" : " hours");
 				  })(connectedSince)
 				: "n.a.",
 

diff --git a/apps/info-dashboard/src/lib/fetchers/metrics.ts b/apps/info-dashboard/src/lib/fetchers/metrics.ts
@@ -22,8 +22,7 @@ export type MetricsEndpointReturnType = {
 };
 
 export async function fetchMetrics() {
-	//const api_host = process.env.NEXT_PUBLIC_API_HOST;
-	const API_HOST = "https://api-testnet.lilypad.tech/";
+	const API_HOST = process.env.NEXT_PUBLIC_API_HOST;
 	const METRICS_URL = `${API_HOST}metrics-dashboard/metrics`;
 	const raw = await fetch(METRICS_URL);
 	const res = (await raw.json()) as MetricsEndpointReturnType;

diff --git a/apps/info-dashboard/src/lib/fetchers/node-status.ts b/apps/info-dashboard/src/lib/fetchers/node-status.ts
@@ -16,8 +16,7 @@ import { Balances, PowSubmissions } from "./node-chain-data";
 import { DateTime } from "luxon";
 
 export async function fetchNodeStatus() {
-	//const api_host = process.env.NEXT_PUBLIC_API_HOST;
-	const API_HOST = "https://api-testnet.lilypad.tech/";
+	const API_HOST = process.env.NEXT_PUBLIC_API_HOST;
 	const leaderboard_url = `${API_HOST}metrics-dashboard/leaderboard`;
 	const raw = await fetch(leaderboard_url);
 	return (await raw.json()) as NodeStatusReturnType;

diff --git a/apps/info-dashboard/src/lib/fetchers/nodes.ts b/apps/info-dashboard/src/lib/fetchers/nodes.ts
@@ -17,8 +17,7 @@ export type NodesEndpointReturnElement = {
 export type NodesEndpointReturnType = NodesEndpointReturnElement[];
 
 export async function fetchNodes() {
-	//const api_host = process.env.NEXT_PUBLIC_API_HOST;
-	const API_HOST = "https://api-testnet.lilypad.tech/";
+	const API_HOST = process.env.NEXT_PUBLIC_API_HOST;
 	const URL = `${API_HOST}metrics-dashboard/nodes`;
 	const raw = await fetch(URL);
 	const res = (await raw.json()) as NodesEndpointReturnType;

diff --git a/apps/website-cms/.env b/apps/website-cms/.env
@@ -0,0 +1,4 @@
+DATABASE_URI=mongodb://mongo:27017/website-cms
+PAYLOAD_SECRET=c256bbf0402b9caebdd34339
+NODE_ENV=development
+PAYLOAD_SECRET=TESTING
diff --git a/apps/website-cms/.gitignore b/apps/website-cms/.gitignore
@@ -0,0 +1 @@
+.pnpm-store