diff --git a/src/api/services/protocol.service.ts b/src/api/services/protocol.service.ts index d953f0c0..e3446108 100644 --- a/src/api/services/protocol.service.ts +++ b/src/api/services/protocol.service.ts @@ -14,35 +14,35 @@ 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[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[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 { const protocol = await ProtocolService.#fetch(async () => api.v4.protocols(query).get({ query })); @@ -50,11 +50,11 @@ export abstract class ProtocolService { 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 }; } } diff --git a/src/api/services/token.service.ts b/src/api/services/token.service.ts index e489f77a..2f6767d7 100644 --- a/src/api/services/token.service.ts +++ b/src/api/services/token.service.ts @@ -14,13 +14,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[0]["query"], ) { @@ -44,12 +44,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[0]["query"]): Promise { diff --git a/src/components/element/protocol/ProtocolLibrary.tsx b/src/components/element/protocol/ProtocolLibrary.tsx index ec024e6a..1ce9b1eb 100644 --- a/src/components/element/protocol/ProtocolLibrary.tsx +++ b/src/components/element/protocol/ProtocolLibrary.tsx @@ -1,12 +1,10 @@ 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[]; @@ -14,11 +12,7 @@ export type ProtocolLibraryProps = { }; export default function ProtocolLibrary({ protocols, count }: ProtocolLibraryProps) { - const rows = useMemo( - () => - protocols?.map(p => ), - [protocols], - ); + const rows = useMemo(() => protocols?.map(p => ), [protocols]); return ( - + {protocol.name} diff --git a/src/components/element/token/TokenLibrary.tsx b/src/components/element/token/TokenLibrary.tsx index e04f1248..33b760fb 100644 --- a/src/components/element/token/TokenLibrary.tsx +++ b/src/components/element/token/TokenLibrary.tsx @@ -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 = { @@ -13,8 +13,7 @@ export type TokenLibraryProps = { export default function TokenLibrary({ tokens, count }: TokenLibraryProps) { const rows = useMemo( - () => - tokens?.map(t => ), + () => tokens?.map(t => ), [tokens], ); diff --git a/src/components/element/token/TokenTableRow.tsx b/src/components/element/token/TokenTableRow.tsx index 07f7fa26..45f2ed5e 100644 --- a/src/components/element/token/TokenTableRow.tsx +++ b/src/components/element/token/TokenTableRow.tsx @@ -1,11 +1,11 @@ -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)[]; @@ -13,7 +13,6 @@ export type TokenTableRowProps = { } & BoxProps; export default function TokenTableRow({ hideTags, token, className, ...props }: TokenTableRowProps) { - return ( - + {token.name} diff --git a/src/entry.server.tsx b/src/entry.server.tsx index fd0d39ec..e343283c 100644 --- a/src/entry.server.tsx +++ b/src/entry.server.tsx @@ -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); @@ -36,7 +35,6 @@ function handleBotRequest( responseHeaders: Headers, remixContext: EntryContext, ) { - return new Promise((resolve, reject) => { let shellRendered = false; const { pipe, abort } = renderToPipeableStream( diff --git a/src/routes/_merkl.opportunities.$chain.$type.$id.(overview).tsx b/src/routes/_merkl.opportunities.$chain.$type.$id.(overview).tsx index c6b5b0e7..c9b07bce 100644 --- a/src/routes/_merkl.opportunities.$chain.$type.$id.(overview).tsx +++ b/src/routes/_merkl.opportunities.$chain.$type.$id.(overview).tsx @@ -1,6 +1,4 @@ -import type { Campaign, Opportunity } from "@merkl/api"; import { Group } from "@ariakit/react"; -import { useOutletContext } from "@remix-run/react"; import { Space } from "packages/dappkit/src"; import CampaignLibrary from "src/components/element/campaign/CampaignLibrary"; import { ErrorContent } from "src/components/layout/ErrorContent"; diff --git a/src/routes/_merkl.protocols.(all).(protocols).tsx b/src/routes/_merkl.protocols.(all).(protocols).tsx index d64cbe0a..694977ea 100644 --- a/src/routes/_merkl.protocols.(all).(protocols).tsx +++ b/src/routes/_merkl.protocols.(all).(protocols).tsx @@ -15,7 +15,7 @@ export default function Index() { return ( - + ); diff --git a/src/routes/_merkl.tokens.(all).(tokens).tsx b/src/routes/_merkl.tokens.(all).(tokens).tsx index 1ca0d62f..a18e00ce 100644 --- a/src/routes/_merkl.tokens.(all).(tokens).tsx +++ b/src/routes/_merkl.tokens.(all).(tokens).tsx @@ -15,7 +15,7 @@ export default function Index() { return ( - + );