From 3a81c3c327182f831ae5ba11c92686e3206e7ad4 Mon Sep 17 00:00:00 2001 From: romanmyko Date: Thu, 31 Oct 2024 15:14:47 +0200 Subject: [PATCH] rename main baner to JoinUs block --- FrontEnd/src/global.css | 18 ++++++------- .../src/pages/LandingPage/JoinUs/JoinUs.jsx | 25 +++++++++++++++++++ .../JoinUs.module.css} | 24 +++++++++--------- .../LandingPage/LoginBanner/LoginBanner.jsx | 25 ------------------- FrontEnd/src/pages/LandingPage/MainPage.jsx | 24 +++++++----------- .../src/pages/LandingPage/MainPage.module.css | 10 -------- 6 files changed, 53 insertions(+), 73 deletions(-) create mode 100644 FrontEnd/src/pages/LandingPage/JoinUs/JoinUs.jsx rename FrontEnd/src/pages/LandingPage/{LoginBanner/LoginBanner.module.css => JoinUs/JoinUs.module.css} (70%) delete mode 100644 FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.jsx diff --git a/FrontEnd/src/global.css b/FrontEnd/src/global.css index 996efb1c..7cf43db3 100644 --- a/FrontEnd/src/global.css +++ b/FrontEnd/src/global.css @@ -77,26 +77,24 @@ /* Footer */ --footer-backround: #3C4044; --footer-font-color: #FFF; - --footer-links-font-color: #FFF; + --footer-links-font-color: #A0ABC0; --footer-bottom-backround: #333; - --footer-policy-links-font-color: #959595; - --footer-scroll-button: #B4D27A; - /* main pages About block*/ --about-text-font-color: #292E32; --about-text-background-color: #FFF; - --about-as-font-color: #FFF; --about-as-background-color: #0B6C61; - --about-cards-font-color: #292E32; --about-cards-background-color: #F0F1F3; --about-cards-background-content-color: #FFF; /* main pages Banner block*/ --banner-main-font-color: #000; - --banner-main-color: #B4D27A; - --banner-main-batton-text-color: #FFF; - --banner-main-batton-color: black; + --banner-main-dark-color: #1F9A7C; + /* main pages JoinUs block*/ + --join-us-batton-color: black; + --join-us-main-color: #B4D27A; + --join-us-font-color: black; + --join-us-batton-text-color: white; /* CompanyCard */ --companies-card-text-color: #292e32; --companies-card-box-shadow: rgba(65, 64, 69, 0.2); @@ -115,8 +113,6 @@ --primary-green-80: #1f9a7c; --character-title-85: rgba(0, 0, 0, 0.85); - /*Login Page*/ - --min-height-login-page: calc(100vh - 528px); --wf-base-white: #FFF; --profile-min-height-block: calc(100vh - 565px); diff --git a/FrontEnd/src/pages/LandingPage/JoinUs/JoinUs.jsx b/FrontEnd/src/pages/LandingPage/JoinUs/JoinUs.jsx new file mode 100644 index 00000000..0bf3d17e --- /dev/null +++ b/FrontEnd/src/pages/LandingPage/JoinUs/JoinUs.jsx @@ -0,0 +1,25 @@ +import css from './JoinUs.module.css'; +import { Link } from 'react-router-dom'; + +const JoinUs = () => { + return ( +
+
+

+ Майданчик для тих, хто втілює свої ідеї в життя +

+
+ + Долучитися + +
+
+
+ ); +}; + +export default JoinUs; diff --git a/FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.module.css b/FrontEnd/src/pages/LandingPage/JoinUs/JoinUs.module.css similarity index 70% rename from FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.module.css rename to FrontEnd/src/pages/LandingPage/JoinUs/JoinUs.module.css index c1025d08..e3d426c3 100644 --- a/FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.module.css +++ b/FrontEnd/src/pages/LandingPage/JoinUs/JoinUs.module.css @@ -1,11 +1,11 @@ -.login-banner-group { +.join-us { display: flex; - background: var(--banner-main-color); + background: var(--join-us-main-color); width: 100vw; justify-content: center; } -.login-banner-group__content { +.join-us__content { display: flex; flex-direction: column; justify-content: center; @@ -15,8 +15,8 @@ } -.login-banner-group__text { - color: var(--banner-main-font-color, black); +.join-us__text { + color: var(--join-us-font-color, black); font-feature-settings: 'calt' off; font-family: var(--font-main); font-size: 24px; @@ -27,16 +27,16 @@ text-align: center; } -.login-banner-group__button { +.join-us__button { display: flex; justify-content: center; } -.login-banner-group__button-text { +.join-us__button-text { display: flex; justify-content: center; align-items: center; - color: var(--banner-main-batton-text-color, white); + color: var(--join-us-batton-text-color, white); font-feature-settings: 'calt' off; font-family: var(--font-main); font-size: 16px; @@ -48,24 +48,24 @@ text-align: center; width: 170px; height: 46px; - background: var(--banner-main-batton-color, black); + background: var(--join-us-batton-color, black); border-radius: 4px; } @media only screen and (min-width: 768px) { - .login-banner-group__content { + .join-us__content { width: 694px; height: 262px; } - .login-banner-group__text { + .join-us__text { font-size: 40px; line-height: 48px; } } @media only screen and (min-width: 1512px) { - .login-banner-group__content { + .join-us__content { height: 326px; } } diff --git a/FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.jsx b/FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.jsx deleted file mode 100644 index b6e27202..00000000 --- a/FrontEnd/src/pages/LandingPage/LoginBanner/LoginBanner.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import css from './LoginBanner.module.css'; -import { Link } from 'react-router-dom'; - -const MainLoginBanner = () => { - return ( -
-
-

- Майданчик для тих, хто втілює свої ідеї в життя -

-
- - Долучитися - -
-
-
- ); -}; - -export default MainLoginBanner; diff --git a/FrontEnd/src/pages/LandingPage/MainPage.jsx b/FrontEnd/src/pages/LandingPage/MainPage.jsx index edc5cccd..5cdf613c 100644 --- a/FrontEnd/src/pages/LandingPage/MainPage.jsx +++ b/FrontEnd/src/pages/LandingPage/MainPage.jsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import MainBanner from './Banner/Banner'; import MainCompanies from './Companies/Companies'; -import MainLoginBanner from './LoginBanner/LoginBanner'; +import JoinUs from './JoinUs/JoinUs'; import MainAboutSection from './AboutSection/About'; import CookieMod from '../../components/CookieAcception/CookieMod'; import css from './MainPage.module.css'; @@ -14,20 +14,14 @@ const MainPage = ({ isAuthorized }) => { const [modalActive, setModalActive] = useState(true); return (
-
- -
- - {!isAuthorized ? : null} - -
- -
-
-
+ + + {!isAuthorized ? : null} + +
); }; diff --git a/FrontEnd/src/pages/LandingPage/MainPage.module.css b/FrontEnd/src/pages/LandingPage/MainPage.module.css index 22a69226..c585079d 100644 --- a/FrontEnd/src/pages/LandingPage/MainPage.module.css +++ b/FrontEnd/src/pages/LandingPage/MainPage.module.css @@ -1,13 +1,3 @@ .main-app { - width: 100vw; -} - -.main-app-body { - display: flex; - flex-direction: column; -} - -.main-app-header { - display: flex; flex-direction: column; }