From a879e5e5e736cccc15f1878f00657ecd78d947a4 Mon Sep 17 00:00:00 2001 From: egortriston Date: Sun, 29 Jun 2025 21:45:30 +0300 Subject: [PATCH] all fixes --- src/components/Layout.tsx | 2 +- .../profile/LegalEntityListBlock.tsx | 40 +++++++----- src/components/profile/ProfileAddressCard.tsx | 50 ++++++++++++--- src/components/profile/ProfileBalanceCard.tsx | 4 +- src/components/profile/ProfileGarageMain.tsx | 58 ++++++++++++----- src/components/profile/ProfileHistoryItem.tsx | 31 +++++----- src/components/profile/ProfileHistoryMain.tsx | 4 +- src/components/profile/ProfileHistoryTabs.tsx | 2 +- .../profile/ProfileSettingsActionsBlock.tsx | 2 +- src/pages/profile-acts.tsx | 4 +- src/styles/my.css | 28 +++++++++ src/styles/protekproject.webflow.css | 62 +++++++++++++------ 12 files changed, 209 insertions(+), 78 deletions(-) diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx index 43b40e2..f2b79ba 100644 --- a/src/components/Layout.tsx +++ b/src/components/Layout.tsx @@ -30,7 +30,7 @@ const Layout = ({ children }: { children: React.ReactNode }) => { onSuccess={handleAuthSuccess} /> -
{children}
+
{children}
setAuthModalOpen(true)} /> ); diff --git a/src/components/profile/LegalEntityListBlock.tsx b/src/components/profile/LegalEntityListBlock.tsx index 8e15e14..6fb2a74 100644 --- a/src/components/profile/LegalEntityListBlock.tsx +++ b/src/components/profile/LegalEntityListBlock.tsx @@ -110,7 +110,7 @@ const LegalEntityListBlock: React.FC = ({ legalEntiti
router.push('/profile-requisites')} @@ -130,7 +130,7 @@ const LegalEntityListBlock: React.FC = ({ legalEntiti
Реквизиты компании
@@ -141,8 +141,9 @@ const LegalEntityListBlock: React.FC = ({ legalEntiti
onEdit && onEdit(entity)} + aria-label="Редактировать юридическое лицо" >
= ({ legalEntiti className="absolute left-0.5 top-0" />
-
+
Редактировать
handleDelete(entity.id, entity.shortName)} + onKeyDown={e => (e.key === 'Enter' || e.key === ' ') && handleDelete(entity.id, entity.shortName)} + style={{ display: 'inline-flex', cursor: 'pointer', transition: 'color 0.2s' }} + onMouseEnter={e => { + const path = e.currentTarget.querySelector('path'); + if (path) path.setAttribute('fill', '#ec1c24'); + }} + onMouseLeave={e => { + const path = e.currentTarget.querySelector('path'); + if (path) path.setAttribute('fill', '#D0D0D0'); + }} > -
- Удалить +
+ + +
-
+
Удалить
diff --git a/src/components/profile/ProfileAddressCard.tsx b/src/components/profile/ProfileAddressCard.tsx index 3e8b5d6..0ce1280 100644 --- a/src/components/profile/ProfileAddressCard.tsx +++ b/src/components/profile/ProfileAddressCard.tsx @@ -52,14 +52,50 @@ const ProfileAddressCard: React.FC = ({
)} -
-
- edit -
Редактировать
+
+
(e.key === 'Enter' || e.key === ' ') && onEdit && onEdit()} + onMouseEnter={e => { + const svg = (e.currentTarget as HTMLElement).querySelector('img'); + if (svg) (svg as HTMLImageElement).style.filter = 'invert(32%) sepia(97%) saturate(7490%) hue-rotate(355deg) brightness(97%) contrast(108%)'; + }} + onMouseLeave={e => { + const svg = (e.currentTarget as HTMLElement).querySelector('img'); + if (svg) (svg as HTMLImageElement).style.filter = ''; + }} + > + edit +
Редактировать
-
- delete -
Удалить
+
(e.key === 'Enter' || e.key === ' ') && onDelete && onDelete()} + onMouseEnter={e => { + const path = e.currentTarget.querySelector('path'); + if (path) path.setAttribute('fill', '#ec1c24'); + }} + onMouseLeave={e => { + const path = e.currentTarget.querySelector('path'); + if (path) path.setAttribute('fill', '#D0D0D0'); + }} + > + + + +
Удалить
{onSelectMain && ( diff --git a/src/components/profile/ProfileBalanceCard.tsx b/src/components/profile/ProfileBalanceCard.tsx index ef039c0..d2085a1 100644 --- a/src/components/profile/ProfileBalanceCard.tsx +++ b/src/components/profile/ProfileBalanceCard.tsx @@ -89,11 +89,11 @@ const ProfileBalanceCard: React.FC = ({ {balance}
-
+
Лимит отсрочки
-
+
{limit}
{limitLeft.includes('Не установлен') ? limitLeft : `Осталось ${limitLeft}`} diff --git a/src/components/profile/ProfileGarageMain.tsx b/src/components/profile/ProfileGarageMain.tsx index c898b53..f99eacc 100644 --- a/src/components/profile/ProfileGarageMain.tsx +++ b/src/components/profile/ProfileGarageMain.tsx @@ -179,7 +179,7 @@ const ProfileGarageMain = () => { {!vehiclesLoading && filteredVehicles.map((vehicle) => (
-
+
@@ -203,15 +203,29 @@ const ProfileGarageMain = () => {
@@ -418,15 +432,29 @@ const ProfileGarageMain = () => {
diff --git a/src/components/profile/ProfileHistoryItem.tsx b/src/components/profile/ProfileHistoryItem.tsx index 662ae7b..c2bac90 100644 --- a/src/components/profile/ProfileHistoryItem.tsx +++ b/src/components/profile/ProfileHistoryItem.tsx @@ -80,24 +80,25 @@ const ProfileHistoryItem: React.FC = ({
diff --git a/src/components/profile/ProfileHistoryMain.tsx b/src/components/profile/ProfileHistoryMain.tsx index 7e31885..5a96f22 100644 --- a/src/components/profile/ProfileHistoryMain.tsx +++ b/src/components/profile/ProfileHistoryMain.tsx @@ -272,7 +272,7 @@ const ProfileHistoryMain = () => { return (
-
+
{ placeholder="Поиск в истории..." />
-
+
{(selectedManufacturer !== "Все" || search.trim() || activeTab !== "Все") && (
))}
diff --git a/src/components/profile/ProfileSettingsActionsBlock.tsx b/src/components/profile/ProfileSettingsActionsBlock.tsx index e7576d2..30e4953 100644 --- a/src/components/profile/ProfileSettingsActionsBlock.tsx +++ b/src/components/profile/ProfileSettingsActionsBlock.tsx @@ -10,7 +10,7 @@ const ProfileSettingsActionsBlock: React.FC = Сохранить изменения
- Добавить юридическое лицо + Добавить юр лицо
); diff --git a/src/pages/profile-acts.tsx b/src/pages/profile-acts.tsx index f5f318b..73ecfc8 100644 --- a/src/pages/profile-acts.tsx +++ b/src/pages/profile-acts.tsx @@ -58,7 +58,7 @@ const ProfileActsPage = () => { ); } return ( -
+ <> ProfileActs @@ -78,7 +78,7 @@ const ProfileActsPage = () => {
+ ); }; diff --git a/src/styles/my.css b/src/styles/my.css index 2dce3d4..3948d63 100644 --- a/src/styles/my.css +++ b/src/styles/my.css @@ -430,4 +430,32 @@ input#VinSearchInput { text-overflow: ellipsis; max-height: 2.8em; line-height: 1.4em; +} + + +@media (max-width: 767px) { + .w-layout-hflex.flex-block-6 { + flex-direction: column !important; + } + @media (max-width: 767px) { + .div-block-12, + .div-block-12.small, + .div-block-12-copy, + .div-block-12-copy.small, + .div-block-123, + .div-block-123.small, + .div-block-red, + .div-block-red.small { + width: 100% !important; + max-width: 100% !important; + } + } +} +@media (max-width: 767px) { + .flex-block-6 { + grid-template-columns: 1fr !important; + grid-template-rows: none !important; + grid-template-areas: none !important; + grid-auto-flow: row !important; /* <--- ВАЖНО! */ + } } \ No newline at end of file diff --git a/src/styles/protekproject.webflow.css b/src/styles/protekproject.webflow.css index d16faf3..db68418 100644 --- a/src/styles/protekproject.webflow.css +++ b/src/styles/protekproject.webflow.css @@ -787,6 +787,8 @@ .w-layout-blockcontainer { max-width: 728px; } + + } @media screen and (max-width: 767px) { @@ -794,6 +796,8 @@ max-width: none; } + + .w-commerce-commercelayoutcontainer { flex-direction: column; align-items: stretch; @@ -4024,6 +4028,7 @@ body { position: relative; } + .button-for-mobile-menu-block:hover { background-color: var(--_button---hover-dark_blue); } @@ -5426,10 +5431,10 @@ body { margin-left: 0; margin-right: 0; } - - .topmenuh { +/* + .bottom_head { margin-top: 0; - } + } */ .flex-block-4 { grid-column-gap: 40px; @@ -5579,6 +5584,8 @@ body { background-color: var(--white); } + + .button-for-mobile-menu-block { padding-left: 20px; padding-right: 20px; @@ -5680,9 +5687,9 @@ body { margin-top: 12px; } - .topmenub { + /* .bottom_head { margin-top: 0; - } + } */ .vinleftbar { width: 320px; @@ -6082,7 +6089,7 @@ body { padding-bottom: 40px; } - .top_head, .topmenuh { + .top_head, .bottom_head { padding-left: 30px; padding-right: 30px; } @@ -6882,7 +6889,7 @@ body { margin-left: 0; } - .topmenub { + .bottom_head { padding-left: 30px; padding-right: 30px; } @@ -7543,8 +7550,9 @@ body { } .flex-block-18-copy-copy { - grid-column-gap: 10px; - grid-row-gap: 10px; + grid-column-gap: 40px; + grid-row-gap: 40px; + flex-flow: column; } .link-block-4-copy { @@ -7602,8 +7610,9 @@ body { } .flex-block-87 { - grid-column-gap: 0px; - grid-row-gap: 0px; + grid-column-gap: 10px; + grid-row-gap: 10px; + flex: 1; } .mobile-menu-bottom { @@ -7627,10 +7636,16 @@ body { } .button-for-mobile-menu-block { - grid-column-gap: 0px; - grid-row-gap: 0px; - width: 60px; - padding-bottom: 5px; + grid-column-gap: 2px; + grid-row-gap: 2px; + background-color: var(--_fonts---color--white); + color: var(--_button---light-blue-grey); + flex-flow: column; + width: 70px; + } + + .button-for-mobile-menu-block:hover { + background-color: var(--_button---light-blue); } .section-3 { @@ -7643,7 +7658,8 @@ body { } .flex-block-93 { - margin-left: 0; + align-self: auto; + min-height: 48px; } .sort-list-card { @@ -7882,6 +7898,10 @@ body { .container-copy.footer { padding-bottom: 90px; } + + .mobile-menu-buttom-section { + display: block; + } } @media screen and (max-width: 479px) { @@ -7951,7 +7971,7 @@ body { grid-row-gap: 15px; } - .top_head, .topmenuh { + .top_head, .bottom_head { padding-left: 15px; padding-right: 15px; } @@ -9132,7 +9152,7 @@ body { top: 58px; } - .topmenub { + .bottom_head { padding-left: 15px; padding-right: 15px; } @@ -9400,6 +9420,12 @@ body { #w-node-_35f55517-cbe0-9ee3-13bb-a3ed00029bba-00029ba8, #w-node-_35f55517-cbe0-9ee3-13bb-a3ed00029bc7-00029ba8 { justify-self: stretch; } + .button-for-mobile-menu-block { + grid-column-gap: 0px; + grid-row-gap: 0px; + width: 60px; + padding-bottom: 5px; + } } .flex-block-113 {