From 4e32ae49dc0b4bd2eeca2c3a923413a74f3471db Mon Sep 17 00:00:00 2001 From: sheykei Date: Tue, 3 Dec 2024 13:02:03 +0100 Subject: [PATCH] fix: lint --- src/api/services/campaign.service.ts | 13 ------------- src/api/services/opportunity.service.ts | 2 +- .../element/campaign/CampaignTableRow.tsx | 4 ++-- ...kl.opportunities.$chain.$type.$id.(overview).tsx | 3 +-- ...l.opportunities.$chain.$type.$id.leaderboard.tsx | 4 ++-- .../_merkl.opportunities.$chain.$type.$id.tsx | 2 +- 6 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/api/services/campaign.service.ts b/src/api/services/campaign.service.ts index 21539473..00604e36 100644 --- a/src/api/services/campaign.service.ts +++ b/src/api/services/campaign.service.ts @@ -1,4 +1,3 @@ -<<<<<<< HEAD import type { Campaign } from "@angleprotocol/merkl-api"; import { api } from "../index.server"; @@ -52,16 +51,4 @@ export abstract class CampaignService { static async getByID(Id: string): Promise { return null; } -======= -class CampaignService { - // // ------ Fetch all campaigns - // async get(): Promise { - // const { data } = await api.v4.campaigns.index.get({ query: {} }); - // return data; - // } - // // ------ Fetch a campaign by ID - // async getByID(Id: string): Promise { - // return "To implements"; - // } ->>>>>>> 19f3164 (fix: loaders) } diff --git a/src/api/services/opportunity.service.ts b/src/api/services/opportunity.service.ts index abb28a43..ae4ca252 100644 --- a/src/api/services/opportunity.service.ts +++ b/src/api/services/opportunity.service.ts @@ -1,4 +1,4 @@ -import type { Campaign, Opportunity } from "@merkl/api"; +import type { Opportunity } from "@merkl/api"; import config from "merkl.config"; import { api } from "../index.server"; diff --git a/src/components/element/campaign/CampaignTableRow.tsx b/src/components/element/campaign/CampaignTableRow.tsx index aa7f2033..e9c19049 100644 --- a/src/components/element/campaign/CampaignTableRow.tsx +++ b/src/components/element/campaign/CampaignTableRow.tsx @@ -1,5 +1,7 @@ import type { Campaign } from "@merkl/api"; import { type Component, Group, Hash, Icon, OverrideTheme, Text, Value, mergeClass } from "dappkit"; +import moment from "moment"; +import Tooltip from "packages/dappkit/src/components/primitives/Tooltip"; import { useCallback, useMemo, useState } from "react"; import useCampaign from "src/hooks/resources/useCampaign"; import { formatUnits, parseUnits } from "viem"; @@ -7,8 +9,6 @@ import Chain from "../chain/Chain"; import Token from "../token/Token"; import { CampaignRow } from "./CampaignTable"; import RestrictionsCollumn from "./tableCollumns/RestrictionsCollumn"; -import Tooltip from "packages/dappkit/src/components/primitives/Tooltip"; -import moment from "moment"; export type CampaignTableRowProps = Component<{ campaign: Campaign; diff --git a/src/routes/_merkl.opportunities.$chain.$type.$id.(overview).tsx b/src/routes/_merkl.opportunities.$chain.$type.$id.(overview).tsx index 244def7d..0b04c6b9 100644 --- a/src/routes/_merkl.opportunities.$chain.$type.$id.(overview).tsx +++ b/src/routes/_merkl.opportunities.$chain.$type.$id.(overview).tsx @@ -1,9 +1,8 @@ -import { Group } from "@ariakit/react"; +import { useOutletContext } from "@remix-run/react"; import { Container, Space } from "packages/dappkit/src"; import CampaignLibrary from "src/components/element/campaign/CampaignLibrary"; import { ErrorContent } from "src/components/layout/ErrorContent"; import type { OutletContextOpportunity } from "./_merkl.opportunity.$chain.$type.$id"; -import { useOutletContext } from "@remix-run/react"; export default function Index() { const { opportunity } = useOutletContext(); diff --git a/src/routes/_merkl.opportunities.$chain.$type.$id.leaderboard.tsx b/src/routes/_merkl.opportunities.$chain.$type.$id.leaderboard.tsx index eddbe1e9..01d28af1 100644 --- a/src/routes/_merkl.opportunities.$chain.$type.$id.leaderboard.tsx +++ b/src/routes/_merkl.opportunities.$chain.$type.$id.leaderboard.tsx @@ -52,7 +52,7 @@ export default function Index() { return ( - + @@ -68,7 +68,7 @@ export default function Index() { 400k - + ); diff --git a/src/routes/_merkl.opportunities.$chain.$type.$id.tsx b/src/routes/_merkl.opportunities.$chain.$type.$id.tsx index fad4c1aa..06021a03 100644 --- a/src/routes/_merkl.opportunities.$chain.$type.$id.tsx +++ b/src/routes/_merkl.opportunities.$chain.$type.$id.tsx @@ -42,7 +42,7 @@ export default function Index() { const spaced = opportunity?.name.split(" "); return spaced - .map((str) => { + .map(str => { const key = str + crypto.randomUUID(); if (!str.match(/[\p{Letter}\p{Mark}]+/gu)) return [