Merge branch 'dev' into 'staging'
Dev See merge request frontend/marketplace!210
This commit is contained in:
commit
eaef10b643
@ -17,7 +17,8 @@ export const verification = async (
|
||||
try {
|
||||
const verificationResponse = await makeRequest<never, Verification>({
|
||||
method: "GET",
|
||||
url: `${API_URL}/${userId}`,
|
||||
url: API_URL,
|
||||
// url: `${API_URL}/${userId}`,
|
||||
useToken: true,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
@ -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();
|
||||
|
@ -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={document.file || (documentUrl && { url: documentUrl })}>
|
||||
{(document.file || documentUrl) &&
|
||||
<Document file={document.file || documentUrl}>
|
||||
<Page
|
||||
pageNumber={1}
|
||||
width={200}
|
||||
@ -104,7 +102,7 @@ export default function DocumentUploadItem({
|
||||
renderAnnotationLayer={false}
|
||||
onClick={downloadFile}
|
||||
/>
|
||||
</Document>
|
||||
</Document>}
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
|
@ -78,9 +78,10 @@ export default function CustomTariffCard({ serviceKey, privileges }: Props) {
|
||||
gap: "25px",
|
||||
}}
|
||||
>
|
||||
{privileges.map((privilege) => (
|
||||
{privileges.map((privilege) => {
|
||||
if (privilege.privilegeId !== "quizManual") return (
|
||||
<TariffPrivilegeSlider key={privilege._id} privilege={privilege} />
|
||||
))}
|
||||
)})}
|
||||
</Box>
|
||||
{!upMd && (
|
||||
<Divider
|
||||
|
@ -42,6 +42,8 @@ function TariffConstructor() {
|
||||
}}
|
||||
>
|
||||
{Object.entries(customTariffs).filter(([serviceKey]) => serviceKey === "squiz").map(([serviceKey, privileges], index) => {
|
||||
console.log("privileges")
|
||||
console.log(privileges)
|
||||
return (
|
||||
<Box key={serviceKey}>
|
||||
<Box
|
||||
|
Loading…
Reference in New Issue
Block a user