gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/merge-conflict' into 'develop'

Browse Source 
fix: merge conflict

See merge request witapp/aura-webapp!61
This commit is contained in:
Victor Ershov 2024-03-24 21:34:52 +00:00
commit ba080d3d4e
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/resources/SinglePayment.ts
View File

@ -5,9 +5,7 @@ interface Payload {
token: string; token: string;
} }
export interface PayloadGet extends Payload { export type PayloadGet = Payload;
id: string;
}
export interface PayloadPost extends Payload { export interface PayloadPost extends Payload {
data: { data: {
@ -75,8 +73,7 @@ export const createRequestPost = ({ data, token }: PayloadPost): Request => {
}); });
}; };
export const createRequestGet = ({ id, token }: PayloadGet): Request => { export const createRequestGet = ({ token }: PayloadGet): Request => {
id;
const url = new URL(routes.server.dApiTestPaymentProducts()); const url = new URL(routes.server.dApiTestPaymentProducts());
return new Request(url, { method: "GET", headers: getAuthHeaders(token) }); return new Request(url, { method: "GET", headers: getAuthHeaders(token) });
}; };

1
src/components/pages/PaymentWithEmailPage/index.tsx
View File

@ -117,7 +117,6 @@ function PaymentWithEmailPage() {
console.log(token); console.log(token);
const productsSinglePayment = await api.getSinglePaymentProducts({ const productsSinglePayment = await api.getSinglePaymentProducts({
id: "1",
token, token,
}); });
const { productId } = productsSinglePayment[0]; const { productId } = productsSinglePayment[0];

1
src/routes.ts
View File

@ -7,7 +7,6 @@ export const apiHost = "https://api-web.aura.wit.life";
const dApiHost = isProduction ? "https://d.api.witapps.us" : "https://dev.api.witapps.us" const dApiHost = isProduction ? "https://d.api.witapps.us" : "https://dev.api.witapps.us"
const siteHost = "https://aura.wit.life"; const siteHost = "https://aura.wit.life";
const prefix = "api/v1"; const prefix = "api/v1";
const dApiHost = "https://dev.api.witapps.us";
const routes = { const routes = {
client: { client: {