Skip to content

Commit 5a87e7d

Browse files
Phosphorus-MPhosphorus-M
committed
fix: correct spelling of COMMUNITY_PROJECTS and improve component structure
1 parent 85474e9 commit 5a87e7d

5 files changed

Lines changed: 87 additions & 90 deletions

File tree

‎Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ edition = "2021"
77
crate-type = ["cdylib", "rlib"]
88

99
[dependencies]
10-
1110
axum = { version = "0.8", optional = true }
1211
leptos = { version = "0.8.15", features = ["nightly"] }
1312
leptos_meta = { version = "0.8.5" }

‎src/components/cards/project_card.rs‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::components::{button_link::ButtonLink, cards::card_title::CardTitle, icons::GithubIcon};
22
use leptos::{component, prelude::*, view, IntoView};
33
use std::collections::HashMap;
4+
use leptos::leptos_dom::helpers::window;
45

56
#[component]
67
pub fn ProjectCard(
@@ -24,44 +25,47 @@ pub fn ProjectCard(
2425

2526
view! {
2627
<div class="group flex flex-col items-center sm:items-stretch gap-y-6 border border-black p-4 sm:p-6 hover:bg-orange-500 dark:hover:bg-zinc-900/40 bg-orange-100 dark:bg-black/40 drop-shadow-[0_0_0_rgba(0,0,0)] hover:drop-shadow-[-4px_-4px_0_rgba(0,0,0)] transition justify-between">
27-
<a href=link target="_blank">
28+
<button on:click=move |_| {
29+
let win = window();
30+
win.open_with_url_and_target(link, "_blank").unwrap();
31+
} class="all-[unset] w-full cursor-pointer text-left flex items-stretch flex-col h-full justify-between ">
2832
<div class="flex flex-col justify-between gap-y-2">
29-
{if brand_as_letter {
30-
view! {
31-
<span class=format!(
32-
"h-[60px] w-[60px] rounded-full text-4xl flex justify-center items-center {}",
33-
current_color,
34-
)>{brand_src}</span>
33+
<Show
34+
when=move || { brand_as_letter }
35+
fallback={
36+
let color = current_color.clone();
37+
let src = brand_src.clone();
38+
move || view!{
39+
<img
40+
src=src.clone()
41+
loading="lazy"
42+
width="60"
43+
class=format!("rounded-full h-[60px] w-[60px] {color}")
44+
alt=name.join(" ")
45+
/>
46+
}
3547
}
36-
.into_any()
37-
} else {
38-
view! {
39-
<img
40-
src=brand_src
41-
loading="lazy"
42-
width="60"
43-
class=format!("rounded-full h-[60px] w-[60px] {}", current_color)
44-
alt=name.join(" ")
45-
/>
46-
}
47-
.into_any()
48-
}} <CardTitle texts=name />
48+
>
49+
<span class=format!("h-[60px] w-[60px] rounded-full text-4xl flex justify-center items-center {current_color}")>
50+
{brand_src.clone()}
51+
</span>
52+
</Show> <CardTitle texts=name />
4953
<p class="mt-2 font-work-sans text-black dark:text-white">{description}</p>
5054
</div>
5155
<div class="flex gap-4 sm:gap-0 justify-around items-center mt-4">
5256
<ButtonLink href=button_link size="tiny">
53-
{if button_text.is_empty() {
54-
name.join(" ")
55-
} else {
56-
button_text.to_string()
57-
}}
58-
57+
<Show
58+
when=move || { !button_text.is_empty() }
59+
fallback=move || name.join(" ")
60+
>
61+
<span>{button_text}</span>
62+
</Show>
5963
</ButtonLink>
6064
<span class="px-1">
6165
<GithubIcon size=30 />
6266
</span>
6367
</div>
64-
</a>
68+
</button>
6569
</div>
6670
}
6771
}

‎src/components/community_projects.rs‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use leptos_router::components::A;
33

44
use crate::{
55
components::{NextIcon, ProjectCard},
6-
extras::COMUNITY_PROJECTS,
6+
extras::COMMUNITY_PROJECTS,
77
};
88

99
#[component]
@@ -16,17 +16,18 @@ pub fn CommunityProjects(#[prop(default = false)] show_more: bool) -> impl IntoV
1616
<span class="font-alfa-slab text-orange-500">"Comunidad"</span>
1717
</h2>
1818
<div class="w-full grid sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 sm:gap-x-8 gap-y-8">
19-
{COMUNITY_PROJECTS
20-
.iter()
21-
.take(if show_more { 4 } else { COMUNITY_PROJECTS.len() })
22-
.map(|item| {
19+
<For
20+
each=move || COMMUNITY_PROJECTS.iter().take(if show_more { 4 } else { COMMUNITY_PROJECTS.len() })
21+
key=|item| item.name
22+
children={move |item| {
2323
let image_src = if cfg!(debug_assertions)
2424
&& item.brand_src.starts_with("/gen_assets")
2525
{
2626
format!("/assets{}", item.brand_src)
2727
} else {
2828
item.brand_src.to_string()
2929
};
30+
3031
view! {
3132
<ProjectCard
3233
name=item.name
@@ -39,27 +40,21 @@ pub fn CommunityProjects(#[prop(default = false)] show_more: bool) -> impl IntoV
3940
button_bg_color=item.button_bg_color
4041
/>
4142
}
42-
})
43-
.collect::<Vec<_>>()}
43+
}}
44+
/>
4445
</div>
45-
{if show_more {
46-
view! {
47-
<div class="w-full flex justify-end my-3 ">
48-
<p 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">
49-
<A href="/proyectos" exact=true>
50-
"Ver todos los proyectos"
51-
<span class="inline-block ml-2">
52-
<NextIcon class="fill-current" size=20 />
53-
</span>
54-
</A>
55-
</p>
56-
</div>
57-
}
58-
.into_any()
59-
} else {
60-
view! { <div></div> }.into_any()
61-
}}
62-
46+
<Show when=move || show_more>
47+
<div class="w-full flex justify-end my-3 ">
48+
<p 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">
49+
<A href="/proyectos" exact=true>
50+
"Ver todos los proyectos"
51+
<span class="inline-block ml-2">
52+
<NextIcon class="fill-current" size=20 />
53+
</span>
54+
</A>
55+
</p>
56+
</div>
57+
</Show>
6358
</div>
6459
</section>
6560
}

‎src/components/hero.rs‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
use crate::components::SloganButton;
2+
use leptos::leptos_dom::logging;
23
use leptos::{component, prelude::*, view, IntoView};
3-
use leptos_router::hooks::use_query_map;
4+
use leptos::leptos_dom::helpers::location;
45

56
#[component]
67
pub fn Hero() -> impl IntoView {
7-
let query_params = use_query_map();
8-
98
let is_in_debug_mode = cfg!(debug_assertions);
10-
let uwu = Memo::new(move |_| query_params.with(|params| params.get("uwu").is_some()));
9+
10+
let (uwu, set_uwu) = signal(false);
11+
12+
Effect::new(move |_| {
13+
let location = location();
14+
set_uwu.set(location.search().map(|s| s.contains("uwu")).unwrap_or(false));
15+
});
1116

1217
let image_src = move || match (is_in_debug_mode, uwu.get()) {
1318
(true, true) => "./assets/RustLang_uwu.png",
@@ -16,16 +21,16 @@ pub fn Hero() -> impl IntoView {
1621
(false, true) => "./RustLang_uwu.png",
1722
};
1823

24+
let class_fn = move || if !uwu.get() {
25+
"grid items-center py-14 lg:py-32 px-4 gap-x-20 gap-y-10 lg:grid-cols-2 w-full"
26+
} else {
27+
"grid items-center justify-center"
28+
};
29+
1930
view! {
20-
<section
21-
class=(
22-
"grid items-center py-14 lg:py-32 px-4 gap-x-20 gap-y-10 lg:grid-cols-2 w-full",
23-
move || !uwu.get(),
24-
)
25-
class="grid items-center justify-center"
26-
>
31+
<section class=class_fn>
2732
<figure class="w-80 mx-auto lg:w-full">
28-
{move || {
33+
{move ||
2934
if !uwu.get() {
3035
view! {
3136
<img
@@ -48,29 +53,23 @@ pub fn Hero() -> impl IntoView {
4853
}
4954
.into_any()
5055
}
51-
}}
56+
}
5257
</figure>
5358
<div>
54-
{move || {
55-
if !uwu.get() {
56-
view! {
57-
<h1 class="flex flex-col mb-4 gap-y-2">
58-
<span class="font-work-sans text-4xl font-light text-center lg:text-left">
59-
"Bienvenidos a"
60-
</span>
61-
<span class="font-alfa-slab text-orange-500 dark:text-orange_(pantone)-500 text-6xl sm:text-7xl lg:text-8xl text-center lg:text-left">
62-
"Rust Lang"
63-
</span>
64-
<span class="font-work-sans text-5xl font-semibold text-center lg:text-left">
65-
"En Español"
66-
</span>
67-
</h1>
68-
}
69-
.into_any()
70-
} else {
71-
view! { <h1 class="hidden">"UwU"</h1> }.into_any()
72-
}
73-
}} <SloganButton />
59+
<Show when=move || !uwu.get() >
60+
<h1 class="flex flex-col mb-4 gap-y-2">
61+
<span class="font-work-sans text-4xl font-light text-center lg:text-left">
62+
"Bienvenidos a"
63+
</span>
64+
<span class="font-alfa-slab text-orange-500 dark:text-orange_(pantone)-500 text-6xl sm:text-7xl lg:text-8xl text-center lg:text-left">
65+
"Rust Lang"
66+
</span>
67+
<span class="font-work-sans text-5xl font-semibold text-center lg:text-left">
68+
"En Español"
69+
</span>
70+
</h1>
71+
</Show>
72+
<SloganButton uwu=uwu />
7473
</div>
7574
</section>
7675
}

‎src/components/slogan_button.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
use leptos::{component, prelude::*, view, IntoView};
33

44
#[component]
5-
pub fn SloganButton() -> impl IntoView {
5+
pub fn SloganButton(uwu: ReadSignal<bool>) -> impl IntoView {
66
let slogans = [
77
"Una comunidad de gente mal intencionada y tonta.",
88
"Rust the lang, not the game",
@@ -35,7 +35,6 @@ pub fn SloganButton() -> impl IntoView {
3535
let (slogan, set_slogan) = signal(slogans[0].to_string());
3636

3737
let click_handler = move |_| {
38-
leptos::logging::log!("Button clicked!");
3938
#[cfg(target_arch = "wasm32")]
4039
{
4140
use wasm_bindgen::prelude::*;
@@ -45,7 +44,6 @@ pub fn SloganButton() -> impl IntoView {
4544
fn random() -> f64;
4645
}
4746
let index = (random() * slogans.len() as f64).floor() as usize;
48-
leptos::logging::log!("Selected index: {}, slogan: {}", index, slogans[index]);
4947
set_slogan.set(slogans[index].to_string());
5048
}
5149

@@ -62,7 +60,9 @@ pub fn SloganButton() -> impl IntoView {
6260

6361
view! {
6462
<div
65-
class="flex select-none items-center justify-center lg:justify-start group dark:text-white drop-shadow-[7px_7px_2px_rgba(0,0,0,.5)] hover:drop-shadow-none dark:transition-all dark:ease-in-out dark:delay-75 cursor-pointer"
63+
class="flex select-none items-center justify-center lg:justify-start group dark:text-white drop-shadow-[7px_7px_2px_rgba(0,0,0,.5)] hover:drop-shadow-none dark:transition-all dark:ease-in-out dark:delay-75 "
64+
class=("lg:justify-center", move || uwu.get())
65+
6666
on:click=click_handler
6767
>
6868
<button

0 commit comments

Comments
 (0)