Skip to content

Commit e9c96f2

Browse files
committed
fix: minor fixes
1 parent fd9baa9 commit e9c96f2

File tree

5 files changed

+62
-89
lines changed

5 files changed

+62
-89
lines changed

src/components/Map.tsx

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -135,38 +135,38 @@ const Map = React.forwardRef<
135135
Japan
136136
</div>
137137
</div> */}
138-
{nodesGeo != null ? (
139-
clusterPoints(
140-
Object.values(nodesGeo).map((geo) => ({
141-
lat: geo.ll[0],
142-
lng: geo.ll[1],
143-
})),
144-
1000,
145-
).map(({ count, lat, lng }, i) => {
146-
const { x, y } = latLonToOffsets(lat * 1.8, lng, 100, 100);
147-
return (
148-
<div
149-
className="absolute grid aspect-square -translate-x-1/2 -translate-y-1/2 place-items-center rounded-full border border-[rgba(255,255,255)]"
150-
key={i}
151-
style={{
152-
left: `${x > 0 ? x : 100 + x}%`,
153-
top: `${y}%`,
154-
transformOrigin: 'top left',
155-
width: `${
156-
Math.max(Math.min(Math.log(count * 1000), 15), 1) +
157-
(width > 640 ? 0 : 4)
158-
}%`,
159-
}}
160-
>
161-
<div className="flex aspect-square w-3/4 justify-center rounded-full bg-white">
162-
<img
163-
alt="Polykey Logo"
164-
className="w-3/5"
165-
src="images/polykey-logomark-dark.svg"
166-
/>
167-
</div>
138+
{nodesGeo != null
139+
? clusterPoints(
140+
Object.values(nodesGeo).map((geo) => ({
141+
lat: geo.ll[0],
142+
lng: geo.ll[1],
143+
})),
144+
1000,
145+
).map(({ count, lat, lng }, i) => {
146+
const { x, y } = latLonToOffsets(lat * 1.8, lng, 100, 100);
147+
return (
168148
<div
169-
className="
149+
className="absolute grid aspect-square -translate-x-1/2 -translate-y-1/2 place-items-center rounded-full border border-[rgba(255,255,255)]"
150+
key={i}
151+
style={{
152+
left: `${x > 0 ? x : 100 + x}%`,
153+
top: `${y}%`,
154+
transformOrigin: 'top left',
155+
width: `${
156+
Math.max(Math.min(Math.log(count * 1000), 15), 1) +
157+
(width > 640 ? 0 : 4)
158+
}%`,
159+
}}
160+
>
161+
<div className="flex aspect-square w-3/4 justify-center rounded-full bg-white">
162+
<img
163+
alt="Polykey Logo"
164+
className="w-3/5"
165+
src="images/polykey-logomark-dark.svg"
166+
/>
167+
</div>
168+
<div
169+
className="
170170
absolute bottom-0 right-0
171171
inline-block
172172
aspect-square w-6 rounded-full
@@ -176,15 +176,13 @@ const Map = React.forwardRef<
176176
text-xs
177177
leading-5
178178
text-white"
179-
>
180-
{count}
179+
>
180+
{count}
181+
</div>
181182
</div>
182-
</div>
183-
);
184-
})
185-
) : (
186-
<></>
187-
)}
183+
);
184+
})
185+
: null}
188186
</div>
189187
</div>
190188
);

src/components/ResourceChart.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,7 @@ const ResourceChart = ({
117117
title={title}
118118
{...props}
119119
/>
120-
) : (
121-
<></>
122-
);
120+
) : null;
123121
};
124122

125123
export default ResourceChart;

src/components/SeedNodeCard.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ const NodeCard = React.forwardRef<
1010
}
1111
// Complains about props not being validated
1212
>(({ className, nodeId, data, ...props }, ref) => {
13-
let contents: React.JSX.Element;
13+
let contents: React.JSX.Element | null;
1414
if (data == null) {
15-
contents = <></>;
15+
contents = null;
1616
} else if ('error' in data) {
1717
contents = (
1818
<>

src/pages/index.tsx

Lines changed: 18 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Map from '../components/Map';
88
import SeedNodeCard from '../components/SeedNodeCard';
99
import ResourceChart from '../components/ResourceChart';
1010

11-
export default function Home(): React.JSX.Element {
11+
const Home = () => {
1212
const { siteConfig } = useDocusaurusContext();
1313
const nodesGeoQuery = useQuery<{ [nodeId: string]: IpGeo }>({
1414
queryKey: ['nodesGeo'],
@@ -77,23 +77,6 @@ export default function Home(): React.JSX.Element {
7777
libNetworkVersion: 'NetVer',
7878
};
7979

80-
const versionMetadataKeysSorted = React.useMemo(() => {
81-
if (!Array.isArray(deploymentsQuery.data)) return [];
82-
83-
const keySet = new Set<string>();
84-
for (const deployment of deploymentsQuery.data) {
85-
if (
86-
deployment &&
87-
typeof deployment.versionMetadata === 'object' &&
88-
deployment.versionMetadata != null
89-
) {
90-
for (const key of Object.keys(deployment.versionMetadata)) {
91-
keySet.add(key);
92-
}
93-
}
94-
}
95-
return Array.from(keySet).sort();
96-
}, [deploymentsQuery.data]);
9780
return (
9881
<Layout
9982
description="Polykey, a new approach to secrets management."
@@ -110,23 +93,19 @@ export default function Home(): React.JSX.Element {
11093
<div className="mx-auto max-w-6xl space-y-3 p-3">
11194
<h1 className="text-center text-2xl">Seed Nodes</h1>
11295
<div className="flex flex-wrap justify-center gap-3">
113-
{seedNodesQuery.data != null ? (
114-
Object.entries(seedNodesQuery.data).map(([nodeId, data]) => (
115-
<SeedNodeCard
116-
className="min-w-0 shrink grow-[0.5]"
117-
data={data}
118-
key={nodeId}
119-
nodeId={nodeId}
120-
/>
121-
))
122-
) : (
123-
<></>
124-
)}
96+
{seedNodesQuery.data != null
97+
? Object.entries(seedNodesQuery.data).map(([nodeId, data]) => (
98+
<SeedNodeCard
99+
className="min-w-0 shrink grow-[0.5]"
100+
data={data}
101+
key={nodeId}
102+
nodeId={nodeId}
103+
/>
104+
))
105+
: null}
125106
{seedNodesQuery.error != null ? (
126107
<>Unable to fetch seednodes status from Polykey-Network-Status</>
127-
) : (
128-
<></>
129-
)}
108+
) : null}
130109
</div>
131110
{resourceCpuQuery.error == null ||
132111
resourceMemoryQuery.error == null ? (
@@ -140,9 +119,7 @@ export default function Home(): React.JSX.Element {
140119
)}
141120
title="CPU Usage"
142121
/>
143-
) : (
144-
<></>
145-
)}
122+
) : null}
146123
</div>
147124
<div className="inline-block aspect-[1.5] w-full md:w-1/2">
148125
{resourceMemoryQuery.data != null ? (
@@ -153,14 +130,10 @@ export default function Home(): React.JSX.Element {
153130
)}
154131
title="Memory Usage"
155132
/>
156-
) : (
157-
<></>
158-
)}
133+
) : null}
159134
</div>
160135
</div>
161-
) : (
162-
<></>
163-
)}
136+
) : null}
164137
<div className="rounded-2xl bg-[#E4F6F2] p-3">
165138
<span className="font-semibold">Deployments:</span>
166139
<table className="mt-3 w-full table-auto">
@@ -287,4 +260,6 @@ export default function Home(): React.JSX.Element {
287260
</div>
288261
</Layout>
289262
);
290-
}
263+
};
264+
265+
export default Home;

src/theme/SearchBar.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
22
import styles from './SearchBar.module.css';
33

4-
export default function FooterLayout(): React.JSX.Element {
4+
const FooterLayout = () => {
55
return <p className={styles.helpme}></p>;
6-
}
6+
};
7+
8+
export default FooterLayout;

0 commit comments

Comments
 (0)