From ca62398a329ee2ffe2cc605223877cc75ad52245 Mon Sep 17 00:00:00 2001 From: wilovy Date: Wed, 21 Jan 2026 02:06:17 -0600 Subject: [PATCH 1/2] chore: :truck: Remove `shared` folder --- src/components/editor/CodeEditor.astro | 87 ++++++++ src/components/{shared => }/editor/config.ts | 2 +- .../{shared => }/editor/keywords.ts | 0 src/components/editor/output/Terminal.astro | 186 ++++++++++++++++++ .../{shared => }/editor/output/renderer.ts | 0 src/components/{shared => }/editor/theme.ts | 0 .../{shared => }/footer/Footer.astro | 0 .../{shared => }/sections/Section.astro | 0 src/components/shared/editor/CodeEditor.astro | 80 -------- .../shared/editor/output/Terminal.astro | 168 ---------------- .../{shared => }/sidebar/Sidebar.astro | 0 .../sidebar/ToggleSidebarButton.astro | 0 src/features/content/components/Navbar.astro | 12 +- src/features/home/components/Community.astro | 14 +- src/features/home/components/Hero.astro | 2 +- src/features/home/components/Playground.astro | 30 ++- src/pages/[slug].astro | 120 +++++++---- src/pages/index.astro | 2 +- 18 files changed, 403 insertions(+), 300 deletions(-) create mode 100644 src/components/editor/CodeEditor.astro rename src/components/{shared => }/editor/config.ts (94%) rename src/components/{shared => }/editor/keywords.ts (100%) create mode 100644 src/components/editor/output/Terminal.astro rename src/components/{shared => }/editor/output/renderer.ts (100%) rename src/components/{shared => }/editor/theme.ts (100%) rename src/components/{shared => }/footer/Footer.astro (100%) rename src/components/{shared => }/sections/Section.astro (100%) delete mode 100644 src/components/shared/editor/CodeEditor.astro delete mode 100644 src/components/shared/editor/output/Terminal.astro rename src/components/{shared => }/sidebar/Sidebar.astro (100%) rename src/components/{shared => }/sidebar/ToggleSidebarButton.astro (100%) diff --git a/src/components/editor/CodeEditor.astro b/src/components/editor/CodeEditor.astro new file mode 100644 index 0000000..3182f92 --- /dev/null +++ b/src/components/editor/CodeEditor.astro @@ -0,0 +1,87 @@ +--- +interface Props { + slug: string + initialCode?: string +} + +const { slug, initialCode = 'fn main() {\n println!("Hola, mundo!");\n}\n' } = Astro.props +--- + +
+
+ + diff --git a/src/components/shared/editor/config.ts b/src/components/editor/config.ts similarity index 94% rename from src/components/shared/editor/config.ts rename to src/components/editor/config.ts index 4445bb6..dc4b33c 100644 --- a/src/components/shared/editor/config.ts +++ b/src/components/editor/config.ts @@ -8,7 +8,7 @@ import { LRLanguage, } from "@codemirror/language" import { parser } from "@lezer/rust" -import { rustCompletions } from "~/components/shared/editor/keywords" +import { rustCompletions } from "~/components/editor/keywords" const rustLanguage = LRLanguage.define({ name: "rust", diff --git a/src/components/shared/editor/keywords.ts b/src/components/editor/keywords.ts similarity index 100% rename from src/components/shared/editor/keywords.ts rename to src/components/editor/keywords.ts diff --git a/src/components/editor/output/Terminal.astro b/src/components/editor/output/Terminal.astro new file mode 100644 index 0000000..b22895d --- /dev/null +++ b/src/components/editor/output/Terminal.astro @@ -0,0 +1,186 @@ +--- +import IconLoader2 from "~icons/tabler/loader-2" +import IconPlayerPlay from "~icons/tabler/player-play" +import IconTerminal from "~icons/tabler/terminal" +--- + + +
+
+
+ +
+
+
+ $ + cargo run +
+
+
+ + diff --git a/src/components/shared/editor/output/renderer.ts b/src/components/editor/output/renderer.ts similarity index 100% rename from src/components/shared/editor/output/renderer.ts rename to src/components/editor/output/renderer.ts diff --git a/src/components/shared/editor/theme.ts b/src/components/editor/theme.ts similarity index 100% rename from src/components/shared/editor/theme.ts rename to src/components/editor/theme.ts diff --git a/src/components/shared/footer/Footer.astro b/src/components/footer/Footer.astro similarity index 100% rename from src/components/shared/footer/Footer.astro rename to src/components/footer/Footer.astro diff --git a/src/components/shared/sections/Section.astro b/src/components/sections/Section.astro similarity index 100% rename from src/components/shared/sections/Section.astro rename to src/components/sections/Section.astro diff --git a/src/components/shared/editor/CodeEditor.astro b/src/components/shared/editor/CodeEditor.astro deleted file mode 100644 index 8f38bde..0000000 --- a/src/components/shared/editor/CodeEditor.astro +++ /dev/null @@ -1,80 +0,0 @@ ---- -interface Props { - slug: string - initialCode?: string -} - -const { slug, initialCode = 'fn main() {\n println!("Hola, mundo!");\n}\n' } = Astro.props ---- - -
- - diff --git a/src/components/shared/editor/output/Terminal.astro b/src/components/shared/editor/output/Terminal.astro deleted file mode 100644 index db1be0f..0000000 --- a/src/components/shared/editor/output/Terminal.astro +++ /dev/null @@ -1,168 +0,0 @@ ---- -import IconLoader2 from "~icons/tabler/loader-2" -import IconPlayerPlay from "~icons/tabler/player-play" -import IconTerminal from "~icons/tabler/terminal" ---- - - -
-
-
- -
-
-
- $ - cargo run -
-
-
- - diff --git a/src/components/shared/sidebar/Sidebar.astro b/src/components/sidebar/Sidebar.astro similarity index 100% rename from src/components/shared/sidebar/Sidebar.astro rename to src/components/sidebar/Sidebar.astro diff --git a/src/components/shared/sidebar/ToggleSidebarButton.astro b/src/components/sidebar/ToggleSidebarButton.astro similarity index 100% rename from src/components/shared/sidebar/ToggleSidebarButton.astro rename to src/components/sidebar/ToggleSidebarButton.astro diff --git a/src/features/content/components/Navbar.astro b/src/features/content/components/Navbar.astro index 9e58eeb..42f39c7 100644 --- a/src/features/content/components/Navbar.astro +++ b/src/features/content/components/Navbar.astro @@ -1,7 +1,7 @@ --- import logoImage from "~/assets/images/webp/logo.webp" -import Sidebar from "~/components/shared/sidebar/Sidebar.astro" -import ToggleSidebarButton from "~/components/shared/sidebar/ToggleSidebarButton.astro" +import Sidebar from "~/components/sidebar/Sidebar.astro" +import ToggleSidebarButton from "~/components/sidebar/ToggleSidebarButton.astro" import { lessons } from "~/content-manager" import IconBrandGithub from "~icons/tabler/brand-github" @@ -31,4 +31,10 @@ const sidebarItems = lessons.map((content) => ({ - + diff --git a/src/features/home/components/Community.astro b/src/features/home/components/Community.astro index 151dfad..b06e4bf 100644 --- a/src/features/home/components/Community.astro +++ b/src/features/home/components/Community.astro @@ -1,5 +1,5 @@ --- -import Section from "~/components/shared/sections/Section.astro" +import Section from "~/components/sections/Section.astro" import FaBrandsDiscord from "~icons/fa-brands/discord" --- @@ -7,16 +7,20 @@ import FaBrandsDiscord from "~icons/fa-brands/discord" id="community" className="min-h-screen flex flex-col justify-center items-center w-full py-20 px-6" > -

Comunidad Rust

+

+ Comunidad Rust +

-
+

Sigue aprendiendo junto a miles de entusiastas de Rust - Forma parte de nuestra comunidad, comparte tus avances, resuelve dudas y colabora con otros aprendices - y expertos de Rust. + Forma parte de nuestra comunidad, comparte tus avances, resuelve dudas y colabora + con otros aprendices y expertos de Rust.

-
+
+
-

Prueba Rust en tu navegador

+

+ Prueba Rust en tu navegador +

-

- ¡Aprende Rust sin instalar nada! - Explora lecciones interactivas y experimenta con código en un playground integrado, directamente - desde tu navegador. 🚀 +

+ ¡Aprende Rust sin instalar nada! + Explora lecciones interactivas y experimenta con código en un playground integrado, + directamente desde tu navegador. 🚀

-
+
+
diff --git a/src/pages/[slug].astro b/src/pages/[slug].astro index f0c0004..7641286 100644 --- a/src/pages/[slug].astro +++ b/src/pages/[slug].astro @@ -1,6 +1,6 @@ --- -import CodeEditor from "~/components/shared/editor/CodeEditor.astro" -import Terminal from "~/components/shared/editor/output/Terminal.astro" +import CodeEditor from "~/components/editor/CodeEditor.astro" +import Terminal from "~/components/editor/output/Terminal.astro" import { lessons } from "~/content-manager" import NavButtons from "~/features/content/components/NavButtons.astro" import Navbar from "~/features/content/components/Navbar.astro" @@ -25,20 +25,36 @@ const { lesson, previousLesson, nextLesson } = Astro.props -
+
- - -
-