From 6fb94e912d29e900197819b513faf5cc5fa11aa8 Mon Sep 17 00:00:00 2001 From: romanmyko Date: Mon, 16 Sep 2024 12:35:08 +0300 Subject: [PATCH 1/4] corrected syze block header and alt type --- .../HeaderFooter/header/Header.module.css | 2 +- .../HeaderFooter/header/navbar/Navbar.jsx | 22 +++++++++---------- .../header/navbar/Navbar.module.css | 21 ++++++------------ 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/FrontEnd/src/components/HeaderFooter/header/Header.module.css b/FrontEnd/src/components/HeaderFooter/header/Header.module.css index 2990c8f59..d8f8188a4 100644 --- a/FrontEnd/src/components/HeaderFooter/header/Header.module.css +++ b/FrontEnd/src/components/HeaderFooter/header/Header.module.css @@ -2,11 +2,11 @@ display: flex; flex-direction: column; align-items: flex-start; + width: var(--main-block-size); } .header-divider { width: var(--main-block-size); height: 1px; - background: var(--main-black-20, #E2E5EB); } diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx index dcac62561..c330caf6f 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx +++ b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx @@ -10,20 +10,18 @@ function Navbar(props) {
- craft merge logo + CraftMerge logo
-
- {props.page === 'login' || props.page === 'registration' ? null : ( - <> - - +
+ {props.page === 'login' || props.page === 'registration' ? null : ( + <> + + )} {props.isAuthorized === true ? : } diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css index 52bd89536..8c983b0d9 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css +++ b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css @@ -1,25 +1,18 @@ .navbar-content { display: flex; - width: 1305px; padding: 8px 104px; align-items: center; justify-content: space-between; } -/* .navbar-logo__text { - color: #292E32; - font-feature-settings: 'calt' off; - font-family: var(--font-logo); - font-size: 24px; - font-style: normal; - font-weight: 500; - line-height: 24px; - letter-spacing: -0.24px; -} */ +.navbar-logo__text{ + display: flex; +} -.navbar-logo__img { - width: 600px; - height: 400px; +.navbar-main-logo{ + display: flex; + width: 199px; + height: 24px; } .navbar-utility-bar { From f0e87d812f6932d306caeecd9cbac833d59ed698 Mon Sep 17 00:00:00 2001 From: romanmyko Date: Mon, 16 Sep 2024 16:57:52 +0300 Subject: [PATCH 2/4] corected syze block footer and alt and title --- FrontEnd/src/components/HeaderFooter/footer/Footer.jsx | 2 +- .../src/components/HeaderFooter/footer/Footer.module.css | 6 +++--- .../components/HeaderFooter/footer/bottom/FooterBottom.jsx | 2 +- .../HeaderFooter/footer/bottom/FooterBottom.module.css | 1 - .../components/HeaderFooter/footer/top/FooterNavigation.jsx | 2 +- .../src/components/HeaderFooter/footer/top/FooterPolicy.jsx | 4 ++-- .../HeaderFooter/footer/top/FooterPolicy.module.css | 2 +- .../components/HeaderFooter/footer/top/FooterTop.module.css | 1 - 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/FrontEnd/src/components/HeaderFooter/footer/Footer.jsx b/FrontEnd/src/components/HeaderFooter/footer/Footer.jsx index f3659515a..dde245bb2 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/Footer.jsx +++ b/FrontEnd/src/components/HeaderFooter/footer/Footer.jsx @@ -7,7 +7,7 @@ const UNSUITABLE_PAGES = ['login', 'register']; function Footer(props) { return ( -
+
{UNSUITABLE_PAGES.includes(props.page) ? () : (<> diff --git a/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css b/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css index c50bc6bd4..f1ae1552b 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css @@ -1,4 +1,4 @@ -.footer-content { - margin-top: auto; - width: var(--main-block-size); +.footer-content-main { + display: flex; + flex-direction: column; } diff --git a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx b/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx index d29bcc4c5..26e9dd7ce 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx +++ b/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx @@ -4,7 +4,7 @@ function FooterBottom() { return (

- Copyright 2023 Forum. All rights reserved. + Copyright 2023 CraftMerge. All rights reserved.

craft merge logo + alt="Footer craft merge logo" + title="CraftMerge">
{POLICY_LINKS.map((element) => ( diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css b/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css index e619adb06..125b64328 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css @@ -25,7 +25,7 @@ white-space: nowrap; } -.policy-content__main_logo { +.policy-content__main-logo { width: 199px; height: 24px; } diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterTop.module.css b/FrontEnd/src/components/HeaderFooter/footer/top/FooterTop.module.css index fcb64a6b8..3a25df91e 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/top/FooterTop.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/top/FooterTop.module.css @@ -1,6 +1,5 @@ .footer-top { display: flex; - width: var(--main-block-size); flex-direction: column; justify-content: center; align-items: flex-start; From 5657ce0a23e8abe5c857c321c3c9c348d8869a4a Mon Sep 17 00:00:00 2001 From: romanmyko Date: Tue, 17 Sep 2024 17:15:59 +0300 Subject: [PATCH 3/4] Correct Alt Title and replace search logo --- .../header/navbar => public/svg}/search-icon.svg | 0 .../HeaderFooter/header/navbar/Profile.jsx | 2 +- .../HeaderFooter/header/navbar/Profile.module.css | 2 +- .../HeaderFooter/header/navbar/SearchBox.jsx | 3 +-- .../HeaderFooter/header/navbar/SearchBox.module.css | 2 +- .../FormComponents/WarnUnsavedDataModal.jsx | 2 +- .../components/landing-page/about-section/About.jsx | 2 +- .../src/components/landing-page/banner/Banner.jsx | 12 ++++++------ .../components/landing-page/partners/Partners.jsx | 4 ++-- .../terms_conditions/TermsAndConditionsComponent.jsx | 1 - 10 files changed, 14 insertions(+), 16 deletions(-) rename FrontEnd/{src/components/HeaderFooter/header/navbar => public/svg}/search-icon.svg (100%) diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/search-icon.svg b/FrontEnd/public/svg/search-icon.svg similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/search-icon.svg rename to FrontEnd/public/svg/search-icon.svg diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx b/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx index f6602f39c..d9b7570d0 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx +++ b/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.jsx @@ -30,7 +30,7 @@ function Profile() { avatar diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css b/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css index e7fbd1dab..8f4b40134 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css +++ b/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css @@ -14,4 +14,4 @@ border-radius: 100px; border: 1px solid var(--main-black-20, #E2E5EB); background: var(--conditional-pop-over, #FFF) -} \ No newline at end of file +} diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.jsx b/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.jsx index 9e34e7b4d..569232de6 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.jsx +++ b/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.jsx @@ -1,5 +1,4 @@ import { useState } from 'react'; -import icon_search from './search-icon.svg'; import { useNavigate } from 'react-router-dom'; import css from './SearchBox.module.css'; @@ -36,7 +35,7 @@ function SearchBox() { className={css['header-search-form__addon']} disabled={!searchTerm.trim()} > - + Search
); diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css b/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css index 412c7a0c4..3bb402c52 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css +++ b/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css @@ -68,4 +68,4 @@ textarea:focus, .header-search-form__input:focus { border: none; outline: none; -} \ No newline at end of file +} diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx b/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx index 924a6bde3..d29959f9e 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx +++ b/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx @@ -9,7 +9,7 @@ const WarnUnsavedDataModal = ({ onCancel, onConfirm }) => { Збереження введених даних

diff --git a/FrontEnd/src/components/landing-page/about-section/About.jsx b/FrontEnd/src/components/landing-page/about-section/About.jsx index fa7ad79ef..e4340ecfd 100644 --- a/FrontEnd/src/components/landing-page/about-section/About.jsx +++ b/FrontEnd/src/components/landing-page/about-section/About.jsx @@ -33,7 +33,7 @@ const MainAboutSection = () => { src={`${process.env.REACT_APP_PUBLIC_URL}/img/about.jpeg`} alt="about img" loading="lazy" - title="about img" + title="About CarftMerge" />
diff --git a/FrontEnd/src/components/landing-page/banner/Banner.jsx b/FrontEnd/src/components/landing-page/banner/Banner.jsx index 62a8402f9..5594a4f69 100644 --- a/FrontEnd/src/components/landing-page/banner/Banner.jsx +++ b/FrontEnd/src/components/landing-page/banner/Banner.jsx @@ -49,17 +49,17 @@ const MainBanner = (props) => { banner img banner img banner img
@@ -67,7 +67,7 @@ const MainBanner = (props) => {
winemaking @@ -91,7 +91,7 @@ const MainBanner = (props) => {
cheese @@ -103,7 +103,7 @@ const MainBanner = (props) => {
delivery diff --git a/FrontEnd/src/components/landing-page/partners/Partners.jsx b/FrontEnd/src/components/landing-page/partners/Partners.jsx index db5666171..9744f4f58 100644 --- a/FrontEnd/src/components/landing-page/partners/Partners.jsx +++ b/FrontEnd/src/components/landing-page/partners/Partners.jsx @@ -8,12 +8,12 @@ const MainPartners = () => {
- + Left
- + Right
diff --git a/FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.jsx b/FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.jsx index f6c307b0c..30bfbd015 100644 --- a/FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.jsx +++ b/FrontEnd/src/components/terms-and-conditions-app/terms_conditions/TermsAndConditionsComponent.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import styles from './TermsAndConditionsComponent.module.css'; import TermsAndConditionsText from './text'; import TEXT_CONTENT from './text'; From 2fa0f1fa182b5fc8554257083bbf23f264390998 Mon Sep 17 00:00:00 2001 From: romanmyko Date: Fri, 20 Sep 2024 15:18:24 +0300 Subject: [PATCH 4/4] alt text v1.1 --- .../ProfilePage/FormComponents/WarnUnsavedDataModal.jsx | 2 +- FrontEnd/src/components/landing-page/partners/Partners.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx b/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx index d29959f9e..93249ba0d 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx +++ b/FrontEnd/src/components/ProfilePage/FormComponents/WarnUnsavedDataModal.jsx @@ -9,7 +9,7 @@ const WarnUnsavedDataModal = ({ onCancel, onConfirm }) => { Збереження введених даних

diff --git a/FrontEnd/src/components/landing-page/partners/Partners.jsx b/FrontEnd/src/components/landing-page/partners/Partners.jsx index 9744f4f58..f2042874a 100644 --- a/FrontEnd/src/components/landing-page/partners/Partners.jsx +++ b/FrontEnd/src/components/landing-page/partners/Partners.jsx @@ -8,12 +8,12 @@ const MainPartners = () => {
- Left + Left navigation
- Right + Right navigation