diff --git a/.env.development.local b/.env.development.local new file mode 100644 index 0000000..71abd43 --- /dev/null +++ b/.env.development.local @@ -0,0 +1 @@ +REACT_APP_DOMAIN="https://sadmin.pena" \ No newline at end of file diff --git a/.env.production.local b/.env.production.local new file mode 100644 index 0000000..71abd43 --- /dev/null +++ b/.env.production.local @@ -0,0 +1 @@ +REACT_APP_DOMAIN="https://sadmin.pena" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 6363e17..d850905 100644 --- a/.gitignore +++ b/.gitignore @@ -14,9 +14,7 @@ .DS_Store .env.local -.env.development.local .env.test.local -.env.production.local npm-debug.log* yarn-debug.log* diff --git a/cypress/e2e/access.cy.ts b/cypress/e2e/access.cy.ts index 8a6724f..9ad87fa 100644 --- a/cypress/e2e/access.cy.ts +++ b/cypress/e2e/access.cy.ts @@ -100,7 +100,7 @@ describe("Форма регистрации", () => { cy.get('input[name="password"]').type(password); cy.get('input[name="repeatPassword"]').type(password); - cy.intercept("POST", "https://admin.pena.digital/auth/register").as("registerRequest"); + cy.intercept("POST", process.env.REACT_APP_DOMAIN + "/auth/register").as("registerRequest"); cy.get('button[type="submit"]').click(); cy.wait("@registerRequest"); diff --git a/src/__tests__/tickets.test.ts b/src/__tests__/tickets.test.ts index a526bf6..78847cb 100644 --- a/src/__tests__/tickets.test.ts +++ b/src/__tests__/tickets.test.ts @@ -10,7 +10,7 @@ describe("tests", () => { beforeEach(async () => { await axios({ method: "post", - url: "https://admin.pena.digital/heruvym/getTickets", + url: process.env.REACT_APP_DOMAIN + "/heruvym/getTickets", data: { amt: 20, page: 0, @@ -23,7 +23,7 @@ describe("tests", () => { await axios({ method: "post", - url: "https://admin.pena.digital/heruvym/getMessages", + url: process.env.REACT_APP_DOMAIN + "/heruvym/getMessages", data: { amt: 100, page: 0, diff --git a/src/api/account.ts b/src/api/account.ts index 34b74fc..a4c495a 100644 --- a/src/api/account.ts +++ b/src/api/account.ts @@ -30,10 +30,7 @@ export type Account = { wallet: Wallet; }; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/customer" - : "https://admin.pena.digital/customer"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/customer" export const getAccountInfo = async ( id: string diff --git a/src/api/auth.ts b/src/api/auth.ts index b878ad3..2cf1134 100644 --- a/src/api/auth.ts +++ b/src/api/auth.ts @@ -8,10 +8,7 @@ import type { RegisterResponse, } from "@frontend/kitui"; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/auth" - : "https://admin.pena.digital/auth"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/auth" export const signin = async ( login: string, diff --git a/src/api/discounts.ts b/src/api/discounts.ts index 82ecf01..068f8f0 100644 --- a/src/api/discounts.ts +++ b/src/api/discounts.ts @@ -9,10 +9,7 @@ import type { GetDiscountResponse, } from "@root/model/discount"; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/price" - : "https://admin.pena.digital/price"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/price" interface CreateDiscountParams { purchasesAmount: number; diff --git a/src/api/privilegies.ts b/src/api/privilegies.ts index f0acef2..cc87faa 100644 --- a/src/api/privilegies.ts +++ b/src/api/privilegies.ts @@ -10,10 +10,7 @@ type SeverPrivilegesResponse = { squiz: PrivilegeWithAmount[]; }; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/strator" - : "https://admin.pena.digital/strator"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/strator" export const getRoles = async (): Promise<[TMockData | null, string?]> => { try { diff --git a/src/api/roles.ts b/src/api/roles.ts index 366c178..ea3b0cc 100644 --- a/src/api/roles.ts +++ b/src/api/roles.ts @@ -35,10 +35,7 @@ export type UserType = { updatedAt: string; }; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/role" - : "https://admin.pena.digital/role"; +const baseUrl =process.env.REACT_APP_DOMAIN + "/role" export const getRoles_mock = (): Promise => { return new Promise((resolve) => { diff --git a/src/api/tariffs.ts b/src/api/tariffs.ts index d0cc3fc..475b783 100644 --- a/src/api/tariffs.ts +++ b/src/api/tariffs.ts @@ -20,10 +20,7 @@ type GetTariffsResponse = { tariffs: Tariff[]; }; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/strator" - : "https://admin.pena.digital/strator"; +const baseUrl =process.env.REACT_APP_DOMAIN + "/strator" export const createTariff = async ( body: CreateTariffBackendRequest diff --git a/src/api/tickets.ts b/src/api/tickets.ts index 769ae89..ffebe05 100644 --- a/src/api/tickets.ts +++ b/src/api/tickets.ts @@ -4,10 +4,7 @@ import { parseAxiosError } from "@root/utils/parse-error"; import type { SendTicketMessageRequest } from "@root/model/ticket"; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/heruvym" - : "https://admin.pena.digital/heruvym"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/heruvym" export const sendTicketMessage = async ( body: SendTicketMessageRequest diff --git a/src/api/user.ts b/src/api/user.ts index 873bd74..aa6be3b 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -9,10 +9,7 @@ type RegisteredUsersResponse = { users: UserType[]; }; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/user" - : "https://admin.pena.digital/user"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/user"; export const getUserInfo = async ( id: string diff --git a/src/api/verification.ts b/src/api/verification.ts index 08a56f2..4c14d9d 100644 --- a/src/api/verification.ts +++ b/src/api/verification.ts @@ -25,10 +25,7 @@ type PatchVerificationBody = { taxnumber?: string; }; -const baseUrl = - process.env.NODE_ENV === "production" - ? "/verification" - : "https://admin.pena.digital/verification"; +const baseUrl = process.env.REACT_APP_DOMAIN + "/verification" export const verification = async ( userId: string diff --git a/src/pages/Setting/ConditionalRender.tsx b/src/pages/Setting/ConditionalRender.tsx index 8fec820..c9f1919 100644 --- a/src/pages/Setting/ConditionalRender.tsx +++ b/src/pages/Setting/ConditionalRender.tsx @@ -20,7 +20,7 @@ const ConditionalRender = ({ // useEffect(() => { // const axiosAccount = async () => { // try { - // const { data } = await axios.get("https://admin.pena.digital/user/643e23f3dba63ba17272664d"); + // const { data } = await axios.get(process.env.REACT_APP_DOMAIN + "/user/643e23f3dba63ba17272664d"); // setRole(data.role); // } catch (error) { // console.error("Ошибка при получение роли пользавателя"); diff --git a/src/pages/dashboard/Content/Support/Chat/Chat.tsx b/src/pages/dashboard/Content/Support/Chat/Chat.tsx index 8dd5cca..ce6b471 100644 --- a/src/pages/dashboard/Content/Support/Chat/Chat.tsx +++ b/src/pages/dashboard/Content/Support/Chat/Chat.tsx @@ -30,7 +30,7 @@ export default function Chat() { const ticket = tickets.find(ticket => ticket.id === ticketId); useTicketMessages({ - url: "https://admin.pena.digital/heruvym/getMessages", + url: process.env.REACT_APP_DOMAIN + "/heruvym/getMessages", ticketId, messagesPerPage, messageApiPage, @@ -47,7 +47,7 @@ export default function Chat() { useSSESubscription({ enabled: Boolean(token) && Boolean(ticketId), - url: `https://admin.pena.digital/heruvym/ticket?ticket=${ticketId}&Authorization=${token}`, + url: process.env.REACT_APP_DOMAIN + `/heruvym/ticket?ticket=${ticketId}&Authorization=${token}`, onNewData: addOrUpdateMessages, onDisconnect: () => { clearMessageState(); diff --git a/src/pages/dashboard/Content/Support/Support.tsx b/src/pages/dashboard/Content/Support/Support.tsx index 2bed321..ab376c1 100644 --- a/src/pages/dashboard/Content/Support/Support.tsx +++ b/src/pages/dashboard/Content/Support/Support.tsx @@ -16,7 +16,7 @@ export default function Support() { const token = useToken(); useTicketsFetcher({ - url: "https://admin.pena.digital/heruvym/getTickets", + url: process.env.REACT_APP_DOMAIN + "/heruvym/getTickets", ticketsPerPage, ticketApiPage, onSuccess: result => { @@ -31,7 +31,7 @@ export default function Support() { useSSESubscription({ enabled: Boolean(token), - url: `https://admin.pena.digital/heruvym/subscribe?Authorization=${token}`, + url: process.env.REACT_APP_DOMAIN + `/heruvym/subscribe?Authorization=${token}`, onNewData: updateTickets, onDisconnect: () => { clearMessageState(); diff --git a/src/pages/dashboard/ModalUser/VerificationTab.tsx b/src/pages/dashboard/ModalUser/VerificationTab.tsx index 261437c..ffe8048 100644 --- a/src/pages/dashboard/ModalUser/VerificationTab.tsx +++ b/src/pages/dashboard/ModalUser/VerificationTab.tsx @@ -65,7 +65,7 @@ export const VerificationTab = ({ userId }: VerificationTabProps) => { if (accepted && _ === "OK") await makeRequest({ method: "patch", useToken: true, - url: `https://admin.pena.digital/customer/account/${userId}`, + url: process.env.REACT_APP_DOMAIN + `/customer/account/${userId}`, body: {status: verificationInfo.status} });