From 3ce8e17645d2a3f21f630c0a173df6736d123742 Mon Sep 17 00:00:00 2001
From: kurpfish <ph4z3r_f@mail.ru>
Date: Wed, 18 Aug 2021 18:16:57 +0300
Subject: [PATCH] footer changed

---
 src/App.js                                    |  5 +-
 src/components/Auth/AuthForDevelopers.js      | 35 +------
 .../Auth/AuthForDevelopers.module.css         | 85 -----------------
 src/components/Auth/AuthForPartners.js        | 32 +------
 src/components/Calendar/Calendar.js           |  2 +
 src/components/Calendar/Calendar.module.css   |  4 +
 src/components/Candidate/Candidate.js         |  2 +
 src/components/Candidate/candidate.css        |  4 +
 src/components/Footer/Footer.js               | 38 +++++++-
 src/components/Footer/footer.css              | 95 +++++++++++++++++--
 src/components/Home/Home.js                   |  2 +
 src/index.js                                  |  2 -
 src/pages/FormPage.js                         |  2 +
 src/pages/formPage.scss                       |  4 +
 14 files changed, 154 insertions(+), 158 deletions(-)

diff --git a/src/App.js b/src/App.js
index 4c6c7d50..5ba9fb9e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,7 @@
 import React, { Suspense, lazy } from 'react'
 import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import { selectAuth } from './redux/outstaffingSlice';
 import 'bootstrap/dist/css/bootstrap.min.css'
 import './fonts/stylesheet.css'
 import { ProtectedRoute } from './components/ProtectedRoute/ProtectedRoute';
@@ -12,7 +14,8 @@ import CalendarPage from'./pages/CalendarPage';
 import ReportPage from './pages/ReportFormPage.js';
 import FormPage from './pages/FormPage.js';
 
-const App = () => {
+const App = (props) => {
+  const isAuth = useSelector(selectAuth)
   return (<>
     <h1>IT Аутстаффинг в России</h1>
     <Router>
diff --git a/src/components/Auth/AuthForDevelopers.js b/src/components/Auth/AuthForDevelopers.js
index a1ee30ae..ca58e2ac 100644
--- a/src/components/Auth/AuthForDevelopers.js
+++ b/src/components/Auth/AuthForDevelopers.js
@@ -8,9 +8,6 @@ import arrow from '../../images/arrow__login_page.png'
 import authImg from '../../images/auth_img.png'
 import cross from '../../images/cross.png'
 import text from '../../images/Body_Text.png'
-import align from '../../images/align-left.png'
-import phone from '../../images/phone.png'
-import telegram from '../../images/telegram.png'
 import vector from '../../images/Vector_Smart_Object.png'
 import vectorBlack from '../../images/Vector_Smart_Object_black.png'
 import { fetchAuth } from '../../server/server'
@@ -22,6 +19,7 @@ import { Loader } from '../Loader/Loader'
 
 import { withSwalInstance } from 'sweetalert2-react';
 import swal from 'sweetalert2';
+import { Footer } from '../Footer/Footer'
  
 const SweetAlert = withSwalInstance(swal);
 
@@ -153,36 +151,7 @@ const AuthForDevelopers = () => {
               </div>
             </div>
           </div>
-
-          <div className='row'>
-            <div className='col-12 col-xl-7'>
-              <div className={style.developers__footer__left}>
-                <div className={style.footer__left__img}>
-                  <img src={align} alt='' />
-                </div>
-                <div className={style.footer__left__sp}>
-                  <span>
-                    Подберем и документально оформим IT-специалистов, после чего передадим исполнителей под ваше руководство. 
-                    Вы получаете полное управление над сотрудниками, имея возможность контролировать и заменять IT штат.{' '}
-                  </span>
-                </div>
-              </div>
-            </div>
-
-            <div className='col-4 col-xl-2'>
-              <div className={style.developers__footer__icon}>
-                <img src={phone} alt='' />
-                <img src={telegram} alt='' />
-              </div>
-            </div>
-
-            <div className='col-8 col-xl-3'>
-              <div className={style.developers__footer__right}>
-                <p className={style.phone}>+7 495 156 78 98</p>
-                <p className={style.workingHours}>Будни с 9:00 до 21:00</p>
-              </div>
-            </div>
-          </div>
+          <Footer />
         </div>
       </div>
     </section>
diff --git a/src/components/Auth/AuthForDevelopers.module.css b/src/components/Auth/AuthForDevelopers.module.css
index 76dc33a7..465f5d4a 100644
--- a/src/components/Auth/AuthForDevelopers.module.css
+++ b/src/components/Auth/AuthForDevelopers.module.css
@@ -361,91 +361,6 @@
   }
 }
 
-.developers__footer__left {
-  display: flex;
-  align-items: center;
-  margin-bottom: 60px;
-}
-
-@media (max-width: 575.98px) {
-  .developers__footer__left {
-    margin-top: 120px;
-  }
-}
-
-.footer__left__sp {
-  padding: 0 100px 0 34px;
-}
-
-@media (max-width: 575.98px) {
-  .footer__left__sp {
-    padding: 0;
-    margin-left: 10px;
-  }
-}
-
-.developers__footer__left > div > span {
-  color: #18586e;
-  font-family: 'GT Eesti Pro Display';
-  font-size: 1.6em;
-  font-weight: 400;
-  font-style: normal;
-  letter-spacing: normal;
-  line-height: 16.81px;
-  text-align: left;
-}
-
-@media (max-width: 575.98px) {
-  .developers__footer__left > div > span {
-    font-size: 1.2em;
-  }
-}
-
-.developers__footer__icon {
-  text-align: end;
-}
-
-.developers__footer__icon > img {
-  margin-left: 20px;
-}
-
-@media (max-width: 575.98px) {
-  .developers__footer__icon > img {
-    margin-left: 10px;
-  }
-}
-
-.developers__footer__right {
-  display: flex;
-  flex-direction: column;
-  align-items: left;
-}
-
-@media (max-width: 575.98px) {
-  .developers__footer__right {
-    margin-bottom: 20px;
-  }
-}
-.phone {
-  color: #003b65;
-  font-family: 'CeraPro';
-  font-size: 2.1em;
-  letter-spacing: normal;
-  line-height: 25px;
-  text-align: left;
-}
-
-.workingHours {
-  color: #003b65;
-  font-family: 'CeraPro';
-  font-size: 1.2em;
-  font-weight: 400;
-  font-style: normal;
-  letter-spacing: normal;
-  line-height: normal;
-  margin-left: 24px;
-}
-
 .auth__link {
   display: block;
 }
diff --git a/src/components/Auth/AuthForPartners.js b/src/components/Auth/AuthForPartners.js
index b06a6dff..dea62a33 100644
--- a/src/components/Auth/AuthForPartners.js
+++ b/src/components/Auth/AuthForPartners.js
@@ -23,6 +23,7 @@ import { Loader } from '../Loader/Loader'
 
 import { withSwalInstance } from 'sweetalert2-react';
 import swal from 'sweetalert2';
+import { Footer } from '../Footer/Footer'
  
 const SweetAlert = withSwalInstance(swal);
 
@@ -144,36 +145,7 @@ const AuthForPartners = () => {
               </div>
             </div>
           </div>
-
-          <div className="row">
-            <div className="col-12 col-xl-7">
-              <div className={style.partners__footer__left}>
-                <div className={style.footer__left__img}>
-                  <img src={align} alt="" />
-                </div>
-                <div className={style.footer__left__sp}>
-                  <span>
-                    Подберем и документально оформим IT-специалистов, после чего передадим исполнителей под ваше руководство. 
-                    Вы получаете полное управление над сотрудниками, имея возможность контролировать и заменять IT штат.{' '}
-                  </span>
-                </div>
-              </div>
-            </div>
-
-            <div className="col-4 col-xl-2">
-              <div className={style.partners__footer__icon}>
-                <img src={phone} alt="" />
-                <img src={telegram} alt="" />
-              </div>
-            </div>
-
-            <div className="col-8 col-xl-3">
-              <div className={style.partners__footer__right}>
-                <p className={style.phone}>+7 495 156 78 98</p>
-                <p className={style.workingHours}>Будни с 9:00 до 21:00</p>
-              </div>
-            </div>
-          </div>
+          <Footer />
         </div>
       </div>
     </section>
diff --git a/src/components/Calendar/Calendar.js b/src/components/Calendar/Calendar.js
index f36f0a32..a1d1393b 100644
--- a/src/components/Calendar/Calendar.js
+++ b/src/components/Calendar/Calendar.js
@@ -7,6 +7,7 @@ import calendarMale from '../../images/medium_male.png';
 import rectangle from '../../images/rectangle_secondPage.png';
 import CalendarComponent from './CalendarComponent';
 import { currentMonth } from './calendarHelper';
+import { Footer } from '../Footer/Footer';
 
 const Calendar = () => {
   const candidateForCalendar = useSelector(selectCurrentCandidate);
@@ -52,6 +53,7 @@ const Calendar = () => {
             </p>
           </div>
         </div>
+        <Footer />
     </section>
   );
 };
diff --git a/src/components/Calendar/Calendar.module.css b/src/components/Calendar/Calendar.module.css
index 6b0dc78a..cf0d2939 100644
--- a/src/components/Calendar/Calendar.module.css
+++ b/src/components/Calendar/Calendar.module.css
@@ -293,3 +293,7 @@
   letter-spacing: normal;
   line-height: normal;
 }
+
+.calendar footer {
+  margin-top: 2rem !important;
+}
\ No newline at end of file
diff --git a/src/components/Candidate/Candidate.js b/src/components/Candidate/Candidate.js
index 93139604..20e08cdf 100644
--- a/src/components/Candidate/Candidate.js
+++ b/src/components/Candidate/Candidate.js
@@ -10,6 +10,7 @@ import front from '../../images/front_end.png';
 import back from '../../images/back_end.png';
 import design from '../../images/design.png';
 import { fetchItemsForId } from '../../server/server';
+import { Footer } from '../Footer/Footer';
 
 import './candidate.css';
 
@@ -129,6 +130,7 @@ const Candidate = () => {
             </div>
           </div>
         </div>
+        <Footer />
     </div>
   );
 };
diff --git a/src/components/Candidate/candidate.css b/src/components/Candidate/candidate.css
index f0a02aa8..12eccf2f 100644
--- a/src/components/Candidate/candidate.css
+++ b/src/components/Candidate/candidate.css
@@ -280,4 +280,8 @@
 
 .candidate + .logout-button{
   top: 80px !important;
+}
+
+.candidate footer {
+  margin-top: 2.5rem !important;
 }
\ No newline at end of file
diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js
index 506cfb5f..3c9e78b0 100644
--- a/src/components/Footer/Footer.js
+++ b/src/components/Footer/Footer.js
@@ -1,10 +1,46 @@
 import React from 'react';
 import './footer.css';
+import align from '../../images/align-left.png'
+import phone from '../../images/phone.png'
+import telegram from '../../images/telegram.png'
 
 export const Footer = () => {
     return (
+        <div className='container'>
         <footer>
-            <div>2021 © Outstaffing</div>
+            
+        <div className='footer row'>
+            <div className='col-12 col-xl-7'>
+                <div className='footer__left'>
+                    <div className='footer__img'>
+                    <img src={align} alt='' />
+                    </div>
+                    <div className='footer__description'>
+                    <span>
+                        Подберем и документально оформим IT-специалистов, после чего передадим исполнителей под ваше руководство. 
+                        Вы получаете полное управление над сотрудниками, имея возможность контролировать и заменять IT штат.{' '}
+                    </span>
+                    </div>
+                </div>
+                </div>
+
+                <div className='col-4 col-xl-2'>
+                <div className='footer__icon'>
+                    <img src={phone} alt='' />
+                    <img src={telegram} alt='' />
+                </div>
+                </div>
+
+                <div className='col-8 col-xl-3'>
+                <div className='footer__right'>
+                    <p className='footer__phone'>+7 495 156 78 98</p>
+                    <p className='footer__hours'>Будни с 9:00 до 21:00</p>
+                </div>
+            </div>
+        </div>
+        <div className='copyright'>2021 © Outstaffing</div>
+
         </footer>
+        </div>
     )
 }
\ No newline at end of file
diff --git a/src/components/Footer/footer.css b/src/components/Footer/footer.css
index 60a7d002..432a8b35 100644
--- a/src/components/Footer/footer.css
+++ b/src/components/Footer/footer.css
@@ -1,11 +1,94 @@
 footer {
-    padding: 2rem 5rem;
-  }
+  margin-top: -3rem;
+}
   
-footer>div {
-    border-top: 2px solid #73c141;
-    padding: 1rem;
+footer .copyright {
+    padding: 1rem 1rem 1rem 5.6rem;
     font-family: 'Muller';
     font-weight: 300;
     font-size: 1.2em;
-}
\ No newline at end of file
+}
+
+.footer__left {
+  display: flex;
+  align-items: center;
+}
+
+@media (max-width: 575.98px) {
+  .footer__left {
+    margin-top: 120px;
+  }
+}
+
+.footer__description {
+  padding: 0 100px 0 34px;
+}
+
+@media (max-width: 575.98px) {
+  .footer__description {
+    padding: 0;
+    margin-left: 10px;
+  }
+}
+
+.footer__left > div > span {
+  color: #18586e;
+  font-family: 'GT Eesti Pro Display';
+  font-size: 1.6em;
+  font-weight: 400;
+  font-style: normal;
+  letter-spacing: normal;
+  line-height: 16.81px;
+  text-align: left;
+}
+
+@media (max-width: 575.98px) {
+  .footer__left > div > span {
+    font-size: 1.2em;
+  }
+}
+
+.footer__icon {
+  text-align: end;
+}
+
+.footer__icon > img {
+  margin-left: 20px;
+}
+
+@media (max-width: 575.98px) {
+  .footer__icon > img {
+    margin-left: 10px;
+  }
+}
+
+.footer__right {
+  display: flex;
+  flex-direction: column;
+  align-items: left;
+}
+
+@media (max-width: 575.98px) {
+  .footer__right {
+    margin-bottom: 20px;
+  }
+}
+.footer__phone {
+  color: #003b65;
+  font-family: 'CeraPro';
+  font-size: 2.1em;
+  letter-spacing: normal;
+  line-height: 25px;
+  text-align: left;
+}
+
+.footer__working-hours {
+  color: #003b65;
+  font-family: 'CeraPro';
+  font-size: 1.2em;
+  font-weight: 400;
+  font-style: normal;
+  letter-spacing: normal;
+  line-height: normal;
+  margin-left: 24px;
+}
diff --git a/src/components/Home/Home.js b/src/components/Home/Home.js
index 3e87521a..37498c52 100644
--- a/src/components/Home/Home.js
+++ b/src/components/Home/Home.js
@@ -4,6 +4,7 @@ import Outstaffing from '../Outstaffing/Outstaffing';
 import Description from '../Description/Description';
 import { fetchProfile, fetchSkills } from '../../server/server';
 import { profiles, tags } from '../../redux/outstaffingSlice';
+import { Footer } from '../Footer/Footer';
 
 const Home = () => {
   const [isLoadingMore, setIsLoadingMore] = useState(false);
@@ -39,6 +40,7 @@ const Home = () => {
     <>
       <Outstaffing />
       <Description onLoadMore={loadMore} isLoadingMore={isLoadingMore} />
+      <Footer />
     </>
   );
 };
diff --git a/src/index.js b/src/index.js
index fc995a6e..6c4f1860 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,7 +3,6 @@ import ReactDOM from 'react-dom';
 import { store } from './store/store';
 import { Provider } from 'react-redux';
 import App from './App';
-import { Footer } from './components/Footer/Footer';
 
 import './index.css';
 
@@ -11,7 +10,6 @@ ReactDOM.render(
   <Provider store={store}>
     <>
     <App />
-    <Footer />
     </>
   </Provider>,
   document.getElementById('root')
diff --git a/src/pages/FormPage.js b/src/pages/FormPage.js
index 471b3a06..fa8446fb 100644
--- a/src/pages/FormPage.js
+++ b/src/pages/FormPage.js
@@ -7,6 +7,7 @@ import { WithLogout } from '../hoc/withLogout';
 import Form from '../components/Form/Form';
 import { LEVELS, SKILLS } from '../components/constants/constants';
 import { fetchItemsForId } from '../server/server';
+import { Footer } from '../components/Footer/Footer';
 
 import arrow from '../images/right-arrow.png';
 import rectangle from '../images/rectangle_secondPage.png';
@@ -70,6 +71,7 @@ const FormPage = () => {
                     </div>
                 </div>
             </div>
+            <Footer />
         </div>
         </WithLogout>
     )
diff --git a/src/pages/formPage.scss b/src/pages/formPage.scss
index 63cd27f4..65df0437 100644
--- a/src/pages/formPage.scss
+++ b/src/pages/formPage.scss
@@ -123,4 +123,8 @@
 .form-page + .logout-button{
     top: 0px !important;
     right: 2.5rem;
+}
+
+.form-page footer {
+    margin-top: 2.5rem !important;
 }
\ No newline at end of file