From 489bbed1e47aa148b51cbb9b174d6fad1b571d12 Mon Sep 17 00:00:00 2001 From: Lvyshnevska Date: Wed, 18 Oct 2023 18:32:56 +0200 Subject: [PATCH 1/4] main page for authorized user updated --- FrontEnd/src/components/landing-page/MainPage.jsx | 8 ++++---- FrontEnd/src/components/landing-page/banner/Banner.js | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/FrontEnd/src/components/landing-page/MainPage.jsx b/FrontEnd/src/components/landing-page/MainPage.jsx index 3a48cba69..ca6b5f461 100644 --- a/FrontEnd/src/components/landing-page/MainPage.jsx +++ b/FrontEnd/src/components/landing-page/MainPage.jsx @@ -7,16 +7,16 @@ import MainAboutSection from './about-section/About'; import CookieMod from '../cookieacception/CookieMod'; import css from './MainPage.module.css'; -const MainPage = () => { +const MainPage = (props) => { const [modalActive, setModalActive] = useState(true); return (
- +
- - + + {!props.isAuthorized ? : (null)}
{ +const MainBanner = (props) => { return (
@@ -24,6 +24,7 @@ const MainBanner = () => {
Це унікальний майданчик
для обміну інформацією і досвідом з тими, хто втілює свої ідеї в життя.
+ {!props.isAuthorized ?
Увійти @@ -31,7 +32,7 @@ const MainBanner = () => {
Зареєстуватися
-
+
: (null)}
From 8da061c9bc70186a62bd2ca4b7df5983dff8ceee Mon Sep 17 00:00:00 2001 From: Lvyshnevska Date: Wed, 18 Oct 2023 18:33:48 +0200 Subject: [PATCH 2/4] some styles fixed --- FrontEnd/src/components/landing-page/partners/Partners.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FrontEnd/src/components/landing-page/partners/Partners.css b/FrontEnd/src/components/landing-page/partners/Partners.css index 3988ba240..62bf870b3 100644 --- a/FrontEnd/src/components/landing-page/partners/Partners.css +++ b/FrontEnd/src/components/landing-page/partners/Partners.css @@ -28,6 +28,7 @@ display: flex; align-items: flex-start; gap: 12px; + z-index: 1; } .partners-section__navi-icon { display: flex; @@ -43,6 +44,7 @@ flex-shrink: 0; } .partners-section__images { + height: 70px; display: flex; justify-content: center; align-items: center; From af519ad22cc2cdbe87d66294a7c17658d3ad76c0 Mon Sep 17 00:00:00 2001 From: Lvyshnevska Date: Wed, 18 Oct 2023 18:36:46 +0200 Subject: [PATCH 3/4] redirect from signup page added for auth user --- FrontEnd/src/components/basicPage/BasicPage.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/FrontEnd/src/components/basicPage/BasicPage.jsx b/FrontEnd/src/components/basicPage/BasicPage.jsx index 71f9d1a09..0937a0f3e 100644 --- a/FrontEnd/src/components/basicPage/BasicPage.jsx +++ b/FrontEnd/src/components/basicPage/BasicPage.jsx @@ -54,7 +54,7 @@ function BasicPage() { >
- } /> + } /> } /> }/> {auth.isAuth ? ( @@ -62,7 +62,11 @@ function BasicPage() { ) : ( } /> )} - } /> + {auth.isAuth ? ( + } /> + ) : ( + } /> + )} } /> } /> } /> From b62e07c7846d8a6ed6bd88426dc436b6b1797d4f Mon Sep 17 00:00:00 2001 From: Lvyshnevska Date: Mon, 23 Oct 2023 13:35:32 +0200 Subject: [PATCH 4/4] prop types added --- FrontEnd/src/components/landing-page/banner/Banner.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/FrontEnd/src/components/landing-page/banner/Banner.js b/FrontEnd/src/components/landing-page/banner/Banner.js index 760e2048f..5041b58d4 100644 --- a/FrontEnd/src/components/landing-page/banner/Banner.js +++ b/FrontEnd/src/components/landing-page/banner/Banner.js @@ -1,6 +1,7 @@ import './Banner.css'; import Ellipses from '../ellipses/Ellipses'; import { Link } from 'react-router-dom'; +import { PropTypes } from 'prop-types'; const MainBanner = (props) => { @@ -86,4 +87,7 @@ const MainBanner = (props) => { ); }; -export default MainBanner; \ No newline at end of file +export default MainBanner; + +MainBanner.propTypes = { + isAuthorized: PropTypes.bool.isRequired};