26 Commits

Author SHA1 Message Date
hueso
19395403b4 add basic error handling on subgraph queries
Some checks failed
Deploy FrontEnd / deploy-staging (push) Has been cancelled
Deploy FrontEnd / deploy-production (push) Has been cancelled
CI script / lint (push) Has been cancelled
CI script / build (push) Has been cancelled
CI script / SonarCloud (push) Has been cancelled
2025-11-07 14:29:27 -03:00
hueso
04b9e6f45a fix: chainID as hex on web3onboard call 2025-11-07 14:29:27 -03:00
hueso
e0445f208c fix: sellerId as string 2025-11-07 14:29:27 -03:00
Jefferson Mantovani
b4f5134156 chore: register version 1.1.0 2025-11-06 16:19:42 -03:00
Jefferson Mantovani
4c721e4431 chore: register version 1.1.0 2025-11-06 11:15:10 -03:00
Jefferson Mantovani
bf75cd766a chore: register version 1.1.0 2025-11-06 11:11:42 -03:00
Jefferson Mantovani
a4163a2ba6 chore: register version 1.1.0 2025-11-06 11:06:02 -03:00
Jefferson Mantovani
fad52d79d2 Merge release/1.1.0 into develop 2025-11-06 10:57:27 -03:00
Jefferson Mantovani
e67c8fcc77 chore: bump version to 1.1.0 2025-11-06 10:56:42 -03:00
Jefferson Mantovani
ac670235cd fix: layout 2025-11-06 10:28:27 -03:00
Jefferson Mantovani
38201bb254 feat: versioning 2025-11-06 10:28:14 -03:00
Jefferson Mantovani
fece86e305 refactor: add transaction timestamp 2025-11-06 10:27:17 -03:00
filipesoccol
b27b07fe47 Merge pull request #8 from doiim/feat/app-footer
feat: add footer with app version
2025-10-31 18:20:29 -03:00
Jefferson Mantovani
d33d7f8538 feat: add footer with app version 2025-10-31 07:14:44 -03:00
Jefferson Mantovani
57714fac9b Merge pull request #7 from doiim/feat/transaction-explorer
feat: add transactions explorer page
2025-10-24 17:12:43 -03:00
Jefferson Mantovani
9eee78fa91 fix: network selection 2025-10-24 16:43:39 -03:00
Jefferson Mantovani
4b4ade2bfa Merge branch 'develop' into feat/transaction-explorer 2025-10-24 15:43:58 -03:00
filipesoccol
364cdd3b60 Merge pull request #6 from doiim/refactor/network-dynamize
Refactor/network dynamize
2025-10-24 15:10:59 -03:00
Jefferson Mantovani
799f7cfe09 feat: add transactions explorer page 2025-10-23 15:40:09 -03:00
Jefferson Mantovani
2117638305 fix network icons 2025-10-15 19:11:30 -03:00
hueso
a3e3f0506c add rsk testnet icon 2025-10-12 18:57:36 -03:00
hueso
976c48ac4b optimized icon importing 2025-10-12 18:57:25 -03:00
hueso
7bcf5d90c2 remove deprecated NetworkEnum 2025-10-11 22:07:32 -03:00
hueso
358ae7410f fixed network selection (hex string) and icons 2025-10-11 22:07:32 -03:00
hueso
a906fa136d refactored network selection 2025-10-11 22:07:32 -03:00
filipesoccol
7ec73e8c6f Merge pull request #5 from jeffmant/refactor/ux-improvements
Some checks failed
CI script / lint (push) Has been cancelled
CI script / build (push) Has been cancelled
CI script / SonarCloud (push) Has been cancelled
Deploy FrontEnd / deploy-staging (push) Has been cancelled
Deploy FrontEnd / deploy-production (push) Has been cancelled
Refactor/ux improvements
2025-10-10 15:07:46 -03:00
47 changed files with 1800 additions and 508 deletions

2
env.d.ts vendored
View File

@@ -1 +1,3 @@
/// <reference types="vite/client" /> /// <reference types="vite/client" />
declare const __APP_VERSION__: string;

View File

@@ -1,6 +1,6 @@
{ {
"name": "p2pix-front-end", "name": "p2pix-front-end",
"version": "0.1.0", "version": "1.1.0",
"scripts": { "scripts": {
"start": "vite --host=0.0.0.0 --port 3000", "start": "vite --host=0.0.0.0 --port 3000",
"build": "run-p type-check build-only", "build": "run-p type-check build-only",

View File

@@ -5,21 +5,20 @@ import SpinnerComponent from "@/components/ui/SpinnerComponent.vue";
import ToasterComponent from "@/components/ui/ToasterComponent.vue"; import ToasterComponent from "@/components/ui/ToasterComponent.vue";
import { init, useOnboard } from "@web3-onboard/vue"; import { init, useOnboard } from "@web3-onboard/vue";
import injectedModule from "@web3-onboard/injected-wallets"; import injectedModule from "@web3-onboard/injected-wallets";
import { Networks } from "@/model/Networks"; import { Networks, DEFAULT_NETWORK } from "@/config/networks";
import { NetworkEnum } from "@/model/NetworkEnum";
import { ref } from "vue"; import { ref } from "vue";
const route = useRoute(); const route = useRoute();
const injected = injectedModule(); const injected = injectedModule();
const targetNetwork = ref(NetworkEnum.sepolia); const targetNetwork = ref(DEFAULT_NETWORK);
const web3Onboard = init({ const web3Onboard = init({
wallets: [injected], wallets: [injected],
chains: Object.entries(Networks).map(([, network]) => ({ chains: Object.values(Networks).map((network) => ({
id: network.chainId, id: `0x${network.id.toString(16)}`,
token: network.token, token: network.nativeCurrency.symbol,
label: network.chainName, label: network.name,
rpcUrl: network.rpcUrl, rpcUrl: network.rpcUrls.default.http[0],
})), })),
connect: { connect: {
autoConnectLastWallet: true, autoConnectLastWallet: true,
@@ -33,7 +32,7 @@ if (!connectedWallet) {
</script> </script>
<template> <template>
<div class="p-3 sm:p-4 md:p-8"> <main class="p-3 sm:p-4 md:p-8">
<TopBar /> <TopBar />
<RouterView v-slot="{ Component }"> <RouterView v-slot="{ Component }">
<template v-if="Component"> <template v-if="Component">
@@ -54,5 +53,5 @@ if (!connectedWallet) {
</template> </template>
</RouterView> </RouterView>
<ToasterComponent :targetNetwork="targetNetwork" /> <ToasterComponent :targetNetwork="targetNetwork" />
</div> </main>
</template> </template>

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 79 KiB

View File

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 644 B

After

Width:  |  Height:  |  Size: 644 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -1,54 +0,0 @@
import { useUser } from "@/composables/useUser";
import { NetworkEnum, TokenEnum } from "@/model/NetworkEnum";
import { createPublicClient, http, type Address } from "viem";
import { getContractAddress, getRpcUrl, getNetworkConfig, getViemChain } from "@/config/networks";
export const getTokenByAddress = (address: Address) => {
const user = useUser();
const networkConfig = getNetworkConfig(user.networkName.value);
for (const [token, tokenAddress] of Object.entries(networkConfig.contracts.tokenAddresses)) {
if (tokenAddress.toLowerCase() === address.toLowerCase()) {
return token;
}
}
return null;
};
export const getTokenAddress = (
token: TokenEnum,
network?: NetworkEnum
): Address => {
const user = useUser();
const networkId = network ? network : user.networkName.value;
const tokenAddress = getContractAddress(networkId, token);
return tokenAddress as Address;
};
export const getP2PixAddress = (network?: NetworkEnum): Address => {
const user = useUser();
const networkId = network ? network : user.networkName.value;
const p2pixAddress = getContractAddress(networkId, 'p2pix');
return p2pixAddress as Address;
};
export const getProviderUrl = (network?: NetworkEnum): string => {
const user = useUser();
const networkId = network || user.networkName.value;
return getRpcUrl(networkId);
};
export const getProviderByNetwork = (network: NetworkEnum) => {
const chain = getViemChain(network);
return createPublicClient({
chain,
transport: http(getProviderUrl(network)),
});
};
export const isPossibleNetwork = (networkChain: NetworkEnum): boolean => {
return Number(networkChain) in NetworkEnum;
};

View File

@@ -1,11 +1,10 @@
import { getContract } from "./provider"; import { getContract } from "./provider";
import { getTokenAddress } from "./addresses"; import { ChainContract } from "viem";
import { import {
parseEther, parseEther,
type Address, type Address,
type TransactionReceipt, type TransactionReceipt,
} from "viem"; } from "viem";
import type { TokenEnum } from "@/model/NetworkEnum";
export const addLock = async ( export const addLock = async (
sellerAddress: Address, sellerAddress: Address,
@@ -37,7 +36,7 @@ export const addLock = async (
export const withdrawDeposit = async ( export const withdrawDeposit = async (
amount: string, amount: string,
token: TokenEnum token: Address
): Promise<boolean> => { ): Promise<boolean> => {
const { address, abi, wallet, client, account } = await getContract(); const { address, abi, wallet, client, account } = await getContract();
@@ -45,13 +44,11 @@ export const withdrawDeposit = async (
throw new Error("Wallet not connected"); throw new Error("Wallet not connected");
} }
const tokenAddress = getTokenAddress(token);
const { request } = await client.simulateContract({ const { request } = await client.simulateContract({
address, address,
abi, abi,
functionName: "withdraw", functionName: "withdraw",
args: [tokenAddress, parseEther(amount), []], args: [token, parseEther(amount), []],
account account
}); });

View File

@@ -1,14 +1,13 @@
import { useUser } from "@/composables/useUser"; import { useUser } from "@/composables/useUser";
import { formatEther, toHex, stringToHex } from "viem"; import { formatEther, toHex, stringToHex } from "viem";
import type { PublicClient, Address } from "viem"; import type { PublicClient, Address } from "viem";
import { Networks } from "@/config/networks";
import { getContract } from "./provider"; import { getContract } from "./provider";
import { getP2PixAddress, getTokenAddress } from "./addresses";
import { p2PixAbi } from "./abi" import { p2PixAbi } from "./abi"
import type { ValidDeposit } from "@/model/ValidDeposit"; import type { ValidDeposit } from "@/model/ValidDeposit";
import { getNetworkSubgraphURL, NetworkEnum, TokenEnum } from "@/model/NetworkEnum"; import type { NetworkConfig } from "@/model/NetworkEnum";
import type { UnreleasedLock } from "@/model/UnreleasedLock"; import type { UnreleasedLock } from "@/model/UnreleasedLock";
import type { LockStatus } from "@/model/LockStatus" import { ChainContract } from "viem";
const getNetworksLiquidity = async (): Promise<void> => { const getNetworksLiquidity = async (): Promise<void> => {
const user = useUser(); const user = useUser();
@@ -16,12 +15,10 @@ const getNetworksLiquidity = async (): Promise<void> => {
const depositLists: ValidDeposit[][] = []; const depositLists: ValidDeposit[][] = [];
for (const network of Object.values(NetworkEnum).filter( for (const network of Object.values(Networks)) {
(v) => !isNaN(Number(v))
)) {
const deposits = await getValidDeposits( const deposits = await getValidDeposits(
getTokenAddress(user.selectedToken.value), user.network.value.tokens[user.selectedToken.value].address,
Number(network) network
); );
if (deposits) depositLists.push(deposits); if (deposits) depositLists.push(deposits);
} }
@@ -62,7 +59,7 @@ const getParticipantID = async (
const getValidDeposits = async ( const getValidDeposits = async (
token: Address, token: Address,
network: NetworkEnum, network: NetworkConfig,
contractInfo?: { client: PublicClient; address: Address } contractInfo?: { client: PublicClient; address: Address }
): Promise<ValidDeposit[]> => { ): Promise<ValidDeposit[]> => {
let client: PublicClient, abi; let client: PublicClient, abi;
@@ -74,9 +71,6 @@ const getValidDeposits = async (
({ abi, client } = await getContract(true)); ({ abi, client } = await getContract(true));
} }
// TODO: Remove this once we have a subgraph for rootstock
if (network === NetworkEnum.rootstock) return [];
const body = { const body = {
query: ` query: `
{ {
@@ -90,7 +84,7 @@ const getValidDeposits = async (
`, `,
}; };
const depositLogs = await fetch(getNetworkSubgraphURL(network), { const depositLogs = await fetch( network.subgraphUrls[0], {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -100,6 +94,10 @@ const getValidDeposits = async (
// remove doubles from sellers list // remove doubles from sellers list
const depositData = await depositLogs.json(); const depositData = await depositLogs.json();
if (!depositData.data) {
console.error("Error fetching deposit logs");
return [];
}
const depositAddeds = depositData.data.depositAddeds; const depositAddeds = depositData.data.depositAddeds;
const uniqueSellers = depositAddeds.reduce( const uniqueSellers = depositAddeds.reduce(
(acc: Record<Address, boolean>, deposit: any) => { (acc: Record<Address, boolean>, deposit: any) => {
@@ -119,7 +117,7 @@ const getValidDeposits = async (
const sellersList = Object.keys(uniqueSellers) as Address[]; const sellersList = Object.keys(uniqueSellers) as Address[];
// Use multicall to batch all getBalance requests // Use multicall to batch all getBalance requests
const balanceCalls = sellersList.map((seller) => ({ const balanceCalls = sellersList.map((seller) => ({
address: getP2PixAddress(network), address: (network.contracts?.p2pix as ChainContract).address,
abi, abi,
functionName: "getBalance", functionName: "getBalance",
args: [seller, token], args: [seller, token],

View File

@@ -1,6 +1,5 @@
import { p2PixAbi } from "./abi"; import { p2PixAbi } from "./abi";
import { updateWalletStatus } from "./wallet"; import { updateWalletStatus } from "./wallet";
import { getProviderUrl, getP2PixAddress } from "./addresses";
import { import {
createPublicClient, createPublicClient,
createWalletClient, createWalletClient,
@@ -10,15 +9,16 @@ import {
WalletClient, WalletClient,
} from "viem"; } from "viem";
import { useUser } from "@/composables/useUser"; import { useUser } from "@/composables/useUser";
import { getViemChain } from "@/config/networks"; import type { NetworkConfig } from "@/model/NetworkEnum";
import type { ChainContract } from "viem";
let walletClient: WalletClient | null = null; let walletClient: WalletClient | null = null;
const getPublicClient = (): PublicClient => { const getPublicClient = (): PublicClient => {
const user = useUser(); const user = useUser();
const rpcUrl = getProviderUrl(); const rpcUrl = (user.network.value as NetworkConfig).rpcUrls.default.http[0];
const chain = getViemChain(user.networkName.value); const chain = user.network.value;
return createPublicClient({ return createPublicClient({
chain, chain,
transport: http(rpcUrl), transport: http(rpcUrl),
@@ -31,7 +31,8 @@ const getWalletClient = (): WalletClient | null => {
const getContract = async (onlyRpcProvider = false) => { const getContract = async (onlyRpcProvider = false) => {
const client = getPublicClient(); const client = getPublicClient();
const address = getP2PixAddress(); const user = useUser();
const address = (user.network.value.contracts?.p2pix as ChainContract).address;
const abi = p2PixAbi; const abi = p2PixAbi;
const wallet = onlyRpcProvider ? null : getWalletClient(); const wallet = onlyRpcProvider ? null : getWalletClient();
@@ -46,7 +47,7 @@ const getContract = async (onlyRpcProvider = false) => {
const connectProvider = async (p: any): Promise<void> => { const connectProvider = async (p: any): Promise<void> => {
const user = useUser(); const user = useUser();
const chain = getViemChain(user.networkName.value); const chain = user.network.value;
const [account] = await p!.request({ method: "eth_requestAccounts" }); const [account] = await p!.request({ method: "eth_requestAccounts" });

View File

@@ -1,12 +1,15 @@
import { getContract, getPublicClient, getWalletClient } from "./provider"; import { getContract, getPublicClient, getWalletClient } from "./provider";
import { getTokenAddress, getP2PixAddress } from "./addresses"; import { parseEther, toHex, ChainContract } from "viem";
import { parseEther, toHex } from "viem";
import { getViemChain } from "@/config/networks";
import { mockTokenAbi } from "./abi"; import { mockTokenAbi } from "./abi";
import { useUser } from "@/composables/useUser"; import { useUser } from "@/composables/useUser";
import { createParticipant } from "@/utils/bbPay"; import { createParticipant } from "@/utils/bbPay";
import type { Participant } from "@/utils/bbPay"; import type { Participant } from "@/utils/bbPay";
import type { Address } from "viem";
const getP2PixAddress = (): Address => {
const user = useUser();
return (user.network.value.contracts?.p2pix as ChainContract).address;
};
const approveTokens = async (participant: Participant): Promise<any> => { const approveTokens = async (participant: Participant): Promise<any> => {
const user = useUser(); const user = useUser();
@@ -21,7 +24,7 @@ const approveTokens = async (participant: Participant): Promise<any> => {
const [account] = await walletClient.getAddresses(); const [account] = await walletClient.getAddresses();
// Get token address // Get token address
const tokenAddress = getTokenAddress(user.selectedToken.value); const tokenAddress = user.network.value.tokens[user.selectedToken.value].address;
// Check if the token is already approved // Check if the token is already approved
const allowance = await publicClient.readContract({ const allowance = await publicClient.readContract({
@@ -33,7 +36,7 @@ const approveTokens = async (participant: Participant): Promise<any> => {
if ( allowance < parseEther(participant.offer.toString()) ) { if ( allowance < parseEther(participant.offer.toString()) ) {
// Approve tokens // Approve tokens
const chain = getViemChain(user.networkName.value); const chain = user.network.value;
const hash = await walletClient.writeContract({ const hash = await walletClient.writeContract({
address: tokenAddress, address: tokenAddress,
abi: mockTokenAbi, abi: mockTokenAbi,
@@ -65,15 +68,15 @@ const addDeposit = async (): Promise<any> => {
if (!sellerId.id) { if (!sellerId.id) {
throw new Error("Failed to create participant"); throw new Error("Failed to create participant");
} }
const chain = getViemChain(user.networkName.value); const chain = user.network.value;
const hash = await walletClient.writeContract({ const hash = await walletClient.writeContract({
address, address,
abi, abi,
functionName: "deposit", functionName: "deposit",
args: [ args: [
user.networkId.value + "-" + sellerId.id, user.network.value.id + "-" + sellerId.id,
toHex("", { size: 32 }), toHex("", { size: 32 }),
getTokenAddress(user.selectedToken.value), user.network.value.tokens[user.selectedToken.value].address,
parseEther(user.seller.value.offer.toString()), parseEther(user.seller.value.offer.toString()),
true, true,
], ],

View File

@@ -2,7 +2,6 @@ import { formatEther, type Address } from "viem";
import { useUser } from "@/composables/useUser"; import { useUser } from "@/composables/useUser";
import { getPublicClient, getWalletClient, getContract } from "./provider"; import { getPublicClient, getWalletClient, getContract } from "./provider";
import { getTokenAddress } from "./addresses";
import { getValidDeposits, getUnreleasedLockById } from "./events"; import { getValidDeposits, getUnreleasedLockById } from "./events";
@@ -10,7 +9,6 @@ import type { ValidDeposit } from "@/model/ValidDeposit";
import type { WalletTransaction } from "@/model/WalletTransaction"; import type { WalletTransaction } from "@/model/WalletTransaction";
import type { UnreleasedLock } from "@/model/UnreleasedLock"; import type { UnreleasedLock } from "@/model/UnreleasedLock";
import { LockStatus } from "@/model/LockStatus"; import { LockStatus } from "@/model/LockStatus";
import { getNetworkSubgraphURL } from "@/model/NetworkEnum";
export const updateWalletStatus = async (): Promise<void> => { export const updateWalletStatus = async (): Promise<void> => {
const user = useUser(); const user = useUser();
@@ -36,8 +34,8 @@ export const listValidDepositTransactionsByWalletAddress = async (
): Promise<ValidDeposit[]> => { ): Promise<ValidDeposit[]> => {
const user = useUser(); const user = useUser();
const walletDeposits = await getValidDeposits( const walletDeposits = await getValidDeposits(
getTokenAddress(user.selectedToken.value), user.network.value.tokens[user.selectedToken.value].address,
user.networkName.value user.network.value
); );
if (walletDeposits) { if (walletDeposits) {
return walletDeposits return walletDeposits
@@ -67,7 +65,7 @@ export const listAllTransactionByWalletAddress = async (
const user = useUser(); const user = useUser();
// Get the current network for the subgraph URL // Get the current network for the subgraph URL
const network = user.networkName.value; const network = user.network.value;
// Query subgraph for all relevant transactions // Query subgraph for all relevant transactions
const subgraphQuery = { const subgraphQuery = {
@@ -110,7 +108,7 @@ export const listAllTransactionByWalletAddress = async (
`, `,
}; };
const response = await fetch(getNetworkSubgraphURL(network), { const response = await fetch(network.subgraphUrls[0], {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -128,6 +126,7 @@ export const listAllTransactionByWalletAddress = async (
transactions.push({ transactions.push({
token: deposit.token, token: deposit.token,
blockNumber: parseInt(deposit.blockNumber), blockNumber: parseInt(deposit.blockNumber),
blockTimestamp: parseInt(deposit.blockTimestamp),
amount: parseFloat(formatEther(BigInt(deposit.amount))), amount: parseFloat(formatEther(BigInt(deposit.amount))),
seller: deposit.seller, seller: deposit.seller,
buyer: "", buyer: "",
@@ -147,6 +146,7 @@ export const listAllTransactionByWalletAddress = async (
transactions.push({ transactions.push({
token: lock.token, token: lock.token,
blockNumber: parseInt(lock.blockNumber), blockNumber: parseInt(lock.blockNumber),
blockTimestamp: parseInt(lock.blockTimestamp),
amount: parseFloat(formatEther(BigInt(lock.amount))), amount: parseFloat(formatEther(BigInt(lock.amount))),
seller: lock.seller, seller: lock.seller,
buyer: lock.buyer, buyer: lock.buyer,
@@ -164,6 +164,7 @@ export const listAllTransactionByWalletAddress = async (
transactions.push({ transactions.push({
token: undefined, // Subgraph doesn't provide token in this event, we could enhance this later token: undefined, // Subgraph doesn't provide token in this event, we could enhance this later
blockNumber: parseInt(release.blockNumber), blockNumber: parseInt(release.blockNumber),
blockTimestamp: parseInt(release.blockTimestamp),
amount: -1, // Amount not available in this event amount: -1, // Amount not available in this event
seller: "", seller: "",
buyer: release.buyer, buyer: release.buyer,
@@ -181,6 +182,7 @@ export const listAllTransactionByWalletAddress = async (
transactions.push({ transactions.push({
token: withdrawal.token, token: withdrawal.token,
blockNumber: parseInt(withdrawal.blockNumber), blockNumber: parseInt(withdrawal.blockNumber),
blockTimestamp: parseInt(withdrawal.blockTimestamp),
amount: parseFloat(formatEther(BigInt(withdrawal.amount))), amount: parseFloat(formatEther(BigInt(withdrawal.amount))),
seller: withdrawal.seller, seller: withdrawal.seller,
buyer: "", buyer: "",
@@ -200,7 +202,7 @@ export const listReleaseTransactionByWalletAddress = async (
walletAddress: Address walletAddress: Address
) => { ) => {
const user = useUser(); const user = useUser();
const network = user.networkName.value; const network = user.network.value;
// Query subgraph for release transactions // Query subgraph for release transactions
const subgraphQuery = { const subgraphQuery = {
@@ -219,7 +221,7 @@ export const listReleaseTransactionByWalletAddress = async (
}; };
// Fetch data from subgraph // Fetch data from subgraph
const response = await fetch(getNetworkSubgraphURL(network), { const response = await fetch(network.subgraphUrls[0], {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -263,7 +265,7 @@ export const listReleaseTransactionByWalletAddress = async (
const listLockTransactionByWalletAddress = async (walletAddress: Address) => { const listLockTransactionByWalletAddress = async (walletAddress: Address) => {
const user = useUser(); const user = useUser();
const network = user.networkName.value; const network = user.network.value;
// Query subgraph for lock added transactions // Query subgraph for lock added transactions
const subgraphQuery = { const subgraphQuery = {
@@ -284,7 +286,7 @@ const listLockTransactionByWalletAddress = async (walletAddress: Address) => {
try { try {
// Fetch data from subgraph // Fetch data from subgraph
const response = await fetch(getNetworkSubgraphURL(network), { const response = await fetch(network.subgraphUrls[0], {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -312,7 +314,7 @@ const listLockTransactionByWalletAddress = async (walletAddress: Address) => {
buyer: lock.buyer, buyer: lock.buyer,
lockID: BigInt(lock.lockID), lockID: BigInt(lock.lockID),
seller: lock.seller, seller: lock.seller,
token: lock.token, token: undefined, // Token not available in LockAdded subgraph event
amount: BigInt(lock.amount), amount: BigInt(lock.amount),
}, },
// Add other necessary fields to match the original format // Add other necessary fields to match the original format
@@ -332,7 +334,7 @@ const listLockTransactionByWalletAddress = async (walletAddress: Address) => {
const listLockTransactionBySellerAddress = async (sellerAddress: Address) => { const listLockTransactionBySellerAddress = async (sellerAddress: Address) => {
const user = useUser(); const user = useUser();
const network = user.networkName.value; const network = user.network.value;
// Query subgraph for lock added transactions where seller matches // Query subgraph for lock added transactions where seller matches
const subgraphQuery = { const subgraphQuery = {
@@ -342,7 +344,6 @@ const listLockTransactionBySellerAddress = async (sellerAddress: Address) => {
buyer buyer
lockID lockID
seller seller
token
amount amount
blockTimestamp blockTimestamp
blockNumber blockNumber
@@ -354,7 +355,7 @@ const listLockTransactionBySellerAddress = async (sellerAddress: Address) => {
try { try {
// Fetch data from subgraph // Fetch data from subgraph
const response = await fetch(getNetworkSubgraphURL(network), { const response = await fetch(network.subgraphUrls[0], {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -382,7 +383,7 @@ const listLockTransactionBySellerAddress = async (sellerAddress: Address) => {
buyer: lock.buyer, buyer: lock.buyer,
lockID: BigInt(lock.lockID), lockID: BigInt(lock.lockID),
seller: lock.seller, seller: lock.seller,
token: lock.token, token: undefined, // Token not available in LockAdded subgraph event
amount: BigInt(lock.amount), amount: BigInt(lock.amount),
}, },
// Add other necessary fields to match the original format // Add other necessary fields to match the original format

View File

@@ -53,7 +53,7 @@ const getWalletTransactions = async () => {
const callWithdraw = async (amount: string) => { const callWithdraw = async (amount: string) => {
if (amount) { if (amount) {
user.setLoadingWalletTransactions(true); user.setLoadingWalletTransactions(true);
const withdraw = await withdrawDeposit(amount, user.selectedToken.value); const withdraw = await withdrawDeposit(amount, user.network.value.tokens[user.selectedToken.value].address);
if (withdraw) { if (withdraw) {
console.log("Saque realizado!"); console.log("Saque realizado!");
await getWalletTransactions(); await getWalletTransactions();

View File

@@ -1,16 +1,15 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch } from "vue"; import { ref, watch, computed } from "vue";
import { useUser } from "@/composables/useUser"; import { useUser } from "@/composables/useUser";
import SpinnerComponent from "@/components/ui/SpinnerComponent.vue"; import SpinnerComponent from "@/components/ui/SpinnerComponent.vue";
import CustomButton from "@/components/ui/CustomButton.vue"; import CustomButton from "@/components/ui/CustomButton.vue";
import { debounce } from "@/utils/debounce"; import { debounce } from "@/utils/debounce";
import { verifyNetworkLiquidity } from "@/utils/networkLiquidity"; import { verifyNetworkLiquidity } from "@/utils/networkLiquidity";
import { NetworkEnum } from "@/model/NetworkEnum";
import type { ValidDeposit } from "@/model/ValidDeposit"; import type { ValidDeposit } from "@/model/ValidDeposit";
import { decimalCount } from "@/utils/decimalCount"; import { decimalCount } from "@/utils/decimalCount";
import { getTokenImage } from "@/utils/imagesPath"; import { getTokenImage, getNetworkImage } from "@/utils/imagesPath";
import { onClickOutside } from "@vueuse/core"; import { onClickOutside } from "@vueuse/core";
import { Networks } from "@/config/networks";
import { TokenEnum } from "@/model/NetworkEnum"; import { TokenEnum } from "@/model/NetworkEnum";
// Store reference // Store reference
@@ -19,7 +18,7 @@ const selectTokenToggle = ref<boolean>(false);
const { const {
walletAddress, walletAddress,
networkName, network,
selectedToken, selectedToken,
depositsValidList, depositsValidList,
loadingNetworkLiquidity, loadingNetworkLiquidity,
@@ -51,7 +50,7 @@ const connectAccount = async (): Promise<void> => {
const emitConfirmButton = async (): Promise<void> => { const emitConfirmButton = async (): Promise<void> => {
const deposit = selectedDeposits.value?.find( const deposit = selectedDeposits.value?.find(
(d) => d.network === Number(networkName.value) (d) => d.network === network.value
); );
if (!deposit) return; if (!deposit) return;
deposit.participantID = await getParticipantID(deposit.seller, deposit.token); deposit.participantID = await getParticipantID(deposit.seller, deposit.token);
@@ -99,7 +98,7 @@ const verifyLiquidity = (): void => {
); );
selectedDeposits.value = selDeposits; selectedDeposits.value = selDeposits;
hasLiquidity.value = !!selDeposits.find( hasLiquidity.value = !!selDeposits.find(
(d) => d.network === Number(networkName.value) (d) => d.network === network.value
); );
enableOrDisableConfirmButton(); enableOrDisableConfirmButton();
}; };
@@ -110,7 +109,7 @@ const enableOrDisableConfirmButton = (): void => {
return; return;
} }
if (!selectedDeposits.value.find((d) => d.network === networkName.value)) { if (!selectedDeposits.value.find((d) => d.network === network.value)) {
enableConfirmButton.value = false; enableConfirmButton.value = false;
return; return;
} }
@@ -118,7 +117,7 @@ const enableOrDisableConfirmButton = (): void => {
enableConfirmButton.value = true; enableConfirmButton.value = true;
}; };
watch(networkName, (): void => { watch(network, (): void => {
verifyLiquidity(); verifyLiquidity();
enableOrDisableConfirmButton(); enableOrDisableConfirmButton();
}); });
@@ -127,6 +126,13 @@ watch(walletAddress, (): void => {
verifyLiquidity(); verifyLiquidity();
}); });
const availableNetworks = computed(() => {
if (!selectedDeposits.value) return [];
return Object.values(Networks).filter((network) =>
selectedDeposits.value?.some((d) => d.network.id === network.id)
);
});
// Add form submission handler // Add form submission handler
const handleSubmit = async (e: Event): Promise<void> => { const handleSubmit = async (e: Event): Promise<void> => {
e.preventDefault(); e.preventDefault();
@@ -160,7 +166,7 @@ const handleSubmit = async (e: Event): Promise<void> => {
<input <input
type="number" type="number"
name="tokenAmount" name="tokenAmount"
class="border-none outline-none text-lg text-gray-900" class="border-none outline-none text-lg text-gray-900 sm:flex-1 max-w-[60%]"
v-bind:class="{ v-bind:class="{
'font-semibold': tokenValue != undefined, 'font-semibold': tokenValue != undefined,
'text-xl': tokenValue != undefined, 'text-xl': tokenValue != undefined,
@@ -170,7 +176,7 @@ const handleSubmit = async (e: Event): Promise<void> => {
step=".01" step=".01"
required required
/> />
<div class="relative overflow-visible"> <div class="relative overflow-visible ml-auto sm:ml-0">
<button <button
ref="tokenDropdownRef" ref="tokenDropdownRef"
class="flex flex-row items-center p-2 bg-gray-300 hover:bg-gray-200 focus:outline-indigo-800 focus:outline-2 rounded-3xl min-w-fit gap-2 transition-colors" class="flex flex-row items-center p-2 bg-gray-300 hover:bg-gray-200 focus:outline-indigo-800 focus:outline-2 rounded-3xl min-w-fit gap-2 transition-colors"
@@ -233,24 +239,12 @@ const handleSubmit = async (e: Event): Promise<void> => {
</p> </p>
<div class="flex gap-2"> <div class="flex gap-2">
<img <img
alt="Rootstock image" v-for="network in availableNetworks"
src="@/assets/rootstock.svg?url" :key="network.id"
:alt="`${network.name} image`"
:src="getNetworkImage(network.name)"
width="24" width="24"
height="24" height="24"
v-if="
selectedDeposits &&
selectedDeposits.find((d) => d.network == NetworkEnum.rootstock)
"
/>
<img
alt="Ethereum image"
src="@/assets/ethereum.svg?url"
width="24"
height="24"
v-if="
selectedDeposits &&
selectedDeposits.find((d) => d.network == NetworkEnum.sepolia)
"
/> />
</div> </div>
</div> </div>

View File

@@ -0,0 +1,73 @@
<script setup lang="ts">
interface Props {
title: string;
value: string;
change?: string;
changeType?: 'positive' | 'negative' | 'neutral';
icon?: string;
loading?: boolean;
}
const props = withDefaults(defineProps<Props>(), {
changeType: 'neutral',
loading: false
});
</script>
<template>
<div class="analytics-card">
<div class="analytics-content">
<div v-if="loading" class="analytics-value">
<div class="animate-pulse bg-gray-300 h-8 w-16 rounded"></div>
</div>
<div v-else class="analytics-value">{{ value }}</div>
<div class="analytics-title">{{ title }}</div>
<div v-if="change && !loading" class="analytics-change" :class="`change-${changeType}`">
{{ change }}
</div>
</div>
<div v-if="icon && !loading" class="analytics-icon">
<img :src="icon" :alt="`${title} icon`" class="w-8 h-8" />
</div>
</div>
</template>
<style scoped>
.analytics-card {
@apply bg-white rounded-lg border border-gray-200 p-6 flex items-center justify-between shadow-lg;
}
.analytics-content {
@apply flex flex-col;
}
.analytics-value {
@apply text-2xl font-bold text-amber-400 mb-1 break-words overflow-hidden;
word-break: break-all;
max-width: 100%;
}
.analytics-title {
@apply text-sm text-gray-900 mb-1;
}
.analytics-change {
@apply text-xs font-medium;
}
.change-positive {
@apply text-green-600;
}
.change-negative {
@apply text-red-600;
}
.change-neutral {
@apply text-gray-600;
}
.analytics-icon {
@apply flex-shrink-0;
}
</style>

View File

@@ -0,0 +1,279 @@
<script setup lang="ts">
import { ref } from 'vue';
interface Transaction {
id: string;
type: 'deposit' | 'lock' | 'release' | 'return';
timestamp: string;
seller?: string;
buyer?: string | null;
amount: string;
token: string;
blockNumber: string;
transactionHash: string;
}
interface Props {
transactions: Transaction[];
networkExplorerUrl: string;
}
const props = defineProps<Props>();
const copyFeedback = ref<{ [key: string]: boolean }>({});
const copyFeedbackTimeout = ref<{ [key: string]: NodeJS.Timeout | null }>({});
const getTransactionTypeInfo = (type: string) => {
const typeMap = {
deposit: { label: 'Depósito', status: 'completed' as const },
lock: { label: 'Bloqueio', status: 'open' as const },
release: { label: 'Liberação', status: 'completed' as const },
return: { label: 'Retorno', status: 'expired' as const }
};
return typeMap[type as keyof typeof typeMap] || { label: type, status: 'pending' as const };
};
const getTransactionTypeColor = (type: string) => {
const colorMap = {
deposit: 'text-emerald-600',
lock: 'text-amber-600',
release: 'text-emerald-600',
return: 'text-gray-600'
};
return colorMap[type as keyof typeof colorMap] || 'text-gray-600';
};
const formatAddress = (address: string) => {
return `${address.slice(0, 6)}...${address.slice(-4)}`;
};
const formatAmount = (amount: string, decimals: number = 18): string => {
const num = parseFloat(amount) / Math.pow(10, decimals);
return num.toString();
};
const getExplorerUrl = (txHash: string) => {
return `${props.networkExplorerUrl}/tx/${txHash}`;
};
const copyToClipboard = async (address: string, key: string) => {
if (!address) {
return;
}
try {
await navigator.clipboard.writeText(address);
if (copyFeedbackTimeout.value[key]) {
clearTimeout(copyFeedbackTimeout.value[key]!);
}
copyFeedback.value[key] = true;
copyFeedbackTimeout.value[key] = setTimeout(() => {
copyFeedback.value[key] = false;
}, 2000);
} catch (error) {
console.error('Error copying to clipboard:', error);
}
};
</script>
<template>
<div>
<div class="hidden lg:block overflow-x-auto">
<table class="w-full">
<thead>
<tr class="border-b border-gray-200">
<th class="text-left py-3 px-4 text-gray-700 font-medium">Horário</th>
<th class="text-left py-3 px-4 text-gray-700 font-medium">Tipo</th>
<th class="text-left py-3 px-4 text-gray-700 font-medium">Participantes</th>
<th class="text-left py-3 px-4 text-gray-700 font-medium">Valor</th>
<th class="text-left py-3 px-4 text-gray-700 font-medium">Bloco</th>
<th class="text-left py-3 px-4 text-gray-700 font-medium">Ações</th>
</tr>
</thead>
<tbody>
<tr
v-for="transaction in transactions"
:key="transaction.id"
class="border-b border-gray-100 hover:bg-gray-50 transition-colors"
>
<td class="py-4 px-4">
<div class="text-sm text-gray-600">{{ transaction.timestamp }}</div>
</td>
<td class="py-4 px-4">
<span
:class="getTransactionTypeColor(transaction.type)"
class="text-sm font-medium"
>
{{ getTransactionTypeInfo(transaction.type).label }}
</span>
</td>
<td class="py-4 px-4">
<div class="space-y-1">
<div v-if="transaction.seller" class="text-sm">
<span class="text-gray-600">Vendedor: </span>
<div class="relative inline-block">
<span
class="text-gray-900 font-mono cursor-pointer hover:text-amber-500 transition-colors"
@click="copyToClipboard(transaction.seller, `seller-${transaction.id}`)"
title="Copiar"
>
{{ formatAddress(transaction.seller) }}
</span>
<transition name="fade">
<span
v-if="copyFeedback[`seller-${transaction.id}`]"
class="absolute -top-6 left-1/2 transform -translate-x-1/2 text-xs text-emerald-500 font-semibold bg-white px-2 py-1 rounded shadow-sm whitespace-nowrap z-10"
>
Copiado!
</span>
</transition>
</div>
</div>
<div v-if="transaction.buyer" class="text-sm">
<span class="text-gray-600">Comprador: </span>
<div class="relative inline-block">
<span
class="text-gray-900 font-mono cursor-pointer hover:text-amber-500 transition-colors"
@click="copyToClipboard(transaction.buyer, `buyer-${transaction.id}`)"
title="Copiar"
>
{{ formatAddress(transaction.buyer) }}
</span>
<transition name="fade">
<span
v-if="copyFeedback[`buyer-${transaction.id}`]"
class="absolute -top-6 left-1/2 transform -translate-x-1/2 text-xs text-emerald-500 font-semibold bg-white px-2 py-1 rounded shadow-sm whitespace-nowrap z-10"
>
Copiado!
</span>
</transition>
</div>
</div>
</div>
</td>
<td class="py-4 px-4">
<div class="text-sm font-semibold text-emerald-600">
{{ formatAmount(transaction.amount, 18) }} BRZ
</div>
</td>
<td class="py-4 px-4">
<div class="text-sm text-gray-600 font-mono">
#{{ transaction.blockNumber }}
</div>
</td>
<td class="py-4 px-4">
<a
:href="getExplorerUrl(transaction.transactionHash)"
target="_blank"
rel="noopener noreferrer"
class="inline-flex items-center px-3 py-1 bg-amber-400 text-gray-900 rounded-lg text-sm font-medium hover:bg-amber-500 transition-colors"
>
Explorador
</a>
</td>
</tr>
</tbody>
</table>
</div>
<!-- Mobile Cards -->
<div class="lg:hidden space-y-4">
<div
v-for="transaction in transactions"
:key="transaction.id"
class="bg-gray-50 rounded-lg p-4 border border-gray-200"
>
<div class="flex items-center justify-between mb-3">
<span
:class="getTransactionTypeColor(transaction.type)"
class="text-sm font-medium"
>
{{ getTransactionTypeInfo(transaction.type).label }}
</span>
<div class="text-sm text-gray-600">{{ transaction.timestamp }}</div>
</div>
<div class="space-y-2 mb-4">
<div v-if="transaction.seller" class="text-sm">
<span class="text-gray-600">Vendedor: </span>
<div class="relative inline-block">
<span
class="text-gray-900 font-mono cursor-pointer hover:text-amber-500 transition-colors"
@click="copyToClipboard(transaction.seller, `seller-${transaction.id}`)"
title="Copiar"
>
{{ formatAddress(transaction.seller) }}
</span>
<transition name="fade">
<span
v-if="copyFeedback[`seller-${transaction.id}`]"
class="absolute -top-6 left-1/2 transform -translate-x-1/2 text-xs text-emerald-500 font-semibold bg-white px-2 py-1 rounded shadow-sm whitespace-nowrap z-10"
>
Copiado!
</span>
</transition>
</div>
</div>
<div v-if="transaction.buyer" class="text-sm">
<span class="text-gray-600">Comprador: </span>
<div class="relative inline-block">
<span
class="text-gray-900 font-mono cursor-pointer hover:text-amber-500 transition-colors"
@click="copyToClipboard(transaction.buyer, `buyer-${transaction.id}`)"
title="Copiar"
>
{{ formatAddress(transaction.buyer) }}
</span>
<transition name="fade">
<span
v-if="copyFeedback[`buyer-${transaction.id}`]"
class="absolute -top-6 left-1/2 transform -translate-x-1/2 text-xs text-emerald-500 font-semibold bg-white px-2 py-1 rounded shadow-sm whitespace-nowrap z-10"
>
Copiado!
</span>
</transition>
</div>
</div>
<div class="text-sm">
<span class="text-gray-600">Valor: </span>
<span class="font-semibold text-emerald-600">{{ formatAmount(transaction.amount, 18) }} BRZ</span>
</div>
<div class="text-sm">
<span class="text-gray-600">Bloco: </span>
<span class="text-gray-900 font-mono">#{{ transaction.blockNumber }}</span>
</div>
</div>
<a
:href="getExplorerUrl(transaction.transactionHash)"
target="_blank"
rel="noopener noreferrer"
class="inline-flex items-center px-3 py-1 bg-amber-400 text-gray-900 rounded-lg text-sm font-medium hover:bg-amber-500 transition-colors"
>
Ver no Explorador
</a>
</div>
</div>
<!-- Empty State -->
<div v-if="transactions.length === 0" class="text-center py-12">
<div class="text-gray-500 text-lg mb-2">📭</div>
<p class="text-gray-600">Nenhuma transação encontrada</p>
</div>
</div>
</template>
<style scoped>
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.3s ease;
}
.fade-enter-from,
.fade-leave-to {
opacity: 0;
}
</style>

View File

@@ -1,5 +1,4 @@
<script setup lang="ts"> <script setup lang="ts">
import { NetworkEnum } from "@/model/NetworkEnum";
import type { ValidDeposit } from "@/model/ValidDeposit"; import type { ValidDeposit } from "@/model/ValidDeposit";
import type { WalletTransaction } from "@/model/WalletTransaction"; import type { WalletTransaction } from "@/model/WalletTransaction";
import { useUser } from "@/composables/useUser"; import { useUser } from "@/composables/useUser";
@@ -32,10 +31,7 @@ const showInitialItems = (): void => {
}; };
const openEtherscanUrl = (transactionHash: string): void => { const openEtherscanUrl = (transactionHash: string): void => {
const networkUrl = const networkUrl = user.network.value.blockExplorers?.default.url;
user.networkName.value == NetworkEnum.sepolia
? "sepolia.etherscan.io"
: "mumbai.polygonscan.com";
const url = `https://${networkUrl}/tx/${transactionHash}`; const url = `https://${networkUrl}/tx/${transactionHash}`;
window.open(url, "_blank"); window.open(url, "_blank");
}; };
@@ -84,7 +80,7 @@ showInitialItems();
:key="item.blockNumber" :key="item.blockNumber"
:selected-token="user.selectedToken.value" :selected-token="user.selectedToken.value"
:transaction="item" :transaction="item"
:network-name="user.networkName.value" :network-name="user.network.value.name"
@open-explorer="openEtherscanUrl" @open-explorer="openEtherscanUrl"
/> />

View File

@@ -1,12 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import type { WalletTransaction } from "@/model/WalletTransaction"; import type { WalletTransaction } from "@/model/WalletTransaction";
import { NetworkEnum, TokenEnum } from "@/model/NetworkEnum"; import { TokenEnum } from "@/model/NetworkEnum";
import { computed } from "vue"; import { computed } from "vue";
import StatusBadge, { type StatusType } from "../ui/StatusBadge.vue"; import StatusBadge, { type StatusType } from "../ui/StatusBadge.vue";
import { Networks } from "@/config/networks";
const props = defineProps<{ const props = defineProps<{
transaction: WalletTransaction; transaction: WalletTransaction;
networkName: NetworkEnum; networkName: keyof typeof Networks;
selectedToken: TokenEnum; selectedToken: TokenEnum;
}>(); }>();
@@ -28,7 +29,7 @@ const eventName = computed(() => {
}); });
const explorerName = computed(() => { const explorerName = computed(() => {
return props.networkName === NetworkEnum.sepolia ? "Etherscan" : "Polygonscan"; return Networks[(props.networkName as string).toLowerCase()].blockExplorers?.default.name;
}); });
const statusType = computed((): StatusType => { const statusType = computed((): StatusType => {
@@ -55,6 +56,21 @@ const showContinueButton = computed(() => {
return eventName.value === "Reserva" && props.transaction.lockStatus === 1; return eventName.value === "Reserva" && props.transaction.lockStatus === 1;
}); });
const formattedDate = computed(() => {
if (!props.transaction.blockTimestamp) return "";
const timestamp = props.transaction.blockTimestamp;
const date = new Date(timestamp * 1000);
const day = String(date.getDate()).padStart(2, "0");
const month = String(date.getMonth() + 1).padStart(2, "0");
const year = date.getFullYear();
const hours = String(date.getHours()).padStart(2, "0");
const minutes = String(date.getMinutes()).padStart(2, "0");
return `${day}/${month}/${year} ${hours}:${minutes}`;
});
const handleExplorerClick = () => { const handleExplorerClick = () => {
emit("openExplorer", props.transaction.transactionHash); emit("openExplorer", props.transaction.transactionHash);
}; };
@@ -70,6 +86,12 @@ const handleExplorerClick = () => {
<span class="text-xl sm:text-xl leading-7 font-semibold text-gray-900"> <span class="text-xl sm:text-xl leading-7 font-semibold text-gray-900">
{{ transaction.amount }} {{ selectedToken }} {{ transaction.amount }} {{ selectedToken }}
</span> </span>
<span
v-if="formattedDate"
class="text-xs sm:text-sm leading-5 font-normal text-gray-500 mt-1"
>
{{ formattedDate }}
</span>
</div> </div>
<div class="flex flex-col items-center justify-center"> <div class="flex flex-col items-center justify-center">
<div class="mb-2 mt-4"> <div class="mb-2 mt-4">

View File

@@ -71,7 +71,7 @@ const handleSubmit = (e: Event): void => {
const data: Participant = { const data: Participant = {
offer: offer.value, offer: offer.value,
chainID: user.networkId.value, chainID: user.network.value.id,
identification: processedIdentification, identification: processedIdentification,
bankIspb: selectedBank.value?.ISPB, bankIspb: selectedBank.value?.ISPB,
accountType: accountType.value, accountType: accountType.value,

View File

@@ -90,13 +90,13 @@ const handleInputEvent = (event: any): void => {
<div class="flex gap-2"> <div class="flex gap-2">
<img <img
alt="Polygon image" alt="Polygon image"
src="@/assets/polygon.svg?url" src="@/assets/networks/polygon.svg?url"
width="24" width="24"
height="24" height="24"
/> />
<img <img
alt="Ethereum image" alt="Ethereum image"
src="@/assets/ethereum.svg?url" src="@/assets/networks/ethereum.svg?url"
width="24" width="24"
height="24" height="24"
/> />

View File

@@ -2,10 +2,8 @@
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import { useUser } from "@/composables/useUser"; import { useUser } from "@/composables/useUser";
import { onClickOutside } from "@vueuse/core"; import { onClickOutside } from "@vueuse/core";
import { NetworkEnum } from "@/model/NetworkEnum";
import { getNetworkImage } from "@/utils/imagesPath"; import { getNetworkImage } from "@/utils/imagesPath";
import { Networks } from "@/model/Networks"; import { Networks } from "@/config/networks";
import { useOnboard } from "@web3-onboard/vue"; import { useOnboard } from "@web3-onboard/vue";
import ChevronDown from "@/assets/chevronDown.svg"; import ChevronDown from "@/assets/chevronDown.svg";
@@ -13,10 +11,24 @@ import TwitterIcon from "@/assets/twitterIcon.svg";
import LinkedinIcon from "@/assets/linkedinIcon.svg"; import LinkedinIcon from "@/assets/linkedinIcon.svg";
import GithubIcon from "@/assets/githubIcon.svg"; import GithubIcon from "@/assets/githubIcon.svg";
import { connectProvider } from "@/blockchain/provider"; import { connectProvider } from "@/blockchain/provider";
import { DEFAULT_NETWORK } from "@/config/networks";
import type { NetworkConfig } from "@/model/NetworkEnum";
interface MenuOption {
label: string;
route?: string;
action?: () => void;
showInDesktop?: boolean;
showInMobile?: boolean;
isDynamic?: boolean;
dynamicLabel?: () => string;
dynamicRoute?: () => string;
showVersion?: boolean;
}
// Use the new composable // Use the new composable
const user = useUser(); const user = useUser();
const { walletAddress, sellerView, networkId } = user; const { walletAddress, sellerView, network } = user;
const menuOpenToggle = ref<boolean>(false); const menuOpenToggle = ref<boolean>(false);
const infoMenuOpenToggle = ref<boolean>(false); const infoMenuOpenToggle = ref<boolean>(false);
@@ -40,20 +52,20 @@ watch(connectedWallet, async (newVal: any) => {
}); });
watch(connectedChain, (newVal: any) => { watch(connectedChain, (newVal: any) => {
// Check if connected chain is valid, otherwise default to Sepolia (NetworkEnum.SEPOLIA) // Check if connected chain is valid, otherwise default to Sepolia
if ( if (
!newVal || !newVal ||
!Object.values(Networks).some( !Object.values(Networks).some(
(network) => Number(network.chainId) === Number(newVal.id) (network) => network.id === Number(newVal.id)
) )
) { ) {
console.log( console.log(
"Invalid or unsupported network detected, defaulting to Sepolia" "Invalid or unsupported network detected, defaulting to Sepolia"
); );
user.setNetworkId(user.networkId.value); user.setNetwork(DEFAULT_NETWORK);
return; return;
} }
user.setNetworkId(newVal?.id); user.setNetworkById(newVal?.id);
}); });
const formatWalletAddress = (): string => { const formatWalletAddress = (): string => {
@@ -78,16 +90,24 @@ const closeMenu = (): void => {
menuOpenToggle.value = false; menuOpenToggle.value = false;
}; };
const networkChange = async (network: NetworkEnum): Promise<void> => { const networkChange = async (network: NetworkConfig): Promise<void> => {
currencyMenuOpenToggle.value = false; currencyMenuOpenToggle.value = false;
try {
await setChain({ // If wallet is connected, try to change chain in wallet
chainId: Networks[network].chainId, if (connectedWallet.value) {
wallet: connectedWallet.value?.label || "", const chainId = network.id.toString(16)
}); try {
user.setNetworkId(network); await setChain({
} catch (error) { chainId: `0x${chainId}`,
console.log("Error changing network", error); wallet: connectedWallet.value.label,
});
user.setNetwork(network);
} catch (error) {
console.log("Error changing network", error);
}
} else {
// If no wallet connected, just update the network state
user.setNetwork(network);
} }
}; };
@@ -102,11 +122,80 @@ onClickOutside(currencyRef, () => {
onClickOutside(infoMenuRef, () => { onClickOutside(infoMenuRef, () => {
infoMenuOpenToggle.value = false; infoMenuOpenToggle.value = false;
}); });
const infoMenuOptions: MenuOption[] = [
{
label: "Explorar Transações",
route: "/explore",
showInDesktop: true,
showInMobile: false,
},
{
label: "Perguntas frequentes",
route: "/faq",
showInDesktop: true,
showInMobile: false,
},
{
label: "Versões",
route: "/versions",
showInDesktop: true,
showInMobile: false,
},
];
const walletMenuOptions: MenuOption[] = [
{
label: "Quero vender",
isDynamic: true,
dynamicLabel: () => (sellerView.value ? "Quero comprar" : "Quero vender"),
dynamicRoute: () => (sellerView.value ? "/" : "/seller"),
showInDesktop: false,
showInMobile: true,
},
{
label: "Explorar Transações",
route: "/explore",
showInDesktop: false,
showInMobile: true,
},
{
label: "Gerenciar Ofertas",
route: "/manage_bids",
showInDesktop: true,
showInMobile: true,
},
{
label: "Perguntas frequentes",
route: "/faq",
showInDesktop: false,
showInMobile: true,
},
{
label: "Versões",
route: "/versions",
showInDesktop: false,
showInMobile: true,
},
{
label: "Desconectar",
route: "/",
action: disconnectUser,
showInDesktop: true,
showInMobile: true,
},
];
const handleMenuOptionClick = (option: MenuOption): void => {
if (!option.action) {
closeMenu();
}
};
</script> </script>
<template> <template>
<header class="z-20"> <header class="z-20">
<RouterLink :to="'/'" class="default-button"> <RouterLink :to="'/'" class="default-button flex items-center md:h-auto md:py-2 h-10 py-0">
<img <img
alt="P2Pix logo" alt="P2Pix logo"
class="logo hidden md:inline-block" class="logo hidden md:inline-block"
@@ -116,7 +205,7 @@ onClickOutside(infoMenuRef, () => {
/> />
<img <img
alt="P2Pix logo" alt="P2Pix logo"
class="logo inline-block md:hidden w-10/12" class="logo inline-block md:hidden h-10"
width="40" width="40"
height="40" height="40"
src="@/assets/logo2.svg?url" src="@/assets/logo2.svg?url"
@@ -154,26 +243,44 @@ onClickOutside(infoMenuRef, () => {
> >
<div class="mt-2"> <div class="mt-2">
<div class="bg-white rounded-md z-10 -left-36 w-52"> <div class="bg-white rounded-md z-10 -left-36 w-52">
<div class="menu-button gap-2 px-4 rounded-md cursor-pointer"> <template
<span v-for="(option, index) in infoMenuOptions.filter(
class="text-gray-900 py-4 text-end font-semibold text-sm" (opt) => opt.showInDesktop
> )"
Documentação :key="index"
</span>
</div>
<div class="w-full flex justify-center">
<hr class="w-4/5" />
</div>
<RouterLink
:to="'/faq'"
class="menu-button gap-2 px-4 rounded-md cursor-pointer"
> >
<span <RouterLink
class="text-gray-900 py-4 text-end font-semibold text-sm whitespace-nowrap" v-if="option.route"
:to="option.route"
class="menu-button gap-2 px-4 rounded-md cursor-pointer"
> >
Perguntas frequentes <span
</span> class="text-gray-900 py-4 text-end font-semibold text-sm whitespace-nowrap"
</RouterLink> >
{{ option.label }}
</span>
</RouterLink>
<div
v-else
class="menu-button gap-2 px-4 rounded-md cursor-pointer"
>
<span
class="text-gray-900 py-4 text-end font-semibold text-sm"
>
{{ option.label }}
</span>
</div>
<div
v-if="
index <
infoMenuOptions.filter((opt) => opt.showInDesktop).length -
1
"
class="w-full flex justify-center"
>
<hr class="w-4/5" />
</div>
</template>
<div class="w-full flex justify-center"> <div class="w-full flex justify-center">
<hr class="w-4/5" /> <hr class="w-4/5" />
</div> </div>
@@ -219,13 +326,6 @@ onClickOutside(infoMenuRef, () => {
</div> </div>
</transition> </transition>
</div> </div>
<RouterLink
:to="'/faq'"
v-if="!walletAddress"
class="default-button inline-block md:hidden"
>
FAQ
</RouterLink>
<RouterLink <RouterLink
:to="sellerView ? '/' : '/seller'" :to="sellerView ? '/' : '/seller'"
class="default-button whitespace-nowrap w-40 sm:w-44 md:w-36 hidden md:inline-block" class="default-button whitespace-nowrap w-40 sm:w-44 md:w-36 hidden md:inline-block"
@@ -234,16 +334,7 @@ onClickOutside(infoMenuRef, () => {
{{ sellerView ? "Quero comprar" : "Quero vender" }} {{ sellerView ? "Quero comprar" : "Quero vender" }}
</div> </div>
</RouterLink> </RouterLink>
<RouterLink <div class="flex flex-col relative">
:to="sellerView ? '/' : '/seller'"
v-if="!walletAddress"
class="default-button sm:whitespace-normal whitespace-nowrap inline-block md:hidden w-40 sm:w-44 md:w-36"
>
<div class="topbar-text topbar-link text-center mx-auto inline-block">
{{ sellerView ? "Quero comprar" : "Quero vender" }}
</div>
</RouterLink>
<div class="flex flex-col relative" v-if="walletAddress">
<div <div
ref="currencyRef" ref="currencyRef"
class="top-bar-info cursor-pointer h-10 group hover:bg-gray-50 transition-all duration-500 ease-in-out" class="top-bar-info cursor-pointer h-10 group hover:bg-gray-50 transition-all duration-500 ease-in-out"
@@ -258,7 +349,7 @@ onClickOutside(infoMenuRef, () => {
> >
<img <img
alt="Choosed network image" alt="Choosed network image"
:src="getNetworkImage(NetworkEnum[user.networkName.value])" :src="getNetworkImage(network.name)"
height="24" height="24"
width="24" width="24"
/> />
@@ -267,9 +358,7 @@ onClickOutside(infoMenuRef, () => {
:class="{ '!text-gray-900': currencyMenuOpenToggle }" :class="{ '!text-gray-900': currencyMenuOpenToggle }"
> >
{{ {{
Networks[user.networkName.value] user.network.value.name || "Invalid Chain"
? Networks[user.networkName.value].chainName
: "Invalid Chain"
}} }}
</span> </span>
<div <div
@@ -292,20 +381,20 @@ onClickOutside(infoMenuRef, () => {
class="mt-2 bg-white rounded-md border border-gray-300 drop-shadow-md shadow-md overflow-clip" class="mt-2 bg-white rounded-md border border-gray-300 drop-shadow-md shadow-md overflow-clip"
> >
<div <div
v-for="(chainData, network) in Networks" v-for="network in Networks"
:key="network" :key="network.id"
class="menu-button p-4 gap-2 cursor-pointer hover:bg-gray-200 flex items-center !justify-start whitespace-nowrap transition-colors duration-150 ease-in-out" class="menu-button p-4 gap-2 cursor-pointer hover:bg-gray-200 flex items-center !justify-start whitespace-nowrap transition-colors duration-150 ease-in-out"
@click="networkChange(network)" @click="networkChange(network)"
> >
<img <img
:alt="chainData.chainName + ' image'" :alt="network.name + ' image'"
width="20" width="20"
height="20" height="20"
:src="getNetworkImage(NetworkEnum[network])" :src="getNetworkImage(network.name)"
class="mr-2 ml-1" class="mr-2 ml-1"
/> />
<span class="text-gray-900 font-semibold text-sm"> <span class="text-gray-900 font-semibold text-sm">
{{ chainData.chainName }} {{ network.name }}
</span> </span>
</div> </div>
<div class="w-full flex justify-center"> <div class="w-full flex justify-center">
@@ -318,7 +407,7 @@ onClickOutside(infoMenuRef, () => {
<button <button
type="button" type="button"
v-if="!walletAddress" v-if="!walletAddress"
class="border-amber-500 border-2 rounded default-button hidden md:inline-block" class="border-amber-500 border-2 sm:rounded !rounded-lg default-button hidden md:inline-block"
@click="connnectWallet()" @click="connnectWallet()"
> >
Conectar carteira Conectar carteira
@@ -326,7 +415,7 @@ onClickOutside(infoMenuRef, () => {
<button <button
type="button" type="button"
v-if="!walletAddress" v-if="!walletAddress"
class="border-amber-500 border-2 rounded default-button inline-block md:hidden" class="border-amber-500 border-2 sm:rounded !rounded-lg default-button inline-block md:hidden h-10"
@click="connnectWallet()" @click="connnectWallet()"
> >
Conectar Conectar
@@ -372,23 +461,40 @@ onClickOutside(infoMenuRef, () => {
<div <div
class="bg-white rounded-md z-10 border border-gray-300 drop-shadow-md shadow-md overflow-clip" class="bg-white rounded-md z-10 border border-gray-300 drop-shadow-md shadow-md overflow-clip"
> >
<RouterLink <template
to="/manage_bids" v-for="(option, index) in walletMenuOptions.filter(
class="redirect_button menu-button" (opt) => opt.showInDesktop
@click="closeMenu()" )"
:key="index"
> >
Gerenciar Ofertas <RouterLink
</RouterLink> v-if="option.route && !option.action"
<div class="w-full flex justify-center"> :to="option.route"
<hr class="w-4/5" /> class="redirect_button menu-button"
</div> @click="closeMenu()"
<RouterLink >
to="/" {{ option.label }}
class="redirect_button menu-button" </RouterLink>
@click="disconnectUser" <RouterLink
> v-else-if="option.route && option.action"
Desconectar :to="option.route"
</RouterLink> class="redirect_button menu-button"
@click="option.action"
>
{{ option.label }}
</RouterLink>
<div
v-if="
index <
walletMenuOptions.filter((opt) => opt.showInDesktop)
.length -
1
"
class="w-full flex justify-center"
>
<hr class="w-4/5" />
</div>
</template>
</div> </div>
</div> </div>
</div> </div>
@@ -400,32 +506,49 @@ onClickOutside(infoMenuRef, () => {
v-show="menuOpenToggle" v-show="menuOpenToggle"
class="mobile-menu fixed w-4/5 text-gray-900 inline-block md:hidden" class="mobile-menu fixed w-4/5 text-gray-900 inline-block md:hidden"
> >
<div class="pl-4 mt-2 h-full"> <div class="pl-4 h-full">
<div class="bg-white rounded-md z-10 h-full"> <div class="bg-white rounded-md z-10 h-full">
<div class="menu-button" @click="closeMenu()"> <template
<RouterLink v-for="(option, index) in walletMenuOptions.filter(
:to="sellerView ? '/' : '/seller'" (opt) => opt.showInMobile
class="redirect_button mt-2" )"
:key="index"
>
<div class="menu-button" @click="handleMenuOptionClick(option)">
<RouterLink
v-if="option.isDynamic"
:to="option.dynamicRoute ? option.dynamicRoute() : '/'"
class="redirect_button"
:class="{ 'mt-2': index === 0 }"
>
{{ option.dynamicLabel ? option.dynamicLabel() : option.label }}
</RouterLink>
<RouterLink
v-else-if="option.route && !option.action"
:to="option.route"
class="redirect_button"
>
{{ option.label }}
</RouterLink>
<RouterLink
v-else-if="option.route && option.action"
:to="option.route"
class="redirect_button"
@click.stop="option.action"
>
{{ option.label }}
</RouterLink>
</div>
<div
v-if="
index <
walletMenuOptions.filter((opt) => opt.showInMobile).length - 1
"
class="w-full flex justify-center"
> >
{{ sellerView ? "Quero comprar" : "Quero vender" }} <hr class="w-4/5" />
</RouterLink> </div>
</div> </template>
<div class="w-full flex justify-center">
<hr class="w-4/5" />
</div>
<div class="menu-button" @click="closeMenu()">
<RouterLink to="/manage_bids" class="redirect_button">
Gerenciar Ofertas
</RouterLink>
</div>
<div class="w-full flex justify-center">
<hr class="w-4/5" />
</div>
<div class="menu-button" @click="disconnectUser">
<RouterLink to="/" class="redirect_button">
Desconectar
</RouterLink>
</div>
<div class="w-full flex justify-center"> <div class="w-full flex justify-center">
<hr class="w-4/5" /> <hr class="w-4/5" />
</div> </div>
@@ -459,22 +582,22 @@ onClickOutside(infoMenuRef, () => {
v-show="currencyMenuOpenToggle" v-show="currencyMenuOpenToggle"
class="mobile-menu fixed w-4/5 text-gray-900 inline-block md:hidden" class="mobile-menu fixed w-4/5 text-gray-900 inline-block md:hidden"
> >
<div class="pl-4 mt-2 h-full"> <div class="pl-4 h-full">
<div class="bg-white rounded-md z-10 h-full"> <div class="bg-white rounded-md z-10 h-full">
<div <div
v-for="(chainData, network) in Networks" v-for="network in Networks"
:key="network" :key="network.id"
class="menu-button gap-2 sm:px-4 rounded-md cursor-pointer py-2 px-4" class="menu-button gap-2 sm:px-4 rounded-md cursor-pointer py-2 px-4"
@click="networkChange(network)" @click="networkChange(network)"
> >
<img <img
:alt="chainData.chainName + 'image'" :alt="network.name + 'image'"
width="20" width="20"
height="20" height="20"
:src="getNetworkImage(NetworkEnum[network])" :src="getNetworkImage(network.name)"
/> />
<span class="text-gray-900 py-4 text-end font-bold text-sm"> <span class="text-gray-900 py-4 text-end font-bold text-sm">
{{ chainData.chainName }} {{ network.name }}
</span> </span>
</div> </div>
</div> </div>
@@ -524,8 +647,12 @@ a:hover {
} }
.mobile-menu { .mobile-menu {
margin-top: 1400px; top: 60px;
bottom: 0px; right: 10px;
height: auto; left: auto;
max-height: calc(100vh - 60px);
overflow-y: auto;
border-radius: 8px;
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
} }
</style> </style>

View File

@@ -33,7 +33,7 @@ const props = withDefaults(
} }
.form-card:not(.no-border) { .form-card:not(.no-border) {
@apply border-y-10; @apply border-y;
} }
.form-card.full-width { .form-card.full-width {

View File

@@ -1,11 +1,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from "vue"; import { computed } from "vue";
import { NetworkEnum } from "@/model/NetworkEnum";
import { getNetworkImage } from "@/utils/imagesPath"; import { getNetworkImage } from "@/utils/imagesPath";
import type { NetworkConfig } from "@/model/NetworkEnum";
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
networks: NetworkEnum[]; networks: NetworkConfig[];
size?: "sm" | "md" | "lg"; size?: "sm" | "md" | "lg";
showLabel?: boolean; showLabel?: boolean;
}>(), }>(),
@@ -24,8 +24,8 @@ const sizeMap = {
const networkData = computed(() => { const networkData = computed(() => {
return props.networks.map((network) => ({ return props.networks.map((network) => ({
network, network,
image: getNetworkImage(String(network)), image: getNetworkImage(network.name),
name: String(network), name: network.name,
})); }));
}); });
</script> </script>
@@ -34,7 +34,7 @@ const networkData = computed(() => {
<div class="network-badges"> <div class="network-badges">
<div <div
v-for="data in networkData" v-for="data in networkData"
:key="data.network" :key="data.network.id"
class="network-badge" class="network-badge"
:title="data.name" :title="data.name"
> >

View File

@@ -1,16 +1,16 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from "vue"; import { computed } from "vue";
import { NetworkEnum } from "@/model/NetworkEnum"; import { Networks } from "@/config/networks";
import { Networks } from "@/model/Networks"; import type { NetworkConfig } from "@/model/NetworkEnum";
import { getNetworkImage } from "@/utils/imagesPath"; import { getNetworkImage } from "@/utils/imagesPath";
import Dropdown, { type DropdownItem } from "./Dropdown.vue"; import Dropdown, { type DropdownItem } from "./Dropdown.vue";
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
modelValue: NetworkEnum; modelValue: NetworkConfig;
disabled?: boolean; disabled?: boolean;
size?: "sm" | "md" | "lg"; size?: "sm" | "md" | "lg";
availableNetworks?: NetworkEnum[]; availableNetworks?: NetworkConfig[];
}>(), }>(),
{ {
disabled: false, disabled: false,
@@ -19,21 +19,19 @@ const props = withDefaults(
); );
const emit = defineEmits<{ const emit = defineEmits<{
"update:modelValue": [value: NetworkEnum]; "update:modelValue": [value: NetworkConfig];
change: [value: NetworkEnum]; change: [value: NetworkConfig];
}>(); }>();
const networkItems = computed((): DropdownItem<NetworkEnum>[] => { const networkItems = computed((): DropdownItem<NetworkConfig>[] => {
const networks = props.availableNetworks || (Object.values(NetworkEnum).filter(v => typeof v === 'number') as NetworkEnum[]); return Object.values(Networks).map((network) => ({
return networks.map((network) => ({
value: network, value: network,
label: Networks[network]?.chainName || String(network), label: network.name,
icon: getNetworkImage(String(network)), icon: getNetworkImage(network.name),
})); }));
}); });
const handleChange = (value: NetworkEnum) => { const handleChange = (value: NetworkConfig) => {
emit("update:modelValue", value); emit("update:modelValue", value);
emit("change", value); emit("change", value);
}; };

View File

@@ -1,20 +1,20 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed, watch, onMounted } from "vue"; import { ref, computed, watch, onMounted } from "vue";
import { useOnboard } from "@web3-onboard/vue"; import { useOnboard } from "@web3-onboard/vue";
import { Networks } from "@/model/Networks"; import { Networks } from "@/config/networks";
import { useUser } from "@/composables/useUser"; import { useUser } from "@/composables/useUser";
const { connectedWallet } = useOnboard(); const { connectedWallet } = useOnboard();
const user = useUser(); const user = useUser();
const { networkId, networkName } = user; const { network } = user;
const isWrongNetwork = ref(false); const isWrongNetwork = ref(false);
const targetNetworkName = computed(() => Networks[networkName.value].chainName); const targetNetworkName = computed(() => network.value.name);
const checkNetwork = () => { const checkNetwork = () => {
if (connectedWallet.value) { if (connectedWallet.value) {
const chainId = connectedWallet.value.chains[0].id; const chainId = connectedWallet.value.chains[0].id;
isWrongNetwork.value = Number(chainId) !== networkId.value; isWrongNetwork.value = Number(chainId) !== network.value.id;
} else { } else {
isWrongNetwork.value = false; // No wallet connected yet isWrongNetwork.value = false; // No wallet connected yet
} }
@@ -23,11 +23,12 @@ const checkNetwork = () => {
const switchNetwork = async () => { const switchNetwork = async () => {
try { try {
if (connectedWallet.value && connectedWallet.value.provider) { if (connectedWallet.value && connectedWallet.value.provider) {
let chainId = network.value.id.toString(16);
await connectedWallet.value.provider.request({ await connectedWallet.value.provider.request({
method: "wallet_switchEthereumChain", method: "wallet_switchEthereumChain",
params: [ params: [
{ {
chainId: Networks[networkName.value].chainId, chainId: `0x${chainId}`,
}, },
], ],
}); });
@@ -39,7 +40,7 @@ const switchNetwork = async () => {
onMounted(checkNetwork); onMounted(checkNetwork);
watch(connectedWallet, checkNetwork); watch(connectedWallet, checkNetwork);
watch(networkId, checkNetwork, { immediate: true }); watch(network, checkNetwork, { immediate: true });
</script> </script>
<template> <template>

View File

@@ -0,0 +1,475 @@
import { NetworkConfig } from '@/model/NetworkEnum';
import { ref, computed, type Ref } from 'vue';
import { isTestnetEnvironment } from '@/config/networks';
import { sepolia, rootstock, rootstockTestnet } from "viem/chains";
export interface Transaction {
id: string;
type: 'deposit' | 'lock' | 'release' | 'return';
timestamp: string;
blockTimestamp: string;
seller?: string;
buyer?: string | null;
amount: string;
token: string;
blockNumber: string;
transactionHash: string;
}
export interface AnalyticsData {
totalVolume: string;
totalTransactions: string;
totalLocks: string;
totalDeposits: string;
totalReleases: string;
}
export function useGraphQL(network: Ref<NetworkConfig>) {
const searchAddress = ref('');
const selectedType = ref('all');
const loading = ref(false);
const error = ref<string | null>(null);
const analyticsLoading = ref(false);
const transactionsData = ref<Transaction[]>([]);
const analyticsData = ref<AnalyticsData>({
totalVolume: '0',
totalTransactions: '0',
totalLocks: '0',
totalDeposits: '0',
totalReleases: '0'
});
const getGraphQLUrl = () => {
const rskNetworkName = isTestnetEnvironment() ? rootstockTestnet.name : rootstock.name;
switch (network.value.name) {
case sepolia.name:
return import.meta.env.VITE_SEPOLIA_SUBGRAPH_URL!;
case rskNetworkName:
return import.meta.env.VITE_RSK_SUBGRAPH_URL!;
default:
throw new Error(`Unsupported network: ${network.value.name}`);
}
};
const executeQuery = async (query: string, variables: any = {}) => {
const url = getGraphQLUrl();
try {
const response = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
query,
variables,
}),
});
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const data = await response.json();
if (data.errors) {
throw new Error(data.errors[0]?.message || 'GraphQL error');
}
return data.data;
} catch (err) {
console.error('GraphQL query error:', err);
throw err;
}
};
const fetchAllActivity = async () => {
loading.value = true;
error.value = null;
const query = `
query GetAllActivity($first: Int = 50) {
depositAddeds(first: $first, orderBy: "blockTimestamp", orderDirection: "desc") {
id
seller
token
amount
blockNumber
blockTimestamp
transactionHash
}
depositWithdrawns(first: $first, orderBy: "blockTimestamp", orderDirection: "desc") {
id
seller
token
amount
blockNumber
blockTimestamp
transactionHash
}
lockAddeds(first: $first, orderBy: "blockTimestamp", orderDirection: "desc") {
id
buyer
lockID
seller
amount
blockNumber
blockTimestamp
transactionHash
}
lockReleaseds(first: $first, orderBy: "blockTimestamp", orderDirection: "desc") {
id
buyer
lockId
amount
blockNumber
blockTimestamp
transactionHash
}
lockReturneds(first: $first, orderBy: "blockTimestamp", orderDirection: "desc") {
id
buyer
lockId
blockNumber
blockTimestamp
transactionHash
}
}
`;
try {
const data = await executeQuery(query, { first: 50 });
transactionsData.value = processActivityData(data);
} catch (err) {
error.value = err instanceof Error ? err.message : 'Failed to fetch transactions';
} finally {
loading.value = false;
}
};
const fetchUserActivity = async (userAddress: string) => {
loading.value = true;
error.value = null;
const query = `
query GetUserActivity($userAddress: String!, $first: Int = 50) {
depositAddeds(first: $first, where: { seller: $userAddress }, orderBy: "blockTimestamp", orderDirection: "desc") {
id
seller
token
amount
blockNumber
blockTimestamp
transactionHash
}
depositWithdrawns(first: $first, where: { seller: $userAddress }, orderBy: "blockTimestamp", orderDirection: "desc") {
id
seller
token
amount
blockNumber
blockTimestamp
transactionHash
}
lockAddeds(first: $first, where: { buyer: $userAddress }, orderBy: "blockTimestamp", orderDirection: "desc") {
id
buyer
lockID
seller
amount
blockNumber
blockTimestamp
transactionHash
}
lockReleaseds(first: $first, where: { buyer: $userAddress }, orderBy: "blockTimestamp", orderDirection: "desc") {
id
buyer
lockId
amount
blockNumber
blockTimestamp
transactionHash
}
lockReturneds(first: $first, where: { buyer: $userAddress }, orderBy: "blockTimestamp", orderDirection: "desc") {
id
buyer
lockId
blockNumber
blockTimestamp
transactionHash
}
}
`;
try {
const data = await executeQuery(query, { userAddress, first: 50 });
transactionsData.value = processActivityData(data);
} catch (err) {
error.value = err instanceof Error ? err.message : 'Failed to fetch user transactions';
} finally {
loading.value = false;
}
};
const clearData = () => {
transactionsData.value = [];
analyticsData.value = {
totalVolume: '0',
totalTransactions: '0',
totalLocks: '0',
totalDeposits: '0',
totalReleases: '0'
};
};
const fetchAnalytics = async () => {
analyticsLoading.value = true;
const query = `
query GetAnalytics {
depositAddeds(first: 1000) {
amount
blockTimestamp
}
depositWithdrawns(first: 1000) {
amount
blockTimestamp
}
lockAddeds(first: 1000) {
amount
blockTimestamp
}
lockReleaseds(first: 1000) {
amount
blockTimestamp
}
lockReturneds(first: 1000) {
blockTimestamp
}
}
`;
try {
const data = await executeQuery(query);
analyticsData.value = processAnalyticsData(data);
} catch (err) {
console.error('Failed to fetch analytics:', err);
} finally {
analyticsLoading.value = false;
}
};
const processActivityData = (data: any): Transaction[] => {
if (!data) return [];
const activities: Transaction[] = [];
if (data.depositAddeds) {
data.depositAddeds.forEach((deposit: any) => {
activities.push({
id: deposit.id,
blockNumber: deposit.blockNumber,
blockTimestamp: deposit.blockTimestamp,
transactionHash: deposit.transactionHash,
type: 'deposit',
seller: deposit.seller,
buyer: undefined,
amount: deposit.amount,
token: deposit.token,
timestamp: formatTimestamp(deposit.blockTimestamp)
});
});
}
if (data.depositWithdrawns) {
data.depositWithdrawns.forEach((withdrawal: any) => {
activities.push({
id: withdrawal.id,
blockNumber: withdrawal.blockNumber,
blockTimestamp: withdrawal.blockTimestamp,
transactionHash: withdrawal.transactionHash,
type: 'deposit', // Treat as deposit withdrawal
seller: withdrawal.seller,
buyer: undefined,
amount: withdrawal.amount,
token: withdrawal.token,
timestamp: formatTimestamp(withdrawal.blockTimestamp)
});
});
}
if (data.lockAddeds) {
data.lockAddeds.forEach((lock: any) => {
activities.push({
id: lock.id,
blockNumber: lock.blockNumber,
blockTimestamp: lock.blockTimestamp,
transactionHash: lock.transactionHash,
type: 'lock',
seller: lock.seller,
buyer: lock.buyer,
amount: lock.amount,
token: lock.token,
timestamp: formatTimestamp(lock.blockTimestamp)
});
});
}
if (data.lockReleaseds) {
data.lockReleaseds.forEach((release: any) => {
activities.push({
id: release.id,
blockNumber: release.blockNumber,
blockTimestamp: release.blockTimestamp,
transactionHash: release.transactionHash,
type: 'release',
seller: undefined, // Release doesn't have seller info
buyer: release.buyer,
amount: release.amount,
token: 'BRZ', // Default token
timestamp: formatTimestamp(release.blockTimestamp)
});
});
}
if (data.lockReturneds) {
data.lockReturneds.forEach((returnTx: any) => {
activities.push({
id: returnTx.id,
blockNumber: returnTx.blockNumber,
blockTimestamp: returnTx.blockTimestamp,
transactionHash: returnTx.transactionHash,
type: 'return',
seller: undefined, // Return doesn't have seller info
buyer: returnTx.buyer,
amount: '0', // Return doesn't have amount
token: 'BRZ', // Default token
timestamp: formatTimestamp(returnTx.blockTimestamp)
});
});
}
return activities.sort((a, b) => parseInt(b.blockTimestamp) - parseInt(a.blockTimestamp));
};
const formatTimestamp = (timestamp: string): string => {
const now = Date.now() / 1000;
const diff = now - parseInt(timestamp);
if (diff < 60) return 'Just now';
if (diff < 3600) return `${Math.floor(diff / 60)} minutes ago`;
if (diff < 86400) return `${Math.floor(diff / 3600)} hours ago`;
return `${Math.floor(diff / 86400)} days ago`;
};
const formatAmount = (amount: string): string => {
const num = parseFloat(amount);
if (num >= 1000000000000000) return `${(num / 1000000000000000).toFixed(1)}Q`;
if (num >= 1000000000000) return `${(num / 1000000000000).toFixed(1)}T`;
if (num >= 1000000000) return `${(num / 1000000000).toFixed(1)}B`;
if (num >= 1000000) return `${(num / 1000000).toFixed(1)}M`;
if (num >= 1000) return `${(num / 1000).toFixed(1)}K`;
if (num < 1) return num.toFixed(4);
return num.toFixed(2);
};
const processAnalyticsData = (data: any): AnalyticsData => {
if (!data) {
return {
totalVolume: '0',
totalTransactions: '0',
totalLocks: '0',
totalDeposits: '0',
totalReleases: '0'
};
}
let totalVolume = 0;
let totalTransactions = 0;
let totalLocks = 0;
let totalDeposits = 0;
let totalReleases = 0;
if (data.depositAddeds) {
data.depositAddeds.forEach((deposit: any) => {
totalVolume += parseFloat(deposit.amount || '0');
totalTransactions++;
totalDeposits++;
});
}
if (data.depositWithdrawns) {
data.depositWithdrawns.forEach((withdrawal: any) => {
totalVolume += parseFloat(withdrawal.amount || '0');
totalTransactions++;
});
}
if (data.lockAddeds) {
data.lockAddeds.forEach((lock: any) => {
totalVolume += parseFloat(lock.amount || '0');
totalTransactions++;
totalLocks++;
});
}
if (data.lockReleaseds) {
data.lockReleaseds.forEach((release: any) => {
totalVolume += parseFloat(release.amount || '0');
totalTransactions++;
totalReleases++;
});
}
if (data.lockReturneds) {
data.lockReturneds.forEach((returnTx: any) => {
totalTransactions++;
});
}
const result = {
totalVolume: formatAmount(totalVolume.toString()),
totalTransactions: totalTransactions.toString(),
totalLocks: totalLocks.toString(),
totalDeposits: totalDeposits.toString(),
totalReleases: totalReleases.toString()
};
return result;
};
const filteredTransactions = computed(() => {
let filtered = transactionsData.value;
if (selectedType.value !== 'all') {
filtered = filtered.filter(tx => tx.type === selectedType.value);
}
if (searchAddress.value) {
const searchLower = searchAddress.value.toLowerCase();
filtered = filtered.filter(tx =>
tx.seller?.toLowerCase().includes(searchLower) ||
tx.buyer?.toLowerCase().includes(searchLower)
);
}
return filtered;
});
return {
searchAddress,
selectedType,
transactions: filteredTransactions,
analytics: analyticsData,
loading,
error,
analyticsLoading,
fetchAllActivity,
fetchUserActivity,
fetchAnalytics,
clearData
};
}

View File

@@ -1,15 +1,14 @@
import { ref } from "vue"; import { ref } from "vue";
import { NetworkEnum, TokenEnum } from "../model/NetworkEnum";
import type { ValidDeposit } from "@/model/ValidDeposit"; import type { ValidDeposit } from "@/model/ValidDeposit";
import type { Participant } from "../utils/bbPay"; import type { Participant } from "../utils/bbPay";
import type { Address } from "viem" import type { Address } from "viem"
import { DEFAULT_NETWORK, getNetworkConfig } from "@/config/networks"; import { DEFAULT_NETWORK, Networks } from "@/config/networks";
import { TokenEnum, NetworkConfig } from "@/model/NetworkEnum"
const walletAddress = ref<Address | null>(null); const walletAddress = ref<Address | null>(null);
const balance = ref(""); const balance = ref("");
const networkId = ref(parseInt(getNetworkConfig(DEFAULT_NETWORK).chainId, 16)); const network = ref(DEFAULT_NETWORK);
const networkName = ref(DEFAULT_NETWORK); const selectedToken = ref<TokenEnum>(TokenEnum.BRZ);
const selectedToken = ref(TokenEnum.BRZ);
const loadingLock = ref(false); const loadingLock = ref(false);
const sellerView = ref(false); const sellerView = ref(false);
const depositsValidList = ref<ValidDeposit[]>([]); const depositsValidList = ref<ValidDeposit[]>([]);
@@ -32,9 +31,29 @@ export function useUser() {
selectedToken.value = token; selectedToken.value = token;
}; };
const setNetworkId = (network: string | number) => { const setNetwork = (chain: NetworkConfig) => {
networkName.value = Number(network) as NetworkEnum || DEFAULT_NETWORK; network.value = chain;
networkId.value = Number(network); };
const setNetworkById = (id: string | number) => {
let chainId: number;
if (typeof id === 'string') {
// Parse hex string or number string to number
if (id.startsWith('0x')) {
chainId = parseInt(id, 16);
} else {
chainId = parseInt(id, 10);
}
} else {
chainId = id;
}
// Find network by chain ID
const chain = Object.values(Networks).find(n => n.id === chainId);
if (chain) {
network.value = chain;
}
}; };
const setLoadingLock = (isLoading: boolean) => { const setLoadingLock = (isLoading: boolean) => {
@@ -76,8 +95,7 @@ export function useUser() {
// State // State
walletAddress, walletAddress,
balance, balance,
networkId, network,
networkName,
selectedToken, selectedToken,
loadingLock, loadingLock,
sellerView, sellerView,
@@ -91,7 +109,8 @@ export function useUser() {
setWalletAddress, setWalletAddress,
setBalance, setBalance,
setSelectedToken, setSelectedToken,
setNetworkId, setNetwork,
setNetworkById,
setLoadingLock, setLoadingLock,
setSellerView, setSellerView,
setDepositsValidList, setDepositsValidList,

View File

@@ -1,103 +1,30 @@
import { NetworkEnum } from "@/model/NetworkEnum"; import { sepolia, rootstock, rootstockTestnet } from "viem/chains";
import { sepolia, rootstockTestnet, type Chain } from "viem/chains"; import { NetworkConfig } from "@/model/NetworkEnum"
// TODO: import addresses from p2pix-smart-contracts deployments
export interface NetworkConfig { export const isTestnetEnvironment = () => {
id: NetworkEnum; return import.meta.env.VITE_ENVIRONMENT === 'testnet' ||
chainId: string; import.meta.env.NODE_ENV === 'development' ||
chainName: string; import.meta.env.MODE === 'development';
token: string; };
rpcUrl: string;
blockExplorerUrl: string;
iconPath: string;
viemChain: Chain;
contracts: {
p2pixAddress: string;
tokenAddresses: Record<string, string>;
};
}
export const NETWORK_CONFIGS: Record<NetworkEnum, NetworkConfig> = { export const Networks: {[key:string]: NetworkConfig} = {
[NetworkEnum.sepolia]: { sepolia: { ...sepolia,
id: NetworkEnum.sepolia, rpcUrls: { default: { http: [import.meta.env.VITE_SEPOLIA_API_URL]}},
chainId: "0xAA36A7", contracts: { ...sepolia.contracts,
chainName: "Sepolia Testnet", p2pix: { address: import.meta.env.VITE_SEPOLIA_P2PIX_ADDRESS } },
token: "ETH", tokens: {
rpcUrl: import.meta.env.VITE_SEPOLIA_API_URL, BRZ: { address: import.meta.env.VITE_SEPOLIA_TOKEN_ADDRESS } },
blockExplorerUrl: "https://sepolia.etherscan.io", subgraphUrls: [import.meta.env.VITE_SEPOLIA_SUBGRAPH_URL]
iconPath: "/ethereum.svg",
viemChain: sepolia,
contracts: {
p2pixAddress: "0xb7cD135F5eFD9760981e02E2a898790b688939fe",
tokenAddresses: {
BRZ: "0x3eBE67A2C7bdB2081CBd34ba3281E90377462289",
},
},
}, },
[NetworkEnum.rootstock]: { rootstock: { ...(isTestnetEnvironment() ? rootstockTestnet : rootstock),
id: NetworkEnum.rootstock, rpcUrls: { default: { http: [import.meta.env.VITE_RSK_API_URL]}},
chainId: "0x1F", contracts: { ...(isTestnetEnvironment() ? rootstockTestnet.contracts : rootstock.contracts),
chainName: "Rootstock Testnet", p2pix: { address: import.meta.env.VITE_RSK_P2PIX_ADDRESS } },
token: "tRBTC", tokens: {
rpcUrl: import.meta.env.VITE_ROOTSTOCK_API_URL, BRZ: { address: import.meta.env.VITE_RSK_TOKEN_ADDRESS } },
blockExplorerUrl: "https://explorer.testnet.rsk.co", subgraphUrls: [import.meta.env.VITE_RSK_SUBGRAPH_URL]
iconPath: "/rootstock.svg",
viemChain: rootstockTestnet,
contracts: {
p2pixAddress: "0x57Dcba05980761169508886eEdc6f5E7EC0411Dc",
tokenAddresses: {
BRZ: "0xfE841c74250e57640390f46d914C88d22C51e82e",
},
},
}, },
}; };
export const DEFAULT_NETWORK = NetworkEnum.sepolia; export const DEFAULT_NETWORK = Networks.sepolia;
export const ENABLED_NETWORKS: NetworkEnum[] = [
NetworkEnum.sepolia,
NetworkEnum.rootstock,
];
export const getNetworkConfig = (networkId: NetworkEnum): NetworkConfig => {
return NETWORK_CONFIGS[networkId];
};
export const getEnabledNetworks = (): NetworkConfig[] => {
return ENABLED_NETWORKS.map(id => NETWORK_CONFIGS[id]);
};
export const isNetworkEnabled = (networkId: NetworkEnum): boolean => {
return ENABLED_NETWORKS.includes(networkId);
};
export const getNetworkByChainId = (chainId: string): NetworkConfig | null => {
const network = Object.values(NETWORK_CONFIGS).find(
config => config.chainId === chainId
);
return network || null;
};
export const getContractAddress = (
networkId: NetworkEnum,
contractType: 'p2pix' | string
): string => {
const config = getNetworkConfig(networkId);
if (contractType === 'p2pix') {
return config.contracts.p2pixAddress;
}
return config.contracts.tokenAddresses[contractType] || '';
};
export const getRpcUrl = (networkId: NetworkEnum): string => {
return getNetworkConfig(networkId).rpcUrl;
};
export const getBlockExplorerUrl = (networkId: NetworkEnum): string => {
return getNetworkConfig(networkId).blockExplorerUrl;
};
export const getViemChain = (networkId: NetworkEnum): Chain => {
return getNetworkConfig(networkId).viemChain;
};

8
src/model/AppVersion.ts Normal file
View File

@@ -0,0 +1,8 @@
export interface AppVersion {
tag: string;
ipfsHash: string;
releaseDate: string;
description?: string;
}

View File

@@ -1,18 +1,10 @@
export enum NetworkEnum { import type { Chain, ChainContract } from "viem";
sepolia = 11155111,
rootstock = 31,
}
export const getNetworkSubgraphURL = (network: NetworkEnum) => {
const networkMap: Record<NetworkEnum, string> = {
[NetworkEnum.sepolia]: import.meta.env.VITE_SEPOLIA_SUBGRAPH_URL || "",
[NetworkEnum.rootstock]: import.meta.env.VITE_RSK_SUBGRAPH_URL || "",
};
return networkMap[network] || "";
};
export enum TokenEnum { export enum TokenEnum {
BRZ = "BRZ", BRZ = 'BRZ',
// BRX = 'BRX' // BRX = 'BRX'
} }
export type NetworkConfig = Chain & {
tokens: Record<TokenEnum, ChainContract>,
subgraphUrls: string[]
};

View File

@@ -1,28 +0,0 @@
import { NetworkEnum } from "@/model/NetworkEnum";
import { getNetworkConfig } from "@/config/networks";
export interface NetworkConfig {
chainId: string;
chainName: string;
token: string;
rpcUrl?: string;
blockExplorerUrl?: string;
}
// Mapeamento para compatibilidade com código existente
export const Networks: { [key in NetworkEnum]: NetworkConfig } = {
[NetworkEnum.sepolia]: {
chainId: getNetworkConfig(NetworkEnum.sepolia).chainId,
chainName: getNetworkConfig(NetworkEnum.sepolia).chainName,
token: getNetworkConfig(NetworkEnum.sepolia).token,
rpcUrl: getNetworkConfig(NetworkEnum.sepolia).rpcUrl,
blockExplorerUrl: getNetworkConfig(NetworkEnum.sepolia).blockExplorerUrl,
},
[NetworkEnum.rootstock]: {
chainId: getNetworkConfig(NetworkEnum.rootstock).chainId,
chainName: getNetworkConfig(NetworkEnum.rootstock).chainName,
token: getNetworkConfig(NetworkEnum.rootstock).token,
rpcUrl: getNetworkConfig(NetworkEnum.rootstock).rpcUrl,
blockExplorerUrl: getNetworkConfig(NetworkEnum.rootstock).blockExplorerUrl,
},
};

View File

@@ -1,5 +1,5 @@
import { NetworkEnum } from "./NetworkEnum";
import type { Address } from "viem"; import type { Address } from "viem";
import type { NetworkConfig } from "@/model/NetworkEnum";
export type ValidDeposit = { export type ValidDeposit = {
token: Address; token: Address;
@@ -7,6 +7,6 @@ export type ValidDeposit = {
remaining: number; remaining: number;
seller: Address; seller: Address;
participantID: string; participantID: string;
network: NetworkEnum; network: NetworkConfig;
open?: boolean; open?: boolean;
}; };

View File

@@ -4,6 +4,7 @@ import type { Address } from "viem"
export type WalletTransaction = { export type WalletTransaction = {
token?: Address; token?: Address;
blockNumber: number; blockNumber: number;
blockTimestamp?: number;
amount: number; amount: number;
seller: string; seller: string;
buyer: string; buyer: string;

View File

@@ -1,11 +1,15 @@
import { createRouter, createWebHistory } from "vue-router"; import { createRouter, createWebHistory, createWebHashHistory } from "vue-router";
import HomeView from "@/views/HomeView.vue"; import HomeView from "@/views/HomeView.vue";
import FaqView from "@/views/FaqView.vue"; import FaqView from "@/views/FaqView.vue";
import ManageBidsView from "@/views/ManageBidsView.vue"; import ManageBidsView from "@/views/ManageBidsView.vue";
import SellerView from "@/views/SellerView.vue"; import SellerView from "@/views/SellerView.vue";
import ExploreView from "@/views/ExploreView.vue";
import VersionsView from "@/views/VersionsView.vue";
const router = createRouter({ const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL), history: import.meta.env.MODE === 'production' && import.meta.env.BASE_URL === './'
? createWebHashHistory()
: createWebHistory(import.meta.env.BASE_URL),
routes: [ routes: [
{ {
path: "/", path: "/",
@@ -33,6 +37,16 @@ const router = createRouter({
name: "faq", name: "faq",
component: FaqView, component: FaqView,
}, },
{
path: "/explore",
name: "explore",
component: ExploreView,
},
{
path: "/versions",
name: "versions",
component: VersionsView,
},
], ],
}); });

View File

@@ -1,30 +1,11 @@
import type { TokenEnum } from "@/model/NetworkEnum"; import type { TokenEnum } from "@/model/NetworkEnum";
import { Networks } from "@/config/networks";
export const imagesPath = import.meta.glob<string>("@/assets/*.{png,svg}", {
eager: true,
query: "?url",
import: "default",
});
export const getNetworkImage = (networkName: string): string => { export const getNetworkImage = (networkName: string): string => {
try { const normalizedName = networkName.toLowerCase().replace(/[^a-z0-9]/g, '-');
const path = Object.keys(imagesPath).find((key) => return new URL(`../assets/networks/${normalizedName}.svg`, import.meta.url).href;
key.endsWith(`${networkName.toLowerCase()}.svg`)
);
return path ? imagesPath[path] : "";
} catch (error) {
console.error("Error fetching network image");
const path = Object.keys(imagesPath).find((key) =>
key.endsWith(`invalidIcon.svg`)
);
return path ? imagesPath[path] : "";
return "";
}
}; };
export const getTokenImage = (tokenName: TokenEnum): string => { export const getTokenImage = (tokenName: TokenEnum): string => {
const path = Object.keys(imagesPath).find((key) => return new URL(`../assets/tokens/${tokenName.toLowerCase()}.svg`, import.meta.url).href;
key.endsWith(`${tokenName.toLowerCase()}.svg`)
);
return path ? imagesPath[path] : "";
}; };

30
src/utils/versions.ts Normal file
View File

@@ -0,0 +1,30 @@
import type { AppVersion } from "@/model/AppVersion";
export const appVersions: AppVersion[] = [
{
tag: "1.1.0",
ipfsHash: "bafybeiaffdxrxoex3qh7kirnkkufnvpafb4gmkt7mjxufnnpbrq6tmqoha",
releaseDate: "2025-11-06",
description: "Explorer and versioning features added"
},
{
tag: "1.0.0",
ipfsHash: "bafybeiagfqnxnb5zdrks6dicfm7kxjdtzzzzm2ouluxgdseg2hrrotayzi",
releaseDate: "2023-01-28",
description: "Initial release"
},
];
export function getLatestVersion(): AppVersion | null {
return appVersions.length > 0 ? appVersions[0] : null;
}
export function getVersionByTag(tag: string): AppVersion | null {
return appVersions.find((v) => v.tag === tag) || null;
}
export function getIpfsUrl(ipfsHash: string): string {
return `https://${ipfsHash}.ipfs.dweb.link`;
}

163
src/views/ExploreView.vue Normal file
View File

@@ -0,0 +1,163 @@
<script setup lang="ts">
import { onMounted, watch } from 'vue';
import { useUser } from '@/composables/useUser';
import { useGraphQL } from '@/composables/useGraphQL';
import FormCard from '@/components/ui/FormCard.vue';
import LoadingComponent from '@/components/ui/LoadingComponent.vue';
import AnalyticsCard from '@/components/Explorer/AnalyticsCard.vue';
import TransactionTable from '@/components/Explorer/TransactionTable.vue';
const user = useUser();
const { network } = user;
const {
searchAddress,
selectedType,
transactions,
analytics,
loading,
error,
analyticsLoading,
fetchAllActivity,
fetchUserActivity,
fetchAnalytics,
clearData
} = useGraphQL(network);
const transactionTypes = [
{ key: 'all', label: 'Todas' },
{ key: 'deposit', label: 'Depósitos' },
{ key: 'lock', label: 'Bloqueios' },
{ key: 'release', label: 'Liberações' },
{ key: 'return', label: 'Retornos' }
];
const handleTypeFilter = (type: string) => {
selectedType.value = type;
};
watch(searchAddress, async (newAddress) => {
if (newAddress.trim()) {
await fetchUserActivity(newAddress.trim());
} else {
await fetchAllActivity();
}
});
watch(network, async () => {
clearData();
await Promise.all([
fetchAllActivity(),
fetchAnalytics()
]);
}, { deep: true });
onMounted(async () => {
await Promise.all([
fetchAllActivity(),
fetchAnalytics()
]);
});
</script>
<template>
<div class="min-h-screen">
<div class="container mx-auto px-4 py-8">
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5 gap-4 mb-8">
<AnalyticsCard
title="Volume Total"
:value="analytics.totalVolume"
:loading="analyticsLoading"
/>
<AnalyticsCard
title="Total de Transações"
:value="analytics.totalTransactions"
:loading="analyticsLoading"
/>
<AnalyticsCard
title="Total de Bloqueios"
:value="analytics.totalLocks"
:loading="analyticsLoading"
/>
<AnalyticsCard
title="Total de Depósitos"
:value="analytics.totalDeposits"
:loading="analyticsLoading"
/>
<AnalyticsCard
title="Total de Liberações"
:value="analytics.totalReleases"
:loading="analyticsLoading"
/>
</div>
<!-- Search and Filters -->
<FormCard padding="lg" class="mb-6">
<div class="space-y-4">
<!-- Search Input -->
<div class="flex-1">
<input
v-model="searchAddress"
type="text"
placeholder="Buscar por endereço de carteira..."
class="w-full px-4 py-3 bg-gray-50 border border-gray-300 rounded-lg text-gray-900 placeholder-gray-500 focus:outline-none focus:ring-2 focus:ring-amber-400 focus:border-transparent"
/>
</div>
<!-- Type Filters -->
<div class="flex flex-wrap gap-2">
<button
v-for="type in transactionTypes"
:key="type.key"
@click="handleTypeFilter(type.key)"
:class="[
'px-4 py-2 rounded-lg text-sm font-medium transition-colors',
selectedType === type.key
? 'bg-amber-400 text-gray-900'
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
]"
>
{{ type.label }}
</button>
</div>
</div>
</FormCard>
<!-- Loading State -->
<div v-if="loading" class="text-center py-12">
<LoadingComponent title="Carregando transações..." />
</div>
<!-- Error State -->
<div v-else-if="error" class="text-center py-12">
<div class="text-red-600 text-lg mb-2"></div>
<p class="text-red-600 mb-2">Erro ao carregar transações</p>
<p class="text-gray-600 text-sm">{{ error }}</p>
</div>
<!-- Transactions Table -->
<FormCard v-else padding="lg">
<div class="mb-6">
<h2 class="text-xl font-semibold text-gray-900 mb-2">Transações Recentes</h2>
<p class="text-gray-600">{{ transactions.length }} transações encontradas</p>
</div>
<TransactionTable
:transactions="transactions"
:network-explorer-url="network.blockExplorers?.default.url || ''"
/>
</FormCard>
</div>
</div>
</template>
<style scoped>
.container {
max-width: 1200px;
}
</style>

View File

@@ -30,18 +30,18 @@ const openItem = (index: number) => {
<template> <template>
<div class="page"> <div class="page">
<div class="text-container"> <div class="text-container">
<span class="text font-extrabold text-5xl max-w-[50rem]" <span class="text font-extrabold sm:text-5xl text-3xl sm:max-w-[50rem] max-w-[90%]"
>Perguntas Frequentes >Perguntas Frequentes
</span> </span>
<span class="text font-medium text-base max-w-[40rem]" <span class="text font-medium sm:text-base text-sm sm:max-w-[40rem] max-w-[90%]"
>Não conseguiu uma resposta para sua dúvida? Acesse a comunidade do >Não conseguiu uma resposta para sua dúvida? Acesse a comunidade do
Discord para falar diretamente conosco.</span Discord para falar diretamente conosco.</span
> >
</div> </div>
<div class="flex justify-between w-10/12 mt-20"> <div class="faq-container">
<div> <div class="sumario-section">
<h1 class="text-3xl text-white font-bold">Sumário</h1> <h1 class="sumario-title">Sumário</h1>
<h3 <h3
:class="index == selectedSection ? 'selected-sumario' : 'sumario'" :class="index == selectedSection ? 'selected-sumario' : 'sumario'"
v-for="(f, index) in faq" v-for="(f, index) in faq"
@@ -52,7 +52,7 @@ const openItem = (index: number) => {
</h3> </h3>
</div> </div>
<div class="w-4/6"> <div class="content-section">
<div <div
v-for="(item, index) in faq[selectedSection].items" v-for="(item, index) in faq[selectedSection].items"
v-bind:key="item.title" v-bind:key="item.title"
@@ -61,16 +61,16 @@ const openItem = (index: number) => {
<img <img
alt="plus" alt="plus"
src="@/assets/plus.svg?url" src="@/assets/plus.svg?url"
class="mr-3" class="icon"
v-if="!item.isOpen" v-if="!item.isOpen"
/> />
<img <img
alt="plus" alt="minus"
src="@/assets/minus.svg?url" src="@/assets/minus.svg?url"
class="mr-3" class="icon"
v-if="item.isOpen" v-if="item.isOpen"
/> />
<h4 class="text-white">{{ item.title }}</h4> <h4 class="item-title">{{ item.title }}</h4>
</div> </div>
<div class="content" v-if="item.isOpen" v-html="item.content"></div> <div class="content" v-if="item.isOpen" v-html="item.content"></div>
<div class="hr"></div> <div class="hr"></div>
@@ -81,23 +81,52 @@ const openItem = (index: number) => {
</template> </template>
<style scoped> <style scoped>
.page {
@apply flex flex-col items-center justify-center w-full mt-8 sm:mt-16 px-4;
}
.text-container {
@apply flex flex-col items-center justify-center gap-4 mb-8 sm:mb-12;
}
.text {
@apply text-white text-center;
}
.faq-container {
@apply flex flex-col sm:flex-row sm:justify-between w-full sm:w-10/12 max-w-7xl gap-8 sm:gap-0 mt-8 sm:mt-20;
}
.sumario-section {
@apply w-full sm:w-auto sm:min-w-[200px];
}
.sumario-title {
@apply text-xl sm:text-3xl text-white font-bold mb-4 sm:mb-0;
}
.sumario { .sumario {
margin-top: 24px; @apply text-white mt-6 sm:mt-6 cursor-pointer text-sm sm:text-base;
cursor: pointer;
} }
.selected-sumario { .selected-sumario {
font-weight: bolder; @apply text-white font-bold mt-6 sm:mt-6 cursor-pointer text-sm sm:text-base;
margin-top: 24px;
cursor: pointer;
} }
.page {
@apply flex flex-col items-center justify-center w-full mt-16; .content-section {
@apply w-full sm:w-4/6;
}
.icon {
@apply mr-3 flex-shrink-0 w-5 h-5 sm:w-6 sm:h-6;
}
.item-title {
@apply text-white font-semibold text-sm sm:text-base;
} }
div.content { div.content {
padding-top: 24px; @apply pt-6 text-white text-sm sm:text-base;
color: white;
} }
.content :deep(ul) { .content :deep(ul) {
@@ -112,9 +141,12 @@ div.content {
@apply list-disc m-1 p-1; @apply list-disc m-1 p-1;
} }
.content :deep(p) {
@apply mb-2;
}
.hr { .hr {
border: 1px solid #1f2937; @apply border border-gray-700 my-6;
margin: 24px 0;
} }
h3 { h3 {
@@ -125,12 +157,4 @@ h2,
h4 { h4 {
font-weight: 600; font-weight: 600;
} }
.text-container {
@apply flex flex-col items-center justify-center gap-4;
}
.text {
@apply text-white text-center;
}
</style> </style>

View File

@@ -24,7 +24,7 @@ const user = useUser();
user.setSellerView(false); user.setSellerView(false);
// States // States
const { loadingLock, walletAddress, networkName } = user; const { loadingLock, walletAddress, network } = user;
const flowStep = ref<Step>(Step.Search); const flowStep = ref<Step>(Step.Search);
const participantID = ref<string>(); const participantID = ref<string>();
const sellerAddress = ref<Address>(); const sellerAddress = ref<Address>();
@@ -103,7 +103,7 @@ if (paramLockID) {
await checkForUnreleasedLocks(); await checkForUnreleasedLocks();
}); });
watch(networkName, async () => { watch(network, async () => {
if (walletAddress.value) await checkForUnreleasedLocks(); if (walletAddress.value) await checkForUnreleasedLocks();
}); });
} }

View File

@@ -16,7 +16,7 @@ import type { WalletTransaction } from "@/model/WalletTransaction";
import router from "@/router/index"; import router from "@/router/index";
const user = useUser(); const user = useUser();
const { walletAddress, networkName, selectedToken } = user; const { walletAddress, network, selectedToken } = user;
const loadingWithdraw = ref<boolean>(false); const loadingWithdraw = ref<boolean>(false);
const showAlert = ref<boolean>(false); const showAlert = ref<boolean>(false);
@@ -29,7 +29,9 @@ const callWithdraw = async (amount: string) => {
loadingWithdraw.value = true; loadingWithdraw.value = true;
let withdraw; let withdraw;
try { try {
withdraw = await withdrawDeposit(amount, selectedToken.value); withdraw = await withdrawDeposit(
amount,
network.value.tokens[selectedToken.value].address);
} catch { } catch {
loadingWithdraw.value = false; loadingWithdraw.value = false;
} }
@@ -79,7 +81,7 @@ watch(walletAddress, async () => {
await getWalletTransactions(); await getWalletTransactions();
}); });
watch(networkName, async () => { watch(network, async () => {
await getWalletTransactions(); await getWalletTransactions();
}); });
</script> </script>

View File

@@ -69,7 +69,7 @@ const sendNetwork = async () => {
/> />
<div v-if="flowStep == Step.Network"> <div v-if="flowStep == Step.Network">
<SendNetwork <SendNetwork
:sellerId="user.sellerId.value" :sellerId="String(user.sellerId.value)"
:offer="Number(user.seller.value.offer)" :offer="Number(user.seller.value.offer)"
:selected-token="user.selectedToken.value" :selected-token="user.selectedToken.value"
v-if="!loading" v-if="!loading"

157
src/views/VersionsView.vue Normal file
View File

@@ -0,0 +1,157 @@
<script setup lang="ts">
import { ref, onMounted } from "vue";
import { appVersions, getIpfsUrl, getLatestVersion } from "@/utils/versions";
import type { AppVersion } from "@/model/AppVersion";
const versions = ref<AppVersion[]>([]);
const latestVersion = ref<AppVersion | null>(null);
const currentVersion = __APP_VERSION__;
onMounted(() => {
versions.value = [...appVersions].sort((a, b) =>
new Date(b.releaseDate).getTime() - new Date(a.releaseDate).getTime()
);
latestVersion.value = getLatestVersion();
});
const openIpfsVersion = (ipfsHash: string) => {
const url = getIpfsUrl(ipfsHash);
window.open(url, "_blank", "noopener,noreferrer");
};
const formatDate = (dateString: string): string => {
const date = new Date(dateString);
return date.toLocaleDateString("pt-BR", {
year: "numeric",
month: "long",
day: "numeric",
});
};
</script>
<template>
<div class="page">
<div class="text-container">
<span class="text font-extrabold text-5xl max-w-[50rem]">
Versões do P2Pix
</span>
<span class="text font-medium text-base max-w-[40rem]">
Visualize todas as versões do P2Pix. Cada versão está
disponível no IPFS para acesso permanente e descentralizado.
</span>
<div v-if="currentVersion" class="mt-4">
<span class="text-gray-400 text-sm">
Versão atual: <span class="font-semibold text-white">{{ currentVersion }}</span>
</span>
</div>
</div>
<div class="versions-container">
<div
v-for="version in versions"
:key="version.tag"
class="version-card"
>
<div class="version-header">
<h3 class="version-tag">{{ version.tag }}</h3>
<span
v-if="version.tag === currentVersion"
class="current-badge"
>
Atual
</span>
</div>
<div class="version-info">
<p class="version-date">
<span class="label">Data de lançamento:</span>
{{ formatDate(version.releaseDate) }}
</p>
<p v-if="version.description" class="version-description">
{{ version.description }}
</p>
<div class="version-actions">
<button
v-if="currentVersion !== version.tag"
@click="openIpfsVersion(version.ipfsHash)"
class="ipfs-button"
>
Abrir no IPFS
</button>
</div>
</div>
</div>
<div v-if="versions.length === 0" class="empty-state">
<p class="text-gray-400">Nenhuma versão cadastrada ainda.</p>
</div>
</div>
</div>
</template>
<style scoped>
.page {
@apply flex flex-col items-center justify-center w-full mt-16 px-4;
}
.text-container {
@apply flex flex-col items-center justify-center gap-4 mb-12;
}
.text {
@apply text-white text-center;
}
.versions-container {
@apply w-full max-w-4xl space-y-4;
}
.version-card {
@apply bg-gray-800 rounded-lg p-6 border border-gray-700 hover:border-amber-500 transition-colors;
}
.version-header {
@apply flex items-center justify-between mb-4;
}
.version-tag {
@apply text-2xl font-bold text-white;
}
.current-badge {
@apply px-3 py-1 bg-amber-500 text-gray-900 text-xs font-semibold rounded-full;
}
.version-info {
@apply space-y-3;
}
.version-date {
@apply text-gray-300 text-sm;
}
.label {
@apply text-gray-400 font-medium;
}
.version-description {
@apply text-gray-300 text-sm;
}
.version-actions {
@apply flex justify-center sm:justify-start items-center gap-4 pt-2 w-full;
}
.ipfs-button {
@apply px-4 py-2 bg-amber-500 text-gray-900 font-semibold rounded hover:bg-amber-600 transition-colors text-sm;
}
.ipfs-hash {
@apply text-gray-400 text-xs font-mono break-all;
}
.empty-state {
@apply text-center py-12;
}
</style>

View File

@@ -1,15 +1,29 @@
import { fileURLToPath, URL } from "node:url"; import { fileURLToPath, URL } from "node:url";
import { execSync } from "node:child_process";
import { defineConfig } from "vite"; import { defineConfig } from "vite";
import vue from "@vitejs/plugin-vue"; import vue from "@vitejs/plugin-vue";
import vueJsx from "@vitejs/plugin-vue-jsx"; import vueJsx from "@vitejs/plugin-vue-jsx";
import svgLoader from "vite-svg-loader"; import svgLoader from "vite-svg-loader";
function getGitTag(): string {
try {
const tags = execSync("git tag --sort=-version:refname").toString().trim().split("\n");
return tags.length > 0 ? tags[0] : "unknown";
} catch (fallbackError) {
return "";
}
}
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default defineConfig({
base: "./",
build: { build: {
target: "esnext", target: "esnext",
}, },
define: {
__APP_VERSION__: JSON.stringify(getGitTag()),
},
optimizeDeps: { optimizeDeps: {
esbuildOptions: { esbuildOptions: {
target: "esnext", target: "esnext",