jmarya/pacco
jmarya/pacco
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages 1 Wiki Activity

Squashed commit of the following:

Browse source 
commit 8b7e357c0e
Author: JMARyA <jmarya@hydrar.de>
Date:   Sat Jan 18 19:12:11 2025 +0100

    add more package info

commit bf9813b7a4
Author: JMARyA <jmarya@hydrar.de>
Date:   Fri Jan 17 22:48:19 2025 +0100

    add display for man entries + config files

commit 6c1ca1e8c0
Author: JMARyA <jmarya@hydrar.de>
Date:   Fri Jan 17 17:52:28 2025 +0100

    finish ui

commit 36128864aa
Author: JMARyA <jmarya@hydrar.de>
Date:   Wed Jan 15 22:46:25 2025 +0100

    refactor
This commit is contained in:
JMARyA 2025-01-18 19:13:26 +01:00
parent 92cefff212
commit 380352dd07
Signed by: jmarya
GPG key ID: 901B2ADDF27C2263
6 changed files with 635 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/pkg/package.rs
View file

@ -192,6 +192,82 @@ impl Package {
Some(base)
}
pub fn man_entries(&self) -> Vec<String> {
let files = self.file_list();
files
.into_iter()
.filter(|x| x.starts_with("usr/share/man"))
.map(|x| {
x.trim_start_matches("usr/share/man/")
.trim_end_matches(".gz")
.to_string()
})
.collect()
}
pub fn kernel_modules(&self) -> Vec<String> {
let files = self.file_list();
files
.into_iter()
.filter(|x| x.starts_with("usr/lib/modules"))
.map(|x| {
x.trim_start_matches("usr/lib/modules/")
.trim_end_matches(".zst")
.to_string()
})
.collect()
}
pub fn firmware(&self) -> Vec<String> {
let files = self.file_list();
files
.into_iter()
.filter(|x| x.starts_with("usr/lib/firmware"))
.map(|x| {
x.trim_start_matches("usr/lib/firmware/")
.trim_end_matches(".zst")
.to_string()
})
.collect()
}
pub fn keyrings(&self) -> Vec<String> {
let files = self.file_list();
files
.into_iter()
.filter(|x| x.starts_with("usr/share/pacman/keyrings"))
.map(|x| {
x.trim_start_matches("usr/share/pacman/keyrings/")
.to_string()
})
.collect()
}
pub fn shared_objects(&self) -> Vec<String> {
list_tar_file(&self.base_path().join(self.file_name()))
.unwrap_or_default()
.into_iter()
.filter(|x| {
let file_name = x.split("/").last().unwrap();
file_name.contains(".so.") || file_name.ends_with(".so")
})
.collect()
}
pub fn icons(&self) -> Vec<String> {
let files = self.file_list();
files
.into_iter()
.filter(|x| x.starts_with("usr/share/icons"))
.map(|x| x.trim_start_matches("usr/share/icons/").to_string())
.collect()
}
pub fn etc_entries(&self) -> Vec<String> {
let files = self.file_list();
files.into_iter().filter(|x| x.starts_with("etc")).collect()
}
pub fn systemd_units(&self) -> Vec<String> {
// TODO : Extract unit infos
list_tar_file(&self.base_path().join(self.file_name()))
@ -199,7 +275,7 @@ impl Package {
.into_iter()
.filter(|x| {
let ext = x.split(".").last().unwrap();
ext == "service" || ext == "timer" || ext == "mount"
ext == "service" || ext == "timer" || ext == "mount" || ext == "socket"
})
.collect()
}

59
src/routes/mod.rs
View file

@ -1,7 +1,8 @@
use based::auth::MaybeUser;
use based::page::{Shell, htmx_link, render_page};
use based::request::{RawResponse, RequestContext, StringResponse, respond_with};
use maud::{PreEscaped, html};
use based::ui::components::Shell;
use based::ui::{prelude::*, render_page};
use maud::{PreEscaped, Render, html};
use pacco::pkg::mirror::MirrorRepository;
use rocket::http::{ContentType, Status};
use rocket::{State, get};
@ -23,27 +24,39 @@ pub async fn index_page(
) -> StringResponse {
let repos: Vec<String> = Repository::list();
let content = html!(
div class="flex justify-between" {
h1 class="text-4xl font-bold pb-6" { "Repositories" };
@if let Some(user) = user.take_user() {
a class="text-lg" href="/account" { (user.username) };
};
};
div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6" {
@for repo in repos {
(htmx_link(&format!("/{repo}"), "flex items-center gap-4 p-4 bg-gray-100 dark:bg-gray-700 rounded-lg shadow-md transition hover:bg-gray-200 dark:hover:bg-gray-600", "", html! {
p class="font-medium text-gray-800 dark:text-gray-100" {
(repo)
@if config.is_mirrored_repo(&repo) {
div class="inline-block px-3 py-1 text-sm font-medium text-white bg-blue-500 rounded-full" { "Mirrored" };
};
};
}))
}
};
);
let content = Div().vanish()
.push(
Flex(
Div().vanish()
.push(Padding(Text("Repositories")._4xl().bold()).bottom(ScreenValue::_6))
.push_some(user.take_user().as_ref(), |user: &based::auth::User| Link("/account", Text(&user.username).large()))
).justify(Justify::Between)
).push(
html!(
div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6" {
@for repo in repos {
(Animated(
Rounded(
Padding(
Shadow::medium(
Flex(Hover(
Background(Gray::_600, Nothing())).on(
Background(Gray::_700,
Link(
&format!("/{repo}"),
Div().vanish().push(Text(&repo).medium().color(&Gray::_100))
.push_some(
if config.is_mirrored_repo(&repo) {
Some(&())
} else { None },
|_: &()| Context(Padding(Rounded(Background(Blue::_500, Text("Mirrored").white().medium().sm())).size(Size::Full)).x(ScreenValue::_3).y(ScreenValue::_1)))).use_htmx()
))).items_center().gap(ScreenValue::_4)
)).all(ScreenValue::_4))
.size(Size::Large)))
}
}
)
).render();
render(content, "Repositories", ctx).await
}

701
src/routes/ui.rs
View file

@ -1,8 +1,9 @@
use based::{
page::htmx_link,
request::{RequestContext, StringResponse},
};
use maud::{PreEscaped, html};
use based::request::{RequestContext, StringResponse};
use based::ui::primitives::flex::Strategy;
use based::ui::primitives::space::SpaceBetweenWidget;
use based::ui::primitives::text::{Code, TextWidget};
use based::ui::{UIWidget, prelude::*};
use maud::{PreEscaped, Render, html};
use rocket::{State, get};
use pacco::pkg::{Package, Repository, arch::Architecture, find_package_by_name};
@ -35,151 +36,305 @@ pub async fn pkg_ui(
let systemd_units = pkg.systemd_units();
let pacman_hooks = pkg.pacman_hooks();
let binaries = pkg.binaries();
let man_entries = pkg.man_entries();
let etc_entries = pkg.etc_entries();
let kernel_modules = pkg.kernel_modules();
let firmware = pkg.firmware();
let keyrings = pkg.keyrings();
let shared_objects = pkg.shared_objects();
let icons = pkg.icons();
let mut pkginfo = pkg.pkginfo();
let content = html! {
// Package Name
div class="flex flex-wrap gap-2 justify-center items-center" {
(htmx_link(&format!("/{}", repo.name), "text-3xl font-bold text-gray-800 dark:text-gray-100", "", html! {
(repo.name)
}))
p class="font-bold p-2 text-gray-400" { "/" };
h1 class="text-3xl font-bold text-gray-800 dark:text-gray-100 pr-2" {
(pkg.name)
};
@if pkg.is_signed() {
div class="flex items-center gap-2 text-slate-300 pr-4" {
span class="text-2xl font-bold" {
"✓"
}
span class="text-sm font-medium" { "Signed" }
// TODO : Add more info: Who signed? + Public Key recv
}
}
@for arch in arch {
span class="px-3 py-1 text-sm font-medium bg-gray-200 dark:bg-gray-700 text-gray-600 dark:text-gray-300 rounded-full" {
(arch.to_string())
};
}
a href=(format!("/pkg/{}/{}/{}", pkg.repo, pkg.arch.to_string(), pkg.file_name())) class="ml-4 inline-flex items-center px-2 py-2 bg-gray-200 text-black font-xs rounded-lg shadow-md hover:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-opacity-50" {
svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2" {
path stroke-linecap="round" stroke-linejoin="round" d="M12 5v14m7-7l-7 7-7-7" {};
};
p class="ml-2" { "Download" };
};
};
div class="flex flex-wrap pt-6" {
div class="space-y-2 p-4 bg-gray-50 dark:bg-gray-800 shadow-lg rounded-lg transition flex-1 m-2 grow" {
h2 class="text-xl font-semibold text-gray-700 dark:text-gray-300 underline" { "Info" };
@if let Some(desc) = take_out(&mut pkginfo, |x| { x.0 == "pkgdesc" }).1 {
(build_info(desc.0, desc.1))
}
@if let Some(desc) = take_out(&mut pkginfo, |x| { x.0 == "packager" }).1 {
(build_info(desc.0, desc.1))
}
@if let Some(desc) = take_out(&mut pkginfo, |x| { x.0 == "url" }).1 {
(build_info(desc.0, desc.1))
}
@if let Some(desc) = take_out(&mut pkginfo, |x| { x.0 == "size" }).1 {
(build_info(desc.0, desc.1))
}
@for (key, val) in pkginfo {
(build_info(key, val))
};
};
div class="space-y-2 p-4 bg-gray-50 dark:bg-gray-800 shadow-lg rounded-lg transition m-2 grow md:grow-0 md:shrink" {
h2 class="text-xl font-semibold text-gray-700 dark:text-gray-300" { "Versions" }
ul class="space-y-1" {
@for version in versions {
li class="text-gray-800 dark:text-gray-100 hover:text-blue-500 dark:hover:text-blue-400 transition" {
(htmx_link(&format!("/{}/{}?ver={version}", repo.name, &pkg.name), if pkg.version.as_ref().map(|x| *x == Package::version(&version).0).unwrap_or_default() { "text-blue-500" } else { "" }, "", html! {
(version)
}))
};
}
}
}
};
div class="flex flex-wrap pt-6" {
div class="space-y-2" {
h2 class="text-xl font-bold text-gray-700 dark:text-gray-300" { "Content" }
div class="flex flex-wrap" {
@if !systemd_units.is_empty() {
div class="space-y-2 p-4 bg-gray-50 dark:bg-gray-800 shadow-lg rounded-lg transition m-2 grow" {
h3 class="text-lg font-medium text-gray-800 dark:text-gray-100 underline" { "Systemd Units" }
ul class="list-disc list-inside text-gray-700 dark:text-gray-300 space-y-1" {
@for unit in systemd_units {
li { (unit) }
}
}
}
}
@if !pacman_hooks.is_empty() {
div class="space-y-2 p-4 bg-gray-50 dark:bg-gray-800 shadow-lg rounded-lg transition m-2 grow" {
h3 class="text-lg font-medium text-gray-800 dark:text-gray-100 underline" { "Pacman Hooks" }
ul class="list-disc list-inside text-gray-700 dark:text-gray-300 space-y-1" {
@for hook in pacman_hooks {
h2 class="text-xl font-semibold text-gray-700 dark:text-gray-300" { (hook.0) }
pre class="bg-gray-100 dark:bg-gray-700 p-4 rounded-lg text-gray-800 dark:text-gray-100 overflow-x-auto text-sm" {
(hook.1)
}
}
}
}
}
@if !binaries.is_empty() {
div class="space-y-2 p-4 bg-gray-50 dark:bg-gray-800 shadow-lg rounded-lg transition m-2 grow" {
h3 class="text-lg font-medium text-gray-800 dark:text-gray-100 underline" { "Binaries" }
ul class="list-disc list-inside text-gray-700 dark:text-gray-300 space-y-1" {
@for binary in binaries {
li { (binary) }
}
}
}
}
div class="space-y-2 p-4 bg-gray-50 dark:bg-gray-800 shadow-lg rounded-lg transition m-2 grow" {
h3 class="text-lg font-medium text-gray-800 dark:text-gray-100 underline" { "Package Files" }
ul class="list-disc list-inside text-gray-700 dark:text-gray-300 space-y-1" {
@for file in pkg.file_list() {
li { (file) }
}
}
}
}
};
};
// Install Script
@if let Some(install_script) = install_script {
div class="space-y-4 pt-6" {
h2 class="text-3xl font-semibold text-gray-700 dark:text-gray-300" { "Install Script" }
pre class="bg-gray-100 dark:bg-gray-700 p-4 rounded-lg text-gray-800 dark:text-gray-100 overflow-x-auto text-sm" {
(install_script)
}
};
}
};
let content = Div().vanish()
.push(
Flex(
// Package Name
Div().vanish()
.push(
Link(&format!("/{}", repo.name),
Text(&repo.name).bold().color(&Gray::_100)._3xl()
).use_htmx()
)
.push(Padding(Text("/").bold().color(&Gray::_400)).all(ScreenValue::_2))
.push(
Padding(Text(&pkg.name)._3xl().bold().color(&Gray::_100)).right(ScreenValue::_2)
)
.push_if(pkg.is_signed(), || {
Flex(
Padding(
Div().vanish()
.push(Span("✓")._2xl().bold().color(&Slate::_300))
.push(Span("Signed").sm().medium().color(&Slate::_300))
// TODO : Add more info: Who signed? + Public Key recv
).right(ScreenValue::_4)
).items_center().gap(ScreenValue::_2)
})
.push_for_each(&arch, |arch: &Architecture| {
Rounded(
Padding(
Background(Gray::_700,
Span(&arch.to_string()).medium().sm())
).x(ScreenValue::_3).y(ScreenValue::_1)
).size(Size::Full)
})
.push(Margin(
Flex(
Padding(
Hover(Background(Gray::_300, Nothing())).on(Background(Gray::_200,
Rounded(Shadow::medium(
Link(&format!("/pkg/{}/{}/{}", pkg.repo, pkg.arch.to_string(), pkg.file_name()),
Paragraph(
html! {
svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2" {
path stroke-linecap="round" stroke-linejoin="round" d="M12 5v14m7-7l-7 7-7-7" {};
};
p class="ml-2 text-black" { "Download" };
}
).black().xs()))).size(Size::Large)
))
).x(ScreenValue::_2).y(ScreenValue::_2)
).items_center()
).left(ScreenValue::_4)
)
).wrap(Wrap::Wrap).gap(ScreenValue::_2).full_center().group()
)
.push(
Padding(
Flex(
Div().vanish().push(
Context(
FlexGrow(Strategy::Grow,
Animated(Background(Gray::_800, Shadow::large(Rounded(Margin(Padding(SpaceBetween(
Div()
.push(
Context(Text("Info").xl().semibold().color(&Gray::_300).underlined())
)
.push_some(
take_out(&mut pkginfo, |x| { x.0 == "pkgdesc" }).1,
|x: (String, String)| build_info(x.0, x.1)
)
.push_some(
take_out(&mut pkginfo, |x| { x.0 == "packager" }).1,
|x: (String, String)| build_info(x.0, x.1)
)
.push_some(
take_out(&mut pkginfo, |x| { x.0 == "url" }).1,
|x: (String, String)| build_info(x.0, x.1)
)
.push_some(
take_out(&mut pkginfo, |x| { x.0 == "size" }).1,
|x: (String, String)| build_info(x.0, x.1)
)
.push_for_each(&pkginfo, |(key, val)| build_info(key.clone(), val.clone()))
).y(ScreenValue::_2)).all(ScreenValue::_4)).all(ScreenValue::_2)).size(Size::Large)))))
)).push(
SpaceBetween(
Padding(
Background(Gray::_800,
Shadow::large(
Rounded(
Margin(
Screen::medium(FlexGrow(Strategy::NoGrow, Nothing())).on(
FlexGrow(Strategy::Grow,
Div().vanish()
.push(
Text("Versions").xl().semibold().color(&Gray::_300)
)
.push(
SpaceBetween(
Div().vanish()
.push_for_each(&versions, |version: &String| {
Animated(Link(&format!("/{}/{}?ver={version}", repo.name, &pkg.name),
if pkg.version.as_ref()
.map(|x| *x == Package::version(&version).0).unwrap_or_default()
{ Text(&version).color(&Blue::_500).render() } else {
Hover(Text("").color(&Blue::_400)).on(
Text(&version).color(&Gray::_100)).render()
}
).use_htmx())
})
).y(ScreenValue::_1)
)
))
).all(ScreenValue::_2)
).size(Size::Large)
)
)
).all(ScreenValue::_4)
).y(ScreenValue::_2)
)
).wrap(Wrap::Wrap).group()
).top(ScreenValue::_6)
).push(
Padding(Flex(
SpaceBetween(
Div().vanish()
.push(
Text("Content").xl().bold().color(&Gray::_300)
)
.push(
Flex(
Div().vanish()
.push_if(!systemd_units.is_empty(), || {
InfoCard(
Div().vanish()
.push(
CardTitle("Systemd Units")
)
.push(
ListElements(&systemd_units)
)
)
})
.push_if(!pacman_hooks.is_empty(), || {
InfoCard(
Div().vanish()
.push(CardTitle("Pacman Hooks"))
.push(
Paragraph(
SpaceBetween(
Div().vanish()
.push_for_each(&pacman_hooks, |hook: &(String, String)| {
Div().vanish()
.push(
Text(&hook.0).xl().semibold().color(&Gray::_300)
)
.push(
Padding(Rounded(Background(Gray::_700, Code(&hook.1).sm().color(&Gray::_100))).size(Size::Large)).all(ScreenValue::_4)
)
})
.push(
html! {
@for unit in &systemd_units {
li { (unit) }
}
})
).y(ScreenValue::_1)
).list_style(ListStyle::Disc).color(&Gray::_300)
)
)
})
.push_if(!binaries.is_empty(),
|| InfoCard(
Div().vanish()
.push(
CardTitle("Binaries")
).push(
ListElements(&binaries)
)
)
) .push_if(!kernel_modules.is_empty(),
|| InfoCard(
Div().vanish()
.push(CardTitle("Kernel Modules"))
.push(
ListElements(&kernel_modules)
)
)
).push_if(!shared_objects.is_empty(),
|| InfoCard(
Div().vanish()
.push(CardTitle("Shared Objects (Libraries)"))
.push(
ListElements(&shared_objects)
)
)
).push_if(!firmware.is_empty(),
|| InfoCard(
Div().vanish()
.push(CardTitle("Firmware"))
.push(
ListElements(&firmware)
)
)
).push_if(!keyrings.is_empty(),
|| InfoCard(
Div().vanish()
.push(CardTitle("Pacman Keyrings"))
.push(
ListElements(&keyrings)
)
)
).push_if(!icons.is_empty(),
|| InfoCard(
Div().vanish()
.push(CardTitle("Icons"))
.push(
ListElements(&icons)
)
)
)
.push_if(!man_entries.is_empty(),
|| InfoCard(
Div().vanish()
.push(CardTitle("Man Entries"))
.push(
ListElements(&man_entries)
)
)
)
.push_if(!etc_entries.is_empty(),
|| InfoCard(
Div().vanish()
.push(CardTitle("Config Files"))
.push(
ListElements(&etc_entries)
)
)
)
.push(
InfoCard(
Div().vanish().push(
CardTitle("Package Files")
)
.push(
ListElements(&pkg.file_list())
)
)
)
).group().wrap(Wrap::Wrap)
)
).y(ScreenValue::_2)
).wrap(Wrap::Wrap).group()).top(ScreenValue::_6)
).push_some(install_script.as_ref(), |install_script: &String| {
SpaceBetween(
Margin(
Div()
.push(Text("Install Script")._3xl().semibold().color(&Gray::_300).indentation(ScreenValue::_2))
.push(Rounded(Padding(Background(Gray::_700,
Code(install_script.trim())
.color(&Gray::_100).sm()
.indentation(ScreenValue::_0)
)).all(ScreenValue::_2)).size(Size::Large))
).top(ScreenValue::_6)
).y(ScreenValue::_4)
}).render();
Some(render(content, pkg_name, ctx).await)
}
pub fn arch_card(a: &str, repo_name: &str, current: bool) -> PreEscaped<String> {
let url = if current {
&format!("/{repo_name}")
} else {
&format!("/{repo_name}?arch={a}")
};
let link = Link(&url, Text(&a).sm().medium().color(&Gray::_300)).use_htmx();
Rounded(
Padding(if current {
Background(Blue::_500, link)
} else {
Background(Gray::_700, link)
})
.x(ScreenValue::_3)
.y(ScreenValue::_1),
)
.size(Size::Full)
.render()
}
#[get("/<repo>?<arch>")]
pub async fn repo_ui(
repo: &str,
@ -197,56 +352,128 @@ pub async fn repo_ui(
repo.list_pkg()
};
let content = html! {
let repo_info = Margin(
// Repository name and architectures
div class="flex flex-wrap items-center justify-center mb-6" {
h1 class="text-3xl font-bold text-gray-800 dark:text-gray-100" {
(repo.name)
};
Flex(
Div()
.vanish()
.push(Text(&repo.name)._3xl().bold().color(&Gray::_100))
.push_if(config.is_mirrored_repo(&repo.name), || {
Background(
Blue::_500,
Rounded(Margin(
Padding(Text("Mirrored").sm().medium().white())
.x(ScreenValue::_3)
.y(ScreenValue::_1),
))
.size(Size::Full),
)
})
.push(
Screen::medium(Margin(Nothing()).top(ScreenValue::_0)).on(Margin(
Flex(Div().vanish().push_for_each(&architectures, |a: &String| {
html! {
@if let Some(arch) = arch.as_ref() {
@if arch.to_string() == *a {
(arch_card(&a, &repo.name, true))
} @else {
(arch_card(&a, &repo.name, false))
}
} @else {
(arch_card(&a, &repo.name, false))
}
}
}))
.group()
.gap(ScreenValue::_2),
)
.top(ScreenValue::_2)),
)
.push(
Text(&format!("{} packages", packages.len()))
.sm()
.color(&Gray::_100),
),
)
.gap(ScreenValue::_3)
.wrap(Wrap::Wrap)
.full_center()
.group(),
)
.bottom(ScreenValue::_6);
@if config.is_mirrored_repo(&repo.name) {
div class="inline-block px-3 py-1 text-sm font-medium text-white bg-blue-500 rounded-full ml-4" { "Mirrored" };
};
let package_list = SpaceBetween(Div().vanish().push_for_each(&packages, |pkg| {
Animated(
Flex(
Padding(
Hover(Background(Gray::_600, Nothing())).on(Background(
Gray::_700,
Rounded(Shadow::medium(
Link(
&format!("/{}/{pkg}", repo.name),
Div()
.vanish()
.push(Context(Sized(
ScreenValue::_10,
ScreenValue::_10,
Rounded(Background(
Blue::_500,
Flex(
Text(
&pkg.chars()
.next()
.unwrap_or_default()
.to_uppercase()
.to_string(),
)
.white()
.semibold(),
)
.full_center()
.group(),
))
.size(Size::Full),
)))
.push(Context(Width(
ScreenValue::fit,
Text(&pkg).medium().color(&Gray::_100),
)))
.push(Context(
Padding(
Flex(
Div()
.vanish()
.push(
Span("✓")._2xl().bold().color(&Slate::_300),
)
.push(
Span("Signed")
.sm()
.medium()
.color(&Slate::_300),
),
)
.items_center()
.gap(ScreenValue::_2)
.group(),
)
.right(ScreenValue::_4),
)),
)
.use_htmx(),
))
.size(Size::Large),
)),
)
.all(ScreenValue::_4),
)
.items_center()
.gap(ScreenValue::_4),
)
}))
.y(ScreenValue::_4);
div class="flex gap-2 mt-2 md:mt-0 ml-4" {
@for a in architectures {
@if let Some(arch) = arch.as_ref() {
@if arch.to_string() == a {
(htmx_link(&format!("/{}", repo.name), "px-3 py-1 text-sm font-medium bg-blue-400 dark:bg-blue-500 text-gray-600 dark:text-gray-300 rounded-full", "", html! {
(a)
}));
} @else {
(htmx_link(&format!("/{}?arch={}", repo.name, a), "px-3 py-1 text-sm font-medium bg-gray-200 dark:bg-gray-700 text-gray-600 dark:text-gray-300 rounded-full", "", html! {
(a)
}));
}
} @else {
(htmx_link(&format!("/{}?arch={}", repo.name, a), "px-3 py-1 text-sm font-medium bg-gray-200 dark:bg-gray-700 text-gray-600 dark:text-gray-300 rounded-full", "", html! {
(a)
}));
}
}
}
};
// Package list
ul class="space-y-4" {
@for pkg in packages {
(htmx_link(&format!("/{}/{pkg}", repo.name), "flex items-center gap-4 p-4 bg-gray-100 dark:bg-gray-700 rounded-lg shadow-md transition hover:bg-gray-200 dark:hover:bg-gray-600", "", html! {
div class="w-10 h-10 flex items-center justify-center rounded-full bg-blue-500 text-white font-semibold" {
{(pkg.chars().next().unwrap_or_default().to_uppercase())}
};
p class="font-medium flex-1 text-gray-800 dark:text-gray-100 max-w-fit" {
(pkg)
};
div class="flex items-center gap-2 text-slate-300 pr-4" {
span class="text-2xl font-bold" { "✓" };
span class="text-sm font-medium" { "Signed" };
};
}))
}
}
};
let content = Div().vanish().push(repo_info).push(package_list).render();
render(content, &repo.name, ctx).await
}
@ -265,12 +492,16 @@ pub fn build_info(key: String, value: String) -> PreEscaped<String> {
return key_value("Packager".to_string(), value);
}
"url" => {
return html! {
div class="flex" {
span class="font-bold w-32" { (format!("Website: ")) };
a class="ml-2 text-blue-400" href=(value) { (value) };
};
};
return Flex(
Div()
.vanish()
.push(Width(ScreenValue::_32, Span("Website: ").bold()))
.push(
Margin(Link(&value, Span(&value).color(&Blue::_400))).left(ScreenValue::_6),
),
)
.group()
.render();
}
"builddate" => {
let date = chrono::DateTime::from_timestamp(value.parse().unwrap(), 0).unwrap();
@ -303,12 +534,15 @@ pub fn build_info(key: String, value: String) -> PreEscaped<String> {
}
pub fn key_value(key: String, value: String) -> PreEscaped<String> {
html! {
div class="flex items-center" {
span class="font-bold w-32" { (format!("{key}: ")) };
span class="ml-2" { (value) };
};
}
Flex(
Div()
.vanish()
.push(Width(ScreenValue::_32, Span(&format!("{key}: ")).bold()))
.push(Margin(Span(&value)).left(ScreenValue::_6)),
)
.items_center()
.group()
.render()
}
pub fn take_out<T>(v: &mut Vec<T>, f: impl Fn(&T) -> bool) -> (&mut Vec<T>, Option<T>) {
@ -339,24 +573,57 @@ pub fn find_pkg_url(pkg: &str) -> Option<String> {
pub fn pkg_list_info(key: &str, value: &str) -> PreEscaped<String> {
let pkgs = value.split_whitespace().map(|pkg| {
if let Some(pkg_url) = find_pkg_url(pkg) {
html! {
a href=(pkg_url) class="ml-2 text-blue-400" { (pkg) };
}
Margin(Link(&pkg_url, Text(&pkg).color(&Blue::_400)).use_htmx()).left(ScreenValue::_6)
} else {
html! {
span class="ml-2" { (pkg) };
}
Margin(Span(&pkg)).left(ScreenValue::_6)
}
});
html! {
div class="flex items-center" {
span class="font-bold w-32" { (format!("{key}: ")) };
div class="flex flex-wrap" {
@for pkg in pkgs {
(pkg)
};
};
};
(Flex(
Div().vanish()
.push(Width(ScreenValue::_32, Span(&format!("{key}: ")).bold()))
.push(Flex(
html! {
@for pkg in pkgs {
(pkg)
}
}
).group().wrap(Wrap::Wrap))
).items_center().group())
}
}
#[allow(non_snake_case)]
pub fn ListElements(el: &[String]) -> TextWidget {
Paragraph(
SpaceBetween(html! {
@for unit in el {
li { (unit) }
}
})
.y(ScreenValue::_1),
)
.list_style(ListStyle::Disc)
.color(&Gray::_300)
}
#[allow(non_snake_case)]
pub fn CardTitle(title: &str) -> PreEscaped<String> {
Context(Text(title).large().medium().color(&Gray::_100).underlined())
}
#[allow(non_snake_case)]
pub fn InfoCard<T: UIWidget + 'static>(inner: T) -> SpaceBetweenWidget {
SpaceBetween(
Padding(Background(
Gray::_800,
Shadow::large(
Rounded(Margin(FlexGrow(Strategy::Grow, inner)).all(ScreenValue::_2))
.size(Size::Large),
),
))
.all(ScreenValue::_4),
)
.y(ScreenValue::_2)
}

19
src/routes/user.rs
View file

@ -1,7 +1,7 @@
use based::{
auth::{Session, Sessions, User, csrf::CSRF},
page::htmx_link,
request::{RequestContext, StringResponse, api::to_uuid, respond_html},
ui::AttrExtendable,
};
use maud::{PreEscaped, html};
use rocket::{
@ -14,6 +14,7 @@ use rocket::{
};
use super::render;
use based::ui::prelude::*;
#[get("/login")]
pub async fn login(ctx: RequestContext) -> StringResponse {
@ -83,7 +84,7 @@ pub async fn new_api_key(user: User, csrf: &str, session_name: &str) -> StringRe
if session_name.is_empty() {
return respond_html(
html! {
div id="next_session" {};
(Div().id("next_session"))
(user.update_csrf().await)
}
.into_string(),
@ -99,7 +100,7 @@ pub async fn new_api_key(user: User, csrf: &str, session_name: &str) -> StringRe
span class="text-red-500" { (api.token) };
};
div id="next_session" {};
(Div().id("next_session"))
(user.update_csrf().await)
}
.into_string(),
@ -124,7 +125,14 @@ pub async fn account_page(user: User, ctx: RequestContext) -> StringResponse {
h2 class="text-xl font-semibold mb-2" { (user.username) };
};
(htmx_link("/passwd", "mb-6 bg-green-500 text-white py-2 px-6 rounded hover:bg-green-600", "", html! { "Change Password" }))
(Link("/passwd", Margin(
Rounded(Padding(
Hover(
Background(Green::_600, Nothing())).on(
Background(Green::_500, Text("Change Password").white())
)
).x(ScreenValue::_6).y(ScreenValue::_2))
).bottom(ScreenValue::_6)).use_htmx())
section class="mb-6 mt-6" {
h3 class="text-lg font-semibold mb-4" { "Active Sessions" };
@ -134,8 +142,7 @@ pub async fn account_page(user: User, ctx: RequestContext) -> StringResponse {
(build_session_block(&ses, &user).await)
};
div id="next_session" {};
(Div().id("next_session"))
}
}