feat: separe communities and projects in individual pages

Author: Phosphorus-M

build.rs

@@ -21,7 +21,7 @@ fn main() {
 
     // Generate src/extras/mod.rs
     let mut out = fs::File::create("src/extras/mod.rs").unwrap();
-    write!(out, "#[rustfmt::skip]\nmod comunities;\n#[rustfmt::skip]\nmod projects;\npub use comunities::*;\npub use projects::*;\n").unwrap();
+    write!(out, "#[rustfmt::skip]\nmod other_communities;\nmod rust_communities;\n#[rustfmt::skip]\nmod projects;\npub use other_communities::*;\npub use rust_communities::*;\npub use projects::*;\n").unwrap();
 
     for folder in folders {
         let folder = folder.unwrap();
@@ -34,7 +34,7 @@ fn main() {
         path.push(folder.path());
 
         match folder.file_name().to_str().unwrap() {
-            "comunidades" => generate_comunity(&path),
+            "comunidades" => generate_community(&path),
             "proyectos" => generate_projects(&path),
             _ => {}
         }
@@ -55,9 +55,9 @@ fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> std::io::Result
     Ok(())
 }
 
-fn generate_comunity(path: &Path) {
+fn generate_community(path: &Path) {
     let folders = fs::read_dir(path).unwrap();
-    let mut comunities = Vec::new();
+    let mut communities = Vec::new();
 
     for file in folders {
         let file = file.unwrap();
@@ -68,26 +68,41 @@ fn generate_comunity(path: &Path) {
         let file_path = file.path();
         let toml_str = fs::read_to_string(&file_path).unwrap();
         let toml_str = toml::from_str::<CommunityItem>(&toml_str).unwrap();
-        comunities.push((file_path, toml_str));
+        communities.push((file_path, toml_str));
     }
-    let mut out = fs::File::create("src/extras/comunities.rs").unwrap();
+    let mut other_file = fs::File::create("src/extras/other_communities.rs").unwrap();
     write!(
-        out,
-        "use crate::models::CommunityItem;\npub const OTHER_COMUNITIES: &[CommunityItem] = &[\n"
+        other_file,
+        "use crate::models::CommunityItem;\npub const OTHER_COMMUNITIES: &[CommunityItem] = &[\n"
     )
-    .unwrap();
-    for (_p, t) in comunities {
+    .expect("No se pudo crear el archivo src/extras/other_communities.rs");
+
+    let mut rust_file = fs::File::create("src/extras/rust_communities.rs").unwrap();
+    write!(
+        rust_file,
+        "use crate::models::CommunityItem;\npub const RUST_COMMUNITIES: &[CommunityItem] = &[\n"
+    )
+    .expect("No se pudo crear el archivo src/extras/rust_communities.rs");
+
+    for (_p, community) in communities {
+        let mut output_file = if community.name.join("").to_lowercase().contains("rust") {
+            &rust_file
+        } else {
+            &other_file
+        };
+
         let CommunityItem {
             name,
             description,
             link,
             icon,
             brand_src,
             brand_alt,
-        } = t;
+        } = community;
         let brand_src = brand_src.replace("./", "/gen_assets/");
+
         write!(
-            out,
+            output_file,
             r#"
     CommunityItem {{
         name: &{name:?},
@@ -100,7 +115,9 @@ fn generate_comunity(path: &Path) {
         )
         .unwrap();
     }
-    write!(out, "\n];").unwrap();
+
+    write!(other_file, "\n];").unwrap();
+    write!(rust_file, "\n];").unwrap();
 }
 
 fn iter_dir(path: &Path, mut callback: impl FnMut(DirEntry, Metadata)) {

src/app.rs

@@ -4,7 +4,7 @@ use leptos_router::{Router, Routes, StaticParamsMap, StaticRoute};
 
 use crate::{
     components::{Footer, HeadInformation, Header},
-    pages::{Aprende, Communidad, Contributors, Index},
+    pages::{Aprende, Communities, Contributors, Index, Projects},
 };
 
 #[component]
@@ -33,15 +33,20 @@ pub fn App() -> impl IntoView {
                         static_params=move || Box::pin(async move { StaticParamsMap::default() })
                     />
                     <StaticRoute
-                        path="/comunidad"
-                        view=Communidad
+                        path="/comunidades"
+                        view=Communities
                         static_params=move || Box::pin(async move { StaticParamsMap::default() })
                     />
                     <StaticRoute
                         path="/colaboradores"
                         view=Contributors
                         static_params=move || Box::pin(async move { StaticParamsMap::default() })
                     />
+                    <StaticRoute
+                        path="/proyectos"
+                        view=Projects
+                        static_params=move || Box::pin(async move { StaticParamsMap::default() })
+                    />
                     <StaticRoute
                         path="/aprende"
                         view=Aprende

src/components/community_projects.rs

@@ -46,7 +46,7 @@ pub fn CommunityProjects(#[prop(default = false)] show_more: bool) -> impl IntoV
                     view! {
                         <div class="w-full flex justify-end my-3">
                             <A
-                                href="/comunidad"
+                                href="/proyectos"
                                 class="text-black/80 dark:text-white/80 hover:text-orange-500 fill-black/80 dark:fill-white/80 hover:fill-orange-500 font-work-sans font-light text-2xl flex justify-center items-center"
                             >
                                 "Ver todos los proyectos"

src/components/other_communities.rs

@@ -2,23 +2,50 @@ use leptos::{component, view, IntoView};
 
 use crate::{
     components::{CommunityCard, NextIcon},
-    extras::OTHER_COMUNITIES,
+    extras::{OTHER_COMMUNITIES, RUST_COMMUNITIES},
 };
 
 #[component]
-pub fn OtherCommunities(#[prop(default = false)] show_more: bool) -> impl IntoView {
+pub fn OtherCommunities(
+    #[prop(default = false)] show_more: bool,
+    #[prop(default = false)] other_communities: bool,
+) -> impl IntoView {
+    let communities = match (other_communities, show_more) {
+        (true, false) => OTHER_COMMUNITIES.to_vec(),
+        (false, false) => RUST_COMMUNITIES.to_vec(),
+        (_, true) => {
+            let mut all_communities = vec![];
+            all_communities.extend(OTHER_COMMUNITIES.to_vec());
+            all_communities.extend(RUST_COMMUNITIES.to_vec());
+            all_communities
+        }
+    };
+
     view! {
         <section class="bg-orange-50 dark:bg-transparent py-20">
             <div class="container mx-auto px-4">
-                <h2 class="text-3xl text-left mb-6">
-                    <span class="font-work-sans font-light">"Otras "</span>
-                    <span class="font-alfa-slab text-orange-500">"Comunidades"</span>
-                    <span class="font-work-sans font-light">" recomendadas "</span>
-                </h2>
+
+                {if other_communities {
+                    view! {
+                        <h2 class="text-3xl text-left mb-6">
+                            <span class="font-work-sans font-light">"Otras "</span>
+                            <span class="font-alfa-slab text-orange-500">"Comunidades"</span>
+                            <span class="font-work-sans font-light">" recomendadas "</span>
+                        </h2>
+                    }
+                } else {
+                    view! {
+                        <h2 class="text-3xl text-left mb-6">
+                            <span class="font-work-sans font-light">"Comunidades de"</span>
+                            <span class="font-alfa-slab text-orange-500">" Rust"</span>
+                        </h2>
+                    }
+                }}
                 <div class="w-full grid sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 gap-x-8 gap-y-8">
-                    {OTHER_COMUNITIES
+
+                    {communities
                         .iter()
-                        .take(if show_more { 5 } else { OTHER_COMUNITIES.len() })
+                        .take(if show_more { 5 } else { communities.len() })
                         .map(|item| {
                             let image_src = if cfg!(debug_assertions)
                                 && item.brand_src.starts_with("/gen_assets")
@@ -40,12 +67,11 @@ pub fn OtherCommunities(#[prop(default = false)] show_more: bool) -> impl IntoVi
                         })
                         .collect::<Vec<_>>()}
                 </div>
-
                 {if show_more {
                     view! {
                         <div class="w-full flex justify-end my-3">
                             <a
-                                href="/comunidad"
+                                href="/comunidades"
                                 class="text-black/80 dark:text-white/80 hover:text-orange-500 fill-black/80  dark:fill-white/80 hover:fill-orange-500 font-work-sans font-light text-2xl flex justify-center items-center"
                             >
                                 "Ver todas las comunidades"

src/models/mod.rs

@@ -1,3 +1,4 @@
+#[derive(Clone)]
 pub struct CommunityItem {
     pub name: &'static [&'static str],
     pub description: &'static str,

src/pages/communidad.rs renamed to src/pages/communities.rs

@@ -1,13 +1,13 @@
 use leptos::{component, view, IntoView};
 
-use crate::components::{CommunityProjects, OtherCommunities};
+use crate::components::OtherCommunities;
 
 #[component]
-pub fn Communidad() -> impl IntoView {
+pub fn Communities() -> impl IntoView {
     view! {
         <div>
-            <CommunityProjects/>
             <OtherCommunities/>
+            <OtherCommunities other_communities=true/>
         </div>
     }
 }

src/pages/mod.rs

@@ -1,9 +1,11 @@
 mod aprende;
-mod communidad;
+mod communities;
 mod contributors;
 mod index;
+mod projects;
 
 pub use aprende::Aprende;
-pub use communidad::Communidad;
+pub use communities::Communities;
 pub use contributors::Contributors;
 pub use index::Index;
+pub use projects::Projects;

src/pages/projects.rs

@@ -0,0 +1,14 @@
+use leptos::{component, view, IntoView};
+
+use crate::components::CommunityProjects;
+
+#[component]
+pub fn Projects() -> impl IntoView {
+    view! {
+        <div class="mx-auto">
+            <CommunityProjects/>
+
+        // TODO: Fetch all our projects from Discord using our API
+        </div>
+    }
+}