Merge pull request #274 from ita-social-projects/#272-UpdateMainPageL…

…ayout #272 update main page layout
ita-social-projects · Oct 23, 2023 · 62f312d · 62f312d
2 parents f95c32b + b62e07c
commit 62f312d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/FrontEnd/src/components/basicPage/BasicPage.jsx b/FrontEnd/src/components/basicPage/BasicPage.jsx
@@ -54,7 +54,7 @@ function BasicPage() {
     >
       <Header isAuthorized={auth.isAuth} />
       <Routes>
-        <Route path="/" element={<MainPage />} />
+        <Route path="/" element={<MainPage isAuthorized={auth.isAuth}/>} />
         <Route path="/profile/*" element={<ProfilePage />} />
         <Route
           path="/profiles/:filter"
@@ -65,7 +65,11 @@ function BasicPage() {
         ) : (
           <Route path="/login" element={<AuthorizationPage />} />
         )}
-        <Route path="/sign-up" element={<SignUpPage />} />
+        {auth.isAuth ? (
+          <Route path="/sign-up" element={<Navigate to="/profile/user-info" />} />
+        ) : (
+          <Route path="/sign-up" element={<SignUpPage />} />
+        )}
         <Route path="/privacy-policy" element={<PrivacyPolicy />} />
         <Route path="/terms-and-conditions" element={<TermsAndConditions />} />
         <Route path="/cookies-policy" element={<CookiesPolicyComponent />} />

diff --git 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 (
     <div className="main-app">
       <div className="main-app-header">
-        <MainBanner />
+        <MainBanner isAuthorized={props.isAuthorized}/>
         <div className={css['main-app-body']}>
-          <MainPartners />
           <MainCompanies />
-          <MainLoginBanner />
+          <MainPartners />
+          {!props.isAuthorized ? <MainLoginBanner /> : (null)}
           <MainAboutSection />
           <div>
             <CookieMod

diff --git a/FrontEnd/src/components/landing-page/banner/Banner.js b/FrontEnd/src/components/landing-page/banner/Banner.js
@@ -1,9 +1,10 @@
 import './Banner.css';
 import Ellipses from '../ellipses/Ellipses';
 import { Link } from 'react-router-dom';
+import { PropTypes } from 'prop-types';
 
 
-const MainBanner = () => {
+const MainBanner = (props) => {
     return (
         <div className="main-banner-group">
             <div className="main-banner-group__main-rectangle"/>
@@ -24,14 +25,15 @@ const MainBanner = () => {
             <div className="main-banner-group__frame-rectangle13"/>
             <div className="main-banner-group__frame-description">
                 <div className="main-banner-group__banner-text">Це унікальний майданчик <br/>для обміну інформацією і досвідом з тими, хто втілює свої ідеї в життя.</div>
+                {!props.isAuthorized ?
                 <div className="main-banner-group__frame-login">
                     <div className="main-banner-group__login-button">
                         <Link className="main-banner-group__login-button-text" to="/login">Увійти</Link>
                     </div>
                     <div className="main-banner-group__register-button">
                         <Link className="main-banner-group__register-button-text" to="/sign-up">Зареєстуватися</Link>
                     </div>
-                </div>
+                </div> : (null)}
             </div>
             <div className="main-banner-group__white-ellipses">
                 <Ellipses type="white" count={7} />
@@ -85,4 +87,7 @@ const MainBanner = () => {
     );
 };
 
-export default MainBanner;
+export default MainBanner;
+
+MainBanner.propTypes = {
+  isAuthorized: PropTypes.bool.isRequired};
diff --git 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;