Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support split client and API #522

Merged
merged 1 commit into from
Jan 3, 2025
Merged

feat: support split client and API #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"eject": "react-scripts eject",
"format": "npx prettier --write src"
},
"proxy": "http://localhost:3000",
"eslintConfig": {
"extends": [
"react-app",
Expand Down
12 changes: 7 additions & 5 deletions client/src/services/claim.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import { GetDeliveredRewardsDto } from "src/entities/dto";
import { TransactionStatus } from "src/entities/koios.entities";
import { GetCustomRewards, GetRewardsDto } from "../entities/vm.entities";

const API_URL = process.env.REACT_APP_CLAIM_API || "http://localhost:3000"

export async function getRewards(
address: string,
): Promise<GetRewardsDto | undefined> {
const response = await axios.get(`/api/getrewards?address=${address}`);
const response = await axios.get(`${API_URL}/api/getrewards?address=${address}`);
if (response && response.data) {
return response.data;
}
Expand All @@ -21,7 +23,7 @@ export async function getCustomRewards(
native: boolean,
): Promise<GetCustomRewards | undefined> {
const response = await axios.get(
`/api/getcustomrewards?staking_address=${staking_address}&session_id=${session_id}&selected=${selected}&unlock=${
`${API_URL}/api/getcustomrewards?staking_address=${staking_address}&session_id=${session_id}&selected=${selected}&unlock=${
unlock ? "true" : "false"
}&native=${native ? "true" : "false"}`,
);
Expand All @@ -35,7 +37,7 @@ export async function getDeliveredRewards(
stakingAddress: string,
): Promise<GetDeliveredRewardsDto> {
const response = await axios.get(
`/api/getdeliveredrewards?staking_address=${stakingAddress}`,
`${API_URL}/api/getdeliveredrewards?staking_address=${stakingAddress}`,
);
return response.data;
}
Expand All @@ -44,7 +46,7 @@ export async function getTransactionStatus(
txHash: string,
): Promise<TransactionStatus[] | undefined> {
const response = await axios.get(
`/api/gettransactionstatus?txHash=${txHash}`,
`${API_URL}/api/gettransactionstatus?txHash=${txHash}`,
);
if (response && response.data) {
return response.data;
Expand All @@ -54,7 +56,7 @@ export async function getTransactionStatus(

export async function getTxStatus(request_id: string, session_id: string) {
const response = await axios.get(
`/api/txstatus?request_id=${request_id}&session_id=${session_id}`,
`${API_URL}/api/txstatus?request_id=${request_id}&session_id=${session_id}`,
);
return response.data;
}
34 changes: 18 additions & 16 deletions client/src/services/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,42 @@ import { Dto, GetPoolsDto, GetQueueDto } from "src/entities/dto";
import { EpochParams, Tip } from "src/entities/koios.entities";
import { ProjectData } from "src/entities/project.entities";

const API_URL = process.env.REACT_APP_CLAIM_API || "http://localhost:3000"

export async function getFeatures() {
const response = await axios.get(`/features`);
const response = await axios.get(`${API_URL}/features`);
return response.data;
}

export async function getSettings(): Promise<Dto.GetVmSettings["response"]> {
const response =
await axios.get<Dto.GetVmSettings["response"]>(`/api/getsettings`);
await axios.get<Dto.GetVmSettings["response"]>(`${API_URL}/api/getsettings`);
return response.data;
}

export async function getStakeKey(addr: string) {
if (addr.slice(0, 5) === "stake") {
return { staking_address: addr };
}
const response = await axios.get(`/api/getstakekey?address=${addr}`);
const response = await axios.get(`${API_URL}/api/getstakekey?address=${addr}`);
return response.data;
}

export async function getBlock(): Promise<{ block_no: number }> {
const response = await axios.get(`/api/getblock`);
const response = await axios.get(`${API_URL}/api/getblock`);
if (response && response.data) {
return response.data;
}
return { block_no: 0 };
}

export async function getEpochParams(): Promise<EpochParams> {
const response = await axios.get(`/api/getepochparams`);
const response = await axios.get(`${API_URL}/api/getepochparams`);
return response.data[0];
}

export async function getNetworkId(): Promise<CardanoTypes.NetworkId> {
const response = await axios.get(`/features`);
const response = await axios.get(`${API_URL}/features`);
if (response && response.data) {
if (response.data.network === "preview") {
return CardanoTypes.NetworkId.preview;
Expand All @@ -49,35 +51,35 @@ export async function getNetworkId(): Promise<CardanoTypes.NetworkId> {
}

export async function getProjects(): Promise<ProjectData[]> {
const response = await axios.get(`/api/getprojects`);
const response = await axios.get(`${API_URL}/api/getprojects`);
return response.data;
}

export async function getPopUpInfo(): Promise<PopUpInfo> {
const response = await axios.get(`/api/getpopupinfo`);
const response = await axios.get(`${API_URL}/api/getpopupinfo`);
return response.data;
}

export async function getPools(): Promise<GetPoolsDto> {
const response = await axios.get(`/api/getpools`);
const response = await axios.get(`${API_URL}/api/getpools`);
return response.data;
}

export async function getTip(): Promise<Tip> {
const response = await axios.get(`/api/gettip`);
const response = await axios.get(`${API_URL}/api/gettip`);
return response.data;
}

export async function getQueue(): Promise<GetQueueDto> {
const response = await axios.get(`/api/getqueue`);
const response = await axios.get(`${API_URL}/api/getqueue`);
return response.data;
}

export async function createStakeTx(
params: Dto.CreateDelegationTx["body"],
): Promise<Dto.CreateDelegationTx["response"]> {
const response = await axios.post<Dto.CreateDelegationTx["response"]>(
`/api/tx/delegate`,
`${API_URL}/api/tx/delegate`,
params,
);
return response.data;
Expand All @@ -87,7 +89,7 @@ export async function createTransferTx(
params: Dto.CreateTransferTx["body"],
): Promise<Dto.CreateTransferTx["response"]> {
const response = await axios.post<Dto.CreateTransferTx["response"]>(
`/api/tx/transfer`,
`${API_URL}/api/tx/transfer`,
params,
);
return response.data;
Expand All @@ -97,7 +99,7 @@ export async function submitStakeTx(
params: Dto.SubmitTx["body"],
): Promise<Dto.SubmitTx["response"]> {
const response = await axios.post<Dto.SubmitTx["response"]>(
`/api/tx/submit`,
`${API_URL}/api/tx/submit`,
params,
);
return response.data;
Expand All @@ -109,7 +111,7 @@ export async function getBech32Address({
Dto.GetBech32Address["response"]["addressInBech32"]
> {
const response = await axios.get<Dto.GetBech32Address["response"]>(
`/api/util/bech32-address?addressInHex=${addressInHex}`,
`${API_URL}/api/util/bech32-address?addressInHex=${addressInHex}`,
);
return response.data.addressInBech32;
}
Expand All @@ -118,6 +120,6 @@ export async function getBannerText(): Promise<
Dto.GetBannerText["response"]["text"]
> {
const response =
await axios.get<Dto.GetBannerText["response"]>(`/api/admin/banner`);
await axios.get<Dto.GetBannerText["response"]>(`${API_URL}/api/admin/banner`);
return response.data.text;
}
Loading