Skip to content

Commit bd442f3

Browse files
clara7227clara7227
committed
Merge branch 'master' of https://github.com/ging/ging.github.com
merge master branch
2 parents 2231b06 + 78d4783 commit bd442f3

85 files changed

Lines changed: 737 additions & 288 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.nojekyll‎

Whitespace-only changes.

‎app/globals.css‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,13 +519,22 @@ main {
519519

520520
.arrows {
521521
position: absolute;
522-
bottom: 8rem;
523-
top: 83%;
524522
left: 50%;
525523
width: var(--size);
526524
height: var(--size);
527525
transform: translate(-10%, -50%);
528526
z-index: 100;
527+
/* phone */
528+
@media (max-width: 768px) {
529+
top: 85%;
530+
scale: 0.5;
531+
532+
};
533+
/* rest of devices */
534+
@media (min-width: 769px) {
535+
top: 83%;
536+
scale: 1;
537+
}
529538
}
530539

531540
.arrows::before,

‎app/layout.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ export default function RootLayout({ children }) {
3333

3434
return (
3535
// <html className={` ${sourceSans.variable} ${inter.variable} `}>
36-
<html className={` ${dmSans.variable} ${inter.variable} `}>
36+
<html className={` ${dmSans.variable} ${inter.variable} `} lang="en">
37+
<meta charset="UTF-8" />
38+
<meta name="description" content="GING: Grupo de Investigación de Internet de Nueva Generación, centrado en innovación educativa, espacios de datos, redes, videoconferencia e Inteligencia Artificial." />
39+
<meta name="keywords" content="Grupo, Investigación, UPM, ETSIT, Inteligencia Artificial, Redes, Videoconferencia, Espacios de Datos, Innovación Educativa, publicaciones, proyectos, colaboración"></meta>
3740
<title>GING </title>
3841
<body className="bg-background text-text">
3942
<Header route={"/"} />

‎app/newsEvents/page.js‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
"use client";
2+
import React from "react";
3+
import Heading from "@/components/ui/Heading";
4+
import { useTranslation } from "react-i18next";
5+
import NewsEventsCard from "@/components/cards/NewsEventsCard";
6+
import { newsEvents } from "@/constants/newsEvents";
7+
8+
const NewsEvents = () => {
9+
const { t, i18n } = useTranslation();
10+
const currentLang = i18n.language;
11+
return (
12+
<div className="standard_margin">
13+
<Heading level="h3" className="mt-3">
14+
{t("newsEvents.titleArchive")}
15+
</Heading>
16+
<div>
17+
{" "}
18+
{newsEvents.map(
19+
(
20+
{
21+
className,
22+
title_en,
23+
title_es,
24+
description_en,
25+
description_es,
26+
date,
27+
time,
28+
location,
29+
category,
30+
route,
31+
keywords_en,
32+
keywords_es,
33+
img,
34+
agenda,
35+
link,
36+
document,
37+
eventInscription,
38+
article,
39+
},
40+
key
41+
) => {
42+
return (
43+
<NewsEventsCard
44+
type="expanded"
45+
className={className}
46+
key={key}
47+
date={date}
48+
time={time}
49+
category={category}
50+
title_en={title_en}
51+
title_es={title_es}
52+
description_en={description_en}
53+
description_es={description_es}
54+
location={location}
55+
route={route}
56+
keywords_en={keywords_en}
57+
keywords_es={keywords_es}
58+
img={img}
59+
agenda={agenda}
60+
link={link}
61+
document={document}
62+
eventInscription={eventInscription}
63+
article={article}
64+
></NewsEventsCard>
65+
);
66+
}
67+
)}
68+
</div>
69+
</div>
70+
);
71+
};
72+
73+
export default NewsEvents;

‎app/page.js‎

Lines changed: 63 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
77
import { Button, ButtonVariants } from "@/components/ui/button";
88
import Heading from "@/components/ui/Heading";
99
import { Divider, DividerVariants } from "@/components/ui/divider";
10+
import { newsEvents } from "@/constants/newsEvents";
1011

1112
import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
1213
import EventIcon from "@mui/icons-material/Event";
@@ -15,6 +16,7 @@ import PlaceIcon from "@mui/icons-material/Place";
1516
import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
1617
import { FileDownloadOutlined } from "@mui/icons-material";
1718

19+
import NewsEventsCard from "@/components/cards/NewsEventsCard";
1820
import ResearchLineCard from "@/components/cards/ResearchLineCard";
1921
import Text from "@/components/ui/Text";
2022
import Image from "@/components/ui/image";
@@ -33,8 +35,6 @@ import {
3335

3436
// UI
3537
export default function Page() {
36-
//const [projects, setProjects] = useState(myprojectCards);
37-
3838
const { t, i18n } = useTranslation();
3939
const currentLang = i18n.language;
4040
// useEffect(() => {
@@ -74,113 +74,6 @@ export default function Page() {
7474
</Link>
7575
</BannerContent>
7676
</Banner>
77-
78-
<section className="padding_group_description" style={{backgroundImage: "linear-gradient(to right, #948CFFDD, #2c2e33)" }}>
79-
<Divider size="lg" className="hidden md:flex"></Divider>
80-
<Divider size="sm"></Divider>
81-
<Heading level="h1">40 Aniversario de internet en España</Heading>
82-
<div className="flex gap-4">
83-
<Mybadge variant="event" >
84-
<Heading level="subtitle" className="flex items-center gap-1 line !mb-0"><AccessTimeIcon className="mt-0.5" sx={{ fontSize: 22 }} /> 12:30</Heading>
85-
</Mybadge>
86-
<Mybadge variant="event" >
87-
<Heading level="subtitle" className="flex items-center gap-1 line !mb-0"><EventIcon className="mt-0.5" sx={{ fontSize: 22 }} /> 2 de diciembre</Heading>
88-
</Mybadge>
89-
<Mybadge variant="event" >
90-
<Heading level="subtitle" className="flex items-center gap-1 line !mb-0"><PlaceIcon className="mt-0.5" sx={{ fontSize: 22 }} />Salón de actos del Edificio C de la ETSIT</Heading>
91-
</Mybadge>
92-
</div>
93-
<Divider />
94-
<Text
95-
type="p"
96-
className="mb-1"
97-
>La primera conexión a internet en España fue realizada en 1985 desde la Escuela Técnica Superior de Ingenieros de Telecomunicación (ETSIT) de la Universidad Politécnica de Madrid (UPM). El envío de un email de prueba por una red TCP/IP conectada al servicio de correo electrónico de internet a través de EUnet, cuya transcendencia histórica ignoraban sus propios protagonistas, marcó el comienzo de la expansión en nuestro país de la que acabaría siendo en poco tiempo la red de redes. El acto para conmemorar este hito incluirá la participación por videoconferencia de los estadounidenses Vinton Cerf y Robert Kahn, considerados los padres de internet.</Text>
98-
<div className="grid grid-cols-[3rem_1fr] gap-x-4 mt-8">
99-
<Text type="p" className="mb-1">
100-
12:30
101-
</Text>
102-
<Text type="p" className="mb-1">
103-
Apertura institucional presidida por el rector de la UPM, Óscar
104-
García.
105-
</Text>
106-
<Text type="p" className="mb-1">
107-
12:45
108-
</Text>
109-
<Text type="p" className="mb-1">
110-
Charla del profesor emérito Juan Quemada sobre los primeros pasos en
111-
el despliegue de internet en España.
112-
</Text>
113-
<Text type="p" className="mb-1">
114-
13:10
115-
</Text>
116-
<Text type="p" className="mb-1">
117-
Diálogo por videoconferencia con Vinton Cerf y Robert Kahn, padres
118-
de internet, moderado por Juan Quemada.
119-
</Text>
120-
<Text type="p" className="mb-1">
121-
13:45
122-
</Text>
123-
<Text type="p" className="mb-1">
124-
Mesa redonda con pioneros españoles de internet moderada por el
125-
profesor emérito Juan Riera.
126-
</Text>
127-
<Text type="small" className="mb-1 col-start-2 pl-4 text-sm">
128-
José Antonio Mañas, socio fundador de Goya Servicios Telemáticos.
129-
</Text>
130-
<Text type="small" className="mb-1 col-start-2 pl-4 text-sm">
131-
José Barberá, exdirector de RedIRIS.
132-
</Text>
133-
<Text type="small" className="mb-1 col-start-2 pl-4 text-sm">
134-
Víctor Castelo, exdirector de RedIRIS.
135-
</Text>
136-
<Text type="small" className="mb-1 col-start-2 pl-4 text-sm">
137-
Isidoro Padilla, director de Servicios en Infovía (Telefónica).
138-
</Text>
139-
<Text type="p" className="mb-1">
140-
14:20
141-
</Text>
142-
<Text type="p" className="mb-1">
143-
Inauguración de la sección sobre la historia de internet en España
144-
en el Museo de Telecomunicación de la ETSIT-UPM.
145-
</Text>
146-
<Text type="p" className="mb-1">
147-
14:30
148-
</Text>
149-
<Text type="p" className="mb-1">
150-
Cóctel.
151-
</Text>
152-
</div>
153-
154-
<div className="flex gap-4 mt-8">
155-
<a
156-
href="https://eventos.upm.es/143851/detail/40o-aniversario-de-internet-en-espana.html"
157-
target="_blank"
158-
>
159-
<Button
160-
variant="outline"
161-
className="mb-8 gap-1 pb-2.5 flex items-center"
162-
>
163-
Inscripciones
164-
<ArrowForwardIcon className="h-6" />
165-
</Button>
166-
</a>
167-
<a
168-
href="/assets/documents/Articulo_FHT.pdf"
169-
download="Articulo_FHT.pdf"
170-
>
171-
<Button
172-
variant="outline"
173-
className="mb-8 gap-1 pb-2.5 flex items-center"
174-
>
175-
Descargar artículo
176-
<FileDownloadOutlined className="h-6" />
177-
</Button>
178-
</a>
179-
</div>
180-
{/* <Divider size="md"></Divider> */}
181-
<Divider size="xxl" className="hidden md:flex"></Divider>
182-
</section>
183-
18477
<section className="padding_group_description bg-background-200">
18578
<Divider size="xl" className="hidden md:flex" id="section2"></Divider>
18679

@@ -191,19 +84,19 @@ export default function Page() {
19184
<Divider size="xs" className="flex md:hidden"></Divider>
19285
<div className="statisticsContainer">
19386
<div className="statisticItemContainer">
194-
<h1 className="numbersFront"> +400</h1>
87+
<p className="numbersFront"> +400</p>
19588
<p className="unitFront">{t("front.statistics.papers")}</p>
19689
</div>
19790
<div className="statisticItemContainer">
198-
<h1 className="numbersFront">+6K</h1>
91+
<p className="numbersFront">+6K</p>
19992
<p className="unitFront">{t("front.statistics.citations")}</p>
20093
</div>
20194
<div className="statisticItemContainer">
202-
<h1 className="numbersFront">+150</h1>
95+
<p className="numbersFront">+150</p>
20396
<p className="unitFront">{t("front.statistics.projects")}</p>
20497
</div>
20598
<div className="statisticItemContainer">
206-
<h1 className="numbersFront">45</h1>
99+
<p className="numbersFront">45</p>
207100
<p className="unitFront">H-Index</p>
208101
</div>
209102
</div>
@@ -262,6 +155,63 @@ export default function Page() {
262155

263156
<Divider size="md"></Divider>
264157
</section>
158+
159+
<section className="newsArchive padding_group_description bg-background-550">
160+
161+
<Heading level="h3" className="mt-3">{t("newsEvents.title")} </Heading>
162+
<div className="flex flex-col sm:grid sm:grid-cols-2 lg:grid-cols-3 4xl:grid-cols-4 gap-3">
163+
164+
{newsEvents.map(
165+
(
166+
{
167+
className,
168+
title_es,
169+
title_en,
170+
description_en,
171+
description_es,
172+
date,
173+
time,
174+
location,
175+
category,
176+
route,
177+
keywords_en,
178+
keywords_es,
179+
img,
180+
type,
181+
182+
},
183+
key
184+
) => {
185+
return (
186+
<NewsEventsCard
187+
type="compact"
188+
className={className}
189+
key={key}
190+
date={date}
191+
time={time}
192+
category={category}
193+
title_en={title_en}
194+
title_es={title_es}
195+
description_en={description_en}
196+
description_es={description_es}
197+
location={location}
198+
route={route}
199+
keywords_en={keywords_en}
200+
keywords_es={keywords_es}
201+
img={img}
202+
203+
></NewsEventsCard>
204+
);
205+
}
206+
)}
207+
</div>
208+
<Link href="/newsEvents" className="flex justify-end">
209+
<Button variant="link" className="mt-4">
210+
{t("newsEvents.button")}{" "}
211+
<ArrowForwardIcon className="mt-0.5" sx={{ fontSize: 22 }} />
212+
</Button>
213+
</Link>
214+
</section>
265215
</main>
266216
);
267217
}

0 commit comments

Comments
 (0)