Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions apps/middleman/src/app/(landing)/components/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -430,75 +430,6 @@ export default function LandingPage() {
</div>
</section>

{/* Built By */}
<section className="builders-section">
<div
className="section-label"
style={{ textAlign: "center", marginBottom: 28 }}
>
Built By
</div>
<div className="builders-row">
<a
href="https://trustsoothe.io/"
className="builder-card"
target="_blank"
rel="noopener noreferrer"
>
<div className="builder-logo">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
<path
d="M12 3l-8 4.5v9L12 21l8-4.5v-9L12 3z"
stroke="var(--text-secondary)"
strokeWidth="1.5"
fill="none"
/>
<path
d="M12 12l8-4.5M12 12v9M12 12L4 7.5"
stroke="var(--text-secondary)"
strokeWidth="1"
/>
</svg>
</div>
<div className="builder-info">
<h4>Soothe</h4>
<p>
The development team behind Igniter&apos;s non-custodial
staking platform.
</p>
<span className="builder-link">trustsoothe.io →</span>
</div>
</a>

<a
href="https://poktscan.pocket.network"
className="builder-card"
target="_blank"
rel="noopener noreferrer"
>
<div
className="builder-logo"
style={{
fontWeight: 800,
fontSize: "0.7rem",
letterSpacing: "-0.03em",
color: "var(--text-primary)",
}}
>
EX
</div>
<div className="builder-info">
<h4>Pocket Explorer</h4>
<p>
The official Pocket Network explorer by the Pocket Network
Foundation.
</p>
<span className="builder-link">poktscan.pocket.network →</span>
</div>
</a>
</div>
</section>

{/* Footer */}
<footer className="landing-footer">
<div className="footer-left">
Expand Down
17 changes: 17 additions & 0 deletions apps/middleman/src/app/admin/(internal)/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { redirect } from 'next/navigation'
import { auth } from '@/auth'
import { UserRole } from '@igniter/db/middleman/enums'

export default async function AdminInternalLayout({
children,
}: {
children: React.ReactNode
}) {
const session = await auth()

if (!session || session.user.role !== UserRole.Owner) {
redirect('/')
}

return <>{children}</>
}
61 changes: 15 additions & 46 deletions apps/middleman/src/app/app/(lists)/suppliers/table/columns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
} from "@igniter/ui/assets";
import { Button } from "@igniter/ui/components/button";
import {
FilterGroup,
SortOption,
} from "@igniter/ui/components/DataTable/index";
import {
Expand Down Expand Up @@ -74,8 +73,9 @@ export const columns: (ColumnDef<NodeDetails> & CsvColumnDef<NodeDetails>)[] = [
);
},
filterFn: (row, _columnId, value) => {
if (!value) return true;
const provider = row.getValue("provider") as Provider;
return provider.name.toLowerCase().includes(value.toLowerCase());
return provider?.name === value;
},
csvFormatterFn: (item: NodeDetails) => item.provider?.name || "Imported Node",
},
Expand Down Expand Up @@ -108,6 +108,11 @@ export const columns: (ColumnDef<NodeDetails> & CsvColumnDef<NodeDetails>)[] = [
},
{
accessorKey: "status",
filterFn: (row, _columnId, value) => {
if (!value) return true;
const status = row.getValue("status") as string;
return status === value;
},
header: "Status",
meta: {
headerAlign: 'center'
Expand Down Expand Up @@ -157,6 +162,14 @@ export const columns: (ColumnDef<NodeDetails> & CsvColumnDef<NodeDetails>)[] = [
},
csvFormatterFn: (item: NodeDetails) => amountToPokt(item.balance.toString()).toString(),
},
{
accessorKey: "services",
filterFn: (row, _columnId, value) => {
if (!value) return true;
const services = row.getValue("services") as Array<{ serviceId: string }>;
return (services ?? []).some((s) => s.serviceId === value);
},
},
{
accessorKey: "createdAt",
header: "Created At",
Expand Down Expand Up @@ -208,50 +221,6 @@ export const columns: (ColumnDef<NodeDetails> & CsvColumnDef<NodeDetails>)[] = [
},
];

export const filters: FilterGroup<NodeDetails>[] = [
{
group: "bin/status",
items: [
[
{
label: "All Nodes",
value: "",
column: "status",
},
{
label: "Staked",
value: "staked",
column: "status",
isDefault: true,
},
{
label: "Unstaking",
value: "unstaking",
column: "status",
},
{
label: "Unstaked",
value: "unstaked",
column: "status",
},
],
],
},
{
group: "providers",
items: [
[
{
label: "All Providers",
value: "",
column: "provider",
isDefault: true,
},
],
],
},
];

export const sorts: SortOption<NodeDetails>[][] = [
[
{
Expand Down
62 changes: 60 additions & 2 deletions apps/middleman/src/app/app/(lists)/suppliers/table/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
'use client'

import DataTable from '@igniter/ui/components/DataTable/index'
import { columns, filters, NodeDetails, sorts } from './columns'
import { FilterGroup } from '@igniter/ui/components/DataTable/index'
import { columns, NodeDetails, sorts } from './columns'
import { GetUserNodes } from '@/actions/Nodes'
import { useQuery } from '@tanstack/react-query'
import {ItemBase, useDetailContext} from '@igniter/ui/components/QuickDetails/Provider'
import { useEffect } from 'react'
import { useEffect, useMemo } from 'react'

export default function NodesTable() {
const { data, isError, isLoading, refetch } = useQuery({
Expand Down Expand Up @@ -60,12 +61,69 @@ export default function NodesTable() {
}
}) || [];

const filters = useMemo((): FilterGroup<NodeDetails>[] => {
const uniqueProviders = Array.from(
new Map(
nodes
.filter((n) => n.provider)
.map((n) => [n.provider!.name, n.provider!.name])
).entries()
).sort(([a], [b]) => a.localeCompare(b));

const uniqueServices = Array.from(
new Set(
nodes.flatMap((n) => (n.services ?? []).map((s: { serviceId: string }) => s.serviceId))
)
).sort((a, b) => a.localeCompare(b));

return [
{
group: "bin/status",
items: [
[
{ label: "All Nodes", value: "", column: "status" },
{ label: "Staked", value: "staked", column: "status", isDefault: true },
{ label: "Unstaking", value: "unstaking", column: "status" },
{ label: "Unstaked", value: "unstaked", column: "status" },
],
],
},
{
group: "providers",
items: [
[
{ label: "All Providers", value: "", column: "provider", isDefault: true },
...uniqueProviders.map(([name]) => ({
label: name,
value: name,
column: "provider" as keyof NodeDetails,
})),
],
],
},
{
group: "services",
items: [
[
{ label: "All Services", value: "", column: "services", isDefault: true },
...uniqueServices.map((id) => ({
label: id,
value: id,
column: "services" as keyof NodeDetails,
})),
],
],
},
];
}, [nodes]);

return (
<DataTable
columns={columns}
data={nodes}
filters={filters}
sorts={sorts}
columnVisibility={{ services: false }}
isLoading={isLoading}
isError={isError}
refetch={refetch}
Expand Down
15 changes: 1 addition & 14 deletions apps/middleman/src/app/app/providers/clientPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export default function ClientProvidersPage() {
const router = useRouter();
const { isConnected, connectedIdentities } = useWalletConnection();
const [expandedProviders, setExpandedProviders] = useState<Set<number>>(new Set());
const [hasInitializedExpanded, setHasInitializedExpanded] = useState(false);

const { data, isLoading, isError, refetch } = useQuery({
queryKey: ['providers', connectedIdentities],
Expand All @@ -41,22 +40,10 @@ export default function ClientProvidersPage() {
refetchInterval: 30000,
});

const providers = data?.providers || [];
const providers = (data?.providers || []).slice().sort((a, b) => a.name.localeCompare(b.name));
const delegatorFee = data?.delegatorFee || 0;
const minimumStake = data?.minimumStake || 0;

useEffect(() => {
if (!hasInitializedExpanded && providers.length > 0) {
const autoExpand = new Set<number>();
providers.forEach(p => {
if (p.addressGroups.length === 1) {
autoExpand.add(p.id);
}
});
setExpandedProviders(autoExpand);
setHasInitializedExpanded(true);
}
}, [providers, hasInitializedExpanded]);

const toggleExpanded = (providerId: number) => {
setExpandedProviders(prev => {
Expand Down
4 changes: 3 additions & 1 deletion apps/middleman/src/app/detail/NodeDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ function ServiceCard({ service, ownerAddress }: { service: NodeService; ownerAdd
<p className="text-xs text-[color:var(--muted-foreground)]">Revenue Share</p>
{service.revShare.map((rs, i) => (
<div key={i} className="flex items-center justify-between gap-2">
<span className="font-mono text-xs text-text-tertiary">{getShortAddress(rs.address, 5)}</span>
<span className={`font-mono text-xs ${rs.address.toLowerCase() === ownerAddress.toLowerCase() ? 'text-text-primary font-bold' : 'text-text-tertiary'}`}>
{getShortAddress(rs.address, 5)}
</span>
<span className="font-mono text-xs">{rs.revSharePercentage}%</span>
</div>
))}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/DataTable/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default function DataTable<TData extends object, TValue>({
const currentPage = tableState.pagination.pageIndex;

const defaultFilters = filters.flatMap((filterGroup) =>
filterGroup.items.flatMap((filter) => filter.find((f) => f.isDefault) || [])
filterGroup.items.flatMap((filter) => filter.find((f) => f.value === '') || filter.find((f) => f.isDefault) || [])
);


Expand Down
Loading