From 51752ba5e6e88689a6f01f79cc7d60c81b5ce814 Mon Sep 17 00:00:00 2001 From: Nastya Date: Sat, 6 Jul 2024 23:20:32 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BA=D0=B0=D1=81=D1=82=D0=BE=D0=BC=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=82=D0=B0=D1=80=D0=B8=D1=84=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=B8=D1=82=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D0=B2=D0=B8=D0=BB=D0=B5=D0=B3=D0=B8=D1=8E=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=B0=D0=BD=D1=83=D0=B0=D0=BB=D0=BA=D0=B2=D0=B8?= =?UTF-8?q?=D0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/TariffConstructor/CustomTariffCard.tsx | 5 +++-- src/pages/TariffConstructor/TariffConstructor.tsx | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/TariffConstructor/CustomTariffCard.tsx b/src/pages/TariffConstructor/CustomTariffCard.tsx index 17a7928..892767c 100644 --- a/src/pages/TariffConstructor/CustomTariffCard.tsx +++ b/src/pages/TariffConstructor/CustomTariffCard.tsx @@ -78,9 +78,10 @@ export default function CustomTariffCard({ serviceKey, privileges }: Props) { gap: "25px", }} > - {privileges.map((privilege) => ( + {privileges.map((privilege) => { + if (privilege.privilegeId !== "quizManual") return ( - ))} + )})} {!upMd && ( {Object.entries(customTariffs).filter(([serviceKey]) => serviceKey === "squiz").map(([serviceKey, privileges], index) => { + console.log("privileges") + console.log(privileges) return ( Date: Wed, 10 Jul 2024 18:51:18 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=B8=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20pdf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/verification.ts | 3 ++- src/index.tsx | 5 +---- .../DocumentsDialog/DocumentUploadItem.tsx | 10 ++++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/api/verification.ts b/src/api/verification.ts index b473884..8f0007d 100644 --- a/src/api/verification.ts +++ b/src/api/verification.ts @@ -17,7 +17,8 @@ export const verification = async ( try { const verificationResponse = await makeRequest({ method: "GET", - url: `${API_URL}/${userId}`, + url: API_URL, + // url: `${API_URL}/${userId}`, useToken: true, withCredentials: true, }); diff --git a/src/index.tsx b/src/index.tsx index 992b2d2..b0c6e67 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -57,10 +57,7 @@ import AfterPay from "./pages/AfterPay"; import { PageNotFound } from "./pages/PageNotFound"; import {setNotEnoughMoneyAmount} from "@stores/cart" -pdfjs.GlobalWorkerOptions.workerSrc = new URL( - "pdfjs-dist/build/pdf.worker.min.js", - import.meta.url -).toString(); +pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js`; const App = () => { const location = useLocation(); diff --git a/src/pages/AccountSettings/DocumentsDialog/DocumentUploadItem.tsx b/src/pages/AccountSettings/DocumentsDialog/DocumentUploadItem.tsx index bf39d91..6961ce9 100644 --- a/src/pages/AccountSettings/DocumentsDialog/DocumentUploadItem.tsx +++ b/src/pages/AccountSettings/DocumentsDialog/DocumentUploadItem.tsx @@ -21,10 +21,7 @@ interface Props { accept?: string; } -pdfjs.GlobalWorkerOptions.workerSrc = new URL( - "pdfjs-dist/build/pdf.worker.min.js", - import.meta.url -).toString() +pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js`; export default function DocumentUploadItem({ text, @@ -96,7 +93,8 @@ export default function DocumentUploadItem({ multiple accept={accept} /> - + {(document.file || documentUrl) && + - + } ) }