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 {
|
try {
|
||||||
const verificationResponse = await makeRequest<never, Verification>({
|
const verificationResponse = await makeRequest<never, Verification>({
|
||||||
method: "GET",
|
method: "GET",
|
||||||
url: `${API_URL}/${userId}`,
|
url: API_URL,
|
||||||
|
// url: `${API_URL}/${userId}`,
|
||||||
useToken: true,
|
useToken: true,
|
||||||
withCredentials: true,
|
withCredentials: true,
|
||||||
});
|
});
|
||||||
|
@ -57,10 +57,7 @@ import AfterPay from "./pages/AfterPay";
|
|||||||
import { PageNotFound } from "./pages/PageNotFound";
|
import { PageNotFound } from "./pages/PageNotFound";
|
||||||
import {setNotEnoughMoneyAmount} from "@stores/cart"
|
import {setNotEnoughMoneyAmount} from "@stores/cart"
|
||||||
|
|
||||||
pdfjs.GlobalWorkerOptions.workerSrc = new URL(
|
pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js`;
|
||||||
"pdfjs-dist/build/pdf.worker.min.js",
|
|
||||||
import.meta.url
|
|
||||||
).toString();
|
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
|
@ -21,10 +21,7 @@ interface Props {
|
|||||||
accept?: string;
|
accept?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
pdfjs.GlobalWorkerOptions.workerSrc = new URL(
|
pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js`;
|
||||||
"pdfjs-dist/build/pdf.worker.min.js",
|
|
||||||
import.meta.url
|
|
||||||
).toString()
|
|
||||||
|
|
||||||
export default function DocumentUploadItem({
|
export default function DocumentUploadItem({
|
||||||
text,
|
text,
|
||||||
@ -96,7 +93,8 @@ export default function DocumentUploadItem({
|
|||||||
multiple
|
multiple
|
||||||
accept={accept}
|
accept={accept}
|
||||||
/>
|
/>
|
||||||
<Document file={document.file || (documentUrl && { url: documentUrl })}>
|
{(document.file || documentUrl) &&
|
||||||
|
<Document file={document.file || documentUrl}>
|
||||||
<Page
|
<Page
|
||||||
pageNumber={1}
|
pageNumber={1}
|
||||||
width={200}
|
width={200}
|
||||||
@ -104,7 +102,7 @@ export default function DocumentUploadItem({
|
|||||||
renderAnnotationLayer={false}
|
renderAnnotationLayer={false}
|
||||||
onClick={downloadFile}
|
onClick={downloadFile}
|
||||||
/>
|
/>
|
||||||
</Document>
|
</Document>}
|
||||||
</Box>
|
</Box>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -78,9 +78,10 @@ export default function CustomTariffCard({ serviceKey, privileges }: Props) {
|
|||||||
gap: "25px",
|
gap: "25px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{privileges.map((privilege) => (
|
{privileges.map((privilege) => {
|
||||||
|
if (privilege.privilegeId !== "quizManual") return (
|
||||||
<TariffPrivilegeSlider key={privilege._id} privilege={privilege} />
|
<TariffPrivilegeSlider key={privilege._id} privilege={privilege} />
|
||||||
))}
|
)})}
|
||||||
</Box>
|
</Box>
|
||||||
{!upMd && (
|
{!upMd && (
|
||||||
<Divider
|
<Divider
|
||||||
|
@ -42,6 +42,8 @@ function TariffConstructor() {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{Object.entries(customTariffs).filter(([serviceKey]) => serviceKey === "squiz").map(([serviceKey, privileges], index) => {
|
{Object.entries(customTariffs).filter(([serviceKey]) => serviceKey === "squiz").map(([serviceKey, privileges], index) => {
|
||||||
|
console.log("privileges")
|
||||||
|
console.log(privileges)
|
||||||
return (
|
return (
|
||||||
<Box key={serviceKey}>
|
<Box key={serviceKey}>
|
||||||
<Box
|
<Box
|
||||||
|
Loading…
Reference in New Issue
Block a user