From 2881022b2d9cdb5ce49d70bf528edceea678426b Mon Sep 17 00:00:00 2001 From: Tamara Date: Wed, 17 Jan 2024 22:22:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=BE=D0=B1=D0=B8=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=BD=D0=B0=20=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3=D0=B5,=20=D1=81=D1=81?= =?UTF-8?q?=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20+=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth.ts | 7 +-- src/api/cart.ts | 5 +-- src/api/history.ts | 2 +- src/api/price.ts | 2 +- src/api/recentlyPurchasedTariffs.ts | 2 +- src/api/tariff.ts | 2 +- src/api/ticket.ts | 5 +-- src/api/user.ts | 5 +-- src/api/verification.ts | 5 +-- src/api/wallet.ts | 5 +-- src/components/DropDownMenu.jsx | 1 + src/components/FloatingSupportChat/Chat.tsx | 6 +-- src/components/Footer.tsx | 4 +- src/components/Menu.tsx | 3 +- src/components/NavbarLanding/DialogMenu.tsx | 47 +++++++++++++++++++-- src/components/ProtectedLayout.tsx | 4 +- src/docs/content/PrivacyPolicy.js | 10 ++--- src/index.tsx | 4 +- src/pages/History/index.tsx | 2 +- src/pages/Support/CreateTicket.tsx | 2 +- src/pages/Support/SupportChat.tsx | 4 +- 21 files changed, 75 insertions(+), 52 deletions(-) diff --git a/src/api/auth.ts b/src/api/auth.ts index 526fe66..024c94c 100644 --- a/src/api/auth.ts +++ b/src/api/auth.ts @@ -9,11 +9,8 @@ import type { RegisterResponse, } from "@frontend/kitui" -const apiUrl = - process.env.NODE_ENV === "production" - ? "/auth" - : "https://hub.pena.digital/auth" - +const apiUrl = "https://" + process.env.REACT_APP_DOMAIN + "/auth" +console.log("переменная", apiUrl) export async function register( login: string, password: string, diff --git a/src/api/cart.ts b/src/api/cart.ts index e7dd9bb..7db5e89 100644 --- a/src/api/cart.ts +++ b/src/api/cart.ts @@ -3,10 +3,7 @@ import { AxiosError } from "axios" import { parseAxiosError } from "@root/utils/parse-error" -const apiUrl = - process.env.NODE_ENV === "production" - ? "/customer" - : "https://hub.pena.digital/customer" +const apiUrl = "https://" + process.env.REACT_APP_DOMAIN + "/customer" export async function patchCart( tariffId: string diff --git a/src/api/history.ts b/src/api/history.ts index 243c6f4..6b66e1a 100644 --- a/src/api/history.ts +++ b/src/api/history.ts @@ -28,7 +28,7 @@ const regList:Record = { export async function getHistory(): Promise<[GetHistoryResponse | null, string?]> { try { const historyResponse = await makeRequest({ - url: "https://hub.pena.digital/customer/history?page=1&limit=100&type=payCart", + url: "https://" + process.env.REACT_APP_DOMAIN + "/customer/history?page=1&limit=100&type=payCart", method: "get", useToken: true, }) diff --git a/src/api/price.ts b/src/api/price.ts index a8a3b41..2fdeb5e 100644 --- a/src/api/price.ts +++ b/src/api/price.ts @@ -4,7 +4,7 @@ import { parseAxiosError } from "@root/utils/parse-error" import type { GetDiscountsResponse } from "@root/model/discount" -const apiUrl = process.env.NODE_ENV === "production" ? "/price" : "https://hub.pena.digital/price" +const apiUrl = "https://" + process.env.REACT_APP_DOMAIN + "/price" export async function getDiscounts(signal: AbortSignal | undefined): Promise<[GetDiscountsResponse | null, string?]> { try { diff --git a/src/api/recentlyPurchasedTariffs.ts b/src/api/recentlyPurchasedTariffs.ts index b3405af..1d19de1 100644 --- a/src/api/recentlyPurchasedTariffs.ts +++ b/src/api/recentlyPurchasedTariffs.ts @@ -4,7 +4,7 @@ import { parseAxiosError } from "@root/utils/parse-error" export async function getRecentlyPurchasedTariffs(): Promise<[any | null, string?]> { try { const recentlyPurchased = await makeRequest({ - url: "https://hub.pena.digital/customer/recent", + url: "https://" + process.env.REACT_APP_DOMAIN + "/customer/recent", method: "get", useToken: true, }) diff --git a/src/api/tariff.ts b/src/api/tariff.ts index d20887f..64daa8c 100644 --- a/src/api/tariff.ts +++ b/src/api/tariff.ts @@ -5,7 +5,7 @@ import { parseAxiosError } from "@root/utils/parse-error" import type { ServiceKeyToPrivilegesMap } from "@root/model/privilege" import type { GetTariffsResponse } from "@root/model/tariff" -const apiUrl = process.env.NODE_ENV === "production" ? "/strator" : "https://hub.pena.digital/strator" +const apiUrl = "https://" + process.env.REACT_APP_DOMAIN + "/strator" export async function getTariffs( apiPage: number, diff --git a/src/api/ticket.ts b/src/api/ticket.ts index 6fbffef..01a9d1d 100644 --- a/src/api/ticket.ts +++ b/src/api/ticket.ts @@ -3,10 +3,7 @@ import { parseAxiosError } from "@root/utils/parse-error" import { SendTicketMessageRequest } from "@frontend/kitui" -const apiUrl = - process.env.NODE_ENV === "production" - ? "/heruvym" - : "https://hub.pena.digital/heruvym" +const apiUrl = "https://" + process.env.REACT_APP_DOMAIN + "/heruvym" export async function sendTicketMessage( ticketId: string, diff --git a/src/api/user.ts b/src/api/user.ts index ed0e8ba..2cd4121 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -2,10 +2,7 @@ import { User, makeRequest } from "@frontend/kitui" import { PatchUserRequest } from "@root/model/user" import { parseAxiosError } from "@root/utils/parse-error" -const apiUrl = - process.env.NODE_ENV === "production" - ? "/user" - : "https://hub.pena.digital/user" +const apiUrl = "https://" + process.env.REACT_APP_DOMAIN + "/user" export async function patchUser( user: PatchUserRequest diff --git a/src/api/verification.ts b/src/api/verification.ts index 5873415..75b8fd9 100644 --- a/src/api/verification.ts +++ b/src/api/verification.ts @@ -9,10 +9,7 @@ import type { UpdateDocumentsArgs, } from "@root/model/auth" -const apiUrl = - process.env.NODE_ENV === "production" - ? "/verification" - : "https://hub.pena.digital/verification" +const apiUrl = "https://" + process.env.REACT_APP_DOMAIN + "/verification" export async function verification( userId: string diff --git a/src/api/wallet.ts b/src/api/wallet.ts index 74859dc..56be29e 100644 --- a/src/api/wallet.ts +++ b/src/api/wallet.ts @@ -2,10 +2,7 @@ import { makeRequest } from "@frontend/kitui" import { SendPaymentRequest, SendPaymentResponse } from "@root/model/wallet" import { parseAxiosError } from "@root/utils/parse-error" -const apiUrl = - process.env.NODE_ENV === "production" - ? "/customer" - : "https://hub.pena.digital/customer" +const apiUrl = "https://" + process.env.REACT_APP_DOMAIN + "/customer" const testPaymentBody: SendPaymentRequest = { type: "bankCard", diff --git a/src/components/DropDownMenu.jsx b/src/components/DropDownMenu.jsx index 1fb09f6..6a75ec3 100644 --- a/src/components/DropDownMenu.jsx +++ b/src/components/DropDownMenu.jsx @@ -48,6 +48,7 @@ export const DropDownMenu = ({ anchorElement, setAnchorElement, items = [] }: Dr transition: ".2s", }} to={url} + target="_blank" > {name} (null) useTicketMessages({ - url: "https://hub.pena.digital/heruvym/getMessages", + url: "https://" + process.env.REACT_APP_DOMAIN + "/heruvym/getMessages", isUnauth: true, ticketId: sessionData?.ticketId, messagesPerPage, @@ -81,7 +81,7 @@ export default function Chat({ sx }: Props) { useSSESubscription({ enabled: Boolean(sessionData), - url: `https://hub.pena.digital/heruvym/ticket?ticket=${sessionData?.ticketId}&s=${sessionData?.sessionId}`, + url: "https://" + process.env.REACT_APP_DOMAIN + `/heruvym/ticket?ticket=${sessionData?.ticketId}&s=${sessionData?.sessionId}`, onNewData: addOrUpdateUnauthMessages, onDisconnect: useCallback(() => { setUnauthIsPreventAutoscroll(false) @@ -131,7 +131,7 @@ export default function Chat({ sx }: Props) { if (!sessionData) { setIsMessageSending(true) createTicket({ - url: "https://hub.pena.digital/heruvym/create", + url: "https://" + process.env.REACT_APP_DOMAIN + "/heruvym/create", body: { Title: "Unauth title", Message: messageField, diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 4093308..ca60675 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -57,10 +57,10 @@ export default function Footer() { }, }} > - + - + {/* diff --git a/src/components/Menu.tsx b/src/components/Menu.tsx index c617891..3ac2987 100644 --- a/src/components/Menu.tsx +++ b/src/components/Menu.tsx @@ -25,7 +25,7 @@ export default function Menu() { { name: "Наши продукты", url: "/faq", - subMenu: [{ name: "PenaQuiz", url: "https://squiz.pena.digital" }], + subMenu: [{ name: "PenaQuiz", url: "https://quiz.pena.digital" }], }, { name: "Наши услуги", @@ -100,6 +100,7 @@ export default function Menu() { alignItems: "center", }} to={url} + target="_blank" onMouseEnter={() => setActiveSubMenu(subMenu)} state={{ previousUrl: location.pathname }} > diff --git a/src/components/NavbarLanding/DialogMenu.tsx b/src/components/NavbarLanding/DialogMenu.tsx index 6fef7fc..01260ed 100644 --- a/src/components/NavbarLanding/DialogMenu.tsx +++ b/src/components/NavbarLanding/DialogMenu.tsx @@ -64,6 +64,7 @@ export default function DialogMenu({ open, handleClose }: DialogMenuProps) { const cash = useUserStore((state) => state.userAccount?.wallet.cash) ?? 0; const [subMenuOpen, setSubMenuOpen] = useState(false); + const [subMenuProdOpen, setSubMenuProdOpen] = useState(false) const isMobileHeight = useMediaQuery("(max-height: 400px)"); @@ -104,7 +105,7 @@ export default function DialogMenu({ open, handleClose }: DialogMenuProps) { + + {subMenuProdOpen ? + + : null + } + + diff --git a/src/components/ProtectedLayout.tsx b/src/components/ProtectedLayout.tsx index 60515a1..4065f90 100644 --- a/src/components/ProtectedLayout.tsx +++ b/src/components/ProtectedLayout.tsx @@ -25,7 +25,7 @@ export default function ProtectedLayout() { const ticketsPerPage = useTicketStore((state) => state.ticketsPerPage) useSSESubscription({ - url: `https://hub.pena.digital/heruvym/subscribe?Authorization=${token}`, + url: "https://" + process.env.REACT_APP_DOMAIN + `/heruvym/subscribe?Authorization=${token}`, onNewData: (data) => { updateTickets(data.filter((d) => Boolean(d.id))) setTicketCount(data.length) @@ -34,7 +34,7 @@ export default function ProtectedLayout() { }) useTicketsFetcher({ - url: "https://hub.pena.digital/heruvym/getTickets", + url: "https://" + process.env.REACT_APP_DOMAIN + "/heruvym/getTickets", ticketsPerPage, ticketApiPage, onSuccess: (result) => { diff --git a/src/docs/content/PrivacyPolicy.js b/src/docs/content/PrivacyPolicy.js index 7c18a24..664d6b4 100644 --- a/src/docs/content/PrivacyPolicy.js +++ b/src/docs/content/PrivacyPolicy.js @@ -30,7 +30,7 @@ export default () => ( Настоящая политика обработки персональных данных составлена в соответствии с требованиями Федерального закона от 27.07.2006. № 152-ФЗ «О персональных данных» (далее — Закон о персональных данных) и определяет порядок обработки персональных данных и меры по обеспечению безопасности персональных данных, - предпринимаемые ООО "Пена") (далее — Оператор). + предпринимаемые ООО "ПЕНА") (далее — Оператор). @@ -41,7 +41,7 @@ export default () => ( 1.2. Настоящая политика Оператора в отношении обработки персональных данных (далее — Политика) применяется - ко всей информации, которую Оператор может получить о посетителях веб-сайта https://quiz.pena.digital. + ко всей информации, которую Оператор может получить о посетителях веб-сайта https://pena.digital. @@ -60,7 +60,7 @@ export default () => ( 2.3. Веб-сайт — совокупность графических и информационных материалов, а также программ для ЭВМ и баз данных, - обеспечивающих их доступность в сети интернет по сетевому адресу https://quiz.pena.digital. + обеспечивающих их доступность в сети интернет по сетевому адресу https://pena.digital. @@ -91,7 +91,7 @@ export default () => ( 2.8. Персональные данные — любая информация, относящаяся прямо или косвенно к определенному или определяемому - Пользователю веб-сайта https://quiz.pena.digital. + Пользователю веб-сайта https://pena.digital. @@ -102,7 +102,7 @@ export default () => ( - 2.10. Пользователь — любой посетитель веб-сайта https://quiz.pena.digital. + 2.10. Пользователь — любой посетитель веб-сайта https://pena.digital. diff --git a/src/index.tsx b/src/index.tsx index 15eb433..e453dd1 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -39,7 +39,7 @@ const App = () => { const navigate = useNavigate() useUserFetcher({ - url: `https://hub.pena.digital/user/${userId}`, + url: "https://" + process.env.REACT_APP_DOMAIN + `/user/${userId}`, userId, onNewUser: setUser, onError: (error) => { @@ -53,7 +53,7 @@ const App = () => { }) useUserAccountFetcher({ - url: "https://hub.pena.digital/customer/account", + url: "https://" + process.env.REACT_APP_DOMAIN + "/customer/account", userId, onNewUserAccount: setUserAccount, onError: (error) => { diff --git a/src/pages/History/index.tsx b/src/pages/History/index.tsx index 48e0b58..eb66c78 100644 --- a/src/pages/History/index.tsx +++ b/src/pages/History/index.tsx @@ -40,7 +40,7 @@ export default function History() { try { await makeRequest ( { - url: `https://hub.pena.digital/customer/sendReport/${tariffId}`, + url: "https://" + process.env.REACT_APP_DOMAIN + `/customer/sendReport/${tariffId}`, method: "POST", } ) diff --git a/src/pages/Support/CreateTicket.tsx b/src/pages/Support/CreateTicket.tsx index cd4699b..0c31f89 100644 --- a/src/pages/Support/CreateTicket.tsx +++ b/src/pages/Support/CreateTicket.tsx @@ -17,7 +17,7 @@ export default function CreateTicket() { if (!ticketBodyField || !ticketNameField) return createTicket({ - url: "https://hub.pena.digital/heruvym/create", + url: "https://" + process.env.REACT_APP_DOMAIN + "/heruvym/create", body: { Title: ticketNameField, Message: ticketBodyField, diff --git a/src/pages/Support/SupportChat.tsx b/src/pages/Support/SupportChat.tsx index 812f0e6..03e5c07 100644 --- a/src/pages/Support/SupportChat.tsx +++ b/src/pages/Support/SupportChat.tsx @@ -58,7 +58,7 @@ function SupportChat() { const fetchState = useMessageStore((state) => state.ticketMessageFetchState) useTicketMessages({ - url: "https://hub.pena.digital/heruvym/getMessages", + url: "https://" + process.env.REACT_APP_DOMAIN + "/heruvym/getMessages", ticketId, messagesPerPage, messageApiPage, @@ -76,7 +76,7 @@ function SupportChat() { useSSESubscription({ enabled: Boolean(token) && Boolean(ticketId), - url: `https://hub.pena.digital/heruvym/ticket?ticket=${ticketId}&Authorization=${token}`, + url: "https://" + process.env.REACT_APP_DOMAIN + `/heruvym/ticket?ticket=${ticketId}&Authorization=${token}`, onNewData: addOrUpdateMessages, onDisconnect: useCallback(() => { clearMessageState()