cambios en los footer

ging · Oct 4, 2024 · 2cd2ed7 · 2cd2ed7
1 parent 828094f
commit 2cd2ed7
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 50 deletions.
diff --git a/app/about/page.js b/app/about/page.js
@@ -76,7 +76,7 @@ export default function About() {
           {t("about.Columns.sectionTitle")}
         </Heading>
         <div className="flex flex-col sm:flex-row subprojects_container gap-0 sm:gap-16">
-          <div className="standard_margin-l subproject text-ffdGreen-300 basis-6/12  border-2 sm:border-4 border-solid border-transparent border-t-ffdGreen-400">
+          <div className="standard_margin-l pb-6 sm:pb-0 subproject text-ffdGreen-300 basis-6/12  border-2 sm:border-4 border-solid border-transparent border-t-ffdGreen-400">
           <Heading level="h5" className="mb-1">
               {t("about.Columns.Column1.Title")}
             </Heading>

diff --git a/app/contact/page.js b/app/contact/page.js
@@ -29,7 +29,7 @@ export default function Contact(props) {
         </div>
         <section>
           <div>
-            <ul className="contact_info grid grid-cols-1 gap-8 pb-8 lg:grid-cols-3 lg:pb-0">
+            <ul className="xs:w-3/4 sm:w-full contact_info mx-auto grid grid-cols-1 gap-8 pb-8 sm:grid-cols-3 lg:pb-0">
               <li className="text-center min-h-40 shadow-md py-6 border rounded border-secondary">
                 <div className="flex flex-col gap-2 ">
                   <span className="content-center flex justify-center items-center">
@@ -56,7 +56,7 @@ export default function Contact(props) {
                   </div>
                 </div>
               </li>
-              <li className="text-center min-h-40 shadow-md py-6 border rounded border-secondary">
+              <li className=" text-center min-h-40 shadow-md py-6 border rounded border-secondary">
                 <div className="flex flex-col gap-2 ">
                   <span className="content-center flex justify-center items-center">
                   <SewingPinIcon className=" h-7 w-7 text-primary" />

diff --git a/app/research/page.js b/app/research/page.js
@@ -6,7 +6,7 @@ import Link from "next/link";
 import { mypublications } from "@/constants/publications";
 
 import { useTranslation } from "react-i18next";
-import { Card, CardVariants } from "@/components/core/CustomCards";
+import { Card, CardVariants } from "@/components/core/Cards";
 import { Button, ButtonVariants } from "@/components/ui/button";
 import Heading from "@/components/ui/Heading";
 import Text from "@/components/ui/Text";

diff --git a/app/team/page.js b/app/team/page.js
@@ -8,7 +8,7 @@ import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import Heading from "@/components/ui/Heading";
 import Text from "@/components/ui/Text";
-import { Card, CardVariants } from "@/components/core/CustomCards";
+import { Card, CardVariants } from "@/components/core/Cards";
 import { CardStackIcon } from "@radix-ui/react-icons";
 
 

diff --git a/components/core/Cards.jsx b/components/core/Cards.jsx
@@ -48,17 +48,9 @@ const renderTags = (tags) => {
   if (!tags) return null;
   const tagsArray = tags.split(",").map((tag) => tag.trim()); // Convierte el string en array y elimina espacios
   return tagsArray.map((tag, index) => (
-    <Badge key={index}>{tag}</Badge> // Añade una key a cada Label
+    <Badge key={index} variant="default">{tag}</Badge> // Añade una key a cada Label
   ));
 };
-// currentLang
-// const translateCategory = (category, currentLang) => {
-//   switch (es) {
-//     case "Naranjas":
-//      // transformar article-journal en "Artículo de revista"
-//       break;
-
-// }}
 
 // quitarle guión, añadir espaciado, mayúscula (Formateo)
 const renderCategory = (category) => {
@@ -236,7 +228,7 @@ const Card = React.forwardRef(
 
     // PUBLICATIONS - ok
     const publicationCard = (
-      <article className={cn(CardVariants({ direction, className }))}>
+      <article className={cn(CardVariants({ direction, className })+ " bg-white")}>
         <header className="w-full flex gap-3 justify-start">
           <Badge variant="outline" size="lg">
             {date}
@@ -269,7 +261,7 @@ const Card = React.forwardRef(
     const teamCard = (
       <article
         className={
-          cn(CardVariants({direction, className })) + " mx-auto xs:mx-0 w-60 gap-1"
+          cn(CardVariants({direction, className })) + " mx-auto xs:mx-0 w-60 gap-1 bg-white"
         }
       >
         {(img || svg) && (

diff --git a/components/core/Footer.jsx b/components/core/Footer.jsx
@@ -6,7 +6,8 @@ import Link from "next/link";
 import { useTranslation } from "react-i18next";
 import { routes } from "@/constants/routes";
 import { EnvelopeClosedIcon } from "@radix-ui/react-icons";
-import Image from "../ui/image-old";
+import Image from "../ui/image";
+import Text from "../ui/Text";
 
 export default function Footer(props) {
   const { t } = useTranslation();
@@ -24,42 +25,45 @@ export default function Footer(props) {
   );
 
   const sectionTitleClasses = clsx(
-    "text-white smallcaps text-left mb-2 text-[14px] font-bold"
+    "smallcaps text-left mb-2 text-[14px] font-bold"
   );
 
   return (
-    <footer className="narrow_padding flex flex-wrap justify-between md:flex-nowrap gap-4 sm:gap-8 lg:gap-12 items-start bg-primary text-white">
-      <div className={projectLogoContainerClasses}>
+    <footer className="narrow_padding flex flex-wrap justify-between md:flex-nowrap gap-4 sm:gap-8 lg:gap-12 items-start bg-gray-300 text-gray-800">
+      <div className={projectLogoContainerClasses + " w-full border-b pb-4 border-gray-400 md:border-0"}>
         <img
-          className="w-full min-w-64 max-w-[500px]" // Corrige la sintaxis del max-width
+          className="w-full min-w-64 max-w-[200px]" // Corrige la sintaxis del max-width
           src="logo_boiler_light.svg"
           alt="logo placeholder"
         />
-        <div className="text-white flex items-center">
-          <EnvelopeClosedIcon className="mr-2 mb-0.5" />
-          <p className="text-white text-[14px] flex gap-1">
-            <b>{t("footer.email")} </b>[email protected]
-          </p>
+        <div className=" flex justify-center flex-col gap-0 xs:flex-row xs:gap-2 md:flex-col md:gap-0">
+          <div className="flex flex-row">
+          <EnvelopeClosedIcon className="mr-2 mt-1" />
+          <Text className=" text-[14px] flex gap-1">
+            <b>{t("footer.email")} </b>
+          </Text>
+          </div>
+          <Text className=""> [email protected]</Text>
         </div>
       </div>
 
-      <nav className="w-2/5 sm:w-2/6 md:w-1/3 lg:w-1/4">
+      <nav className=" w-full xs:w-2/6 md:w-1/3 lg:w-1/4 border-b pb-4 border-gray-400 xs:border-0">
         <div className={sectionTitleClasses}>{t("footer.title1")}</div>
         <ul
-          className={`columns-1 gap-x-3 inline-block ${
-            routes.length <= 3 ? "sm:columns-1" : "sm:columns-2"
+          className={`columns-1 gap-x-8 inline-block ${
+            routes.length <= 3 ? "sm:columns-1" : "sm:columns-2 md:columns-1"
           }`}
         >
           {routes.map((route, index) => (
             <li
               key={index}
               className={
                 route.route === props.route
-                  ? "li-selected text-left mb-1 lg:mb-1.5 font-normal text-sm"
-                  : "text-left mb-1 lg:mb-1.5 font-normal text-[14px]"
+                  ? "li-selected text-left mb-1 lg:mb-1.5"
+                  : "text-left mb-1 lg:mb-1.5"
               }
             >
-              <Link className="font-normal" href={route.route}>
+              <Link className="text-base" href={route.route}>
                 {t(route.key)}
               </Link>
             </li>
@@ -69,7 +73,7 @@ export default function Footer(props) {
 
       <div>
         <div className={sectionTitleClasses}>{t("footer.title3")}</div>
-        <div className="w-fit flex gap-4 justify-center items-center flex-wrap xs:flex-nowrap">
+        <div className="w-fit flex gap-4 justify-start items-center flex-wrap xs:flex-col sm:flex-row  sm:flex-wrap lg:flex-nowrap">
           {/* <div className={partnerLogoClasses}>
             <img className={imgClasses} src="placeholder.jpg" alt="logo UPM" />
           </div> */}
@@ -78,7 +82,7 @@ export default function Footer(props) {
               fit="contain" // Ajuste de la imagen
               src="/placeholder.jpg" // Usa una ruta válida
               alt="Descripción de la imagen"
-              className="max-h-full w-auto " // Asegura que la imagen no exceda la altura máxima
+              className="max-h-full w-auto justify-start" // Asegura que la imagen no exceda la altura máxima
             />
           </div>
           <div className={partnerLogoClasses}>

diff --git a/components/ui/badge.jsx b/components/ui/badge.jsx
@@ -17,9 +17,9 @@ const badgeVariants = cva(
       },
       size: {
         default:
-          "px-3 py-.5 text-[0.875rem] font-normal" ,
+          "px-3 pt-0 pb-0.5 text-[0.875rem] font-normal" ,
         lg:
-          "px-3 py-.5 border-2 text-base font-semibold",
+          "px-3 pt-0 pb-0.5 border-2 text-base font-semibold",
         sm:
           "py-0.5 px-1.5 text-sm font-normal rounded-sm",
 

diff --git a/components/ui/image-old.jsx b/components/ui/image-old.jsx
@@ -22,7 +22,7 @@ const Image = ({
     "w-full h-full", // La imagen ocupará todo el contenedor
     {
       "object-cover": fit === "cover", // Uso de object-cover para cubrir el contenedor
-      "object-contain": fit === "contain", // Uso de object-contain para mantener la relación de aspecto
+      "object-contain justify-start": fit === "contain", // Uso de object-contain para mantener la relación de aspecto
     }
   );
 

diff --git a/components/ui/image.jsx b/components/ui/image.jsx
@@ -26,7 +26,7 @@ const Image = ({
     "w-full h-full flex items-center justify-center", 
     {
       "object-cover": fit === "cover",
-      "object-contain": fit === "contain",
+      "object-contain justify-start": fit === "contain",
     }
   );
 

diff --git a/constants/langs/en.js b/constants/langs/en.js
@@ -45,17 +45,17 @@ export const en = {
             "sectionHighlight": "“This highlighted sentence serves to summarize or emphasize the most important points presented in the introduction.“",
         },
         "Goals": {
-            "sectionTitle": "Objetivos",
+            "sectionTitle": "Goals",
             "Goal1": {
-                "GoalTitle": "Objetivo 1",
+                "GoalTitle": "Goal 1",
                 "GoalBody": "Porttitor ultricies magnis tincidunt nostra odio id. Vehicula morbi platea; convallis ex purus nascetur diam cursus lobortis.",
             },
             "Goal2": {
-                "GoalTitle": "Objetivo 2",
+                "GoalTitle": "Goal 2",
                 "GoalBody": " In pharetra efficitur, penatibus nascetur imperdiet mus torquent.Posuere facilisi mi conubia pulvinar donec elementum vel cursus vitae.",
             },
             "Goal3": {
-                "GoalTitle": "Objetivo 3",
+                "GoalTitle": "Goal 3",
                 "GoalBody": " Ultrices nunc commodo mi nascetti tempus eu. Integer pharetra eleifend platea mauris, mauris adipiscing aenean phasellus. Et blandit netus himenaeos."
             }
         },

diff --git a/constants/langs/es.js b/constants/langs/es.js
@@ -17,7 +17,7 @@ export const es = {
         "description": "Plantilla personalizable de sitios web para grupos de investigación y otros proyectos. Puedes consultar la documentación en {notion URL} para empezar a usarla.",
         "action-button": "Sobre proyecto",
         "section1Title": "Sobre el proyecto",
-        "section1Description": "Para el proyecto de Eunomia, se desarrollarán soluciones técnicas, estándares y herramientas abiertas que permitan la compartición de datos de manera segura, garantizando la soberanía y confianza de los usuarios. El proyecto incluye la implementación de tecnologías FIWARE y otros estándares para facilitar la interoperabilidad y la gobernanza de datos. También se proporcionarán tutoriales y soporte para que cualquier usuario pueda experimentar con estas tecnologías.",
+        "section1Description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus lacinia odio vitae vestibulum vestibulum. Cras venenatis euismod malesuada. Nullam id dolor sit amet risus malesuada aliquet. In efficitur, purus ac vehicula gravida, sapien justo luctus metus, id fermentum augue est in nunc. Aliquam erat volutpat. Duis pharetra, orci nec ultrices gravida, odio urna faucibus lorem, nec pharetra turpis felis nec sapien. Sed auctor lectus at elit consectetur, at venenatis ligula faucibus.",
         "section1Subtitle": "Principios del proyecto",
         "latestPublicationsTitle": "Últimas publicaciones",
         "latestPublicationsButton": "Ver todas las publicaciones",
@@ -46,24 +46,38 @@ export const es = {
             "sectionBody": "Vitae accumsan blandit platea hac sit efficitur bibendum. Nullam donec orci cubilia; ante feugiat ridiculus. Diam egestas tellus lectus rutrum ullamcorper fringilla aenean maximus. Aliquam tortor tincidunt platea auctor lorem. Semper varius elementum risus finibus tincidunt montes. Sit nunc purus ridiculus; velit sapien sodales. Fermentum platea nascetur odio quis iaculis dolor cras scelerisque. Phasellus quam venenatis; felis ligula sed est quis ex ante. Risus vehicula hac dictumst litora mus. Posuere per parturient litora eleifend pharetra ad lectus. Primis magna rutrum malesuada laoreet ipsum pulvinar praesent. Tortor egestas sit himenaeos lacinia a ultricies litora. Ultrices consequat nunc et curabitur, hendrerit id mattis feugiat condimentum. Rutrum platea odio lorem interdum tellus; penatibus ullamcorper. Cubilia placerat luctus fames pretium urna penatibus himenaeos himenaeos? Felis pellentesque quam aenean mattis penatibus per suspendisse.",
             "sectionHighlight": "“Frase destacada del texto de la introducción que tiene función de resumir o resaltar los puntos más importantes”",
         },
-
+        "Goals": {
+            "sectionTitle": "Objetivos",
+            "Goal1": {
+                "GoalTitle": "Objetivo 1",
+                "GoalBody": "Porttitor ultricies magnis tincidunt nostra odio id. Vehicula morbi platea; convallis ex purus nascetur diam cursus lobortis.",
+            },
+            "Goal2": {
+                "GoalTitle": "Objetivo 2",
+                "GoalBody": " In pharetra efficitur, penatibus nascetur imperdiet mus torquent.Posuere facilisi mi conubia pulvinar donec elementum vel cursus vitae.",
+            },
+            "Goal3": {
+                "GoalTitle": "Objetivo 3",
+                "GoalBody": " Ultrices nunc commodo mi nascetti tempus eu. Integer pharetra eleifend platea mauris, mauris adipiscing aenean phasellus. Et blandit netus himenaeos."
+            }
+        },
         "Columns": {
-            "sectionTitle": "Content Title",
+            "sectionTitle": "Título de contenido",
             "Column1": {
-                "Title": "Content 1",
+                "Title": "Contenido 1",
                 "Subtitle": "",
                 "Body": "Non cras ornare augue ultrices himenaeos consequat. Viverra viverra faucibus nullam metus congue est adipiscing. Volutpat consectetur ornare feugiat, potenti maximus hac pulvinar inceptos. Eros massa interdum tempus ligula mollis pulvinar dapibus phasellus fusce. Sit habitant pharetra, enim lobortis mollis potenti nullam varius. Aptent integer leo elementum est inceptos egestas facilisi porta maecenas.",
-                "Button": "Action Button"
+                "Button": "Botón de acción"
             },
             "Column2": {
-                "Title": "Content 2",
+                "Title": "Contenido 2",
                 "Subtitle": "",
                 "Body": "Non cras ornare augue ultrices himenaeos consequat. Viverra viverra faucibus nullam metus congue est adipiscing. Volutpat consectetur ornare feugiat, potenti maximus hac pulvinar inceptos. Eros massa interdum tempus ligula mollis pulvinar dapibus phasellus fusce. Sit habitant pharetra, enim lobortis mollis potenti nullam varius.",
-                "Button": "Action Button"
+                "Button": "Botón de acción"
             }
         },
         "Impact": {
-            "sectionTitle": "Impact",
+            "sectionTitle": "Impacto",
             "sectionBody": "Porttitor ultricies magnis tincidunt nostra odio id. In pharetra efficitur, penatibus nascetur imperdiet mus torquent. Congue mauris euismod lorem vehicula tellus fringilla condimentum tincidunt diam. At vel semper mollis; semper vivamus sociosqu ex. Ultrices nunc commodo mi nascetur egestas neque potenti tempus eu. Integer pharetra eleifend platea mauris, mauris adipiscing aenean phasellus. Et blandit netus himenaeos inceptos suspendisse cubilia urna? Posuere facilisi mi conubia pulvinar donec elementum vel cursus vitae. Vehicula morbi platea; convallis ex purus nascetur diam cursus lobortis.",
 
         }