Skip to content

[WIP] feat: new blog ui #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] feat: new blog ui #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed bun.lockb
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub fn shell(options: LeptosOptions) -> impl IntoView {
<Link rel="preconnect" href="https://fonts.googleapis.com" />
<Link rel="preconnect" href="https://fonts.gstatic.com" />
</head>
<body class="bg-[#1e1e1e]">
<body class="bg-[#161616]">
<App />
</body>
</html>
Expand All @@ -87,9 +87,9 @@ pub fn App() -> impl IntoView {

view! {
<Router>
<div class="overflow-auto text-white font-poppins">
<div class="overflow-auto text-white font-mono">
<header::Component />
<main class="container flex flex-col gap-8 px-4 pt-10 pb-14 mx-auto mt-16 max-w-4xl md:px-0">
<main class="container flex flex-col gap-8 px-4 pb-14 mx-auto mt-14 max-w-4xl md:px-0">
<FlatRoutes fallback=|| {
let mut outside_errors = Errors::default();
outside_errors.insert_with_default_key(error_template::AppError::NotFound);
Expand Down
24 changes: 14 additions & 10 deletions src/components/header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ use leptos::prelude::*;
#[component]
pub fn Component() -> impl IntoView {
view! {
<header class="fixed top-0 right-0 left-0 z-10 py-6 px-4 md:px-6 bg-[#1e1e1e]/80 backdrop-blur-md">
<div class="container mx-auto max-w-5xl">
<div class="flex flex-row justify-between items-center text-white">
<div class="flex flex-row gap-4">
<header class="mt-14 z-10">
<div class="container mx-auto max-w-4xl">
<div class="flex flex-row justify-between items-center">
<div class="flex flex-row text-xs items-center py-2 px-4 text-[#969696]">
<p>{"rust-dd://"}</p>
<a
href="/"
on:click=move |_| {
Expand All @@ -19,23 +20,26 @@ pub fn Component() -> impl IntoView {
}
}
}
class="text-lg font-bold transition-all duration-500 sm:text-3xl hover:text-[#ffef5c]"
class="transition-all duration-500 hover:underline hover:text-[#ffef5c]"
>
blog
{"blog"}
</a>
<p>{"."}</p>
<a
href="/references"
class="text-lg font-bold transition-all duration-500 sm:text-3xl hover:text-[#ffef5c]"
class="transition-all duration-500 hover:underline hover:text-[#ffef5c]"
>
references
{"references"}
</a>
<p>{"."}</p>
<a
href="/hireus"
class="text-lg font-bold transition-all duration-500 sm:text-3xl hover:text-[#ffef5c]"
class="transition-all duration-500 hover:underline hover:text-[#ffef5c]"
>
hire us!
{"hire.us"}
</a>
</div>

<div class="hidden md:block">
<icons::Component />
</div>
Expand Down
137 changes: 4 additions & 133 deletions src/pages/home.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,151 +20,22 @@ pub fn Component() -> impl IntoView {
view! {
<Title text="Rust-DD Blog – Tech Insights & Consulting" />
<Suspense fallback=|| ()>
<div class="gap-4 columns-1 sm:columns-2">
<div class="gap-4 mb-20">
<For
each=move || posts.get().and_then(Result::ok).unwrap_or_default()
key=|post| post.id.id.to_string()
let:post
>
<div class="flex flex-col p-3 text-left text-white rounded-lg transition-all duration-500 cursor-pointer break-inside-avoid bg-card hover:text-[#ffef5c]">
<A href=format!("/post/{}", post.slug.as_ref().map_or("", |v| v))>
<div class="flex flex-col gap-1 mb-4 font-medium">
<p class="text-base line-clamp-2">{post.title}</p>
<p class="italic text-xxs">{post.summary}</p>
</div>
<div class="flex flex-row gap-3 justify-start items-center text-xxs">
<div class="flex flex-row gap-3">
<div class="flex flex-row gap-1 items-center">
<svg
class="size-4"
width="1em"
height="1em"
viewBox="0 0 512 512"
fill="currentColor"
role="graphics-symbol"
data-hk="0-1-0-15"
>
<circle cx="256" cy="272" r="16"></circle>
<path d="M280,81.5V72a24,24,0,0,0-48,0v9.5a191,191,0,0,0-84.43,32.13L137,103A24,24,0,0,0,103,137l8.6,8.6A191.17,191.17,0,0,0,64,272c0,105.87,86.13,192,192,192s192-86.13,192-192C448,174.26,374.58,93.34,280,81.5ZM256,320a48,48,0,0,1-16-93.25V152a16,16,0,0,1,32,0v74.75A48,48,0,0,1,256,320Z"></path>
</svg>
<p>{format!("{} min read", post.read_time)}</p>
</div>
<div class="flex flex-row gap-1 items-center">
<svg
class="size-4"
width="1em"
height="1em"
viewBox="0 0 512 512"
fill="currentColor"
role="graphics-symbol"
data-hk="0-1-0-20"
>
<circle cx="256" cy="256" r="64"></circle>
<path d="M490.84,238.6c-26.46-40.92-60.79-75.68-99.27-100.53C349,110.55,302,96,255.66,96c-42.52,0-84.33,12.15-124.27,36.11C90.66,156.54,53.76,192.23,21.71,238.18a31.92,31.92,0,0,0-.64,35.54c26.41,41.33,60.4,76.14,98.28,100.65C162,402,207.9,416,255.66,416c46.71,0,93.81-14.43,136.2-41.72,38.46-24.77,72.72-59.66,99.08-100.92A32.2,32.2,0,0,0,490.84,238.6ZM256,352a96,96,0,1,1,96-96A96.11,96.11,0,0,1,256,352Z"></path>
</svg>
<p>{format!("{} views", post.total_views)}</p>
</div>
<div class="flex flex-row gap-1 items-center">
<svg
class="size-4"
width="1em"
height="1em"
viewBox="0 0 512 512"
fill="currentColor"
role="graphics-symbol"
data-hk="0-1-0-25"
>
<path d="M480,128a64,64,0,0,0-64-64H400V48.45c0-8.61-6.62-16-15.23-16.43A16,16,0,0,0,368,48V64H144V48.45c0-8.61-6.62-16-15.23-16.43A16,16,0,0,0,112,48V64H96a64,64,0,0,0-64,64v12a4,4,0,0,0,4,4H476a4,4,0,0,0,4-4Z"></path>
<path d="M32,416a64,64,0,0,0,64,64H416a64,64,0,0,0,64-64V179a3,3,0,0,0-3-3H35a3,3,0,0,0-3,3ZM376,208a24,24,0,1,1-24,24A24,24,0,0,1,376,208Zm0,80a24,24,0,1,1-24,24A24,24,0,0,1,376,288Zm-80-80a24,24,0,1,1-24,24A24,24,0,0,1,296,208Zm0,80a24,24,0,1,1-24,24A24,24,0,0,1,296,288Zm0,80a24,24,0,1,1-24,24A24,24,0,0,1,296,368Zm-80-80a24,24,0,1,1-24,24A24,24,0,0,1,216,288Zm0,80a24,24,0,1,1-24,24A24,24,0,0,1,216,368Zm-80-80a24,24,0,1,1-24,24A24,24,0,0,1,136,288Zm0,80a24,24,0,1,1-24,24A24,24,0,0,1,136,368Z"></path>
</svg>
<p>{post.created_at}</p>
</div>
</div>
<div class="flex flex-row gap-1 items-center">
<svg
class="size-4"
width="1em"
height="1em"
viewBox="0 0 512 512"
fill="currentColor"
role="graphics-symbol"
data-hk="0-1-0-30"
>
<path d="M332.64,64.58C313.18,43.57,286,32,256,32c-30.16,0-57.43,11.5-76.8,32.38-19.58,21.11-29.12,49.8-26.88,80.78C156.76,206.28,203.27,256,256,256s99.16-49.71,103.67-110.82C361.94,114.48,352.34,85.85,332.64,64.58Z"></path>
<path d="M432,480H80A31,31,0,0,1,55.8,468.87c-6.5-7.77-9.12-18.38-7.18-29.11C57.06,392.94,83.4,353.61,124.8,326c36.78-24.51,83.37-38,131.2-38s94.42,13.5,131.2,38c41.4,27.6,67.74,66.93,76.18,113.75,1.94,10.73-.68,21.34-7.18,29.11A31,31,0,0,1,432,480Z"></path>
</svg>
<button on:click=move |e| {
e.prevent_default();
e.stop_propagation();
let _ = window()
.open_with_url_and_target(
post.author.github.as_ref().unwrap_or(&"".to_string()),
"_blank",
);
}>
<span class="text-xs font-semibold cursor-pointer hover:underline">
{post.author.name}
</span>
</button>
</div>
<div class="flex flex-col gap-1 w-full font-thin">
<p class="text-xs text-[#969696]">{post.created_at}</p>
<p class="text-xs underline line-clamp-2">{post.title}</p>
</div>
</A>
</div>
</For>
</div>
</Suspense>
<Suspense fallback=|| view! { <loader::Component /> }>
<div class="flex flex-row flex-wrap gap-1 px-4 text-xs">
<button
on:click=move |_| selected_tags.update(|prev| prev.clear())
class="py-1 px-2 text-white rounded-lg transition-all duration-500 cursor-pointer bg-primary"
class=("underline", move || selected_tags.get().is_empty())
>
{"All"}
</button>
<For each=move || tags.get().unwrap_or_default() key=|tag| tag.clone() let:data>
<button
on:click={
let tag = data.0.clone();
move |_| {
selected_tags
.update(|prev| {
if prev.contains(&tag) {
*prev = prev
.clone()
.into_iter()
.filter(|v| v != &tag)
.collect::<Vec<_>>();
} else {
*prev = prev
.clone()
.into_iter()
.chain(std::iter::once(tag.clone()))
.collect();
}
});
}
}
class="py-1 px-2 rounded-lg transition-all duration-500 cursor-pointer hover:text-black hover:bg-white"
class=(
"bg-white",
{
let tag = data.0.clone();
move || selected_tags.get().contains(&tag)
},
)
class=(
"text-black",
{
let tag = data.0.clone();
move || selected_tags.get().contains(&tag)
},
)
>
{data.0.clone() + " (" + &data.1.to_string() + ")"}
</button>
</For>
</div>
</Suspense>
}
}
6 changes: 3 additions & 3 deletions src/ssr/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::collections::BTreeMap;

use chrono::Datelike;
use leptos::prelude::{server, ServerFnError};
use serde::{Deserialize, Serialize};

Expand Down Expand Up @@ -40,8 +40,8 @@ pub async fn select_posts(
.unwrap()
.with_timezone(&Utc);
let naive_date = date_time.date_naive();
let formatted_date = naive_date.format("%b %-d, %Y").to_string();
post.created_at = formatted_date.into();
let formatted_date = format!("{} • {:02}", naive_date.year(), naive_date.month());
post.created_at = formatted_date;
});

Ok(posts)
Expand Down