From d6f65d5d91333c91612df2afa6e18e1c5a9d6d86 Mon Sep 17 00:00:00 2001 From: Mel Massadian Date: Mon, 13 Mar 2023 02:18:45 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the config probably need a bit of cleaning at some point. There is a misconfiguration between ts, vite and eslint --- src/atoms/input/Checkbox.tsx | 2 +- src/context/mintStore.ts | 2 +- src/pages/home/feeds/fund-feed.tsx | 10 +++++++++- src/pages/home/feeds/mime-type-feed.tsx | 17 ++++++++++++++--- src/pages/home/feeds/new-objkts-feed.tsx | 5 ++++- .../{one-one-feed.jsx => one-one-feed.tsx} | 8 ++++++-- src/pages/home/feeds/recent-sales-feed.tsx | 3 ++- src/pages/home/feeds/search-feed.tsx | 2 +- src/pages/home/feeds/tag-feed.tsx | 11 ++++++++++- 9 files changed, 48 insertions(+), 12 deletions(-) rename src/pages/home/feeds/{one-one-feed.jsx => one-one-feed.tsx} (78%) diff --git a/src/atoms/input/Checkbox.tsx b/src/atoms/input/Checkbox.tsx index 806854db8..f29a8955d 100644 --- a/src/atoms/input/Checkbox.tsx +++ b/src/atoms/input/Checkbox.tsx @@ -3,7 +3,7 @@ import styles from '@style' import classNames from 'classnames' import React, { useCallback } from 'react' -import './types' +import './types.d.ts' const Checkbox = ( { diff --git a/src/context/mintStore.ts b/src/context/mintStore.ts index 969c0d795..41ba9fe8e 100644 --- a/src/context/mintStore.ts +++ b/src/context/mintStore.ts @@ -23,7 +23,7 @@ import { import type { FileForm } from '@types' import { prepareFilesFromZIP } from '@utils/html' import { prepareDirectory, prepareFile } from '@data/ipfs' -import '@atoms/select/types' +import '@atoms/select/types.d.ts' interface MintState { title?: string diff --git a/src/pages/home/feeds/fund-feed.tsx b/src/pages/home/feeds/fund-feed.tsx index 2b2b70269..2c253d8c3 100644 --- a/src/pages/home/feeds/fund-feed.tsx +++ b/src/pages/home/feeds/fund-feed.tsx @@ -13,7 +13,15 @@ function FundFeed({ contractAddress, cause, namepsace, - tags = null, + tags, +}: { + minShares?: number + introText: string + infoUrl: string + contractAddress: string + cause: string + namepsace: string + tags?: string[] }) { return ( <> diff --git a/src/pages/home/feeds/mime-type-feed.tsx b/src/pages/home/feeds/mime-type-feed.tsx index 3fe51748f..3d2a3ea73 100644 --- a/src/pages/home/feeds/mime-type-feed.tsx +++ b/src/pages/home/feeds/mime-type-feed.tsx @@ -3,20 +3,31 @@ import uniqBy from 'lodash/uniqBy' import { BaseTokenFieldsFragment } from '@data/queries' import { HEN_CONTRACT_FA2 } from '@constants' import TokenCollection from '@atoms/token-collection' +import type { Token_Metadata } from 'gql' -function MimeTypeFeed({ label, namespace, mimeTypes }) { +function MimeTypeFeed({ + label, + namespace, + mimeTypes, +}: { + label: string + namespace: string + mimeTypes: string[] +}) { return ( uniqBy(tokens, 'artist_address')} + postProcessTokens={(tokens: Token_Metadata[]) => + uniqBy(tokens, 'artist_address') + } query={gql` ${BaseTokenFieldsFragment} query getTokensByMimeTypes($limit: Int!) { tokens(where: { mime_type: {_in : [${mimeTypes - .map((mimeType) => `"${mimeType}"`) + .map((mimeType: string) => `"${mimeType}"`) .join( ', ' )}] }, editions : { _neq : 0 }, metadata_status: { _eq: "processed" }, fa2_address: { _eq: "${HEN_CONTRACT_FA2}"}}, order_by: { minted_at: desc }, limit: $limit) { diff --git a/src/pages/home/feeds/new-objkts-feed.tsx b/src/pages/home/feeds/new-objkts-feed.tsx index 5f9a2f7f2..78cf34c4e 100644 --- a/src/pages/home/feeds/new-objkts-feed.tsx +++ b/src/pages/home/feeds/new-objkts-feed.tsx @@ -3,6 +3,7 @@ import uniqBy from 'lodash/uniqBy' import { BaseTokenFieldsFragment } from '@data/queries' import { HEN_CONTRACT_FA2 } from '@constants' import TokenCollection from '@atoms/token-collection' +import type { Token_Metadata } from 'gql' export function NewObjktsFeed() { return ( @@ -11,7 +12,9 @@ export function NewObjktsFeed() { label="New OBJKTs" namespace="new-objkts-feed" maxItems={600} - postProcessTokens={(tokens) => uniqBy(tokens, 'artist_address')} + postProcessTokens={(tokens: Token_Metadata[]) => + uniqBy(tokens, 'artist_address') + } query={gql` ${BaseTokenFieldsFragment} query getNewObjkt($limit: Int!) { diff --git a/src/pages/home/feeds/one-one-feed.jsx b/src/pages/home/feeds/one-one-feed.tsx similarity index 78% rename from src/pages/home/feeds/one-one-feed.jsx rename to src/pages/home/feeds/one-one-feed.tsx index c03d75c93..bc5e99ace 100644 --- a/src/pages/home/feeds/one-one-feed.jsx +++ b/src/pages/home/feeds/one-one-feed.tsx @@ -1,8 +1,10 @@ import { gql } from 'graphql-request' import uniqBy from 'lodash/uniqBy' -import { BaseTokenFieldsFragment } from '@data/api' + import { HEN_CONTRACT_FA2 } from '@constants' import TokenCollection from '@atoms/token-collection' +import { BaseTokenFieldsFragment } from '@data/queries' +import type { Token_Metadata } from 'gql' export function OneOnOneFeed() { return ( @@ -11,7 +13,9 @@ export function OneOnOneFeed() { label="1/1 OBJKTs" namespace="one-on-one-feed" maxItems={600} - postProcessTokens={(tokens) => uniqBy(tokens, 'artist_address')} + postProcessTokens={(tokens: Token_Metadata[]) => + uniqBy(tokens, 'artist_address') + } query={gql` ${BaseTokenFieldsFragment} query getUnoUno($limit: Int!) { diff --git a/src/pages/home/feeds/recent-sales-feed.tsx b/src/pages/home/feeds/recent-sales-feed.tsx index 7331f8b97..7b2608de1 100644 --- a/src/pages/home/feeds/recent-sales-feed.tsx +++ b/src/pages/home/feeds/recent-sales-feed.tsx @@ -3,6 +3,7 @@ import uniqBy from 'lodash/uniqBy' import TokenCollection from '@atoms/token-collection' import { BaseTokenFieldsFragment } from '@data/queries' import { HEN_CONTRACT_FA2 } from '@constants' +import type { Token_Metadata } from 'gql' export function RecentSalesFeed() { return ( @@ -14,7 +15,7 @@ export function RecentSalesFeed() { tokenPath="token" keyPath="token.token_id" maxItems={600} - postProcessTokens={(tokens) => + postProcessTokens={(tokens: Token_Metadata[]) => uniqBy(uniqBy(tokens, 'token_id'), 'artist_address') } query={gql` diff --git a/src/pages/home/feeds/search-feed.tsx b/src/pages/home/feeds/search-feed.tsx index 6f7001d21..f93236714 100644 --- a/src/pages/home/feeds/search-feed.tsx +++ b/src/pages/home/feeds/search-feed.tsx @@ -7,8 +7,8 @@ export function SearchFeed() { return ( diff --git a/src/pages/home/feeds/tag-feed.tsx b/src/pages/home/feeds/tag-feed.tsx index 609b85488..05fe864df 100644 --- a/src/pages/home/feeds/tag-feed.tsx +++ b/src/pages/home/feeds/tag-feed.tsx @@ -3,7 +3,16 @@ import TokenCollection from '@atoms/token-collection' import { BaseTokenFieldsFragment } from '@data/queries' import { HEN_CONTRACT_FA2 } from '@constants' -export function TagFeed({ tag, ...otherProps }) { +export function TagFeed({ + tag, + ...otherProps +}: { + tag: string + label?: string + feeds_menu?: boolean + namespace?: string + [key: string]: unknown +}) { return (