From 444768a350756808762260cb50b14c0b77d4cc79 Mon Sep 17 00:00:00 2001 From: Sergio Ribera <56278796+SergioRibera@users.noreply.github.com> Date: Mon, 14 Oct 2024 01:52:28 -0400 Subject: [PATCH 1/6] fix: change colors --- src/components/Clickable.astro | 9 ++++-- src/globals.css | 6 +++- src/sections/Footer.astro | 57 ++++++++++++++++------------------ 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/src/components/Clickable.astro b/src/components/Clickable.astro index 08f88e5..f2e7dcf 100644 --- a/src/components/Clickable.astro +++ b/src/components/Clickable.astro @@ -12,6 +12,7 @@ const { className, justify = "center", }: { + href?: string justify?: Alignment; className?: string; } = Astro.props; @@ -19,16 +20,18 @@ const { +
diff --git a/src/globals.css b/src/globals.css index 4edb1a5..0b9a376 100644 --- a/src/globals.css +++ b/src/globals.css @@ -5,7 +5,7 @@ :root { --background: #fed7aa; --orange: #f97316; - --light-orange: #ffedd5; + --light-orange: #ffce9a; --black: #000; } @@ -54,6 +54,10 @@ iframe { height: 100%; /* Responsive height */ } +footer { + background: #FFCE9A; +} + .sec { @apply sticky top-0; background: var(--background); diff --git a/src/sections/Footer.astro b/src/sections/Footer.astro index 35282ad..a67a458 100644 --- a/src/sections/Footer.astro +++ b/src/sections/Footer.astro @@ -7,37 +7,34 @@ import linkeding_svg from "@assets/Linkedin.svg"; import telegram_svg from "@assets/Telegram.svg"; --- -
-
-

Se parte de la

-

Comunidad

-

Y Descubre Como La

-

Comunidad Esta integrando

-

Rust en Distintas Areas

-
-
- - -

Github

- +
-
+ From efd757c21fd987851f6d1d4c240841face147d8d Mon Sep 17 00:00:00 2001 From: Sergio Ribera <56278796+SergioRibera@users.noreply.github.com> Date: Mon, 14 Oct 2024 02:11:55 -0400 Subject: [PATCH 2/6] feat: improve clickable component --- src/components/Clickable.astro | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/components/Clickable.astro b/src/components/Clickable.astro index f2e7dcf..5555960 100644 --- a/src/components/Clickable.astro +++ b/src/components/Clickable.astro @@ -9,10 +9,15 @@ type Alignment = | "evenly" | "stretch"; const { - className, + img, + href, + text, + className = "", justify = "center", }: { - href?: string + img?: string; + text?: string; + href?: string; justify?: Alignment; className?: string; } = Astro.props; @@ -28,10 +33,22 @@ const { } .clickable:hover { @apply cursor-pointer; - box-shadow: 0px 0px 0px 1px #000; + box-shadow: none; } -
- -
+{href && + + {img && } + {text &&

{text}

} + + +} + +{!href && +
+ {img && } + {text &&

{text}

} + +
+} From a402bffba4a21e81a4f2f2f8dc01e1abfa47e6bf Mon Sep 17 00:00:00 2001 From: Sergio Ribera <56278796+SergioRibera@users.noreply.github.com> Date: Mon, 14 Oct 2024 02:17:24 -0400 Subject: [PATCH 3/6] feat: replacement for new clickable parameters --- src/components/Clickable.astro | 8 ++++---- src/sections/Footer.astro | 21 ++++----------------- src/sections/Intro.astro | 10 ++++------ 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/components/Clickable.astro b/src/components/Clickable.astro index 5555960..2a4089b 100644 --- a/src/components/Clickable.astro +++ b/src/components/Clickable.astro @@ -25,8 +25,8 @@ const { {href && - + {img && } {text &&

{text}

} @@ -46,7 +46,7 @@ const { } {!href && -
+
{img && } {text &&

{text}

} diff --git a/src/sections/Footer.astro b/src/sections/Footer.astro index a67a458..de1cff7 100644 --- a/src/sections/Footer.astro +++ b/src/sections/Footer.astro @@ -15,26 +15,13 @@ import telegram_svg from "@assets/Telegram.svg";

Rust en Distintas Areas

- - -

Github

- - - - -

Discord

- + +
- - -

Linkedin

- - - -

Telegram

- + +
diff --git a/src/sections/Intro.astro b/src/sections/Intro.astro index 4e1a9c1..cd865df 100644 --- a/src/sections/Intro.astro +++ b/src/sections/Intro.astro @@ -12,10 +12,8 @@ import discord_svg from "@assets/discord.svg";

Un espacio seguro

En Español

- - - Discord - Discord - - + + Discord + Discord +
From c1d03f59cece513493e730868963408c08e6b80c Mon Sep 17 00:00:00 2001 From: Sergio Ribera <56278796+SergioRibera@users.noreply.github.com> Date: Mon, 14 Oct 2024 02:59:01 -0400 Subject: [PATCH 4/6] feat: create layout for some buttons --- src/layouts/ClickableGrid.astro | 35 +++++++++++++++++++++++++++++++++ src/sections/Community.astro | 29 +++------------------------ src/sections/Footer.astro | 33 ++++++++++++++++++++----------- src/sections/Intro.astro | 2 +- src/sections/WhyRust.astro | 12 ++--------- 5 files changed, 63 insertions(+), 48 deletions(-) create mode 100644 src/layouts/ClickableGrid.astro diff --git a/src/layouts/ClickableGrid.astro b/src/layouts/ClickableGrid.astro new file mode 100644 index 0000000..bc845b8 --- /dev/null +++ b/src/layouts/ClickableGrid.astro @@ -0,0 +1,35 @@ +--- +import Clickable from '@components/Clickable.astro'; + +interface ClickableItem { + t?: string; + text?: string; + href?: string; + img?: string; + className?: string; +} + +interface Props { + items: ClickableItem[][]; + className?: string; +} + +const { items, className = '' } = Astro.props; +--- + +
+ {items.map((row, rowIndex) => ( +
+ {row.map((item, colIndex) => ( + + {item.t} + + ))} +
+ ))} +
diff --git a/src/sections/Community.astro b/src/sections/Community.astro index 21e86ab..d05e827 100644 --- a/src/sections/Community.astro +++ b/src/sections/Community.astro @@ -3,6 +3,7 @@ import image1 from "../../public/rust_book.png"; import image2 from "../../public/road_map.png"; import Clickable from "../components/Clickable.astro"; import Section from "@layouts/section.astro"; +import ClickableGrid from "@layouts/ClickableGrid.astro"; import { readTOMLFiles } from "../utils/readProjects"; interface Project { @@ -44,19 +45,7 @@ const prebuiltData = await readTOMLFiles("proyectos-comunitarios/proyectos");
- - -
- Roadmap - El Libro -
- - -
- Rust para c# Developers - Mas -
- +
-
-
- Servicios - Aplicaciones Multiplataforma -
-
- Videojuegos - Inteligencia Artificial -
-
- Y mucho, mucho mas -
-
+
diff --git a/src/sections/Footer.astro b/src/sections/Footer.astro index de1cff7..ac7bc42 100644 --- a/src/sections/Footer.astro +++ b/src/sections/Footer.astro @@ -5,6 +5,8 @@ import github_svg from "@assets/github.svg"; import discord_svg from "@assets/discord.svg"; import linkeding_svg from "@assets/Linkedin.svg"; import telegram_svg from "@assets/Telegram.svg"; + +import ClickableGrid from "@layouts/ClickableGrid.astro"; --- diff --git a/src/sections/Intro.astro b/src/sections/Intro.astro index cd865df..cc767bd 100644 --- a/src/sections/Intro.astro +++ b/src/sections/Intro.astro @@ -12,7 +12,7 @@ import discord_svg from "@assets/discord.svg";

Un espacio seguro

En Español

- + Discord Discord diff --git a/src/sections/WhyRust.astro b/src/sections/WhyRust.astro index ad4a690..3804560 100644 --- a/src/sections/WhyRust.astro +++ b/src/sections/WhyRust.astro @@ -2,6 +2,7 @@ import chart from "@assets/rust_performance.svg"; import Clickable from "@components/Clickable.astro"; import Section from "@layouts/section.astro"; +import ClickableGrid from "@layouts/ClickableGrid.astro"; ---
@@ -37,14 +38,5 @@ import Section from "@layouts/section.astro"; subtitle="Moderno" description="Todas las herramientas que necesitas, Ya incluidas en la instalación" > - -
- Formatter - Gestor de paquetes -
-
- Reglas para calidad - Y mucho más -
- + From fe5e03c0f9b582891378cb5bba18b6be0075445a Mon Sep 17 00:00:00 2001 From: Sergio Ribera <56278796+SergioRibera@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:19:34 -0400 Subject: [PATCH 5/6] feat: add links to clickable --- src/components/Clickable.astro | 8 +++++--- src/sections/Community.astro | 27 ++++++++++++++++++--------- src/sections/WhyRust.astro | 14 +++++++++++++- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/components/Clickable.astro b/src/components/Clickable.astro index 2a4089b..0fa4a7e 100644 --- a/src/components/Clickable.astro +++ b/src/components/Clickable.astro @@ -12,12 +12,14 @@ const { img, href, text, + maxWidth = true, className = "", justify = "center", }: { img?: string; text?: string; href?: string; + maxWidth?: bool; justify?: Alignment; className?: string; } = Astro.props; @@ -25,7 +27,7 @@ const { {href && - + {img && } {text &&

{text}

} @@ -46,7 +48,7 @@ const { } {!href && -
+
{img && } {text &&

{text}

} diff --git a/src/sections/Community.astro b/src/sections/Community.astro index d05e827..b97688a 100644 --- a/src/sections/Community.astro +++ b/src/sections/Community.astro @@ -87,7 +87,7 @@ const prebuiltData = await readTOMLFiles("proyectos-comunitarios/proyectos"); return ( {project.brand_as_letter ? (

@@ -103,13 +103,7 @@ const prebuiltData = await readTOMLFiles("proyectos-comunitarios/proyectos");

{project.name.join(" ")}

{project.description}

- - {project.button_text} - + {project.button_text} ); }) @@ -130,5 +124,20 @@ const prebuiltData = await readTOMLFiles("proyectos-comunitarios/proyectos"); height="[80vh]" className="z-10" > - + diff --git a/src/sections/WhyRust.astro b/src/sections/WhyRust.astro index 3804560..fe2d5aa 100644 --- a/src/sections/WhyRust.astro +++ b/src/sections/WhyRust.astro @@ -38,5 +38,17 @@ import ClickableGrid from "@layouts/ClickableGrid.astro"; subtitle="Moderno" description="Todas las herramientas que necesitas, Ya incluidas en la instalación" > - + From ba50a9bb05d56fa223c7651bb0f66c3686d30fab Mon Sep 17 00:00:00 2001 From: Sergio Ribera <56278796+SergioRibera@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:33:42 -0400 Subject: [PATCH 6/6] feat: add learn section links --- src/sections/Community.astro | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/sections/Community.astro b/src/sections/Community.astro index 4dd90d6..9eaca19 100644 --- a/src/sections/Community.astro +++ b/src/sections/Community.astro @@ -50,7 +50,19 @@ const prebuiltData = await readTOMLFiles("proyectos-comunitarios/proyectos");
- +