cambios en cards, iconos

ging · Oct 11, 2024 · 600fb06 · 600fb06
2 parents 4c0bf15 + 3fb8d3f
commit 600fb06
Show file tree

Hide file tree

Showing 13 changed files with 175 additions and 255 deletions.
diff --git a/README.md b/README.md
@@ -1 +1 @@
-# boiler
+# boiler prueba
diff --git a/app/design-system/page.js b/app/design-system/page.js
@@ -18,7 +18,6 @@ import { FaceIcon } from "@radix-ui/react-icons";
 import { projects } from "@/constants/projects";
 import { mypublications } from "@/constants/publications";
 
-
 export default function DesignSystem(props) {
   const { t, i18n } = useTranslation();
   const currentLang = i18n.language;
@@ -31,7 +30,7 @@ export default function DesignSystem(props) {
   const [filteredCards, setFilteredCards] = useState(projects);
 
   // Tus categorías para el filtro
-  const categories = ["all", "ind", "erg", "other"]; 
+  const categories = ["all", "ind", "erg", "other"];
 
   return (
     <main className={"page_" + currentLang + " standard_margin"}>
@@ -214,11 +213,11 @@ export default function DesignSystem(props) {
         >
           badge outline
         </Badge>
-        </div>
+      </div>
 
-        {/* badge sizes */}
-        <Heading level="h5">Size</Heading>
-        <div className="flex flex-wrap gap-4 pb-8">
+      {/* badge sizes */}
+      <Heading level="h5">Size</Heading>
+      <div className="flex flex-wrap gap-4 pb-8">
         <Badge
           href="#"
           className={badgeVariants({
@@ -248,7 +247,6 @@ export default function DesignSystem(props) {
         </Badge>
       </div>
 
-
       {/* cards */}
       <Heading level="h3">Cards</Heading>
       <section className="cards grid md:grid-cols-2 gap-4">
@@ -271,8 +269,7 @@ export default function DesignSystem(props) {
             return (
               <Card
                 key={id}
-                className={CardVariants({
-                })}
+                className={CardVariants({})}
                 date={date}
                 title={title}
                 subtitle={center}
@@ -291,11 +288,10 @@ export default function DesignSystem(props) {
       <section className="cards grid md:grid-cols-2 gap-4 mt-4">
         <Card
           cardType={"project"}
-          className={CardVariants({
-          })}
+          className={CardVariants({})}
           date={"fecha"}
           title={
-            "Utilización de escape rooms y videojuegos educativos en la Educación Universitaria"
+            "Project. Utilización de escape rooms y videojuegos educativos en la Educación Universitaria"
           }
           subtitle={"E.T.S DE ING. DE SISTEMAS INFORMÁTICOS"}
           tags={
@@ -313,10 +309,9 @@ export default function DesignSystem(props) {
 
         <Card
           cardType={"course"}
-          className={CardVariants({
-          })}
+          className={CardVariants({})}
           date={"2023"}
-          title={"Desarrollo de aplicaciones con React y React Native"}
+          title={"Course. Desarrollo de aplicaciones con React y React Native"}
           subtitle={"2nd Edition"}
           description={
             "Las tecnologías de React y React Native son una manera novedosa y muy potente de desarrollar aplicaciones de cliente, tanto aplicaciones web como aplicaciones nativas Android e iOS. Son una de las tecnologías más demandadas en el mercado laboral hoy en día, y este curso te permitirá dominarlas y hacer tus propias aplicaciones de forma autónoma."
@@ -328,11 +323,10 @@ export default function DesignSystem(props) {
 
         <Card
           cardType={"publication"}
-          className={CardVariants({
-          })}
+          className={CardVariants({})}
           date={"2024"}
           title={
-            "Empowering Database Learning through Remote Educational Escape Rooms"
+            "Pub. Empowering Database Learning through Remote Educational Escape Rooms"
           }
           author={
             "Enrique Barra, Sonsoles López-Pernas, Aldo Gordillo, Alejandro Pozo Huertas, Jose Muñoz, and Javier Conde"
@@ -343,47 +337,27 @@ export default function DesignSystem(props) {
           // buttonText={"leer publicación"}
         ></Card>
 
-        <Card
-          cardType={"team"}
-          className={CardVariants({
-          })}
-          img={"/assets/img/courses/fondo-cursos.png"}
-          name={"Nombre Apellidos"}
-          position={"Profesor Titular"}
-          center={"E.T.S. de ingenieros de telecomunicacion"}
-          mail={"[email protected]"}
-        ></Card>
         <Card
           cardType={"tool"}
-          className={CardVariants({
-          })}
+          className={CardVariants({})}
           img={"/assets/img/courses/fondo-cursos.png"}
-          title={"Card de herramienta"}
+          title={"Tool. Card de herramienta"}
           description={"descripción de la herramienta"}
           route={"https://github.com/agordillo/RESCORM"}
           github={"https://github.com/agordillo/RESCORM"}
         ></Card>
 
-
-
-
         <Card
-          cardType={"team"} 
-          className={CardVariants({  
-          })}
+          cardType={"team"}
+          className={CardVariants({})}
           date={"2024"}
-          name={
-            "Nombre Apellidos"
-          }
-          position={
-            "Eadasdasde"
-          }
-          tags={"Database, Learning, Remote, Education"}  // Tags separados por comas
-          category={"article-journal"}  // Categoría, será traducida a "artículo de revista"
-          img="placeholder.jpg"  // URL de la imagen
+          name={"Team. Nombre Apellidos"}
+          position={"Eadasdasde"}
+          tags={"Database, Learning, Remote, Education"} // Tags separados por comas
+          category={"article-journal"} // Categoría, será traducida a "artículo de revista"
+          img="placeholder.jpg" // URL de la imagen
           // svg={`<svg width="100" height="100"><circle cx="50" cy="50" r="40" fill="blue" /></svg>`} // Código SVG
         />
-
       </section>
       <section>
         <Heading level="h3" className={"mt-12"}>
@@ -406,8 +380,7 @@ export default function DesignSystem(props) {
               <Card
                 key={index}
                 cardType={"project"}
-                className={CardVariants({
-                })}
+                className={CardVariants({})}
                 date={date}
                 category={category}
                 title={title}
@@ -420,13 +393,13 @@ export default function DesignSystem(props) {
           )}
         </div>
       </section>
-
-      <Heading level="h3">Recent publications</Heading>
-      <RecentPublications/>
 
+      <Heading level="h3">Recent publications</Heading>
+      <RecentPublications />
 
-      <Heading level="h3" className={"border-t-2 border-t-primary pt-2 mt-4"}>Jerarquías de textos</Heading>
-
+      <Heading level="h3" className={"border-t-2 border-t-primary pt-2 mt-4"}>
+        Jerarquías de textos
+      </Heading>
 
       <Heading level="h2">Títulos de 1er nivel</Heading>
       <Text type="p"></Text>
@@ -448,8 +421,6 @@ export default function DesignSystem(props) {
 
       <Text type="p">jerarquías de textos</Text>
       <Text type="small">jerarquías de textos</Text>
-
-
     </main>
   );
 }
diff --git a/app/globals.css b/app/globals.css
@@ -51,7 +51,7 @@
   @apply py-6 sm:py-6 md:py-8 lg:py-12 
 }
 .padding_card_highlight {
-  @apply py-3 px-6 sm:p-4 md:pb-6 lg:px-6;
+  @apply p-4 lg:p-6;
 }
 
 

diff --git a/app/layout.js b/app/layout.js
@@ -1,25 +1,35 @@
 "use client";
 
-import React from 'react';
-import { BrowserRouter as Router, Outlet, Routes, Route } from 'react-router-dom';
+import React from "react";
+import {
+  BrowserRouter as Router,
+  Outlet,
+  Routes,
+  Route,
+} from "react-router-dom";
 
 import { Source_Sans_3, Inter } from "next/font/google";
 import "./globals.css";
 import { useState, useEffect } from "react";
 import { routes } from "@/constants/routes";
 
-
 // import i18n (needs to be bundled ;))
 import "./i18n";
 
 import Header from "@/components/core/Header";
 import Footer from "@/components/core/Footer";
 
-const sourceSans = Source_Sans_3({ subsets: ["latin"] , variable: "--font-sourceSans" });
-const inter = Inter({ subsets: ["latin"], weight: ["400", "700"] , variable: "--font-inter" });
+const sourceSans = Source_Sans_3({
+  subsets: ["latin"],
+  variable: "--font-sourceSans",
+});
+const inter = Inter({
+  subsets: ["latin"],
+  weight: ["400", "700"],
+  variable: "--font-inter",
+});
 
 export default function RootLayout({ children }) {
-
   //disable SSR whole project, this will make the project to be rendered only on client side
   const [isClient, setIsClient] = useState(false);
 
@@ -41,10 +51,10 @@ export default function RootLayout({ children }) {
           ))}
           </Routes>
             </div>
-        ) : null} 
-        <Footer /> 
-      </body>
-    </html>
+          ) : null}
+          <Footer />
+        </body>
+      </html>
     </Router>
   );
 }
diff --git a/app/page.js b/app/page.js
@@ -7,7 +7,7 @@ import { useTranslation } from "react-i18next";
 
 import { Button, ButtonVariants } from "@/components/ui/button";
 import Heading from "@/components/ui/Heading";
-import Divider from "@/components/ui/divider";
+import {Divider, DividerVariants} from "@/components/ui/divider";
 import Text from "@/components/ui/Text";
 import { ArrowRightIcon, EnvelopeOpenIcon } from "@radix-ui/react-icons";
 import Image from "@/components/ui/image";

diff --git a/app/research/page.js b/app/research/page.js
@@ -10,7 +10,7 @@ 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";
-import Divider from "@/components/ui/divider";
+import {Divider, DividerVariants} from "@/components/ui/divider";
 
 export default function Research() {
   const { t, i18n } = useTranslation();

diff --git a/app/team/page.js b/app/team/page.js
@@ -32,12 +32,13 @@ export default function Team(props) {
         email,
         center,
         roleTranslationKey,
-      }) => {
+      }, key) => {
         const emailAddress = email ? email.split("@") : null;
         const translatedRole = t(`${roleTranslationKey}`);
         const translatedPosition = t(position);
         return (
           <Card
+            key={key}
             cardType={"team"}
             className={CardVariants({
               variant: "team",
@@ -59,7 +60,8 @@ export default function Team(props) {
       {/* <Header route={"/team"} />   */}
       <main className="standard_margin">
         <Heading level="h2">{t("team.title")}</Heading>
-        <section className="mx-auto xs:ml-0 flex flex-wrap xs:gap-x-6 md:gap-x-8 gap-y-8 md:gap-y-12 justify-center">
+        {/* <section className="mx-auto grid xs:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-8"> */}
+        <section className="mx-auto flex flex-wrap gap-8 justify-center">
           {team["UPM Team"]?.members ? renderMembers(team["UPM Team"].members) : <p>No members found.</p>}
         </section>
       </main>