Merge pull request 'develop' (#24) from develop into main

Reviewed-on: #24

README.md

@@ -2,12 +2,22 @@
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
 
+## About
+
+This project is an institutional page, with a mobile sidebar 'menu
+hamburger', contact form with formik, accordion menu in the footer, input validation using yup and route navigation with no need to reload the page!
+
+Este Projeto é uma página institucional, com 'menu hamburguer' mobile, formulário de contato com formik, menu acordeon no footer, validação de inputs utilizando yup e navegação por rotas sem necessidade de reload da página!
+
 ## Available Scripts
 
 In the project directory, you can run:
 
 ### `npm start`
 
+Rode o projeto no modo de desenvolvimento. \
+Abra [http://localhost:3000](http://localhost:3000) para ve-lo no navegador.
+
 Runs the app in the development mode.\
 Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 
@@ -44,3 +54,19 @@ You don’t have to ever use `eject`. The curated feature set is suitable for sm
 You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
 
 To learn React, check out the [React documentation](https://reactjs.org/).
+
+## Libraries that I used
+
+React
+react-dom
+react-router-dom
+typescript
+sass
+react-headless-accordion
+Classnames
+Formik
+Yup
+
+## Node version
+
+node: ^16.18.11

src/assets/svgs/home.svg

@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3715_5676)">
+<path d="M15.8327 7.59562L14.6904 6.4533L8.40443 0.167326C8.1813 -0.0557753 7.81954 -0.0557753 7.59641 0.167326L1.3104 6.4533L0.167503 7.59623C-0.0517478 7.82324 -0.0454864 8.185 0.181532 8.40425C0.402993 8.61814 0.754068 8.61814 0.975529 8.40425L1.14238 8.23623V15.4285C1.14238 15.7442 1.39823 16 1.71384 16H14.2858C14.6014 16 14.8573 15.7442 14.8573 15.4285V8.23623L15.0247 8.40368C15.2517 8.62293 15.6135 8.61664 15.8327 8.38965C16.0466 8.16819 16.0466 7.81708 15.8327 7.59562ZM9.71421 14.8571H6.28549V10.2855H9.71421V14.8571ZM13.7144 14.8571H10.8571V9.71403C10.8571 9.39841 10.6013 9.14256 10.2856 9.14256H5.71403C5.39841 9.14256 5.14256 9.39841 5.14256 9.71403V14.8571H2.28531V7.09334L7.99982 1.3788L13.7144 7.09334V14.8571Z" fill="#C4C4C4"/>
+</g>
+<defs>
+<clipPath id="clip0_3715_5676">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>

src/assets/svgs/seta-para-cima.svg

@@ -0,0 +1,3 @@
+<svg width="25" height="13" viewBox="0 0 25 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.7428 11.3959C23.741 11.6959 23.6177 11.9953 23.373 12.226L23.3728 12.2261C22.8668 12.7035 22.037 12.7035 21.5311 12.2261L21.5232 12.2345L21.5311 12.2261L12.3457 3.5599L12.0712 3.30091L11.7967 3.5599L2.61178 12.2258C2.10549 12.7033 1.27571 12.7032 0.769767 12.2259L0.769708 12.2258C0.525704 11.9957 0.402467 11.6972 0.400037 11.398C0.401876 11.0981 0.525111 10.7986 0.769782 10.5678L0.769785 10.5678L11.1506 0.773762C11.4013 0.537307 11.7333 0.415846 12.0712 0.415846C12.4093 0.415846 12.7415 0.537566 12.9922 0.773969L23.3728 10.568L23.3729 10.5681C23.6171 10.7983 23.7403 11.0968 23.7428 11.3959Z" fill="white" stroke="white" stroke-width="0.8"/>
+</svg>

src/assets/svgs/seta.svg

@@ -0,0 +1,3 @@
+<svg width="6" height="8" viewBox="0 0 6 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.1162 3.60396L1.67632 0.164193C1.45751 -0.0547314 1.10273 -0.0547314 0.884018 0.164193C0.665288 0.382921 0.665288 0.737679 0.884018 0.95639L3.92778 4.00006L0.884106 7.04362C0.665377 7.26244 0.665377 7.61716 0.884106 7.83589C1.10284 8.0547 1.45759 8.0547 1.67641 7.83589L5.11629 4.39607C5.22566 4.28665 5.28028 4.1434 5.28028 4.00008C5.28028 3.85668 5.22555 3.71332 5.1162 3.60396Z" fill="#C4C4C4"/>
+</svg>

src/assets/svgs/whatsapp.svg

@@ -0,0 +1,11 @@
+<svg width="34" height="34" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3715_5917)">
+<path d="M17.0042 0H16.9958C7.62238 0 0 7.6245 0 17C0 20.7188 1.1985 24.1655 3.23638 26.9641L1.11775 33.2796L7.65213 31.1908C10.3403 32.9715 13.5469 34 17.0042 34C26.3776 34 34 26.3734 34 17C34 7.62663 26.3776 0 17.0042 0Z" fill="#4CAF50"/>
+<path d="M26.8962 24.0061C26.486 25.1642 24.8583 26.1247 23.5599 26.4052C22.6717 26.5944 21.5114 26.7452 17.6057 25.126C12.6098 23.0562 9.39255 17.9796 9.1418 17.6502C8.90167 17.3209 7.12305 14.9621 7.12305 12.5226C7.12305 10.0831 8.36192 8.89524 8.8613 8.38524C9.27142 7.96661 9.9493 7.77536 10.5995 7.77536C10.8099 7.77536 10.999 7.78599 11.169 7.79449C11.6684 7.81574 11.9192 7.84549 12.2485 8.63386C12.6587 9.62199 13.6574 12.0615 13.7764 12.3122C13.8975 12.563 14.0187 12.903 13.8487 13.2324C13.6893 13.5724 13.549 13.7232 13.2983 14.0122C13.0475 14.3012 12.8095 14.5222 12.5588 14.8325C12.3293 15.1024 12.07 15.3914 12.359 15.8907C12.648 16.3795 13.6468 18.0094 15.1173 19.3184C17.0149 21.0077 18.5534 21.5475 19.1038 21.777C19.5139 21.947 20.0027 21.9066 20.3023 21.5879C20.6827 21.1777 21.1523 20.4977 21.6304 19.8284C21.9704 19.3481 22.3997 19.2886 22.8502 19.4586C23.3092 19.618 25.738 20.8186 26.2374 21.0672C26.7368 21.318 27.0662 21.437 27.1873 21.6474C27.3063 21.8577 27.3063 22.8459 26.8962 24.0061Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_3715_5917">
+<rect width="34" height="34" fill="white"/>
+</clipPath>
+</defs>
+</svg>

src/components/MainContent.tsx

@@ -10,9 +10,29 @@ import { TrocaEDevolucao } from "../components/main/components/TrocaEDevolucao";
 import { SegurancaEPrivacidade } from "../components/main/components/SegurancaEPrivacidade";
 import { Contato } from "../components/main/components/Contato";
 
+import home from "../assets/svgs/home.svg";
+import seta from "../assets/svgs/seta.svg";
+import whats from "../assets/svgs/whatsapp.svg";
+import setaCima from "../assets/svgs/seta-para-cima.svg";
+
 const MainContent = () => {
   return (
     <main className={style["main-content-container"]}>
+      <section className={style["main-content-top-container"]}>
+        <div className={style["main-content-bread-wrapper"]}>
+          <a href="/">
+            <img src={home} alt="Home" />
+          </a>
+
+          <figure>
+            <img src={seta} alt="Seta" />
+          </figure>
+          <span>institucional</span>
+        </div>
+        <div className={style["main-content-title-wrapper"]}>
+          <h1>institucional</h1>
+        </div>
+      </section>
       <Router>
         <Routes>
           <Route path="/" element={<Sobre />} />
@@ -27,6 +47,25 @@ const MainContent = () => {
           <Route path="/contato" element={<Contato />} />
         </Routes>
       </Router>
+
+      <a
+        className={style["main-link-topButton"]}
+        href="https://api.whatsapp.com/send/?phone=%2B5522997240484&text&type=phone_number&app_absent=0"
+        target="_blank"
+      >
+        <img
+          className={style["main-whatssap-link"]}
+          src={whats}
+          alt="Whatsapp"
+        />
+      </a>
+      <a className={style["main-link-topButton"]} href="#">
+        <img
+          className={style["main-content-backToTop"]}
+          src={setaCima}
+          alt="Volte ao Topo"
+        />
+      </a>
     </main>
   );
 };

src/components/footer-bottom.module.scss

@@ -5,6 +5,10 @@
   height: 64px;
   background: variables.$color-black;
 
+  @media screen and (min-width: 2500px) {
+    height: 96px;
+  }
+
   @media screen and (max-width: 1024px) {
     height: 134px;
   }
@@ -37,6 +41,11 @@
       text-transform: capitalize;
       color: variables.$color-white;
 
+      @media screen and (min-width: 2500px) {
+        font-size: 20px;
+        line-height: 23px;
+      }
+
       @media screen and (max-width: 1024px) {
         order: 1;
         width: 100%;
@@ -56,11 +65,23 @@
         width: 100%;
       }
 
+      .creditcard {
+        @media screen and (min-width: 2500px) {
+          height: 40px;
+        }
+      }
+
       .footer-line {
         width: 24px;
         border: 1px solid variables.$color-grey;
         transform: rotate(90deg);
       }
+
+      .vtex-certified {
+        @media screen and (min-width: 2500px) {
+          height: 66px;
+        }
+      }
     }
 
     .footer-copyright {
@@ -76,6 +97,14 @@
         width: 100%;
       }
 
+      a {
+        img {
+          @media screen and (min-width: 2500px) {
+            height: 30px;
+          }
+        }
+      }
+
       span {
         font-weight: 400;
         font-size: 10px;
@@ -83,6 +112,11 @@
         text-transform: capitalize;
         white-space: nowrap;
         color: variables.$color-white;
+
+        @media screen and (min-width: 2500px) {
+          font-size: 20px;
+          line-height: 23px;
+        }
       }
     }
   }

src/components/footer-top.module.scss

@@ -9,6 +9,10 @@
   display: flex;
   position: relative;
 
+  @media screen and (min-width: 2500px) {
+    height: 297px;
+  }
+
   .footer-wrapper {
     display: flex;
     justify-content: space-between;
@@ -90,6 +94,10 @@
       display: flex;
       gap: 121px;
 
+      @media screen and (min-width: 2500px) {
+        gap: 293px;
+      }
+
       @media screen and (max-width: 1024px) {
         display: none;
       }
@@ -105,6 +113,11 @@
           line-height: 16px;
           text-transform: uppercase;
           color: variables.$color-black3;
+
+          @media screen and (min-width: 2500px) {
+            font-size: 28px;
+            line-height: 33px;
+          }
         }
 
         h4 {
@@ -113,6 +126,11 @@
           line-height: 14px;
           text-transform: capitalize;
           color: variables.$color-black3;
+
+          @media screen and (min-width: 2500px) {
+            font-size: 24px;
+            line-height: 28px;
+          }
         }
 
         a {
@@ -122,6 +140,11 @@
           text-transform: capitalize;
           text-decoration: none;
           color: variables.$color-black3;
+
+          @media screen and (min-width: 2500px) {
+            font-size: 24px;
+            line-height: 28px;
+          }
         }
       }
     }
@@ -141,6 +164,12 @@
     .footer-social-media-wrapper {
       display: flex;
       gap: 10px;
+
+      img {
+        @media screen and (min-width: 2500px) {
+          height: 70px;
+        }
+      }
     }
 
     a {
@@ -149,6 +178,11 @@
       line-height: 16px;
       text-decoration: none;
       color: variables.$color-black3;
+
+      @media screen and (min-width: 2500px) {
+        font-size: 28px;
+        line-height: 33px;
+      }
     }
   }
 }

src/components/main-content.module.scss

@@ -3,7 +3,82 @@
 .main-content-container {
   width: 100%;
   background: variables.$color-white;
-  padding: 40px 0;
+  padding: 29px 0 40px 0;
+
+  .main-content-top-container {
+    width: 80.46875%;
+    margin: 0 auto;
+
+    @media screen and (max-width: 1024px) {
+      width: 100%;
+      padding: 0 16px;
+    }
+
+    .main-content-bread-wrapper {
+      display: flex;
+      align-items: center;
+      gap: 9.73px;
+
+      a {
+        img {
+          width: 100%;
+          height: 16px;
+
+          @media screen and (min-width: 2500px) {
+            height: 31.25px;
+          }
+        }
+      }
+
+      figure {
+        img {
+          width: 100%;
+          height: 8px;
+
+          @media screen and (min-width: 2500px) {
+            height: 15.62px;
+          }
+        }
+      }
+
+      span {
+        font-weight: 400;
+        font-size: 12px;
+        line-height: 14px;
+        color: variables.$color-grey;
+        text-transform: uppercase;
+
+        @media screen and (min-width: 2500px) {
+          font-weight: 400;
+          font-size: 24px;
+          line-height: 28px;
+        }
+      }
+    }
+
+    .main-content-title-wrapper {
+      text-align: center;
+      padding: 80px 0;
+
+      h1 {
+        font-weight: 400;
+        font-size: 24px;
+        line-height: 28px;
+        letter-spacing: 0.1em;
+        text-transform: uppercase;
+        color: variables.$color-black2;
+
+        @media screen and (min-width: 2500px) {
+          font-size: 48px;
+          line-height: 56px;
+        }
+      }
+
+      @media screen and (max-width: 1024px) {
+        padding: 80px 0 40px 0;
+      }
+    }
+  }
 
   .main-content-wrapper {
     width: 80.46875%;
@@ -38,6 +113,11 @@
           line-height: 19px;
           color: variables.$color-grey3;
           text-decoration: none;
+
+          @media screen and (min-width: 2500px) {
+            font-size: 32px;
+            line-height: 38px;
+          }
         }
 
         .selected {
@@ -73,6 +153,11 @@
         color: variables.$color-black2;
         margin-bottom: 12px;
 
+        @media screen and (min-width: 2500px) {
+          font-size: 48px;
+          line-height: 56px;
+        }
+
         @media screen and (max-width: 1024px) {
           text-align: center;
         }
@@ -84,6 +169,60 @@
         line-height: 15px;
         color: variables.$color-grey3;
         margin-bottom: 12px;
+
+        @media screen and (min-width: 2500px) {
+          font-size: 26px;
+          line-height: 30px;
+
+          margin-bottom: 24px;
+        }
+      }
+    }
+  }
+
+  .main-link-topButton {
+    img {
+      width: auto;
+    }
+
+    .main-whatssap-link,
+    .main-content-backToTop {
+      position: fixed;
+      z-index: 6;
+      right: 16px;
+    }
+
+    .main-whatssap-link {
+      bottom: 220px;
+
+      @media screen and (min-width: 2500px) {
+        height: 66px;
+      }
+
+      @media screen and (max-width: 1024px) {
+        bottom: 90px;
+      }
+    }
+
+    .main-content-backToTop {
+      background: variables.$color-grey;
+      padding: 13px 10px;
+      border-radius: 50%;
+      width: 34px;
+      height: 34px;
+
+      bottom: 180px;
+
+      @media screen and (min-width: 2500px) {
+        width: 66px;
+        height: 66px;
+        padding: 25px 20px;
+
+        bottom: 150px;
+      }
+
+      @media screen and (max-width: 1024px) {
+        bottom: 50px;
       }
     }
   }

src/components/main/components/MainForm.tsx

@@ -31,6 +31,7 @@ const MainForm = () => {
         onSubmit={(values: IFormMain, { resetForm }) => {
           console.log(values);
           resetForm();
+          console.log("blah");
         }}
         initialValues={initialValues}
         validationSchema={FormMainSchema}

src/components/main/components/main-form.module.scss

@@ -4,6 +4,10 @@
   width: 100%;
   height: 650px;
 
+  @media screen and (min-width: 2500px) {
+    height: 900px;
+  }
+
   .main-form {
     width: 100%;
     height: 600px;
@@ -23,6 +27,11 @@
 
         margin-left: 15px;
         margin-bottom: 12px;
+
+        @media screen and (min-width: 2500px) {
+          font-size: 28px;
+          line-height: 33px;
+        }
       }
 
       input {
@@ -31,6 +40,23 @@
         border-radius: 25px;
 
         margin-bottom: 12px;
+
+        @media screen and (min-width: 2500px) {
+          font-size: 28px;
+          line-height: 33px;
+        }
+      }
+
+      input::placeholder {
+        font-weight: 400;
+        font-size: 14px;
+        line-height: 16px;
+        color: variables.$color-grey6;
+
+        @media screen and (min-width: 2500px) {
+          font-size: 28px;
+          line-height: 33px;
+        }
       }
 
       .form-feedback {
@@ -41,6 +67,13 @@
         font-size: 12px;
         line-height: 14px;
         color: variables.$color-red;
+
+        @media screen and (min-width: 2500px) {
+          font-size: 24px;
+          line-height: 28px;
+
+          bottom: 80px;
+        }
       }
     }
 
@@ -49,9 +82,19 @@
       align-items: center;
       justify-content: center;
       margin-bottom: 12px;
+      margin-top: 12px;
+
+      label {
+        display: flex;
+      }
 
       input {
         margin-left: 4.28px;
+
+        @media screen and (min-width: 2500px) {
+          width: 35.15px;
+          height: 35.15px;
+        }
       }
 
       .main-form-dot,
@@ -59,6 +102,11 @@
         font-weight: 400;
         font-size: 14px;
         line-height: 16px;
+
+        @media screen and (min-width: 2500px) {
+          font-size: 28px;
+          line-height: 33px;
+        }
       }
 
       .main-form-dot {
@@ -72,13 +120,19 @@
 
       .form-feedback {
         position: absolute;
-        // right: 100px;
-        // bottom: 0px;
+        right: 18%;
         font-weight: 400;
         font-size: 12px;
         line-height: 14px;
         color: variables.$color-red;
 
+        @media screen and (min-width: 2500px) {
+          font-size: 24px;
+          line-height: 28px;
+
+          right: 15%;
+        }
+
         @media screen and (max-width: 360px) {
           display: flex;
         }
@@ -86,6 +140,7 @@
     }
 
     .main-form-button {
+      font-style: normal;
       font-weight: 400;
       font-size: 16px;
       line-height: 19px;
@@ -99,6 +154,11 @@
       background: variables.$color-black;
       border-radius: 25px;
 
+      @media screen and (min-width: 2500px) {
+        font-size: 32px;
+        line-height: 38px;
+      }
+
       @media screen and (max-width: 360px) {
         margin-top: 4px;
       }

src/components/newsletter.module.scss

@@ -6,6 +6,10 @@
   border-top: 1px solid variables.$color-black;
   background: variables.$color-white;
 
+  @media screen and (min-width: 2500px) {
+    height: 141.24px;
+  }
+
   @media screen and (max-width: 1024px) {
     height: auto;
   }
@@ -38,6 +42,11 @@
 
       margin-bottom: 8px;
 
+      @media screen and (min-width: 2500px) {
+        font-size: 36px;
+        line-height: 42px;
+      }
+
       @media screen and (max-width: 1024px) {
         font-size: 14px;
         line-height: 16px;
@@ -68,6 +77,13 @@
           border: 1px solid variables.$color-grey2;
           border-radius: 4px;
 
+          @media screen and (min-width: 2500px) {
+            min-width: 668px;
+
+            font-size: 28px;
+            line-height: 33px;
+          }
+
           @media screen and (max-width: 1024px) {
             min-width: 100%;
           }
@@ -78,6 +94,11 @@
           font-size: 14px;
           line-height: 16px;
           color: variables.$color-grey;
+
+          @media screen and (min-width: 2500px) {
+            font-size: 28px;
+            line-height: 33px;
+          }
         }
 
         .form-feedback {
@@ -88,6 +109,13 @@
           font-size: 12px;
           line-height: 14px;
           color: variables.$color-red;
+
+          @media screen and (min-width: 2500px) {
+            font-size: 24px;
+            line-height: 28px;
+
+            right: -95px;
+          }
         }
       }
 
@@ -108,6 +136,12 @@
         letter-spacing: 0.05em;
         color: variables.$color-white;
 
+        @media screen and (min-width: 2500px) {
+          width: 246px;
+
+          font-size: 24px;
+        }
+
         @media screen and (max-width: 1024px) {
           width: 100%;
         }

src/variables.module.scss

@@ -18,6 +18,7 @@ $color-grey2: #e5e5e5;
 $color-grey3: #7d7d7d;
 $color-grey4: #f2f2f2;
 $color-grey5: #c6c6c6;
+$color-grey6: #b9b7b7;
 
 $color-red: #ff0000;