Skip to content

Commit

Permalink
fix: files
Browse files Browse the repository at this point in the history
  • Loading branch information
clmntsnr committed Dec 3, 2024
1 parent 383e792 commit a8a3ea9
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 54 deletions.
52 changes: 26 additions & 26 deletions src/api/services/protocol.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,47 @@ export abstract class ProtocolService {
return data;
}

/**
/**
* Retrieves protocols query params from page request
* @param request request containing query params such as paginatio
* @param override params for which to override value
* @returns query
*/
static #getQueryFromRequest(
request: Request,
override?: Parameters<typeof api.v4.opportunities.index.get>[0]["query"],
) {
const page = new URL(request.url).searchParams.get("page");
const items = new URL(request.url).searchParams.get("items");
const search = new URL(request.url).searchParams.get("search");
const [sort, order] = new URL(request.url).searchParams.get("sort")?.split("-") ?? [];
const filters = Object.assign(
{ items, sort, order, name: search, page },
override ?? {},
page !== null && { page: Number(page) - 1 },
);
const query = Object.entries(filters).reduce(
(_query, [key, filter]) => Object.assign(_query, filter == null ? {} : { [key]: filter }),
{},
);
return query;
}
static #getQueryFromRequest(
request: Request,
override?: Parameters<typeof api.v4.opportunities.index.get>[0]["query"],
) {
const page = new URL(request.url).searchParams.get("page");
const items = new URL(request.url).searchParams.get("items");
const search = new URL(request.url).searchParams.get("search");

const [sort, order] = new URL(request.url).searchParams.get("sort")?.split("-") ?? [];

const filters = Object.assign(
{ items, sort, order, name: search, page },
override ?? {},
page !== null && { page: Number(page) - 1 },
);

const query = Object.entries(filters).reduce(
(_query, [key, filter]) => Object.assign(_query, filter == null ? {} : { [key]: filter }),
{},
);

return query;
}

static async get(query: { id: string }): Promise<Protocol> {
const protocol = await ProtocolService.#fetch(async () => api.v4.protocols(query).get({ query }));

return protocol;
}

static async getManyFromRequest(request: Request): Promise<{protocols: Protocol[], count: number}> {
static async getManyFromRequest(request: Request): Promise<{ protocols: Protocol[]; count: number }> {
const query = ProtocolService.#getQueryFromRequest(request);
const protocols = await ProtocolService.#fetch(async () => api.v4.protocols.index.get({ query }));
const count = await ProtocolService.#fetch(async () => api.v4.protocols.count.get({ query }));

return { protocols, count};
return { protocols, count };
}
}
8 changes: 4 additions & 4 deletions src/api/services/token.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ export abstract class TokenService {
return data;
}

/**
/**
* Retrieves tokens query params from page request
* @param request request containing query params such as pagination
* @param override params for which to override value
* @returns query
*/
static #getQueryFromRequest(
static #getQueryFromRequest(
request: Request,
override?: Parameters<typeof api.v4.opportunities.index.get>[0]["query"],
) {
Expand All @@ -45,12 +45,12 @@ export abstract class TokenService {
return query;
}

static async getManyFromRequest(request: Request): Promise<{ tokens: Token[], count: number }> {
static async getManyFromRequest(request: Request): Promise<{ tokens: Token[]; count: number }> {
const query = TokenService.#getQueryFromRequest(request);
const tokens = await TokenService.#fetch(async () => api.v4.tokens.index.get({ query }));
const count = await TokenService.#fetch(async () => api.v4.tokens.count.get({ query }));

return { tokens, count};
return { tokens, count };
}

static async getMany(query: Parameters<typeof api.v4.tokens.index.get>[0]["query"]): Promise<Token[]> {
Expand Down
14 changes: 4 additions & 10 deletions src/components/element/protocol/ProtocolLibrary.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
import type { Protocol } from "@merkl/api";
import { Group, type Order } from "dappkit";
import { Group } from "dappkit";
import { useMemo } from "react";
import useSearchParamState from "src/hooks/filtering/useSearchParamState";
import ProtocolTableRow from "./ProtocolTableRow";
import { ProtocolTable } from "./ProtocolTable";
import OpportunityPagination from "../opportunity/OpportunityPagination";
import OpportunityFilters from "../opportunity/OpportunityFilters";
import ProtocolFilters from "./ProtocolFilters";
import { ProtocolTable } from "./ProtocolTable";
import ProtocolTableRow from "./ProtocolTableRow";

export type ProtocolLibraryProps = {
protocols: Protocol[];
count?: number;
};

export default function ProtocolLibrary({ protocols, count }: ProtocolLibraryProps) {
const rows = useMemo(
() =>
protocols?.map(p => <ProtocolTableRow key={`${p.name}`} protocol={p} />),
[protocols],
);
const rows = useMemo(() => protocols?.map(p => <ProtocolTableRow key={`${p.name}`} protocol={p} />), [protocols]);

return (
<ProtocolTable
Expand Down
3 changes: 1 addition & 2 deletions src/components/element/protocol/ProtocolTableRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export type ProtocolTableRowProps = {
} & BoxProps;

export default function ProtocolTableRow({ hideTags, protocol, className, ...props }: OpportunityTableRowProps) {

return (
<Link to={`/protocols/${protocol.name}`}>
<ProtocolRow
Expand All @@ -28,7 +27,7 @@ export default function ProtocolTableRow({ hideTags, protocol, className, ...pro
h={3}
size={4}
className="text-nowrap flex gap-lg whitespace-nowrap text-ellipsis min-w-0 overflow-hidden">
<Icon src={protocol.icon}/>
<Icon src={protocol.icon} />
{protocol.name}
</Title>
</Group>
Expand Down
5 changes: 2 additions & 3 deletions src/components/element/token/TokenLibrary.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { Token } from "@merkl/api";
import { Group } from "dappkit";
import { useMemo } from "react";
import { TokenTable } from "./TokenTable";
import OpportunityPagination from "../opportunity/OpportunityPagination";
import ProtocolFilters from "./TokenFilters";
import { TokenTable } from "./TokenTable";
import TokenTableRow from "./TokenTableRow";

export type TokenLibraryProps = {
Expand All @@ -13,8 +13,7 @@ export type TokenLibraryProps = {

export default function TokenLibrary({ tokens, count }: TokenLibraryProps) {
const rows = useMemo(
() =>
tokens?.map(t => <TokenTableRow key={`${t.name}-${t.chainId}-${t.address}`} token={t} />),
() => tokens?.map(t => <TokenTableRow key={`${t.name}-${t.chainId}-${t.address}`} token={t} />),
[tokens],
);

Expand Down
7 changes: 3 additions & 4 deletions src/components/element/token/TokenTableRow.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import type { Protocol, Token } from "@merkl/api";
import type { Token } from "@merkl/api";
import { Link } from "@remix-run/react";
import { Button, Group, Icon, Value } from "dappkit";
import type { BoxProps } from "dappkit";
import { Title } from "dappkit";
import { mergeClass } from "dappkit";
import type { TagTypes } from "../Tag";
import { ProtocolRow, TokenRow } from "./TokenTable";
import { TokenRow } from "./TokenTable";

export type TokenTableRowProps = {
hideTags?: (keyof TagTypes)[];
token: Token;
} & BoxProps;

export default function TokenTableRow({ hideTags, token, className, ...props }: TokenTableRowProps) {

return (
<Link to={`/tokens/${token.symbol}`}>
<TokenRow
Expand All @@ -28,7 +27,7 @@ export default function TokenTableRow({ hideTags, token, className, ...props }:
h={3}
size={4}
className="text-nowrap flex gap-lg whitespace-nowrap text-ellipsis min-w-0 overflow-hidden">
<Icon src={token.icon}/>
<Icon src={token.icon} />
{token.name}
</Title>
</Group>
Expand Down
2 changes: 0 additions & 2 deletions src/entry.server.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export default function handleRequest(
// eslint-disable-next-line @typescript-eslint/no-unused-vars
_loadContext: AppLoadContext,
) {

return isbot(request.headers.get("user-agent") || "")
? handleBotRequest(request, responseStatusCode, responseHeaders, remixContext)
: handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext);
Expand All @@ -36,7 +35,6 @@ function handleBotRequest(
responseHeaders: Headers,
remixContext: EntryContext,
) {

return new Promise((resolve, reject) => {
let shellRendered = false;
const { pipe, abort } = renderToPipeableStream(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Campaign, Opportunity } from "@merkl/api";
import { Group } from "@ariakit/react";
import type { Campaign, Opportunity } from "@merkl/api";
import { type LoaderFunctionArgs, json } from "@remix-run/node";
import { useLoaderData } from "@remix-run/react";
import { Container, Space } from "packages/dappkit/src";
Expand Down
2 changes: 1 addition & 1 deletion src/routes/_merkl.protocols.(all).(protocols).tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function Index() {

return (
<Container>
<Space size="xl"/>
<Space size="xl" />
<ProtocolLibrary protocols={protocols} count={count} />
</Container>
);
Expand Down
2 changes: 1 addition & 1 deletion src/routes/_merkl.tokens.(all).(tokens).tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function Index() {

return (
<Container>
<Space size="xl"/>
<Space size="xl" />
<TokenLibrary tokens={tokens} count={count} />
</Container>
);
Expand Down

0 comments on commit a8a3ea9

Please sign in to comment.