From 0a265da88403713200593c5bef3982913af0cf1c Mon Sep 17 00:00:00 2001 From: romanmyko Date: Wed, 21 Aug 2024 17:02:12 +0300 Subject: [PATCH 1/6] small card tags , avatar.png location, optimization global css --- .../header/navbar => public/img}/Avatar.png | Bin .../src/components/CompanyCard/CompanyCard.jsx | 16 ++++++++++------ .../CompanyCard/CompanyCard.module.css | 8 +++----- .../src/components/CompanyCard/variables.css | 12 ------------ .../HeaderFooter/header/navbar/Profile.jsx | 5 ++--- .../header/navbar/Profile.module.css | 2 ++ .../src/components/SearchPage/search.module.css | 11 ++++------- .../SearchPage/search_field/SearchResults.jsx | 2 +- ...Text.module.css => SearchResulys.module.css} | 2 -- .../landing-page/about-section/About.jsx | 2 ++ FrontEnd/src/global.css | 12 ++++++++++++ 11 files changed, 36 insertions(+), 36 deletions(-) rename FrontEnd/{src/components/HeaderFooter/header/navbar => public/img}/Avatar.png (100%) delete mode 100644 FrontEnd/src/components/CompanyCard/variables.css rename FrontEnd/src/components/SearchPage/search_field/{Text.module.css => SearchResulys.module.css} (90%) diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Avatar.png b/FrontEnd/public/img/Avatar.png similarity index 100% rename from FrontEnd/src/components/HeaderFooter/header/navbar/Avatar.png rename to FrontEnd/public/img/Avatar.png diff --git a/FrontEnd/src/components/CompanyCard/CompanyCard.jsx b/FrontEnd/src/components/CompanyCard/CompanyCard.jsx index ef1b66a45..b51105fa3 100644 --- a/FrontEnd/src/components/CompanyCard/CompanyCard.jsx +++ b/FrontEnd/src/components/CompanyCard/CompanyCard.jsx @@ -61,12 +61,16 @@ export default function CompanyCard({ src={profile.banner?.path} alt="Company Banner" className={styles['company-card__image']} + title="Company Banner" + loading="lazy" /> ) : ( {profile.name} )} @@ -76,27 +80,27 @@ export default function CompanyCard({ placement="bottom" pointAtCenter={true} > -
+

{activitiesSliceString} -

+

-
+

{profile.name} -

+
-
+

{profile.regions_ukr_display ? profile.regions_ukr_display.length < lengthOfRegion ? profile.regions_ukr_display : `${profile.regions_ukr_display.substring(0, 35)}...` : ''} -

+

diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css b/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css index edd196c27..e7fbd1dab 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css +++ b/FrontEnd/src/components/HeaderFooter/header/navbar/Profile.module.css @@ -5,6 +5,8 @@ } .header-profile__avatar { + width: 27px; + height: 27px; display: flex; flex-direction: column; align-items: flex-end; diff --git a/FrontEnd/src/components/SearchPage/search.module.css b/FrontEnd/src/components/SearchPage/search.module.css index 67be047b1..3eed4c45e 100644 --- a/FrontEnd/src/components/SearchPage/search.module.css +++ b/FrontEnd/src/components/SearchPage/search.module.css @@ -1,12 +1,10 @@ -@import '../CompanyCard/variables.css'; - .main_block_outer { padding-top: 10px; width: var(--main-block-size); } .new-companies-main { - background-color: var(--new-companies-main); + background-color: var(--search-new-companies-main); } .main_block { @@ -34,7 +32,7 @@ .search_result_error { font-weight: 600; - color: var(--text-color); + color: var(--search-text-color); font: normal normal bold 20px/2 Inter; margin: 145px; } @@ -74,9 +72,8 @@ .pagination button.active { background-color: none; - color: var(--pagination-style-color); - border: 1px solid var(--pagination-style-color); + color: var(--search-pagination-style-color); + border: 1px solid var(--search-pagination-style-color); border-radius: 5px; transition: background-color 0.3s, color 0.3s; } - diff --git a/FrontEnd/src/components/SearchPage/search_field/SearchResults.jsx b/FrontEnd/src/components/SearchPage/search_field/SearchResults.jsx index 1e3086cbc..f8d8adbe8 100644 --- a/FrontEnd/src/components/SearchPage/search_field/SearchResults.jsx +++ b/FrontEnd/src/components/SearchPage/search_field/SearchResults.jsx @@ -1,5 +1,5 @@ import CompanyCard from '../../CompanyCard/CompanyCard'; -import styles from './Text.module.css'; +import styles from './SearchResulys.module.css'; import PropTypes from 'prop-types'; const SearchResults = ({ diff --git a/FrontEnd/src/components/SearchPage/search_field/Text.module.css b/FrontEnd/src/components/SearchPage/search_field/SearchResulys.module.css similarity index 90% rename from FrontEnd/src/components/SearchPage/search_field/Text.module.css rename to FrontEnd/src/components/SearchPage/search_field/SearchResulys.module.css index afeecaa58..cd7c350c7 100644 --- a/FrontEnd/src/components/SearchPage/search_field/Text.module.css +++ b/FrontEnd/src/components/SearchPage/search_field/SearchResulys.module.css @@ -1,5 +1,3 @@ -@import '../../CompanyCard/variables.css'; - .new-companies-block { display: flex; width: 1412px; diff --git a/FrontEnd/src/components/landing-page/about-section/About.jsx b/FrontEnd/src/components/landing-page/about-section/About.jsx index 150b2f094..ca227a3fa 100644 --- a/FrontEnd/src/components/landing-page/about-section/About.jsx +++ b/FrontEnd/src/components/landing-page/about-section/About.jsx @@ -31,6 +31,8 @@ const MainAboutSection = () => { className="about-us-section-content__image" src={`${process.env.REACT_APP_PUBLIC_URL}/img/about.jpeg`} alt="about_img" + loading="lazy" + title="about_img" />
diff --git a/FrontEnd/src/global.css b/FrontEnd/src/global.css index c3ea254fc..730a3b100 100644 --- a/FrontEnd/src/global.css +++ b/FrontEnd/src/global.css @@ -77,4 +77,16 @@ /* main pages Banner block*/ --banner-main-font-color: #000; --banner-main-dark-color: #1F9A7C; + + /* CompanyCard */ + --companies-card-text-color: #292e32; + --companies-card-box-shadow: rgba(65, 64, 69, 0.2); + --companies-card-lover-text: #767f86; + --companies-card-address: #59636a; + --companies-card-button: green; + + --search-new-companies-main: #f1fff7; + --search-text-color: #292e32; + --search-pagination-style-color: #1f9a7c; + } \ No newline at end of file From b0412997377dfb91a8bf5e7dd27493bebc7950d6 Mon Sep 17 00:00:00 2001 From: romanmyko Date: Wed, 21 Aug 2024 18:22:24 +0300 Subject: [PATCH 2/6] footer css global, replace opentech_logo to img --- .../bottom => public/img}/opentech_logo.svg | 0 .../HeaderFooter/footer/Footer.module.css | 1 + .../footer/bottom/FooterBottom.jsx | 12 +++++++++--- .../footer/bottom/FooterBottom.module.css | 17 ++++++++--------- .../footer/top/FooterNavigation.module.css | 6 ++---- .../HeaderFooter/footer/top/FooterPolicy.jsx | 7 +++---- .../footer/top/FooterPolicy.module.css | 19 ++++++------------- .../footer/top/FooterTop.module.css | 7 +++---- FrontEnd/src/global.css | 7 +++++++ 9 files changed, 39 insertions(+), 37 deletions(-) rename FrontEnd/{src/components/HeaderFooter/footer/bottom => public/img}/opentech_logo.svg (100%) diff --git a/FrontEnd/src/components/HeaderFooter/footer/bottom/opentech_logo.svg b/FrontEnd/public/img/opentech_logo.svg similarity index 100% rename from FrontEnd/src/components/HeaderFooter/footer/bottom/opentech_logo.svg rename to FrontEnd/public/img/opentech_logo.svg diff --git a/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css b/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css index 94008bb93..b5c2da720 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css @@ -1,3 +1,4 @@ .footer-content { margin-top: auto; + width: var(--main-block-size); } \ No newline at end of file diff --git a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx b/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx index ee94b8e49..18293c998 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx +++ b/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.jsx @@ -1,11 +1,17 @@ import css from './FooterBottom.module.css'; -import logo from './opentech_logo.svg'; function FooterBottom() { return (
-
Copyright 2023 Forum. All rights reserved.
- +

+ Copyright 2023 Forum. All rights reserved. +

+ opentech_logo
); } diff --git a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css b/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css index 5f6396103..358cadde2 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css @@ -1,17 +1,15 @@ .footer-bottom { display: flex; - width: 1304px; - padding: 6px 104px; - align-items: flex-start; - gap: 864px; - - background: var(--gray-1, #333); + width: var(--main-block-size); + height: 33px; + justify-content: flex-start; + background: var(--footer-bottom-backround); } .footer-bottom__text { - color: var(--wf-base-white, #FFF); + color: var(--footer-font-color); font-feature-settings: 'calt' off; - + padding: 6px 0px 0px 104px; font-family: var(--font-main); font-size: 14px; font-style: normal; @@ -23,4 +21,5 @@ .footer-bottom-logo__svg { width: 165px; height: 20px; -} + padding-left: 55%; +} \ No newline at end of file diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.module.css b/FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.module.css index 4e2a0df73..7d7ef73e7 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/top/FooterNavigation.module.css @@ -12,10 +12,9 @@ } .navigation-content-section__text { - color: var(--main-white, #FFF); + color: var(--footer-font-color); font-feature-settings: 'calt' off; text-decoration: none; - font-family: var(--font-main); font-size: 14px; font-style: normal; @@ -25,10 +24,9 @@ } .navigation-content-section-service__text { - color: var(--main-white, #FFF); + color: var(--footer-font-color); font-feature-settings: 'calt' off; text-decoration: none; - font-family: var(--font-main); font-size: 14px; font-style: normal; diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx b/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx index 3ea38c2af..22a2cf9ff 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx +++ b/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx @@ -23,12 +23,11 @@ function FooterPolicy() { return (
craft-merge-logo + title="CraftMerge logo"> +
{POLICY_LINKS.map((element) => ( Date: Mon, 26 Aug 2024 15:12:51 +0300 Subject: [PATCH 3/6] =?UTF-8?q?ReadMore=20=D0=B0ormatted=20for=20a=20parag?= =?UTF-8?q?raph,=20adjusted=20styles=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailedInfo/ProductsServices.jsx | 10 ++++------ .../ProfileDetail/DetailedInfo/ReadMore.jsx | 6 ++++-- .../DetailedInfo/ReadMore.module.css | 2 ++ .../ProfileDetail/DetailedInfo/Startup.jsx | 2 +- .../MainInfo/ProfileDetailNavBar.jsx | 2 +- .../ProfileDetail/MainInfo/TitleInfo.jsx | 15 ++++++++------- .../ProfileDetail/MainInfo/TitleInfo.module.css | 2 +- .../FormComponents/FormFields/ImageField.jsx | 2 +- .../FormFields/ImageField.module.css | 2 +- .../WarnUnsavedDataModal.module.css | 10 +++++----- .../components/ProfilePage/ProfilePage.module.css | 2 +- .../ProfileFormButton.module.css | 2 +- FrontEnd/src/global.css | 6 ++++++ 13 files changed, 36 insertions(+), 27 deletions(-) diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ProductsServices.jsx b/FrontEnd/src/components/ProfileDetail/DetailedInfo/ProductsServices.jsx index 42a6c1fe0..f48702edd 100644 --- a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ProductsServices.jsx +++ b/FrontEnd/src/components/ProfileDetail/DetailedInfo/ProductsServices.jsx @@ -1,7 +1,5 @@ -import { useMemo } from 'react'; +import { useMemo, useEffect, useContext} from 'react'; import { PropTypes } from 'prop-types'; -import { useEffect } from 'react'; -import { useContext } from 'react'; import { ActiveLinksContext } from '../../../context/ActiveLinksContext'; import classes from './ProductsServices.module.css'; import ReadMore from './ReadMore'; @@ -28,14 +26,14 @@ function ProductsServices ({ data }) {
-

Товари / послуги

+

Товари / послуги

{profile.products &&
-

Товари

+

Товари

{profile.products} @@ -44,7 +42,7 @@ function ProductsServices ({ data }) {
} {profile.services &&
-

Послуги

+

Послуги

{profile.services} diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.jsx b/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.jsx index 9bcf780a5..769ca8847 100644 --- a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.jsx +++ b/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.jsx @@ -21,7 +21,7 @@ const ReadMore = ({ children }) => { const ellipsisSymbol = ellipsis ? ( - {ELLIPSIS_PARAMETERS.symbol} + {ELLIPSIS_PARAMETERS.symbol} ) : null; @@ -35,7 +35,9 @@ const ReadMore = ({ children }) => { : false } > - {text} +

+ {text} +

); }; diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.module.css b/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.module.css index 516cbe966..4028103b3 100644 --- a/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.module.css +++ b/FrontEnd/src/components/ProfileDetail/DetailedInfo/ReadMore.module.css @@ -10,7 +10,9 @@ cursor: pointer; } +.read-more__text, .read-more { + font-family: var(--font-main); color: var(--main-grey-90, #25292C); font-feature-settings: 'calt' off; font-family: var(--font-main); diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Startup.jsx b/FrontEnd/src/components/ProfileDetail/DetailedInfo/Startup.jsx index c256202b4..3a6f6f826 100644 --- a/FrontEnd/src/components/ProfileDetail/DetailedInfo/Startup.jsx +++ b/FrontEnd/src/components/ProfileDetail/DetailedInfo/Startup.jsx @@ -56,7 +56,7 @@ function Startup ({ data }) {
-

Стартап

+

Стартап

diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/ProfileDetailNavBar.jsx b/FrontEnd/src/components/ProfileDetail/MainInfo/ProfileDetailNavBar.jsx index 82952fc2c..808eca9b8 100644 --- a/FrontEnd/src/components/ProfileDetail/MainInfo/ProfileDetailNavBar.jsx +++ b/FrontEnd/src/components/ProfileDetail/MainInfo/ProfileDetailNavBar.jsx @@ -58,7 +58,7 @@ function ProfileDetailNavBar({ data }) { }, [navigate, hash.pathname]); return ( -
+
{Object.entries(companyType()).map( ([link, label]) => diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.jsx b/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.jsx index 52248acfc..b555f2d40 100644 --- a/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.jsx +++ b/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.jsx @@ -60,27 +60,28 @@ function TitleInfo({ isAuthorized, data }) { ) : ( Company logo )}
-
+

{profile.activities} -

+

-
+

{profile.name} -

+
-
+

{profile.regions} -

+

{isAuthorized ? ( <> diff --git a/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.module.css b/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.module.css index 3858cf2f0..6ace21f93 100644 --- a/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.module.css +++ b/FrontEnd/src/components/ProfileDetail/MainInfo/TitleInfo.module.css @@ -17,7 +17,7 @@ box-shadow: 0px 0px 2px 0px rgba(65, 64, 69, 0.2); } -.logo { +.title-block__logo { width: 40px; height: 40px; flex-shrink: 0; diff --git a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.jsx b/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.jsx index 11981835f..ed2fcbf86 100644 --- a/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.jsx +++ b/FrontEnd/src/components/ProfilePage/FormComponents/FormFields/ImageField.jsx @@ -71,7 +71,7 @@ const ImageField = ({ )}
-
+
{renderInput()} {!value && (
); diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx b/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx index 22a2cf9ff..646fb1698 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx +++ b/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.jsx @@ -25,7 +25,7 @@ function FooterPolicy() { craft-merge-logo
diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx index 27e3c9a8f..dcac62561 100644 --- a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx +++ b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx @@ -13,7 +13,7 @@ function Navbar(props) { craft-merge-logo diff --git a/FrontEnd/src/components/landing-page/about-section/About.jsx b/FrontEnd/src/components/landing-page/about-section/About.jsx index ca227a3fa..0e10ff044 100644 --- a/FrontEnd/src/components/landing-page/about-section/About.jsx +++ b/FrontEnd/src/components/landing-page/about-section/About.jsx @@ -30,9 +30,9 @@ const MainAboutSection = () => { about_img
diff --git a/FrontEnd/src/components/landing-page/banner/Banner.jsx b/FrontEnd/src/components/landing-page/banner/Banner.jsx index e45ade12d..62a8402f9 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
From 69d684c3c976db4d5b517b01f36b3861371247c1 Mon Sep 17 00:00:00 2001 From: romanmyko Date: Fri, 30 Aug 2024 15:07:03 +0300 Subject: [PATCH 5/6] New line at the end of the file. --- .../HeaderFooter/footer/bottom/FooterBottom.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css b/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css index 358cadde2..ecaeae941 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/bottom/FooterBottom.module.css @@ -22,4 +22,4 @@ width: 165px; height: 20px; padding-left: 55%; -} \ No newline at end of file +} From bbc83a19ecf7b6399a036e76d693d60e997a495c Mon Sep 17 00:00:00 2001 From: romanmyko Date: Fri, 30 Aug 2024 15:14:24 +0300 Subject: [PATCH 6/6] New line at the end of the file. --- FrontEnd/src/components/HeaderFooter/footer/Footer.module.css | 2 +- .../components/HeaderFooter/footer/short/ShortFooter.module.css | 2 +- .../components/HeaderFooter/footer/top/FooterPolicy.module.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css b/FrontEnd/src/components/HeaderFooter/footer/Footer.module.css index b5c2da720..c50bc6bd4 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); -} \ No newline at end of file +} diff --git a/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.module.css b/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.module.css index 57b6d4de7..b889c946b 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.module.css @@ -70,4 +70,4 @@ font-weight: 400; line-height: 150%; letter-spacing: -0.14px; -} \ No newline at end of file +} diff --git a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css b/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css index e4d35fbc4..e619adb06 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css +++ b/FrontEnd/src/components/HeaderFooter/footer/top/FooterPolicy.module.css @@ -28,4 +28,4 @@ .policy-content__main_logo { width: 199px; height: 24px; -} \ No newline at end of file +}