Merge branch 'main' of https://git.itguild.info/apuc/guild_front

src/components/Calendar/Calendar.jsx

@@ -79,8 +79,8 @@ const Calendar = () => {
             </p>
           </div>
         </div>
-        <Footer />
       </section>
+      <Footer />
     </div>
   );
 };

src/components/Candidate/Candidate.jsx

@@ -233,8 +233,8 @@ const Candidate = () => {
             )}
           </div>
         </div>
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };

src/components/FreeDevelopers/FreeDevelopers.jsx

@@ -92,8 +92,8 @@ export const FreeDevelopers = () => {
             </BaseButton>
           </div>
         </div>
-        <Footer />
       </div>
+      <Footer />
     </section>
   );
 };

src/components/OutstaffingBlock/outstaffingBlock.scss

@@ -9,7 +9,6 @@ body {
   background: #f1f1f1;
   height: 100%;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
   padding-top: 23px;
 
   &__title {

src/components/ReportForm/reportForm.scss

@@ -1,8 +1,6 @@
 .report-form {
   background: #f1f1f1;
-  height: 100%;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   .container {
     max-width: 1160px;

src/pages/Auth/Auth.jsx

@@ -91,10 +91,10 @@ const Auth = () => {
               </div>
             </div>
           </div>
-          <Footer />
         </div>
       </div>
       <SideBar />
+      <Footer />
     </section>
   );
 };

src/pages/Blog/Blog.jsx

@@ -90,12 +90,10 @@ export const Blog = () => {
             );
           })}
         </div>
-
         <div className="blog__load-more">
           <button>Загрузить еще</button>
         </div>
       </div>
-
       <Footer />
     </div>
   );

src/pages/CatalogSpecialists/CatalogSpecialists.jsx

@@ -200,9 +200,9 @@ const CatalogSpecialists = () => {
             );
           })}
         </div>
-        <Footer />
       </div>
       <SideBar />
+      <Footer />
     </section>
   );
 };

src/pages/CatalogSpecialists/catalogSpecialists.scss

@@ -1,8 +1,8 @@
 .catalog-specialists {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   &__wrapper {
     padding-top: 24px;

src/pages/CompanyInfo/CompanyInfo.jsx

@@ -103,8 +103,8 @@ export const CompanyInfo = () => {
             </div>
           </div>
         </div>
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };

src/pages/FormPage/FormPage.jsx

@@ -96,8 +96,8 @@ const FormPage = () => {
             </div>
           </div>
         </div>
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };

src/pages/Home/Home.jsx

@@ -69,9 +69,9 @@ const Home = () => {
           <h2 className="catalog__title">Каталог специалистов</h2>
           <Outstaffing />
           <Description onLoadMore={loadMore} isLoadingMore={isLoadingMore} />
+        </div>
+      </div>
       <Footer />
-        </div>
-      </div>
     </>
   );
 };

src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss

@@ -1,10 +1,13 @@
 .employee-report {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   .container {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     margin-top: 23px;
   }
 

src/pages/PartnerRequests/partnerRequests.scss

@@ -1,11 +1,13 @@
 .partner-requests {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   .container {
-    max-width: 1160px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     margin-top: 23px;
 
     @media (max-width: 570px) {

src/pages/PartnerTreaties/partnerTreaties.scss

@@ -3,7 +3,6 @@
   display: flex;
   flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   &__title {
     font-weight: 700;
@@ -379,7 +378,9 @@
   }
 
   .container {
-    max-width: 1160px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     margin-top: 23px;
 
     @media (max-width: 570px) {

src/pages/PartnerСategories/partnerСategories.scss

@@ -1,8 +1,8 @@
 .partner-categories {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
 
   &__title {
     color: #000000;
@@ -144,7 +144,9 @@
   }
 
   .container {
-    max-width: 1160px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     margin-top: 23px;
 
     @media (max-width: 570px) {

src/pages/RegistrationSetting/RegistrationSetting.js

@@ -212,8 +212,8 @@ export const RegistrationSetting = () => {
             </button>
           )}
         </div>
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };

src/pages/TrackerAuth/TrackerAuth.js

@@ -38,8 +38,8 @@ export const TrackerAuth = () => {
             <ModalReset setModalReset={setModalReset} />
           </ModalLayout>
         )}
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };

src/pages/TrackerAuth/trackerAuth.scss

@@ -1,10 +1,16 @@
 .tracker-auth {
-  &__content {
-    font-family: "LabGrotesque", sans-serif;
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
   background-color: #f1f1f1;
+
+  &__content {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+
     color: #000000;
     padding: 50px 0 0;
-    min-height: 100vh;
 
     @media (max-width: 1375px) {
       padding-top: 100px;
@@ -25,7 +31,7 @@
     margin-bottom: 46px;
     color: #000000;
     span {
-      color: #52B709;
+      color: #52b709;
       position: relative;
       img {
         position: absolute;

src/pages/TrackerIntro/TrackerIntro.js

@@ -102,8 +102,8 @@ export const TrackerIntro = () => {
             </div>
           </div>
         </div>
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };

src/pages/TrackerRegistration/TrackerRegistration.js

@@ -149,8 +149,8 @@ export const TrackerRegistration = () => {
             />
           </ModalLayout>
         )}
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };

src/pages/ViewReport/ViewReport.jsx

@@ -269,8 +269,8 @@ export const ViewReport = () => {
             )}
           </div>
         )}
-        <Footer />
       </div>
+      <Footer />
     </div>
   );
 };