RustLangES · Phosphorus-M · Aug 29, 2023 · Aug 29, 2023 · Aug 29, 2023 · Aug 29, 2023
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -1,14 +1,54 @@
 name: clippy
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches:
       - main
 
 jobs:
-  clippy:
+  fmt:
     runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - run: rustup component add rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  leptosfmt:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: clippy
+      - name: Cache .cargo and target
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo
+          key: ${{ runner.os }}-cargo-leptos-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-leptos-${{ hashFiles('**/Cargo.lock') }}
+            ${{ runner.os }}-cargo-leptos
+      - name: Install LeptosFmt
+        run: cargo install leptosfmt --version 0.1.13
+      - name: Check LeptosFmt
+        run: leptosfmt --check .
 
+  clippy:
+    needs: [ fmt, leptosfmt ]
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
 

diff --git a/clippy.toml b/clippy.toml
@@ -0,0 +1,2 @@
+too-many-arguments-threshold = 100
+type-complexity-threshold = 1000
diff --git a/leptosfmt.toml b/leptosfmt.toml
@@ -0,0 +1,3 @@
+max_width = 100
+tab_spaces = 4
+attr_value_brace_style = "WhenRequired"
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -0,0 +1,9 @@
+max_width = 100
+hard_tabs = false
+tab_spaces = 4
+newline_style = "Auto"
+reorder_imports = true
+reorder_modules = true
+remove_nested_parens = true
+merge_derives = true
+imports_granularity = "Crate"
diff --git a/src/app.rs b/src/app.rs
@@ -11,9 +11,8 @@ pub fn App() -> impl IntoView {
     view! {
         <Router>
             <Routes>
-                <Route path="" view=|| view! { <Index /> }/>
+                <Route path="" view=|| view! { <Index/> }/>
             </Routes>
         </Router>
     }
 }
-
diff --git a/src/components/button_link.rs b/src/components/button_link.rs
@@ -1,5 +1,5 @@
-use std::collections::HashMap;
 use leptos::*;
+use std::collections::HashMap;
 
 #[component]
 pub fn ButtonLink(
@@ -10,23 +10,22 @@ pub fn ButtonLink(
 ) -> impl IntoView {
     let colors = HashMap::from([
         ("primary", "bg-orange-300 hover:bg-black hover:text-white"),
-        ("white", "bg-orange-100")
-    ]);
-    let sizes = HashMap::from([
-        ("tiny", "min-h-7"),
-        ("normal", "h-9"),
-        ("big", "h-12")
+        ("white", "bg-orange-100"),
     ]);
+    let sizes = HashMap::from([("tiny", "min-h-7"), ("normal", "h-9"), ("big", "h-12")]);
     let current_color = colors.get(&color).unwrap().to_string();
     let current_size = sizes.get(&size).unwrap().to_string();
 
-
     view! {
         <a
             href=href
             target="_blank"
-            class=format!("tracking-wider font-work-sans border border-black flex items-center px-4 drop-shadow-[4px_4px_0_rgba(0,0,0)] hover:drop-shadow-[0_0_0_rgba(0,0,0)] transition w-fit gap-x-4 sm:whitespace-nowrap max-w-[10rem] sm:max-w-none {} {}", current_color, current_size)
+            class=format!(
+                "tracking-wider font-work-sans border border-black flex items-center px-4 drop-shadow-[4px_4px_0_rgba(0,0,0)] hover:drop-shadow-[0_0_0_rgba(0,0,0)] transition w-fit gap-x-4 sm:whitespace-nowrap max-w-[10rem] sm:max-w-none {} {}",
+                current_color, current_size
+            )
         >
+
             {children()}
         </a>
     }

diff --git a/src/components/cards/card_title.rs b/src/components/cards/card_title.rs
@@ -1,27 +1,22 @@
 use leptos::*;
 
 #[component]
-pub fn CardTitle(
-    #[prop(into)] texts: Vec<&'static str>
-) -> impl IntoView {
+pub fn CardTitle(#[prop(into)] texts: Vec<&'static str>) -> impl IntoView {
     view! {
         <h5 class="text-xl">
-            {texts.into_iter()
-                .map(|word|
+            {texts
+                .into_iter()
+                .map(|word| {
                     if word.to_lowercase().contains("rust") {
                         view! {
                             <span class="font-alfa-slab text-orange-500 group-hover:text-white">
                                 {word}
                             </span>
                         }
                     } else {
-                        view! {
-                            <span class="font-work-sans text-black">
-                                {word}
-                            </span>
-                        }
+                        view! { <span class="font-work-sans text-black">{word}</span> }
                     }
-                )
+                })
                 .collect::<Vec<_>>()}
         </h5>
     }

diff --git a/src/components/cards/community_card.rs b/src/components/cards/community_card.rs
@@ -1,10 +1,10 @@
 use leptos::*;
 
-use crate::components::dummy_component::DummyComponent;
-use crate::components::icons::discord_icon::DiscordIcon;
-use crate::components::icons::github_icon::GithubIcon;
-use crate::components::icons::telegram_icon::TelegramIcon;
-use crate::components::cards::card_title::CardTitle;
+use crate::components::{
+    cards::card_title::CardTitle,
+    dummy_component::DummyComponent,
+    icons::{discord_icon::DiscordIcon, github_icon::GithubIcon, telegram_icon::TelegramIcon},
+};
 
 #[component]
 pub fn CommunityCard(
@@ -22,19 +22,18 @@ pub fn CommunityCard(
             class="group flex flex-col gap-y-6 border border-black p-6 hover:bg-orange-500 bg-orange-100 drop-shadow-[0_0_0_rgba(0,0,0)] hover:drop-shadow-[-4px_-4px_0_rgba(0,0,0)] transition justify-between"
         >
             <div>
-                <img src=brand_src width="60" class="rounded-full mb-4" alt=brand_alt />
-                <CardTitle texts=name />
-                <p class="font-work-sans text-black">
-                    {description}
-                </p>
+                <img src=brand_src width="60" class="rounded-full mb-4" alt=brand_alt/>
+                <CardTitle texts=name/>
+                <p class="font-work-sans text-black">{description}</p>
             </div>
             <span class="ml-auto">
                 {move || match icon {
-                    "discord" => view!{ <DiscordIcon size=30 /> },
-                    "github" => view!{ <GithubIcon size=30 /> },
-                    "telegram" => view!{ <TelegramIcon size=30 /> },
-                    _ => view!{ <DummyComponent /> }
+                    "discord" => view! { <DiscordIcon size=30/> },
+                    "github" => view! { <GithubIcon size=30/> },
+                    "telegram" => view! { <TelegramIcon size=30/> },
+                    _ => view! { <DummyComponent/> },
                 }}
+
             </span>
         </a>
     }

diff --git a/src/components/cards/mod.rs b/src/components/cards/mod.rs
@@ -1,3 +1,3 @@
+pub mod card_title;
 pub mod community_card;
 pub mod project_card;
-pub mod card_title;
diff --git a/src/components/cards/project_card.rs b/src/components/cards/project_card.rs
@@ -1,9 +1,9 @@
-use std::collections::HashMap;
 use leptos::*;
+use std::collections::HashMap;
 
-use crate::components::cards::card_title::CardTitle;
-use crate::components::button_link::ButtonLink;
-use crate::components::icons::github_icon::GithubIcon;
+use crate::components::{
+    button_link::ButtonLink, cards::card_title::CardTitle, icons::github_icon::GithubIcon,
+};
 
 #[component]
 pub fn ProjectCard(
@@ -32,30 +32,28 @@ pub fn ProjectCard(
             <div class="flex flex-col justify-between gap-y-2">
                 {if brand_as_letter {
                     view! {
-                        <span
-                            class=format!(
-                                "h-[60px] w-[60px] rounded-full text-4xl flex justify-center items-center {}",
-                                current_color
-                            )
-                        >
+                        <span class=format!(
+                            "h-[60px] w-[60px] rounded-full text-4xl flex justify-center items-center {}",
+                            current_color
+                        )>
+
                             {brand_src}
                         </span>
                     }
                 } else {
                     view! {
                         <span>
                             <img
-                                src=brand_src width="60"
+                                src=brand_src
+                                width="60"
                                 class=format!("rounded-full h-[60px] w-[60px] {}", current_color)
                                 alt=brand_alt
                             />
                         </span>
                     }
                 }}
-                <CardTitle texts=name.clone() />
-                <p class="mt-2 font-work-sans text-black">
-                    {description}
-                </p>
+                <CardTitle texts=name.clone()/>
+                <p class="mt-2 font-work-sans text-black">{description}</p>
             </div>
             <div class="flex gap-2 items-center mt-4">
                 <ButtonLink href=button_link size="tiny">
@@ -64,9 +62,10 @@ pub fn ProjectCard(
                     } else {
                         button_text.to_string()
                     }}
+
                 </ButtonLink>
                 <span class="ml-auto">
-                    <GithubIcon size=30 />
+                    <GithubIcon size=30/>
                 </span>
             </div>
         </a>

diff --git a/src/components/community_projects.rs b/src/components/community_projects.rs
@@ -96,20 +96,23 @@ pub fn CommunityProjects() -> impl IntoView {
                     <span class="font-alfa-slab text-orange-500">"Comunidad"</span>
                 </h2>
                 <div class="w-full grid sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 sm:gap-x-8 gap-y-4">
-                    {items.into_iter().map(|item| {
-                        view! {
-                            <ProjectCard
-                                name=item.name
-                                description=item.description
-                                link=item.link
-                                brand_src=item.brand_src
-                                button_link=item.button_link
-                                button_text=item.button_text
-                                brand_as_letter=item.brand_as_letter
-                                button_bg_color=item.button_bg_color
-                            />
-                        }
-                    }).collect::<Vec<_>>()}
+                    {items
+                        .into_iter()
+                        .map(|item| {
+                            view! {
+                                <ProjectCard
+                                    name=item.name
+                                    description=item.description
+                                    link=item.link
+                                    brand_src=item.brand_src
+                                    button_link=item.button_link
+                                    button_text=item.button_text
+                                    brand_as_letter=item.brand_as_letter
+                                    button_bg_color=item.button_bg_color
+                                />
+                            }
+                        })
+                        .collect::<Vec<_>>()}
                 </div>
             </div>
         </section>

diff --git a/src/components/dummy_component.rs b/src/components/dummy_component.rs
@@ -2,7 +2,5 @@ use leptos::*;
 
 #[component]
 pub fn DummyComponent() -> impl IntoView {
-    view! {
-        <div></div>
-    }
+    view! { <div></div> }
 }
diff --git a/src/components/header.rs b/src/components/header.rs
@@ -17,22 +17,23 @@ pub fn Header() -> impl IntoView {
                             alt="Rust Lang en Español"
                         />
                     </div>
-                    <button class="lg:hidden" on:click=move |_| {set_is_open.update(|n| *n = !*n)}>
+                    <button
+                        class="lg:hidden"
+                        on:click=move |_| { set_is_open.update(|n| *n = !*n) }
+                    >
                         <span class="w-6 h-1 bg-black block my-4 relative after:absolute after:block after:bg-black after:w-6 after:h-1 after:bottom-2 before:absolute before:block before:bg-black before:w-6 before:h-1 before:-bottom-2"></span>
                     </button>
                 </div>
-                <nav
-                    class=move || format!(
-                        "w-full lg:w-auto pb-10 pt-5 lg:p-0 {}",
-                        if is_open() { "block" } else { "hidden lg:block" }
+                <nav class=move || {
+                    format!(
+                        "w-full lg:w-auto pb-10 pt-5 lg:p-0 {}", if is_open() { "block" } else {
+                        "hidden lg:block" }
                     )
-                >
+                }>
+
                     <ul class="flex items-center gap-6 flex-col lg:flex-row lg:items-center">
                         <li>
-                            <a
-                                href="https://rustlanges.github.io/rust-book-es"
-                                target="_blank"
-                            >
+                            <a href="https://rustlanges.github.io/rust-book-es" target="_blank">
                                 "Aprende"
                             </a>
                         </li>

diff --git a/src/components/hero.rs b/src/components/hero.rs
@@ -6,17 +6,23 @@ use crate::components::header::Header;
 pub fn Hero() -> impl IntoView {
     view! {
         <section class="w-full flex flex-col">
-            <Header />
+            <Header/>
             <div class="flex items-center justify-center py-14 lg:py-32 px-4">
                 <div class="grid items-center gap-x-20 gap-y-10 lg:grid-cols-2">
                     <figure class="w-80 mx-auto lg:w-full">
-                        <img src="./rhq3ezvso9611-min.png" width="500" class="mx-auto" />
+                        <img src="./rhq3ezvso9611-min.png" width="500" class="mx-auto"/>
                     </figure>
                     <div class="">
                         <h1 class="flex flex-col mb-4 gap-y-2">
-                            <span class="font-work-sans text-4xl font-light text-center lg:text-left">"Bienvenidos a"</span>
-                            <span class="font-alfa-slab text-orange-500 text-6xl sm:text-7xl lg:text-8xl text-center lg:text-left">"Rust Lang"</span>
-                            <span class="font-work-sans text-5xl font-semibold text-center lg:text-left">"En Español"</span>
+                            <span class="font-work-sans text-4xl font-light text-center lg:text-left">
+                                "Bienvenidos a"
+                            </span>
+                            <span class="font-alfa-slab text-orange-500 text-6xl sm:text-7xl lg:text-8xl text-center lg:text-left">
+                                "Rust Lang"
+                            </span>
+                            <span class="font-work-sans text-5xl font-semibold text-center lg:text-left">
+                                "En Español"
+                            </span>
                         </h1>
                         <p class="font-work-sans font-light text-center lg:text-left">
                             "Una comunidad de gente mal intencionada y tonta."
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		too-many-arguments-threshold = 100
		type-complexity-threshold = 1000