feat: improve map design (#592)

layout/FAQs/FAQs.tsx

@@ -3,35 +3,38 @@ import { withoutAuth } from "@context/Auth";
 import Navbar from "@components/Navbar";
 import Footer from "@components/Footer";
 
-import { Question } from "./components";
+import { Question, FindUs } from "./components";
 
 import questions from "@data/faqs.json";
 
 function Faq() {
   return (
-    <Navbar bgColor="primary" button={"quinary"} fgColor={"white"}>
-      <div className="spacing flex flex-col justify-between bg-primary py-20 lg:h-3/4 lg:flex-row">
-        <div className="mb-10 text-white lg:w-2/5">
-          <h1 className="font-terminal-uppercase mb-4 text-4xl font-bold lg:text-6xl">
-            Frequently Asked Questions
-          </h1>
-          <p className="text-lg">
-            This list of frequently asked questions serves to complement the
-            general rules that you can find below. Get in touch with the
-            organizing team whenever a question arises and we will add answers
-            to the most frequently asked questions here.
-          </p>
-        </div>
-        <div className="lg:w-1/3">
-          <div className="flex flex-col">
-            {questions.map((question, i) => (
-              <Question key={i} {...question} />
-            ))}
+    <>
+      <Navbar bgColor="primary" button="quinary" fgColor="white">
+        <div className="spacing flex flex-col justify-between bg-primary py-20 lg:h-3/4 lg:flex-row">
+          <div className="mb-10 text-white lg:w-2/5">
+            <h1 className="font-terminal-uppercase mb-4 text-4xl font-bold lg:text-6xl">
+              Frequently Asked Questions
+            </h1>
+            <p className="text-lg">
+              This list of frequently asked questions serves to complement the
+              general rules that you can find below. Get in touch with the
+              organizing team whenever a question arises and we will add answers
+              to the most frequently asked questions here.
+            </p>
+          </div>
+          <div className="lg:w-1/3">
+            <div className="flex flex-col">
+              {questions.map((question, i) => (
+                <Question key={i} {...question} />
+              ))}
+            </div>
           </div>
         </div>
-      </div>
+      </Navbar>
+      <FindUs />
       <Footer color="primary" />
-    </Navbar>
+    </>
   );
 }
 

layout/Team/components/FindUs/index.jsx → layout/FAQs/components/FindUs/index.tsx

@@ -1,8 +1,4 @@
-import dynamic from "next/dynamic";
-
-const Map = dynamic(() => import("./Map"), {
-  ssr: false,
-});
+import { motion as Motion } from "framer-motion";
 
 const email = "[email protected]";
 
@@ -15,10 +11,13 @@ export default function FindUs() {
         </h2>
 
         <p className="mb-8 font-iregular">
-          The SEI is free for participants and is organized by volunteers from
+          SEI is free for participants and is organized by volunteers from
           CeSIUM and from the university community.
         </p>
-
+        <p className="mb-8 font-iregular">
+          This years event will take place at Pedagogic Complex 2, Gualtar
+          Campus.
+        </p>
         <p className="mb-2 font-ibold">
           Centro de Estudantes de Engenharia Informática
         </p>
@@ -30,7 +29,7 @@ export default function FindUs() {
         </ul>
       </div>
       <div className="w-full lg:w-3/5">
-        <Map />
+        <img src="/images/map/location.svg" alt="" />
       </div>
     </section>
   );

layout/FAQs/components/index.ts

@@ -1,3 +1,4 @@
 import Question from "./Question";
+import FindUs from "./FindUs";
 
-export { Question };
+export { FindUs, Question };

layout/Team/Team.tsx

@@ -1,6 +1,6 @@
 import { withoutAuth } from "@context/Auth";
 
-import { Hero, FindUs, Organization } from "./components";
+import { Hero, Organization } from "./components";
 
 import Navbar from "@components/Navbar";
 import Footer from "@components/Footer";
@@ -10,7 +10,6 @@ function Index() {
     <Navbar bgColor="primary" button="quinary" fgColor="white">
       <Hero />
       <Organization />
-      <FindUs />
       <Footer color="primary" />
     </Navbar>
   );

layout/Team/components/index.ts

@@ -1,5 +1,4 @@
 import Hero from "./Hero";
-import FindUs from "./FindUs";
 import Organization from "./Organization";
 
-export { Hero, FindUs, Organization };
+export { Hero, Organization };