Merge branch 'dev' into 'main'

process.env.REACT_APP_DOMAIN

See merge request frontend/admin!50

.env.development.local

@@ -0,0 +1 @@
+REACT_APP_DOMAIN="https://sadmin.pena"

.env.production.local

@@ -0,0 +1 @@
+REACT_APP_DOMAIN="https://sadmin.pena"

.gitignore

@@ -14,9 +14,7 @@
 
 .DS_Store
 .env.local
-.env.development.local
 .env.test.local
-.env.production.local
 
 npm-debug.log*
 yarn-debug.log*

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");
 

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,

src/api/account.ts

@@ -30,10 +30,7 @@ export type Account = {
   wallet: Wallet;
 };
 
-const baseUrl =
+const baseUrl = process.env.REACT_APP_DOMAIN + "/customer"
-  process.env.NODE_ENV === "production"
-    ? "/customer"
-    : "https://admin.pena.digital/customer";
 
 export const getAccountInfo = async (
   id: string

src/api/auth.ts

@@ -8,10 +8,7 @@ import type {
   RegisterResponse,
 } from "@frontend/kitui";
 
-const baseUrl =
+const baseUrl = process.env.REACT_APP_DOMAIN + "/auth"
-  process.env.NODE_ENV === "production"
-    ? "/auth"
-    : "https://admin.pena.digital/auth";
 
 export const signin = async (
   login: string,

src/api/discounts.ts

@@ -9,10 +9,7 @@ import type {
   GetDiscountResponse,
 } from "@root/model/discount";
 
-const baseUrl =
+const baseUrl = process.env.REACT_APP_DOMAIN + "/price"
-  process.env.NODE_ENV === "production"
-    ? "/price"
-    : "https://admin.pena.digital/price";
 
 interface CreateDiscountParams {
   purchasesAmount: number;

src/api/privilegies.ts

@@ -10,10 +10,7 @@ type SeverPrivilegesResponse = {
   squiz: PrivilegeWithAmount[];
 };
 
-const baseUrl =
+const baseUrl = process.env.REACT_APP_DOMAIN + "/strator"
-  process.env.NODE_ENV === "production"
-    ? "/strator"
-    : "https://admin.pena.digital/strator";
 
 export const getRoles = async (): Promise<[TMockData | null, string?]> => {
   try {

src/api/roles.ts

@@ -35,10 +35,7 @@ export type UserType = {
   updatedAt: string;
 };
 
-const baseUrl =
+const baseUrl =process.env.REACT_APP_DOMAIN + "/role"
-  process.env.NODE_ENV === "production"
-    ? "/role"
-    : "https://admin.pena.digital/role";
 
 export const getRoles_mock = (): Promise<TMockData> => {
   return new Promise((resolve) => {

src/api/tariffs.ts

@@ -20,10 +20,7 @@ type GetTariffsResponse = {
   tariffs: Tariff[];
 };
 
-const baseUrl =
+const baseUrl =process.env.REACT_APP_DOMAIN + "/strator"
-  process.env.NODE_ENV === "production"
-    ? "/strator"
-    : "https://admin.pena.digital/strator";
 
 export const createTariff = async (
   body: CreateTariffBackendRequest

src/api/tickets.ts

@@ -4,10 +4,7 @@ import { parseAxiosError } from "@root/utils/parse-error";
 
 import type { SendTicketMessageRequest } from "@root/model/ticket";
 
-const baseUrl =
+const baseUrl = process.env.REACT_APP_DOMAIN + "/heruvym"
-  process.env.NODE_ENV === "production"
-    ? "/heruvym"
-    : "https://admin.pena.digital/heruvym";
 
 export const sendTicketMessage = async (
   body: SendTicketMessageRequest

src/api/user.ts

@@ -9,10 +9,7 @@ type RegisteredUsersResponse = {
   users: UserType[];
 };
 
-const baseUrl =
+const baseUrl = process.env.REACT_APP_DOMAIN + "/user";
-  process.env.NODE_ENV === "production"
-    ? "/user"
-    : "https://admin.pena.digital/user";
 
 export const getUserInfo = async (
   id: string

src/api/verification.ts

@@ -25,10 +25,7 @@ type PatchVerificationBody = {
   taxnumber?: string;
 };
 
-const baseUrl =
+const baseUrl = process.env.REACT_APP_DOMAIN + "/verification"
-  process.env.NODE_ENV === "production"
-    ? "/verification"
-    : "https://admin.pena.digital/verification";
 
 export const verification = async (
   userId: string

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("Ошибка при получение роли пользавателя");

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<TicketMessage>({
         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();

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<Ticket>({
         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();

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}
     });