diff --git a/src/app/api/streetcode/streetcodes.api.ts b/src/app/api/streetcode/streetcodes.api.ts index 87151e58c..da9a43a0b 100644 --- a/src/app/api/streetcode/streetcodes.api.ts +++ b/src/app/api/streetcode/streetcodes.api.ts @@ -27,6 +27,10 @@ const StreetcodesApi = { getAllMainPage: () => Agent.get(`${API_ROUTES.STREETCODES.GET_ALL_MAINPAGE}`), + getPageMainPage: (page: number, pageSize: number, args: any) => Agent + .get(`${API_ROUTES.STREETCODES.GET_PAGE_MAINPAGE}`, + new URLSearchParams(Object.entries({ page: page.toString(), pageSize: pageSize.toString(), shuffleSeed: args["shuffleSeed"].toString() }))), + getAllCatalog: (page: number, count: number) => Agent .get( `${API_ROUTES.STREETCODES.GET_ALL_CATALOG}`, diff --git a/src/app/common/components/modals/Donates/DonatesModal.component.tsx b/src/app/common/components/modals/Donates/DonatesModal.component.tsx index a88acae6b..89837c163 100644 --- a/src/app/common/components/modals/Donates/DonatesModal.component.tsx +++ b/src/app/common/components/modals/Donates/DonatesModal.component.tsx @@ -74,7 +74,7 @@ const DonatesModal = () => { Promise.all([DonationApi.create(donation)]) .then((response) => { - window.location.assign(response[0].pageUrl); + window.open(response[0].pageUrl); }) .catch(); } @@ -145,7 +145,7 @@ const DonatesModal = () => { checked={isCheckboxChecked} onChange={(e) => setIsCheckboxChecked(e.target.checked)} > - Я даю згоду на обробку моїх персональних даних + Я даю згоду на обробку моїх персональних даних ) : <>} diff --git a/src/features/StreetcodePage/MainBlock/StreetcodeCard/StreetcodeCard.styles.scss b/src/features/StreetcodePage/MainBlock/StreetcodeCard/StreetcodeCard.styles.scss index 6c5924fb9..cd5582795 100644 --- a/src/features/StreetcodePage/MainBlock/StreetcodeCard/StreetcodeCard.styles.scss +++ b/src/features/StreetcodePage/MainBlock/StreetcodeCard/StreetcodeCard.styles.scss @@ -2,6 +2,7 @@ @use "@sass/variables/_variables.colors.scss" as c; @use "@sass/variables/_variables.fonts.scss" as ft; @use "@sass/_utils.functions.scss" as f; + .card { display: flex; flex-direction: row; @@ -65,10 +66,16 @@ .tagContainer{ @include mut.rem-margined(13px, 0, 13px, 0); } +.blurTop{ + @include mut.blur($edge: 0deg, $top: 9px, $height: 16px); +} +.blurBottom{ + @include mut.blur($edge: 180deg, $top: -20px, $height: 21px); +} .teaserBlock { - padding-bottom: f.pxToRem(20px); @include mut.with-font($font-weight: 300, $font-size: 20px); - @include mut.rem-margined(25px, 0px, 0px, 0px); + @include mut.rem-margined($top: 10px); + @include mut.rem-padded($top: 15px, $bottom: 15px); line-height: 23px; overflow: auto; flex-grow: 1; @@ -90,17 +97,6 @@ border-width: 3px; border-color: c.$accented-red-color; } - &:before { - content: ''; - position: absolute; - top: -25px; - left: 0; - right: 0; - height: f.pxToRem(25px); - background: linear-gradient(180deg, rgba(255,255,255,0.01) 0%, rgba(255,255,255,0.25) 5%, rgba(255,255,255,0.75) 21%); - -webkit-text-fill-color: transparent; - } - } .audioBtnActive { background-color: c.$accented-red-color; @@ -170,10 +166,14 @@ @media screen and (max-width: 1024px) { .blockCentering { @include mut.rem-padded($top: 2px, $right: 10px, $bottom: 0px, $left: 10px); + .blurTop{ + @include mut.blur($edge: 0deg, $top: 4px, $height: 11px); + } .teaserBlock { line-height: f.pxToRem(18.75px); font-size: f.pxToRem(16px); - @include mut.rem-margined(15px, 0px, 0px, 0px); + @include mut.rem-margined($top: 5px); + @include mut.rem-padded($top: 10px, $bottom: 15px); @include mut.with-font($font-weight: 300, $font-size: 16px); } .card { @@ -258,9 +258,6 @@ .cardFooter{ margin-top: f.pxToRem(39px) !important; @include mut.rem-padded(0px, 0px, 0px, 0px); - &:before { - top: -64px; - } .audioBtn{ width: 100%; } @@ -272,4 +269,14 @@ } } } -} \ No newline at end of file +} + +@media screen and (max-width: 385px) { + .blockCentering { + .card { + .leftSider { + @include mut.sized(98%, 489px); + } + } + } +} diff --git a/src/features/StreetcodePage/QRBlock/QR.component.tsx b/src/features/StreetcodePage/QRBlock/QR.component.tsx index 252e9238a..5bbde9589 100644 --- a/src/features/StreetcodePage/QRBlock/QR.component.tsx +++ b/src/features/StreetcodePage/QRBlock/QR.component.tsx @@ -28,10 +28,10 @@ const QRComponent = () => { return ( qrUrl?.url ? ( -
+
{isDesktop ? ( -
+
diff --git a/src/features/StreetcodePage/SourcesBlock/SourceItem/SourceItem.component.tsx b/src/features/StreetcodePage/SourcesBlock/SourceItem/SourceItem.component.tsx index 5774703d4..aa4ca1a71 100644 --- a/src/features/StreetcodePage/SourcesBlock/SourceItem/SourceItem.component.tsx +++ b/src/features/StreetcodePage/SourcesBlock/SourceItem/SourceItem.component.tsx @@ -1,7 +1,7 @@ -import { useState } from 'react'; import './SourceItem.styles.scss'; import { observer } from 'mobx-react-lite'; +import { useState } from 'react'; import { SourceCategory } from '@models/sources/sources.model'; import { useModalContext } from '@stores/root-store'; @@ -17,17 +17,17 @@ const SourceItem = ({ srcCategory }: Props) => { const handleMouseDown = () => { setIsDragging(false); - } + }; const handleMouseMove = () => { setIsDragging(true); - } + }; const handleMouseUp = () => { if (!isDragging) { setModal('sources', srcCategory.id, true); } - } + }; return (
{ const { streetcodeStore: { getStreetCodeId } } = useStreetcodeDataContext(); @@ -22,6 +23,7 @@ const TextComponent = () => { const { getByStreetcodeId: getText } = textsApi; const [text, setText] = useState(); const [video, setVideo] = useState