ajustes codigo

ging · Oct 24, 2024 · 4c1d748 · 4c1d748
1 parent 2fc1d0b
commit 4c1d748
Show file tree

Hide file tree

Showing 12 changed files with 129 additions and 89 deletions.
diff --git a/app/about/page.js b/app/about/page.js
@@ -79,27 +79,15 @@ export default function About() {
             <CardTitle level="h4">{t("about.Goals.Goal3.GoalTitle")}</CardTitle>
             <CardDescription>{t("about.Goals.Goal3.GoalBody")}</CardDescription>
           </CustomCard>
-
-          <CustomCard className="h-full w-full flex flex-col justify-start gap-4 xs:w-3/4 sm:w-full  shadow-md shadow-primary/15 rounded text-center padding_card_highlight">
-          <div className="mx-auto h-12 w-12 rounded-full flex bg-primary-300 justify-center items-center"> 
-            <FigmaLogoIcon className="m-auto h-7 w-7  text-primary"/>
-            </div>
-            {/* <span className="divider_auto" /> */}
-            <CardTitle level="h4">Título de la card</CardTitle>
-            <CardDescription>
-              Lorem Ipsum es simplemente el texto de relleno de las imprentas y
-              archivos de texto.
-            </CardDescription>
-          </CustomCard>
         </div>
       </section>
 
-      <section className="subprojects standard_padding-y bg-secondary-300">
-        <Heading level="h3" className="text-left standard_margin-x mb-4 ">
+      <section className="standard_padding-y px-16 bg-secondary-300">
+        <Heading level="h3">
           {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 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">
+        <div className="flex flex-col  sm:flex-row sm:justify-between gap-0 sm:gap-16">
+          <article className="basis-1/2">
             <Heading level="h5" className="mb-1">
               {t("about.Columns.Column1.Title")}
             </Heading>
@@ -116,9 +104,9 @@ export default function About() {
                 <span>{t("about.Columns.Column1.Button")}</span>
               </Link>
             </Button>
-          </div>
+          </article>
 
-          <div className="standard_margin-r subproject text-ffdBlue-300 basis-6/12  border-2 sm:border-4 border-solid border-transparent border-t-ffdBlue-300">
+          <article className="basis-1/2">
             <Heading level="h5" className="mb-1">
               {t("about.Columns.Column2.Title")}
             </Heading>
@@ -132,7 +120,7 @@ export default function About() {
                 <span>{t("about.Columns.Column2.Button")}</span>
               </Link>
             </Button>
-          </div>
+          </article>
         </div>
       </section>
 

diff --git a/app/design-system/page.js b/app/design-system/page.js
@@ -317,7 +317,7 @@ export default function DesignSystem(props) {
           <div className="project_cards my-4 sm:my-6 lg:my-10 sm:grid sm:grid-cols-2 sm:gap-4">
            {filteredCards.map(
              (
-               { date, route, title, author, center, description, category },
+               { date, title, author, doi, center, description, category },
                index
              ) => (
                <Card
@@ -330,7 +330,7 @@ export default function DesignSystem(props) {
                  subtitle={center}
                  description={description}
                 //  tags={tags}
-                 route={route}
+                 doi={doi}
                ></Card>
              )
            )}

diff --git a/app/globals.css b/app/globals.css
@@ -30,12 +30,7 @@
 .standard_margin-y {
     @apply my-6 sm:my-6 md:my-8 lg:my-12 
 }
-.standard_margin-l {
-    @apply mx-6 mt-2 sm:ml-8 sm:mr-0 md:ml-14 lg:ml-24 xl:ml-44 2xl:ml-60
-}
-.standard_margin-r {
-    @apply mx-6 mt-2 sm:mr-8 sm:ml-0 md:mr-14 lg:mr-24 xl:mr-44 2xl:mr-60
-}
+
 
 /*PADDINGS*/
 .standard_padding {

diff --git a/app/page.js b/app/page.js
@@ -53,8 +53,13 @@ export default function Page() {
       <Banner>
         <BannerContent className={"w-full"}>
           <BannerTitle className={"text-white"}>{t("front.title")}</BannerTitle>
-          <BannerDescription className="h-full text-balance">
+          <BannerDescription className="h-full text-balance flex flex-col gap-2">
             {t("front.description")}
+              <Button asChild variant="link" className={"w-fit text-white"}>
+                <Link rel="noopener noreferrer" target="_blank" href={"https://ging.github.io/boiler/documentation/"}>
+                  {t("front.doc-button")}
+                </Link>
+            </Button>
           </BannerDescription>
           <Divider />
           <Button
@@ -68,7 +73,7 @@ export default function Page() {
             {t("front.action-button")} <ArrowRightIcon className=" h-4 w-4" />
           </Button>
         </BannerContent>
-        <Image
+        <Image className={"hidden md:flex"}
           src="placeholder.jpg"
           alt="Descripción de la imagen"
           fit="cover"

diff --git a/components/bannerPum.jsx b/components/bannerPum.jsx
diff --git a/components/core/Cards.jsx b/components/core/Cards.jsx
@@ -212,7 +212,7 @@ const Card = React.forwardRef(
         </CardHeader>
         <CardBody>
           <CardContent className="gap-1">
-            <CardTitle level="h3">
+            <CardTitle level="h5">
               <i>{title}</i>
             </CardTitle>
             <Text level="p">{author}</Text>

diff --git a/components/core/Footer.jsx b/components/core/Footer.jsx
@@ -25,10 +25,10 @@ export default function Footer(props) {
   );
 
   return (
-    <footer className="narrow_padding flex flex-wrap justify-between gap-4 sm:gap-8 lg:gap-12 items-start bg-gray-300 text-gray-800">
-      <div className={projectLogoContainerClasses + " w-full pb-4 border-b border-secondary-400 md:border-0"}>
+    <footer className="narrow_padding flex flex-col flex-wrap justify-start gap-8 xs:flex-row justify-between items-start bg-gray-300 text-gray-800">
+      <div className={projectLogoContainerClasses}>
         <img
-          className="w-full min-w-40 max-w-[200px]" // Corrige la sintaxis del max-width
+          className="min-w-40 max-w-[200px]" // Corrige la sintaxis del max-width
           src="logo_boiler.svg"
           alt="logo placeholder"
         />
@@ -47,7 +47,7 @@ export default function Footer(props) {
         <div className={sectionTitleClasses}>{t("footer.title1")}</div>
         <ul
           className={`columns-1 gap-x-8 inline-block ${
-            activeRoutes.length <= 3 ? "sm:columns-1" : "md:columns-1"
+            activeRoutes.length <= 3 ? "xs:columns-1" : "xs:columns-2"
           }`}
         >
           {activeRoutes.map((route, index) => (
@@ -69,7 +69,7 @@ export default function Footer(props) {
 
       <div>
         <div className={sectionTitleClasses + " pb-2"} >{t("footer.title3")}</div>
-        <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="w-fit flex gap-4 justify-start items-center flex-wrap flex-col xs:flex-row sm:flex-wrap lg:flex-nowrap">
 
           <div className={partnerLogoClasses}>
             <Image

diff --git a/components/ui/Heading.jsx b/components/ui/Heading.jsx
@@ -43,12 +43,13 @@ const Heading = ({ level = "h1", children, className }) => {
   const classes = clsx([
     "text-primary-900 font-title font-bold text-pretty",
     {
-      "text-h1 2xl:text-5xl mb-6": level === "h1", // Aplicar "adasd" si el nivel es h1
-      "text-h2 2xl:text-3xl mb-4": level === "h2",
-      "text-h3 2xl:text-2xl mb-4": level === "h3",
-      "text-h4 2xl:text-xl mb-2": level === "h4",
-      "text-h5 2xl:text-lg mb-2": level === "h5",
-      "text-h6 font-medium uppercase mb-2": level === "h6",
+      "text-40 2xl:text-5xl mb-6": level === "h1", // Aplicar "adasd" si el nivel es h1
+      "text-36 2xl:text-3xl mb-4": level === "h2",
+      "text-32 2xl:text-2xl mb-4": level === "h3",
+      "text-28 2xl:text-xl mb-2": level === "h4",
+      "text-24 2xl:text-lg mb-2": level === "h5",
+      "text-base font-medium uppercase mb-2": level === "h6",
+
     },
     className
   ])

diff --git a/constants/langs/en.js b/constants/langs/en.js
@@ -13,7 +13,8 @@ export const en = {
     },
     "front": {
         "title": "Boilerplate by GING",
-        "description": "Customizable website template for research groups and other projects. See documentation at https://ging.github.io/boiler/documentation/ to use the template.",
+        "description": "Customizable website template for research groups and other projects. See documentation at the link below to use the template.",
+        "doc-button": "Documentation",
         "action-button": "About us",
         "section1Title": "Short description of the project",
         "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.",

diff --git a/constants/langs/es.js b/constants/langs/es.js
@@ -15,8 +15,9 @@ export const es = {
     },
     "front": {
         "title": "Boilerplate del GING",
-        "description": "Plantilla personalizable de sitios web para grupos de investigación y otros proyectos. Puedes consultar la documentación en https://ging.github.io/boiler/documentation/ para empezar a usarla.",
-        "action-button": "Sobre proyecto",
+        "description": "Plantilla personalizable de sitios web para grupos de investigación y otros proyectos. Puedes consultar la documentación en el enlace de abajo para empezar a usarla.",
+        "doc-button": "Documentación",
+        "action-button": "Documentación (cambiar)",
         "section1Title": "Sobre el proyecto",
         "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",

diff --git a/constants/placeholder-constants/team.json b/constants/placeholder-constants/team.json
@@ -17,7 +17,7 @@
     "img": "assets/img/team/avatar_placeholder.jpg",
     "email": "[email protected]",
     "center": "E.T.S. de ingenieros de telecomunicacion",
-    "key": "1"
+    "key": "2"
   },
   {
     "name": "Nombre Apellido",
@@ -27,7 +27,7 @@
     "img": "assets/img/team/avatar_placeholder.jpg",
     "email": "[email protected]",
     "center": "E.T.S. de ingenieros de telecomunicacion",
-    "key": "1"
+    "key": "3"
   },
   {
     "name": "Nombre Apellido",
@@ -37,7 +37,7 @@
     "img": "assets/img/team/avatar_placeholder.jpg",
     "email": "[email protected]",
     "center": "E.T.S. de ingenieros de telecomunicacion",
-    "key": "1"
+    "key": "4"
   },
   {
     "name": "Nombre Apellido",
@@ -47,6 +47,82 @@
     "img": "assets/img/team/avatar_placeholder.jpg",
     "email": "[email protected]",
     "center": "E.T.S. de ingenieros de telecomunicacion",
-    "key": "1"
+    "key": "5"
+  }
+  ,
+  {
+    "name": "Nombre Apellido",
+    "position": "POS",
+    "roleTranslationKey": "team.professorCards.roles.1",
+    "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "img": "assets/img/team/avatar_placeholder.jpg",
+    "email": "[email protected]",
+    "center": "E.T.S. de ingenieros de telecomunicacion",
+    "key": "6"
+  }
+  ,
+  {
+    "name": "Nombre Apellido",
+    "position": "POS",
+    "roleTranslationKey": "team.professorCards.roles.1",
+    "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "img": "assets/img/team/avatar_placeholder.jpg",
+    "email": "[email protected]",
+    "center": "E.T.S. de ingenieros de telecomunicacion",
+    "key": "7"
+  }
+  ,
+  {
+    "name": "Nombre Apellido",
+    "position": "POS",
+    "roleTranslationKey": "team.professorCards.roles.1",
+    "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "img": "assets/img/team/avatar_placeholder.jpg",
+    "email": "[email protected]",
+    "center": "E.T.S. de ingenieros de telecomunicacion",
+    "key": "8"
+  }
+  ,
+  {
+    "name": "Nombre Apellido",
+    "position": "POS",
+    "roleTranslationKey": "team.professorCards.roles.1",
+    "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "img": "assets/img/team/avatar_placeholder.jpg",
+    "email": "[email protected]",
+    "center": "E.T.S. de ingenieros de telecomunicacion",
+    "key": "9"
+  }
+  ,
+  {
+    "name": "Nombre Apellido",
+    "position": "POS",
+    "roleTranslationKey": "team.professorCards.roles.1",
+    "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "img": "assets/img/team/avatar_placeholder.jpg",
+    "email": "[email protected]",
+    "center": "E.T.S. de ingenieros de telecomunicacion",
+    "key": "10"
+  }
+  ,
+  {
+    "name": "Nombre Apellido",
+    "position": "POS",
+    "roleTranslationKey": "team.professorCards.roles.1",
+    "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "img": "assets/img/team/avatar_placeholder.jpg",
+    "email": "[email protected]",
+    "center": "E.T.S. de ingenieros de telecomunicacion",
+    "key": "11"
+  },
+  {
+    "name": "Nombre Apellido",
+    "position": "POS",
+    "roleTranslationKey": "team.professorCards.roles.1",
+    "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "img": "assets/img/team/avatar_placeholder.jpg",
+    "email": "[email protected]",
+    "center": "E.T.S. de ingenieros de telecomunicacion",
+    "key": "12"
   }
 ]
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -25,18 +25,20 @@ module.exports = {
         "main": ['var(--font-sourceSans)', 'sans-serif'],
       },
       fontSize: {
-        'xs': ['0.5rem', { lineHeight: '1.4' }],
-        'sm': ['0.75rem', { lineHeight: '1.4' }],
-        'base': ['1rem', { lineHeight: '1.4' }], // body
-
-        // con Hs creo que es mejor la verdad y así reservamos los tamañosde tw por si acaso
-        'h1': ['3rem', { lineHeight: '1.2' }],
-        'h2': ['2.5rem', { lineHeight: '1.2' }],
-        'h3': ['1.75rem', { lineHeight: '1.2' }],
-        'h4': ['1.5rem', { lineHeight: '1.2' }],
-        'h5': ['1.25rem', { lineHeight: '1.2'}],
-        'h6': ['1rem', { lineHeight: '1.2' }],
-
+        '2xs': ['0.625rem', { lineHeight: '1.4' }],  /* 10px */
+        'xs': ['0.75rem', { lineHeight: '1.4' }],    /* 12px */
+        'sm': ['0.875rem', { lineHeight: '1.4' }],   /* 14px */
+        'base': ['1rem', { lineHeight: '1.4' }],     /* 106px body */
+        '18': ['1.125rem', { lineHeight: '1.4' }],
+        '20': ['1.25rem', { lineHeight: '1.4' }], 
+        '24': ['1.5rem', { lineHeight: '1.4' }], 
+        '28': ['1.75rem', { lineHeight: '1.4' }],
+        '32': ['2rem', { lineHeight: '1.4' }],   
+        '36': ['2.25rem', { lineHeight: '1.4' }],
+        '40': ['2.5rem', { lineHeight: '1.4' }], 
+        '48': ['3rem', { lineHeight: '1.4' }], 
+        '56': ['3.5rem', { lineHeight: '1.4' }], 
+        '64': ['4rem', { lineHeight: '1.4' }],
       },
       colors: {
         // whiteFull: "#ffffff",