From cc431372431576d4ad458dd63ca7941c1a4c3653 Mon Sep 17 00:00:00 2001 From: Korbinian Date: Thu, 2 May 2024 09:19:13 +0200 Subject: [PATCH] move folder --- .../bridge-ui/src/api/domain/interfaces/INFTRepository.ts | 6 ------ packages/bridge-ui/src/libs/bridge/fetchNFTs.ts | 2 +- .../src/libs/nft/domain/interfaces/INFTRepository.ts | 6 ++++++ .../bridge-ui/src/{api => libs/nft}/domain/models/NFT.ts | 0 .../src/{api => libs/nft}/domain/services/NFTService.ts | 0 .../infrastructure/api/MoralisNFTRepository.server.ts | 8 ++++---- .../nft}/infrastructure/mappers/nft/MoralisNFTMapper.ts | 4 ++-- .../src/{api => libs/nft}/infrastructure/types/common.ts | 0 .../src/{api => libs/nft}/infrastructure/types/moralis.ts | 0 packages/bridge-ui/src/routes/api/nft/+server.ts | 4 ++-- packages/bridge-ui/tsconfig.json | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 packages/bridge-ui/src/api/domain/interfaces/INFTRepository.ts create mode 100644 packages/bridge-ui/src/libs/nft/domain/interfaces/INFTRepository.ts rename packages/bridge-ui/src/{api => libs/nft}/domain/models/NFT.ts (100%) rename packages/bridge-ui/src/{api => libs/nft}/domain/services/NFTService.ts (100%) rename packages/bridge-ui/src/{api => libs/nft}/infrastructure/api/MoralisNFTRepository.server.ts (88%) rename packages/bridge-ui/src/{api => libs/nft}/infrastructure/mappers/nft/MoralisNFTMapper.ts (79%) rename packages/bridge-ui/src/{api => libs/nft}/infrastructure/types/common.ts (100%) rename packages/bridge-ui/src/{api => libs/nft}/infrastructure/types/moralis.ts (100%) diff --git a/packages/bridge-ui/src/api/domain/interfaces/INFTRepository.ts b/packages/bridge-ui/src/api/domain/interfaces/INFTRepository.ts deleted file mode 100644 index 46cdf7c3475..00000000000 --- a/packages/bridge-ui/src/api/domain/interfaces/INFTRepository.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { NFT } from '$api/domain/models/NFT'; -import type { FetchNftArgs } from '$api/infrastructure/types/common'; - -export interface INFTRepository { - findByAddress({ address, chainId, refresh }: FetchNftArgs): Promise; -} diff --git a/packages/bridge-ui/src/libs/bridge/fetchNFTs.ts b/packages/bridge-ui/src/libs/bridge/fetchNFTs.ts index 1ab9c430134..e0c88916888 100644 --- a/packages/bridge-ui/src/libs/bridge/fetchNFTs.ts +++ b/packages/bridge-ui/src/libs/bridge/fetchNFTs.ts @@ -1,12 +1,12 @@ import type { Address } from 'viem'; -import type { FetchNftArgs } from '$api/infrastructure/types/common'; import { isL2Chain } from '$libs/chain'; import { eventIndexerApiServices } from '$libs/eventIndexer/initEventIndexer'; import { type NFT, TokenType } from '$libs/token'; import { fetchNFTImageUrl } from '$libs/token/fetchNFTImageUrl'; import { getTokenWithInfoFromAddress } from '$libs/token/getTokenWithInfoFromAddress'; import { getLogger } from '$libs/util/logger'; +import type { FetchNftArgs } from '$nftAPI/infrastructure/types/common'; const log = getLogger('bridge:fetchNFTs'); diff --git a/packages/bridge-ui/src/libs/nft/domain/interfaces/INFTRepository.ts b/packages/bridge-ui/src/libs/nft/domain/interfaces/INFTRepository.ts new file mode 100644 index 00000000000..89f833a0837 --- /dev/null +++ b/packages/bridge-ui/src/libs/nft/domain/interfaces/INFTRepository.ts @@ -0,0 +1,6 @@ +import type { NFT } from '$nftAPI/domain/models/NFT'; +import type { FetchNftArgs } from '$nftAPI/infrastructure/types/common'; + +export interface INFTRepository { + findByAddress({ address, chainId, refresh }: FetchNftArgs): Promise; +} diff --git a/packages/bridge-ui/src/api/domain/models/NFT.ts b/packages/bridge-ui/src/libs/nft/domain/models/NFT.ts similarity index 100% rename from packages/bridge-ui/src/api/domain/models/NFT.ts rename to packages/bridge-ui/src/libs/nft/domain/models/NFT.ts diff --git a/packages/bridge-ui/src/api/domain/services/NFTService.ts b/packages/bridge-ui/src/libs/nft/domain/services/NFTService.ts similarity index 100% rename from packages/bridge-ui/src/api/domain/services/NFTService.ts rename to packages/bridge-ui/src/libs/nft/domain/services/NFTService.ts diff --git a/packages/bridge-ui/src/api/infrastructure/api/MoralisNFTRepository.server.ts b/packages/bridge-ui/src/libs/nft/infrastructure/api/MoralisNFTRepository.server.ts similarity index 88% rename from packages/bridge-ui/src/api/infrastructure/api/MoralisNFTRepository.server.ts rename to packages/bridge-ui/src/libs/nft/infrastructure/api/MoralisNFTRepository.server.ts index 914b4aecaaa..b70637cb265 100644 --- a/packages/bridge-ui/src/api/infrastructure/api/MoralisNFTRepository.server.ts +++ b/packages/bridge-ui/src/libs/nft/infrastructure/api/MoralisNFTRepository.server.ts @@ -1,12 +1,12 @@ import Moralis from 'moralis'; import { type Address, zeroAddress } from 'viem'; -import type { INFTRepository } from '$api/domain/interfaces/INFTRepository'; -import type { NFT } from '$api/domain/models/NFT'; -import { mapToNFTFromMoralis } from '$api/infrastructure/mappers/nft/MoralisNFTMapper'; -import type { NFTApiData } from '$api/infrastructure/types/moralis'; import { moralisApiConfig } from '$config'; import { MORALIS_API_KEY } from '$env/static/private'; +import type { INFTRepository } from '$nftAPI/domain/interfaces/INFTRepository'; +import type { NFT } from '$nftAPI/domain/models/NFT'; +import { mapToNFTFromMoralis } from '$nftAPI/infrastructure/mappers/nft/MoralisNFTMapper'; +import type { NFTApiData } from '$nftAPI/infrastructure/types/moralis'; import type { FetchNftArgs } from '../types/common'; diff --git a/packages/bridge-ui/src/api/infrastructure/mappers/nft/MoralisNFTMapper.ts b/packages/bridge-ui/src/libs/nft/infrastructure/mappers/nft/MoralisNFTMapper.ts similarity index 79% rename from packages/bridge-ui/src/api/infrastructure/mappers/nft/MoralisNFTMapper.ts rename to packages/bridge-ui/src/libs/nft/infrastructure/mappers/nft/MoralisNFTMapper.ts index dc6a0f6b406..15ebabafdb9 100644 --- a/packages/bridge-ui/src/api/infrastructure/mappers/nft/MoralisNFTMapper.ts +++ b/packages/bridge-ui/src/libs/nft/infrastructure/mappers/nft/MoralisNFTMapper.ts @@ -1,8 +1,8 @@ import type { Address } from 'viem'; -import type { NFT } from '$api/domain/models/NFT'; -import type { NFTApiData } from '$api/infrastructure/types/moralis'; import type { TokenType } from '$libs/token'; +import type { NFT } from '$nftAPI/domain/models/NFT'; +import type { NFTApiData } from '$nftAPI/infrastructure/types/moralis'; export function mapToNFTFromMoralis(apiData: NFTApiData, chainId: number): NFT { return { diff --git a/packages/bridge-ui/src/api/infrastructure/types/common.ts b/packages/bridge-ui/src/libs/nft/infrastructure/types/common.ts similarity index 100% rename from packages/bridge-ui/src/api/infrastructure/types/common.ts rename to packages/bridge-ui/src/libs/nft/infrastructure/types/common.ts diff --git a/packages/bridge-ui/src/api/infrastructure/types/moralis.ts b/packages/bridge-ui/src/libs/nft/infrastructure/types/moralis.ts similarity index 100% rename from packages/bridge-ui/src/api/infrastructure/types/moralis.ts rename to packages/bridge-ui/src/libs/nft/infrastructure/types/moralis.ts diff --git a/packages/bridge-ui/src/routes/api/nft/+server.ts b/packages/bridge-ui/src/routes/api/nft/+server.ts index 84365b2c24a..5b750397bf3 100644 --- a/packages/bridge-ui/src/routes/api/nft/+server.ts +++ b/packages/bridge-ui/src/routes/api/nft/+server.ts @@ -1,7 +1,7 @@ import type { RequestHandler } from '@sveltejs/kit'; -import { NFTService } from '$api/domain/services/NFTService'; -import moralisRepository from '$api/infrastructure/api/MoralisNFTRepository.server'; +import { NFTService } from '$nftAPI/domain/services/NFTService'; +import moralisRepository from '$nftAPI/infrastructure/api/MoralisNFTRepository.server'; const nftService = new NFTService(moralisRepository); diff --git a/packages/bridge-ui/tsconfig.json b/packages/bridge-ui/tsconfig.json index ab183f9abbd..cda36531bce 100644 --- a/packages/bridge-ui/tsconfig.json +++ b/packages/bridge-ui/tsconfig.json @@ -23,7 +23,7 @@ "$chainConfig": ["./src/generated/chainConfig.ts"], "$relayerConfig": ["./src/generated/relayerConfig.ts"], "$customToken": ["./src/generated/customTokenConfig.ts"], - "$api/*": ["./src/api/*"], + "$nftAPI/*": ["./src/libs/nft/*"], "$mocks": ["./src/tests/mocks/index.ts"] },