Merge pull request #13 from uddugteam/redesign

Career and Team updates. Lottie SSR fix
uddugteam · Mar 26, 2024 · 1f36d3a · 1f36d3a
2 parents d9ccd41 + 10869d7
commit 1f36d3a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 45 deletions.
diff --git a/next.config.js b/next.config.js
@@ -17,16 +17,6 @@ const nextConfig = {
           loader: '@svgr/webpack',
           options: {
             icon: true,
-            // svgoConfig: {
-            //   plugins: [
-            //     {
-            //       name: 'preset-default',
-            //       params: {
-            //         overrides: { removeViewBox: false },
-            //       },
-            //     },
-            //   ],
-            // },
           },
         },
       ],

diff --git a/src/components/general/Careers/Careers.tsx b/src/components/general/Careers/Careers.tsx
@@ -21,7 +21,7 @@ interface Vacation {
 
 const vacations: Vacation[] = [
   {
-    name: 'Golang Engeneer',
+    name: 'Golang Engineer',
     sphere: 'Web3',
     position: 'Middle, Junior, Intern',
     type: 'Full Time',

diff --git a/src/components/general/Team/Team.module.css b/src/components/general/Team/Team.module.css
@@ -11,7 +11,8 @@
   z-index: 1;
   position: relative;
   text-align: center;
-  margin-bottom: 24px;
+  max-width: 850px;
+  margin: 0 auto 24px;
 
   @media (--tablet-vertical) {
     margin-bottom: 30px;

diff --git a/src/components/general/Team/Team.tsx b/src/components/general/Team/Team.tsx
@@ -202,7 +202,7 @@ const Team: FC = () => {
             <span className={coloredSpanClassNames}>
               creating help humanity
             </span>{' '}
-            get to the future faster Meet
+            get to the future faster
           </Title>
           <Tabs className={styles.tabs} tabs={tabs} />
           <BackgroundCircle className={styles.backgroundCircle} />

diff --git a/src/components/layout/Header/Header.module.css b/src/components/layout/Header/Header.module.css
@@ -142,19 +142,3 @@
   background-repeat: no-repeat;
   background-position: center;
 }
-
-.backgroundCircle {
-  top: 110px;
-  left: 20px;
-  transform: translate3d(0, 0, 0) rotate(-30deg);
-
-  @media (--tablet-vertical) {
-    top: 50px;
-    left: auto;
-    right: -352px;
-  }
-
-  @media (--desktop) {
-    display: none;
-  }
-}
diff --git a/src/components/layout/Header/Header.tsx b/src/components/layout/Header/Header.tsx
@@ -8,7 +8,6 @@ import Wrapper from 'components/layout/Wrapper';
 import Logo from 'components/ui/Logo';
 import Button from 'components/ui/Button';
 import BurgerButton from 'components/ui/burger-button';
-import BackgroundCircle from 'components/ui/BackgroundCircle';
 
 import styles from './Header.module.css';
 
@@ -103,19 +102,21 @@ const Header: FC = () => {
                 </Link>
               </>
             ) : (
-              <BurgerButton
-                className={styles.burgerButton}
-                outsideDirection={isMenuOpened ? -1 : 1}
-                onClick={() => setIsMenuOpened(!isMenuOpened)}
-              />
-              // <Button
-              //   onClick={() => {
-              //     setIsMenuOpened(!isMenuOpened);
-              //   }}
-              //   className={styles.menuToggler}
-              // >
-              //   {isMenuOpened ? '' : 'Menu'}
-              // </Button>
+              <>
+                <BurgerButton
+                  className={styles.burgerButton}
+                  outsideDirection={isMenuOpened ? -1 : 1}
+                  onClick={() => setIsMenuOpened(!isMenuOpened)}
+                />
+                {/* <Button
+                  onClick={() => {
+                    setIsMenuOpened(!isMenuOpened);
+                  }}
+                  className={styles.menuToggler}
+                >
+                  {isMenuOpened ? '' : 'Menu'}
+                </Button> */}
+              </>
             )}
           </div>
           {isWide ? null : (
@@ -151,7 +152,6 @@ const Header: FC = () => {
                   Contact us
                 </Button>
               </Link>
-              {/* <BackgroundCircle className={backgroundCircleClassnames} /> */}
             </div>
           )}
         </nav>

diff --git a/src/components/ui/burger-button/BurgerButton.tsx b/src/components/ui/burger-button/BurgerButton.tsx
@@ -1,5 +1,6 @@
 import { useState, useRef, useEffect } from 'react';
-import Lottie, { LottieRefCurrentProps } from 'lottie-react';
+import dynamic from 'next/dynamic';
+import { LottieRefCurrentProps } from 'lottie-react';
 import classNames from 'classnames';
 
 import Button from 'components/ui/Button';
@@ -13,6 +14,8 @@ interface IBurgerButton {
   outsideDirection: 1 | -1;
 }
 
+const Lottie = dynamic(() => import('lottie-react'), { ssr: false });
+
 const BurgerButton: React.FC<IBurgerButton> = ({
   onClick,
   className,