From e641c33f79fe4b64e8d1b05ede44519e73463f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 04:47:45 +0000 Subject: [PATCH 1/9] update year for see you soon string --- frontend/src/app/localization.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/localization.tsx b/frontend/src/app/localization.tsx index 4100c81..e46cafc 100644 --- a/frontend/src/app/localization.tsx +++ b/frontend/src/app/localization.tsx @@ -147,8 +147,8 @@ export const elementLocalization: ElementLocalization = { en: <>guadalahacks }, landing_seeYouSoon: { - es: <>¡Nos vemos en 2025!, - en: <>See you in 2025! + es: <>¡Nos vemos en 2026!, + en: <>See you in 2026! }, landing_eventDates: { es: <>17 y 18 de mayo de 2025, From 50d87380d08bdd7339be6e35066e807c5736c8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 04:49:53 +0000 Subject: [PATCH 2/9] hide countdown and show see you soon, thank you texts --- frontend/src/sections/LandingPage.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/sections/LandingPage.tsx b/frontend/src/sections/LandingPage.tsx index 920c593..c1a2c5d 100644 --- a/frontend/src/sections/LandingPage.tsx +++ b/frontend/src/sections/LandingPage.tsx @@ -32,16 +32,16 @@ const LandingPage: React.FC = () => { {/* (Commented divs for post-hackathon) */} {/* Countdown */} - {/*
+
{getLocalizedElement("landing_seeYouSoon", language)} -
*/} - +
+ {/* */} {/*
*/} {/* Location */} - {/*
+
{getLocalizedElement("landing_thankYou", language)} -
*/} +
{/* Date */} From bbf91b1309662f63767b3ed33754e976f9b974f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 04:51:27 +0000 Subject: [PATCH 3/9] hide devpost button --- frontend/src/sections/LandingPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/sections/LandingPage.tsx b/frontend/src/sections/LandingPage.tsx index c1a2c5d..2737d49 100644 --- a/frontend/src/sections/LandingPage.tsx +++ b/frontend/src/sections/LandingPage.tsx @@ -57,11 +57,11 @@ const LandingPage: React.FC = () => { {getLocalizedElement("landing_signUpSoon", language)}
*/} -
+ {/*
{getLocalizedElement("landing_devpost", language)} -
+
*/} {/*
From ff4ac32268f2a06a73fdb72f9a23333a4c7c63c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 04:53:43 +0000 Subject: [PATCH 4/9] show projects --- frontend/next.config.js | 8 +++++++- frontend/src/sections/LandingPage.tsx | 12 ++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/frontend/next.config.js b/frontend/next.config.js index 9e2dc93..8c5b033 100644 --- a/frontend/next.config.js +++ b/frontend/next.config.js @@ -75,10 +75,16 @@ const nextConfig = { basePath: false }, { - source: '/projects', + source: '/projects24', destination: 'https://guadalahacks.devpost.com/project-gallery', permanent: false, basePath: false + }, + { + source: '/projects25', + destination: 'https://guadalahacks-2025.devpost.com/project-gallery', + permanent: false, + basePath: false } ] } diff --git a/frontend/src/sections/LandingPage.tsx b/frontend/src/sections/LandingPage.tsx index 2737d49..7f24f2e 100644 --- a/frontend/src/sections/LandingPage.tsx +++ b/frontend/src/sections/LandingPage.tsx @@ -67,12 +67,16 @@ const LandingPage: React.FC = () => { {getLocalizedElement("landing_register", language)} +
*/} +
+ {getLocalizedElement("landing_seeProjects", language)}
- - {getLocalizedElement("landing_seeProjects", language)} - -
*/} + 2025 + +
+ 2024 +
{/* Placeholder Squares */} From f5acb96502476ef81749b301b0e84c656a4f2001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 05:04:05 +0000 Subject: [PATCH 5/9] reorder file and simplify landing --- frontend/src/app/localization.tsx | 18 ++------ frontend/src/sections/LandingPage.tsx | 62 +++++++++++---------------- 2 files changed, 27 insertions(+), 53 deletions(-) diff --git a/frontend/src/app/localization.tsx b/frontend/src/app/localization.tsx index e46cafc..820eff0 100644 --- a/frontend/src/app/localization.tsx +++ b/frontend/src/app/localization.tsx @@ -154,18 +154,6 @@ export const elementLocalization: ElementLocalization = { es: <>17 y 18 de mayo de 2025, en: <>17-18 May 2025 }, - landing_thankYou: { - es: <>Muchas gracias por acomapañarnos., - en: <>Thank you for coming. - }, - landing_teamsComingSoon: { - es: <>Pronto podrás conocer a los equipos detrás de los asombrosos proyectos., - en: <>Soon you'll be able to meet the teams behind these amazing projects. - }, - landing_signUpSoon: { - es: <>Pronto podrás inscribirte a guadalahacks 2025, - en: <>Registrations for guadalahacks 2025 are opening soon - }, landing_register: { es: <>Inscríbete ahora, en: <>Register now @@ -174,9 +162,9 @@ export const elementLocalization: ElementLocalization = { es: <>Crea tu equipo en Devpost, en: <>Create your team on Devpost }, - landing_seeProjects: { - es: <>Conoce los proyectos, - en: <>See all the projects + landing_projects: { + es: <>Proyectos, + en: <>Projects }, landing_countdown: { es: <>para finalizar, diff --git a/frontend/src/sections/LandingPage.tsx b/frontend/src/sections/LandingPage.tsx index 7f24f2e..1ec8e22 100644 --- a/frontend/src/sections/LandingPage.tsx +++ b/frontend/src/sections/LandingPage.tsx @@ -16,7 +16,7 @@ const LandingPage: React.FC = () => { const [language, _] = languageState.useState(); return (
- + {/* LOGO AND DATES */}
logo @@ -29,55 +29,41 @@ const LandingPage: React.FC = () => {
- {/* (Commented divs for post-hackathon) */} - - {/* Countdown */} -
- {getLocalizedElement("landing_seeYouSoon", language)} -
{/* */} - {/*
*/} - {/* Location */} -
- {getLocalizedElement("landing_thankYou", language)} -
- - {/* Date */} - - {/*
- {getLocalizedElement("landing_teamsComingSoon", language)} -
*/} - {/*
*/} - - {/* Login button */} - - {/* Register button */} - {/*
- {getLocalizedElement("landing_signUpSoon", language)} + {/* PRE-HACK */} + {/*
+ + {getLocalizedElement("landing_register", language)} +
*/} + {/* DURING HACK */} {/*
{getLocalizedElement("landing_devpost", language)}
*/} - {/*
- - {getLocalizedElement("landing_register", language)} - -
*/} -
- {getLocalizedElement("landing_seeProjects", language)} -
-
- 2025 -
-
- 2024 + + {/* POST-HACK */} +
+ {getLocalizedElement("landing_seeYouSoon", language)}
+
+
+ + {getLocalizedElement("landing_projects", language) + " 2025"} + +
+
+ + {getLocalizedElement("landing_projects", language) + " 2024"} + +
+
+ {/* Placeholder Squares */}
From 0d3441f656f711f1e9187a5036c1919f07a8f3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 05:23:03 +0000 Subject: [PATCH 6/9] whitespace --- frontend/src/sections/LandingPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/sections/LandingPage.tsx b/frontend/src/sections/LandingPage.tsx index 1ec8e22..ac72f70 100644 --- a/frontend/src/sections/LandingPage.tsx +++ b/frontend/src/sections/LandingPage.tsx @@ -63,7 +63,7 @@ const LandingPage: React.FC = () => {
- + {/* Placeholder Squares */}
From 9f9413b05eef3e44b088bfaff2daecec992bb50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 05:25:02 +0000 Subject: [PATCH 7/9] convert landing_projects into string --- frontend/src/app/localization.tsx | 8 ++++---- frontend/src/sections/LandingPage.tsx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/localization.tsx b/frontend/src/app/localization.tsx index 820eff0..a3dd3ba 100644 --- a/frontend/src/app/localization.tsx +++ b/frontend/src/app/localization.tsx @@ -37,6 +37,10 @@ export const stringLocalization: StringLocalization = { event_map_title: { es: "Ubicación del evento", en: "Event location" + }, + landing_projects: { + es: "Proyectos ", + en: "Projects " } } @@ -162,10 +166,6 @@ export const elementLocalization: ElementLocalization = { es: <>Crea tu equipo en Devpost, en: <>Create your team on Devpost }, - landing_projects: { - es: <>Proyectos, - en: <>Projects - }, landing_countdown: { es: <>para finalizar, en: <>to finish diff --git a/frontend/src/sections/LandingPage.tsx b/frontend/src/sections/LandingPage.tsx index ac72f70..5512b90 100644 --- a/frontend/src/sections/LandingPage.tsx +++ b/frontend/src/sections/LandingPage.tsx @@ -54,12 +54,12 @@ const LandingPage: React.FC = () => {
- {getLocalizedElement("landing_projects", language) + " 2025"} + {getLocalizedString("landing_projects", language) + "2025"}
- {getLocalizedElement("landing_projects", language) + " 2024"} + {getLocalizedString("landing_projects", language) + "2024"}
From 013c903bd72f3246d2faae1c7fdfe959336797ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 05:28:16 +0000 Subject: [PATCH 8/9] import getLocalizedString --- frontend/src/sections/LandingPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/sections/LandingPage.tsx b/frontend/src/sections/LandingPage.tsx index 5512b90..a380946 100644 --- a/frontend/src/sections/LandingPage.tsx +++ b/frontend/src/sections/LandingPage.tsx @@ -1,7 +1,7 @@ import React from 'react'; import dynamic from 'next/dynamic'; import './LandingPage.css'; // Import the CSS -import { getLocalizedElement, languageState } from '@/app/locale'; +import { getLocalizedElement, getLocalizedString, languageState } from '@/app/locale'; import { Varela_Round } from 'next/font/google' import Link from 'next/link'; import Image from 'next/image'; From bfc7de17b696a7044cf2f3f81e67943a175d78c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?han=20rodr=C3=ADguez?= Date: Tue, 20 May 2025 05:38:43 +0000 Subject: [PATCH 9/9] add gap between proj btns --- frontend/src/sections/LandingPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/sections/LandingPage.tsx b/frontend/src/sections/LandingPage.tsx index a380946..bf1e3d6 100644 --- a/frontend/src/sections/LandingPage.tsx +++ b/frontend/src/sections/LandingPage.tsx @@ -51,7 +51,7 @@ const LandingPage: React.FC = () => { {getLocalizedElement("landing_seeYouSoon", language)}
-
+
{getLocalizedString("landing_projects", language) + "2025"}