From fe4618a4e99eae78055d16fe437790c463df7a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Lobo?= <30907944+joaodiaslobo@users.noreply.github.com> Date: Tue, 5 Dec 2023 00:31:56 +0000 Subject: [PATCH] feat: improve map design (#592) --- layout/FAQs/FAQs.tsx | 45 +++--- .../components/FindUs/index.tsx} | 15 +- layout/FAQs/components/index.ts | 3 +- layout/Team/Team.tsx | 3 +- layout/Team/components/FindUs/Map/index.jsx | 46 ------ layout/Team/components/index.ts | 3 +- public/images/map/location.svg | 140 ++++++++++++++++++ 7 files changed, 175 insertions(+), 80 deletions(-) rename layout/{Team/components/FindUs/index.jsx => FAQs/components/FindUs/index.tsx} (73%) delete mode 100644 layout/Team/components/FindUs/Map/index.jsx create mode 100644 public/images/map/location.svg diff --git a/layout/FAQs/FAQs.tsx b/layout/FAQs/FAQs.tsx index c1ca82b1..892e10f2 100644 --- a/layout/FAQs/FAQs.tsx +++ b/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 ( - -
-
-

- Frequently Asked Questions -

-

- 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. -

-
-
-
- {questions.map((question, i) => ( - - ))} + <> + +
+
+

+ Frequently Asked Questions +

+

+ 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. +

+
+
+
+ {questions.map((question, i) => ( + + ))} +
-
+ +
- + ); } diff --git a/layout/Team/components/FindUs/index.jsx b/layout/FAQs/components/FindUs/index.tsx similarity index 73% rename from layout/Team/components/FindUs/index.jsx rename to layout/FAQs/components/FindUs/index.tsx index e8c0648e..b5015166 100644 --- a/layout/Team/components/FindUs/index.jsx +++ b/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 = "cesium@di.uminho.pt"; @@ -15,10 +11,13 @@ export default function FindUs() {

- 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.

- +

+ This years event will take place at Pedagogic Complex 2, Gualtar + Campus. +

Centro de Estudantes de Engenharia Informática

@@ -30,7 +29,7 @@ export default function FindUs() {
- +
); diff --git a/layout/FAQs/components/index.ts b/layout/FAQs/components/index.ts index 623c0a31..572c4b32 100644 --- a/layout/FAQs/components/index.ts +++ b/layout/FAQs/components/index.ts @@ -1,3 +1,4 @@ import Question from "./Question"; +import FindUs from "./FindUs"; -export { Question }; +export { FindUs, Question }; diff --git a/layout/Team/Team.tsx b/layout/Team/Team.tsx index a845572e..f70d455b 100644 --- a/layout/Team/Team.tsx +++ b/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() { -